* [GIT PULL 2/5] omap board changes for v3.6 merge window [not found] <pull-1341925556-888624> @ 2012-07-10 13:05 ` Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren ` (4 subsequent siblings) 5 siblings, 0 replies; 12+ messages in thread From: Tony Lindgren @ 2012-07-10 13:05 UTC (permalink / raw) To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-for-v3.6 for you to fetch changes up to b103a2e22a238085f5c50d96345e1a09bb1efd50: ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support (2012-07-09 23:22:24 -0700) ---------------------------------------------------------------- Board and platform data related changes for omaps ---------------------------------------------------------------- Andy Gross (1): omap2+: add drm device Dmitry Lifshitz (2): ARM: OMAP3: cm-t35: add mt9t001 camera sensor support ARM: OMAP3: cm-t35: add tvp5150 decoder support Peter Ujfalusi (2): ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2 ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2 Tony Lindgren (1): ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support Zumeng Chen (4): ARM: OMAP3EVM: Add NAND flash definition ARM: OMAP3EVM: Adding USB internal LDOs board file ARM: omap3evm: enable VBUS switch for EHCI tranceiver ARM: OMAP3530evm: set pendown_state and debounce time for ads7846 arch/arm/mach-omap2/Makefile | 4 + arch/arm/mach-omap2/board-4430sdp.c | 3 + arch/arm/mach-omap2/board-cm-t35.c | 89 ++++++++++++++++++++ arch/arm/mach-omap2/board-omap3evm.c | 78 ++++++++++++++++- arch/arm/mach-omap2/board-omap4panda.c | 3 + arch/arm/mach-omap2/common-board-devices.c | 18 +++- arch/arm/mach-omap2/common-board-devices.h | 1 + arch/arm/mach-omap2/drm.c | 61 ++++++++++++++ drivers/staging/omapdrm/omap_drv.h | 2 +- .../linux/platform_data/omap_drm.h | 19 ++--- 10 files changed, 263 insertions(+), 15 deletions(-) create mode 100644 arch/arm/mach-omap2/drm.c rename drivers/staging/omapdrm/omap_priv.h => include/linux/platform_data/omap_drm.h (81%) ^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL 5/5] minimal omap5 support for v3.6 merge window [not found] <pull-1341925556-888624> 2012-07-10 13:05 ` [GIT PULL 2/5] omap board changes for v3.6 merge window Tony Lindgren @ 2012-07-10 13:05 ` Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 4/5] am33xx data " Tony Lindgren ` (3 subsequent siblings) 5 siblings, 0 replies; 12+ messages in thread From: Tony Lindgren @ 2012-07-10 13:05 UTC (permalink / raw) To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2: ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap devel-omap5 for you to fetch changes up to 39f47d9f437fa94622bf51d7b18b42b3336ad9ac: ARM: Kconfig update to support additional GPIOs in OMAP5 (2012-07-09 19:14:40 +0530) ---------------------------------------------------------------- This branch contains minimal support for omap5 to boot to a console without clock framework support. This branch depends on omap-cleanup-part2-for-v3.6. ---------------------------------------------------------------- R Sricharan (11): ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme ARM: OMAP5: id: Add cpu id for ES versions ARM: OMAP5: Add minimal support for OMAP5430 SOC ARM: OMAP5: timer: Add clocksource, clockevent support ARM: OMAP5: gpmc: Update gpmc_init() ARM: OMAP5: l3: Add l3 error handler support for omap5 ARM: omap2+: board-generic: clean up the irq data from board file ARM: OMAP5: board-generic: Add device tree support arm/dts: OMAP5: Add omap5 dts files ARM: OMAP5: Add the build support Santosh Shilimkar (2): ARM: OMAP5: Add the WakeupGen IP updates ARM: OMAP5: Add SMP support Tarun Kanti DebBarma (1): ARM: Kconfig update to support additional GPIOs in OMAP5 .../devicetree/bindings/arm/omap/omap.txt | 3 + arch/arm/Kconfig | 1 + arch/arm/boot/dts/omap5-evm.dts | 20 +++ arch/arm/boot/dts/omap5.dtsi | 184 ++++++++++++++++++++ arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-omap2/Kconfig | 8 +- arch/arm/mach-omap2/Makefile | 24 ++- arch/arm/mach-omap2/board-generic.c | 42 +++-- arch/arm/mach-omap2/common.c | 24 +++ arch/arm/mach-omap2/common.h | 19 +- arch/arm/mach-omap2/control.h | 4 + arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/gpmc.c | 3 +- arch/arm/mach-omap2/id.c | 42 ++++- arch/arm/mach-omap2/include/mach/debug-macro.S | 8 +- arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 7 + arch/arm/mach-omap2/io.c | 44 +++++ arch/arm/mach-omap2/iomap.h | 27 +++ arch/arm/mach-omap2/irq.c | 13 +- arch/arm/mach-omap2/omap-headsmp.S | 21 +++ arch/arm/mach-omap2/omap-hotplug.c | 24 ++- arch/arm/mach-omap2/omap-smp.c | 52 ++++-- arch/arm/mach-omap2/omap-wakeupgen.c | 114 +++++++++--- arch/arm/mach-omap2/omap4-common.c | 14 ++ arch/arm/mach-omap2/omap4-sar-layout.h | 12 +- arch/arm/mach-omap2/omap_hwmod.c | 2 +- arch/arm/mach-omap2/omap_l3_noc.h | 22 ++- arch/arm/mach-omap2/prcm-common.h | 2 +- arch/arm/mach-omap2/prcm.c | 2 +- arch/arm/mach-omap2/timer.c | 5 + arch/arm/plat-omap/Kconfig | 4 +- arch/arm/plat-omap/common.c | 9 + arch/arm/plat-omap/counter_32k.c | 16 +- arch/arm/plat-omap/include/plat/cpu.h | 22 ++- arch/arm/plat-omap/include/plat/hardware.h | 1 + arch/arm/plat-omap/include/plat/multi.h | 9 + arch/arm/plat-omap/include/plat/omap-secure.h | 5 - arch/arm/plat-omap/include/plat/omap54xx.h | 32 ++++ arch/arm/plat-omap/include/plat/serial.h | 10 ++ arch/arm/plat-omap/include/plat/uncompress.h | 6 + arch/arm/plat-omap/sram.c | 11 +- 41 files changed, 773 insertions(+), 98 deletions(-) create mode 100644 arch/arm/boot/dts/omap5-evm.dts create mode 100644 arch/arm/boot/dts/omap5.dtsi create mode 100644 arch/arm/plat-omap/include/plat/omap54xx.h ^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL 4/5] am33xx data for v3.6 merge window [not found] <pull-1341925556-888624> 2012-07-10 13:05 ` [GIT PULL 2/5] omap board changes for v3.6 merge window Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren @ 2012-07-10 13:05 ` Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 3/5] omap cleanup part2 " Tony Lindgren ` (2 subsequent siblings) 5 siblings, 0 replies; 12+ messages in thread From: Tony Lindgren @ 2012-07-10 13:05 UTC (permalink / raw) To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel The following changes since commit ecc46cfdad7499a21296f0757059c4965f1fbc98: ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals (2012-07-05 08:05:15 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-am33xx-data-for-v3.6 for you to fetch changes up to 79ab2664336d73245023a236345bb31f2b0a2dfe: Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data (2012-07-05 08:18:04 -0700) ---------------------------------------------------------------- This branch adds clock data for am33xx. Note that eventually these will use the common clock framework, but those patches are not quite ready yet for omaps. This branch depends on omap-cleanup-part2-for-v3.6 branch. ---------------------------------------------------------------- Paul Walmsley (1): ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file Tony Lindgren (1): Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx-data Vaibhav Hiremath (1): ARM: OMAP3+: clock33xx: Add AM33XX clock tree data arch/arm/mach-omap2/Makefile | 1 + arch/arm/mach-omap2/clock.h | 14 + arch/arm/mach-omap2/clock33xx_data.c | 1105 +++++++++++++++++++++++++ arch/arm/mach-omap2/clock3xxx_data.c | 20 +- arch/arm/mach-omap2/clock44xx_data.c | 72 -- arch/arm/mach-omap2/clock_common_data.c | 77 ++ arch/arm/mach-omap2/io.c | 2 + arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 + 8 files changed, 1204 insertions(+), 88 deletions(-) create mode 100644 arch/arm/mach-omap2/clock33xx_data.c ^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL 3/5] omap cleanup part2 for v3.6 merge window [not found] <pull-1341925556-888624> ` (2 preceding siblings ...) 2012-07-10 13:05 ` [GIT PULL 4/5] am33xx data " Tony Lindgren @ 2012-07-10 13:05 ` Tony Lindgren [not found] ` <E1SoaE5-0001gM-89@merlin.infradead.org> 2012-07-13 6:14 ` [GIT PULL 1/5] omap device tree changes " Mohammed, Afzal 5 siblings, 0 replies; 12+ messages in thread From: Tony Lindgren @ 2012-07-10 13:05 UTC (permalink / raw) To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel The following changes since commit 3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c: Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2 (2012-07-04 00:29:31 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-part2-for-v3.6 for you to fetch changes up to fb584511c4664573097ece7df0de06ad00b713a2: ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700) ---------------------------------------------------------------- This branch contains more clean-up like changes and minor fixes for making it easier to support new omap SoCs, such as omap5 and am33xx. This branch has dependencies to earlier clean-up in omap-cleanup-for-v3.6 and omap-devel-dmtimer-for-v3.6 branches, and also depends on the omap-devel-am33xx-for-v3.6 branch, and are based on a merge of these branches. ---------------------------------------------------------------- Jon Hunter (2): ARM: OMAP4: clockdomain/CM code: Update supported transition modes ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status Kishon Vijay Abraham I (1): ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework Paul Walmsley (1): Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6 R Sricharan (1): ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak Sakari Ailus (1): ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL Santosh Shilimkar (1): ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds Tarun Kanti DebBarma (3): ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe() ARM: OMAP2+: dmtimer: cleanup fclk usage Tony Lindgren (2): Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-part2 ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API Vaibhav Hiremath (7): ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c ARM: OMAP2+: am33xx: Make am33xx as a separate class ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals Vikram Pandita (1): ARM: OMAP3+: dpll: optimize noncore dpll locking logic arch/arm/mach-omap2/Kconfig | 12 +++- arch/arm/mach-omap2/Makefile | 8 ++- arch/arm/mach-omap2/clock.c | 18 ------ arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/clock44xx_data.c | 22 ++++---- arch/arm/mach-omap2/clockdomain44xx.c | 10 +++- arch/arm/mach-omap2/cminst44xx.c | 14 ----- arch/arm/mach-omap2/cminst44xx.h | 25 --------- arch/arm/mach-omap2/common.c | 10 +--- arch/arm/mach-omap2/common.h | 5 ++ arch/arm/mach-omap2/control.h | 1 + arch/arm/mach-omap2/dpll3xxx.c | 26 ++++++++- arch/arm/mach-omap2/id.c | 4 +- arch/arm/mach-omap2/omap_hwmod.c | 76 ++++++++++++++++++++++++-- arch/arm/mach-omap2/omap_hwmod_common_data.c | 10 ++++ arch/arm/mach-omap2/powerdomain.c | 6 +- arch/arm/mach-omap2/prcm.c | 23 ++++++++ arch/arm/mach-omap2/prm2xxx_3xxx.h | 65 ---------------------- arch/arm/mach-omap2/prm_common.c | 62 +++++++++++++++++++++ arch/arm/mach-omap2/timer.c | 3 +- arch/arm/plat-omap/Makefile | 4 +- arch/arm/plat-omap/dmtimer.c | 53 ++++++------------ arch/arm/plat-omap/include/plat/cpu.h | 17 +++--- arch/arm/plat-omap/include/plat/omap_hwmod.h | 19 +++++++ arch/arm/plat-omap/include/plat/sdrc.h | 2 +- arch/arm/plat-omap/sram.c | 6 +- 26 files changed, 296 insertions(+), 207 deletions(-) ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <E1SoaE5-0001gM-89@merlin.infradead.org>]
* Re: [GIT PULL 5/5] minimal omap5 support for v3.6 merge window [not found] ` <E1SoaE5-0001gM-89@merlin.infradead.org> @ 2012-07-10 13:42 ` Tony Lindgren 2012-07-10 15:53 ` Arnd Bergmann 0 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2012-07-10 13:42 UTC (permalink / raw) To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel * Tony Lindgren <tony@atomide.com> [120710 06:21]: > The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2: > > ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap devel-omap5 FYI, I got some merge conflicts with the am33xx and PM/smartreflex changes, here's how I resolved them. Regards, Tony --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@@ -48,5 -48,5 +48,8 @@@ Boards - AM335X EVM : Software Developement Board for AM335x compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3" +- AM335X Bone : Low cost community board + compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3" ++ + - OMAP5 EVM : Evaluation Module + compatible = "ti,omap5-evm", "ti,omap5" --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@@ -68,11 -71,13 +71,12 @@@ ifeq ($(CONFIG_PM),y obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o -obj-$(CONFIG_ARCH_OMAP3) += cpuidle34xx.o obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o + obj-$(CONFIG_SOC_OMAP5) += omap-mpuss-lowpower.o -obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o -obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o -obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o + +obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o +obj-$(CONFIG_POWER_AVS_OMAP_CLASS3) += smartreflex-class3.o AFLAGS_sleep24xx.o :=-Wa,-march=armv6 AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a$(plus_sec) @@@ -83,12 -88,10 +87,15 @@@ endi endif +ifeq ($(CONFIG_CPU_IDLE),y) +obj-$(CONFIG_ARCH_OMAP3) += cpuidle34xx.o +obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o +endif + # PRCM + omap-prcm-4-5-common = prcm.o cminst44xx.o cm44xx.o \ + prcm_mpu44xx.o prminst44xx.o \ + vc44xx_data.o vp44xx_data.o obj-y += prm_common.o obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o @@@ -161,7 -168,8 +172,9 @@@ obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk. obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o +obj-$(CONFIG_SOC_AM33XX) += clock33xx_data.o + obj-$(CONFIG_SOC_OMAP5) += $(clock-common) + obj-$(CONFIG_SOC_OMAP5) += dpll3xxx.o dpll44xx.o # OMAP2 clock rate set data (old "OPP" data) obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL 5/5] minimal omap5 support for v3.6 merge window 2012-07-10 13:42 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren @ 2012-07-10 15:53 ` Arnd Bergmann 2012-07-11 6:04 ` Tony Lindgren 0 siblings, 1 reply; 12+ messages in thread From: Arnd Bergmann @ 2012-07-10 15:53 UTC (permalink / raw) To: Tony Lindgren; +Cc: Olof Johansson, linux-omap, linux-arm-kernel On Tuesday 10 July 2012, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [120710 06:21]: > > The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2: > > > > ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap devel-omap5 > > FYI, I got some merge conflicts with the am33xx and PM/smartreflex > changes, here's how I resolved them. > Pulled all five branches now. I put the am33xx clk data into the next/clk branch, as that seemed convenient. The omap5 branch is in the next/newsoc branch, together with the new Marvell ArmadaXP port. I'm not extremely happy with the multi-level dependencies, but it's still manageable at the moment, especially since I have a relatively large number of next/* branches. If others submit pull requests that create additional dependencies I might have to reject them if that gets too complex. Arnd ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL 5/5] minimal omap5 support for v3.6 merge window 2012-07-10 15:53 ` Arnd Bergmann @ 2012-07-11 6:04 ` Tony Lindgren 0 siblings, 0 replies; 12+ messages in thread From: Tony Lindgren @ 2012-07-11 6:04 UTC (permalink / raw) To: Arnd Bergmann; +Cc: Olof Johansson, linux-omap, linux-arm-kernel * Arnd Bergmann <arnd@arndb.de> [120710 08:57]: > On Tuesday 10 July 2012, Tony Lindgren wrote: > > * Tony Lindgren <tony@atomide.com> [120710 06:21]: > > > The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2: > > > > > > ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap devel-omap5 > > > > FYI, I got some merge conflicts with the am33xx and PM/smartreflex > > changes, here's how I resolved them. > > > > Pulled all five branches now. OK thanks. > I put the am33xx clk data into the next/clk branch, as that seemed convenient. > The omap5 branch is in the next/newsoc branch, together with the new Marvell > ArmadaXP port. OK > I'm not extremely happy with the multi-level dependencies, but it's still > manageable at the moment, especially since I have a relatively large number > of next/* branches. Yes me neither, that causes a lot of extra work keeping thing working. The clean-up we did caused quite a bit of these dependencies, but was necessary for adding am33xx and omap5 in somewhat clean way to avoid patching all over the place to add more soc_is_omapxxxx() calls. So this amount of dependencies should be rare. All the clean-up should really have been in the first clean-up branch, but was not quite ready yet at that point. That would have simplified things a lot. > If others submit pull requests that create additional dependencies I might > have to reject them if that gets too complex. Yes sorry about that, I too was considering leaving some of these branches for v3.7 to let the dependencies clear out.. Anyways thanks again for the extra effort on your part too. Regards, Tony ^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [GIT PULL 1/5] omap device tree changes for v3.6 merge window [not found] <pull-1341925556-888624> ` (4 preceding siblings ...) [not found] ` <E1SoaE5-0001gM-89@merlin.infradead.org> @ 2012-07-13 6:14 ` Mohammed, Afzal 2012-07-13 6:41 ` Tony Lindgren 5 siblings, 1 reply; 12+ messages in thread From: Mohammed, Afzal @ 2012-07-13 6:14 UTC (permalink / raw) To: Tony Lindgren, Arnd Bergmann, Olof Johansson Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Hi Tony, On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote: > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6 > > for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89: > > arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700) > > ---------------------------------------------------------------- > Device tree related patches for omaps > > ---------------------------------------------------------------- > Afzal Mohammed (1): > arm/dts: am33xx wdt node The above patch seems to be an empty one, actual changes in it as in original patch [1] is missing, same changes are shown below for your reference [2]. Can you please do the needful so that the intended change of this patch makes to mainline this merge window. Regards Afzal [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html [2] diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index f46e353..08b2a5b 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -185,5 +185,10 @@ compatible = "ti,omap3-hsmmc"; ti,hwmods = "mmc3"; }; + + wdt2: wdt@44e35000 { + compatible = "ti,omap3-wdt"; + ti,hwmods = "wd_timer2"; + }; }; }; ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window 2012-07-13 6:14 ` [GIT PULL 1/5] omap device tree changes " Mohammed, Afzal @ 2012-07-13 6:41 ` Tony Lindgren 2012-07-13 7:56 ` Tony Lindgren 0 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2012-07-13 6:41 UTC (permalink / raw) To: Mohammed, Afzal Cc: Arnd Bergmann, Olof Johansson, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Mohammed, Afzal <afzal@ti.com> [120712 23:19]: > Hi Tony, > > On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote: > > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6 > > > > for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89: > > > > arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700) > > > > ---------------------------------------------------------------- > > Device tree related patches for omaps > > > > ---------------------------------------------------------------- > > Afzal Mohammed (1): > > arm/dts: am33xx wdt node > > The above patch seems to be an empty one, actual changes in it as in > original patch [1] is missing, same changes are shown below for your > reference [2]. > > Can you please do the needful so that the intended change of this > patch makes to mainline this merge window. Argh. Thanks for letting me know. I must have something wrong with my scripts when applying patches. We'll have to apply this as a fix. Regards, Tony > Regards > Afzal > > [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html > [2] > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index f46e353..08b2a5b 100644 > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -185,5 +185,10 @@ > compatible = "ti,omap3-hsmmc"; > ti,hwmods = "mmc3"; > }; > + > + wdt2: wdt@44e35000 { > + compatible = "ti,omap3-wdt"; > + ti,hwmods = "wd_timer2"; > + }; > }; > }; ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window 2012-07-13 6:41 ` Tony Lindgren @ 2012-07-13 7:56 ` Tony Lindgren 2012-08-07 7:13 ` Tony Lindgren 0 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2012-07-13 7:56 UTC (permalink / raw) To: Mohammed, Afzal Cc: Arnd Bergmann, Olof Johansson, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Tony Lindgren <tony@atomide.com> [120712 23:46]: > * Mohammed, Afzal <afzal@ti.com> [120712 23:19]: > > Hi Tony, > > > > On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote: > > > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > > > > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6 > > > > > > for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89: > > > > > > arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700) > > > > > > ---------------------------------------------------------------- > > > Device tree related patches for omaps > > > > > > ---------------------------------------------------------------- > > > Afzal Mohammed (1): > > > arm/dts: am33xx wdt node > > > > The above patch seems to be an empty one, actual changes in it as in > > original patch [1] is missing, same changes are shown below for your > > reference [2]. > > > > Can you please do the needful so that the intended change of this > > patch makes to mainline this merge window. > > Argh. Thanks for letting me know. I must have something wrong with > my scripts when applying patches. We'll have to apply this as a fix. Arnd and Olof, let me know if you want me to resubmit a new branch instead of the already pulled devel-dt branch. That branch should not have other dependencies as it's based on -rc5. Of course is it's buried into other DT patches it's too late. > Regards, > > Tony > > > Regards > > Afzal > > > > [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html > > [2] > > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > > index f46e353..08b2a5b 100644 > > --- a/arch/arm/boot/dts/am33xx.dtsi > > +++ b/arch/arm/boot/dts/am33xx.dtsi > > @@ -185,5 +185,10 @@ > > compatible = "ti,omap3-hsmmc"; > > ti,hwmods = "mmc3"; > > }; > > + > > + wdt2: wdt@44e35000 { > > + compatible = "ti,omap3-wdt"; > > + ti,hwmods = "wd_timer2"; > > + }; > > }; > > }; > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window 2012-07-13 7:56 ` Tony Lindgren @ 2012-08-07 7:13 ` Tony Lindgren 2012-08-07 7:29 ` Mohammed, Afzal 0 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2012-08-07 7:13 UTC (permalink / raw) To: Mohammed, Afzal Cc: Arnd Bergmann, Olof Johansson, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Tony Lindgren <tony@atomide.com> [120713 01:01]: > * Tony Lindgren <tony@atomide.com> [120712 23:46]: > > * Mohammed, Afzal <afzal@ti.com> [120712 23:19]: > > > > Afzal Mohammed (1): > > > > arm/dts: am33xx wdt node > > > > > > The above patch seems to be an empty one, actual changes in it as in > > > original patch [1] is missing, same changes are shown below for your > > > reference [2]. > > > > > > Can you please do the needful so that the intended change of this > > > patch makes to mainline this merge window. > > > > Argh. Thanks for letting me know. I must have something wrong with > > my scripts when applying patches. We'll have to apply this as a fix. > > Arnd and Olof, let me know if you want me to resubmit a new branch instead > of the already pulled devel-dt branch. That branch should not have other > dependencies as it's based on -rc5. Of course is it's buried into other > DT patches it's too late. Now with -rc1 out, I'll queue the following fix. Regards, Tony From: Afzal Mohammed <afzal@ti.com> Date: Wed, 4 Jul 2012 18:00:37 +0530 Subject: [PATCH] arm/dts: Fix am33xx wdt node Add am33xx wdt node. Signed-off-by: Afzal Mohammed <afzal@ti.com> [tony@atomide.com: I messed up and produced an empty commit db27ac80 with stg apply] Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 59509c4..bd0cff3 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -154,5 +154,10 @@ #size-cells = <0>; ti,hwmods = "i2c3"; }; + + wdt2: wdt@44e35000 { + compatible = "ti,omap3-wdt"; + ti,hwmods = "wd_timer2"; + }; }; }; ^ permalink raw reply related [flat|nested] 12+ messages in thread
* RE: [GIT PULL 1/5] omap device tree changes for v3.6 merge window 2012-08-07 7:13 ` Tony Lindgren @ 2012-08-07 7:29 ` Mohammed, Afzal 0 siblings, 0 replies; 12+ messages in thread From: Mohammed, Afzal @ 2012-08-07 7:29 UTC (permalink / raw) To: Tony Lindgren Cc: Arnd Bergmann, Olof Johansson, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org On Tue, Aug 07, 2012 at 12:43:51, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [120713 01:01]: > > * Tony Lindgren <tony@atomide.com> [120712 23:46]: > > > my scripts when applying patches. We'll have to apply this as a fix. > > Arnd and Olof, let me know if you want me to resubmit a new branch instead > > of the already pulled devel-dt branch. That branch should not have other > > dependencies as it's based on -rc5. Of course is it's buried into other > > DT patches it's too late. > > Now with -rc1 out, I'll queue the following fix. Thanks Tony Regards Afzal ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-08-07 7:29 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <pull-1341925556-888624>
2012-07-10 13:05 ` [GIT PULL 2/5] omap board changes for v3.6 merge window Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 4/5] am33xx data " Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 3/5] omap cleanup part2 " Tony Lindgren
[not found] ` <E1SoaE5-0001gM-89@merlin.infradead.org>
2012-07-10 13:42 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren
2012-07-10 15:53 ` Arnd Bergmann
2012-07-11 6:04 ` Tony Lindgren
2012-07-13 6:14 ` [GIT PULL 1/5] omap device tree changes " Mohammed, Afzal
2012-07-13 6:41 ` Tony Lindgren
2012-07-13 7:56 ` Tony Lindgren
2012-08-07 7:13 ` Tony Lindgren
2012-08-07 7:29 ` Mohammed, Afzal
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).