* [GIT PULL 0/5] Second batch of arm-soc changes
@ 2012-03-28 7:13 ` Olof Johansson
0 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 7:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
Hi Linus,
Here is the second batch of arm-soc changes for this merge window. As Arnd
mentioned with the first cover letter, most of these either had external
dependencies that have now been pulled in, or just needed a bit more
linux-next bake time due to getting picked up close to the 3.3 release.
There are 128 non-merge patches, with a total diffstat of:
346 files changed, 10790 insertions(+), 2792 deletions(-)
So, while there's been some good cleanups especially in the first branch,
there's been a net addition of code:
* New SoC family support for Samsung EXYNOS5250: clock tables, driver
updates, etc means net gain in code.
* Added device tree conversions. Once we start to sunset non-device tree
boards on the enabled platforms, we should see payback in code removal.
* Common clock framework. As SoCs get converted over to the framework,
we should see more code removal from this as well.
There are a handful of merge conflicts on the branches, nothing that
should be too messy to sort out. I've described each conflict in the
corresponding pull request, including how we've resolved them in our
for-next branch.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 0/5] Second batch of arm-soc changes
@ 2012-03-28 7:13 ` Olof Johansson
0 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 7:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
Here is the second batch of arm-soc changes for this merge window. As Arnd
mentioned with the first cover letter, most of these either had external
dependencies that have now been pulled in, or just needed a bit more
linux-next bake time due to getting picked up close to the 3.3 release.
There are 128 non-merge patches, with a total diffstat of:
346 files changed, 10790 insertions(+), 2792 deletions(-)
So, while there's been some good cleanups especially in the first branch,
there's been a net addition of code:
* New SoC family support for Samsung EXYNOS5250: clock tables, driver
updates, etc means net gain in code.
* Added device tree conversions. Once we start to sunset non-device tree
boards on the enabled platforms, we should see payback in code removal.
* Common clock framework. As SoCs get converted over to the framework,
we should see more code removal from this as well.
There are a handful of merge conflicts on the branches, nothing that
should be too messy to sort out. I've described each conflict in the
corresponding pull request, including how we've resolved them in our
for-next branch.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-28 7:13 ` Olof Johansson
(?)
@ 2012-03-28 7:13 ` Olof Johansson
2012-03-28 8:25 ` Russell King - ARM Linux
-1 siblings, 1 reply; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 7:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
moving some of the oft-repeated macros to a common location and removing a bunch of
boiler plate. This is another step closer to a common zImage for multiple platforms.
This branch has some context conflicts with current upstream contents:
arch/arm/Kconfig: New selects added for ARCH_S3C24X. Include both sides
of the merge.
arch/arm/mach-shmobile/smp-sh73a0.c: A readl vs readw fix collided with
the io accessor cleanup. Ditch the __io() use but keep readl.
arch/arm/mach-tegra/include/mach/debug-macro.S: include of mach/io.h is
going away, iomap.h is kept.
-Olof
----------------------------------------------------------------
The following changes since commit 6658a6991cef75719a21441aa0b7f8d6821534ee:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/cleanup2
for you to fetch changes up to 88b48684fe2d4f6207223423227c80d5408bccaf:
Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2
----------------------------------------------------------------
Arnd Bergmann (3):
Merge branch 'cleanup' of git://git.kernel.org/.../tmlind/linux-omap into omap/cleanup
Merge tag 'tegra-soc' of git://git.kernel.org/.../olof/tegra into tegra/soc
Merge branch 'tegra/cleanups' into next/cleanup2
Olof Johansson (7):
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into devel/io-cleanup
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into devel/io-cleanup
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
Merge branch 'tegra/soc' into next/cleanup2
Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup2
Rob Herring (28):
Merge remote-tracking branch 'arm-soc/at91/base2+cleanup' into cleanup-base
usb: ohci-pxa27x: add explicit include of hardware.h
ARM: provide runtime hook for ioremap/iounmap
ARM: imx: convert to common runtime ioremap hook
ARM: msm: use runtime ioremap hook
ARM: iop13xx: use runtime ioremap hook
ARM: ixp4xx: use runtime ioremap hook
ARM: ebsa110: use runtime ioremap hook
ARM: remove compile time __arch_ioremap/__arch_iounmap
ARM: iop13xx: move io.h externs to pci.h
ARM: msm: clean-up mach/io.h
[media] davinci: remove includes of mach/io.h
ARM: davinci: remove unneeded mach/io.h include
ARM: orion5x: clean-up mach/io.h
ARM: tegra: clean-up mach/io.h
ARM: ep93xx: clean-up mach/io.h
ARM: at91: add explicit include of hardware.h to uncompressor
ARM: dove: add explicit include of dove.h to addr-map.c
ARM: clps711x: remove unneeded include of mach/io.h
ARM: make mach/io.h include optional
ARM: remove bunch of now unused mach/io.h files
ARM: kill off __mem_pci
ARM: fix ioremap/iounmap for !CONFIG_MMU
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: create a common IOMEM definition
ARM: __io abuse cleanup
ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
ARM: pxa: use common IOMEM definition
Stephen Warren (2):
Merge remote branch 'remotes/korg_olof_tegra/for-3.4/soc' into for-3.4/fixes-for-io-cleanup
ARM: tegra: Include assembler.h in sleep.S to fix build break
Tony Lindgren (1):
ARM: OMAP: Remove remaining includes for mach/io.h
arch/arm/Kconfig | 27 +++++++
arch/arm/include/asm/assembler.h | 2 +
arch/arm/include/asm/io.h | 71 ++++++++---------
arch/arm/kernel/debug.S | 1 +
arch/arm/kernel/entry-armv.S | 1 +
arch/arm/mach-at91/include/mach/io.h | 31 -------
arch/arm/mach-at91/include/mach/uncompress.h | 1 +
arch/arm/mach-bcmring/include/mach/io.h | 33 --------
arch/arm/mach-clps711x/include/mach/io.h | 36 ---------
arch/arm/mach-clps711x/include/mach/uncompress.h | 1 -
arch/arm/mach-cns3xxx/core.c | 8 +-
arch/arm/mach-cns3xxx/devices.c | 2 +-
arch/arm/mach-cns3xxx/include/mach/io.h | 17 ----
arch/arm/mach-davinci/include/mach/entry-macro.S | 1 -
arch/arm/mach-davinci/include/mach/hardware.h | 6 --
arch/arm/mach-davinci/include/mach/io.h | 24 ------
arch/arm/mach-davinci/include/mach/uncompress.h | 2 +
arch/arm/mach-dove/addr-map.c | 1 +
arch/arm/mach-dove/include/mach/io.h | 1 -
arch/arm/mach-ebsa110/core.c | 15 ++++
arch/arm/mach-ebsa110/include/mach/io.h | 9 ---
arch/arm/mach-ep93xx/include/mach/io.h | 22 -----
arch/arm/mach-exynos/include/mach/io.h | 26 ------
arch/arm/mach-footbridge/include/mach/io.h | 13 ---
arch/arm/mach-gemini/include/mach/io.h | 18 -----
arch/arm/mach-h720x/include/mach/io.h | 22 -----
arch/arm/mach-highbank/include/mach/io.h | 7 --
arch/arm/mach-imx/mm-imx3.c | 10 +--
arch/arm/mach-integrator/include/mach/io.h | 1 -
arch/arm/mach-iop13xx/include/mach/io.h | 13 ---
arch/arm/mach-iop13xx/include/mach/iop13xx.h | 1 +
arch/arm/mach-iop13xx/io.c | 20 +++--
arch/arm/mach-iop13xx/iq81340mc.c | 1 +
arch/arm/mach-iop13xx/iq81340sc.c | 1 +
arch/arm/mach-iop13xx/pci.h | 6 ++
arch/arm/mach-iop32x/include/mach/io.h | 1 -
arch/arm/mach-iop33x/include/mach/io.h | 1 -
arch/arm/mach-ixp2000/include/mach/io.h | 1 -
arch/arm/mach-ixp23xx/include/mach/io.h | 1 -
arch/arm/mach-ixp4xx/avila-setup.c | 2 +
arch/arm/mach-ixp4xx/common.c | 33 ++++++++
arch/arm/mach-ixp4xx/coyote-setup.c | 2 +
arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 +
arch/arm/mach-ixp4xx/fsg-setup.c | 1 +
arch/arm/mach-ixp4xx/gateway7001-setup.c | 1 +
arch/arm/mach-ixp4xx/goramo_mlr.c | 1 +
arch/arm/mach-ixp4xx/gtwx5715-setup.c | 1 +
arch/arm/mach-ixp4xx/include/mach/hardware.h | 2 -
arch/arm/mach-ixp4xx/include/mach/io.h | 24 +-----
arch/arm/mach-ixp4xx/include/mach/platform.h | 1 +
arch/arm/mach-ixp4xx/ixdp425-setup.c | 4 +
arch/arm/mach-ixp4xx/nas100d-setup.c | 1 +
arch/arm/mach-ixp4xx/nslu2-setup.c | 1 +
arch/arm/mach-ixp4xx/omixp-setup.c | 3 +
arch/arm/mach-ixp4xx/vulcan-setup.c | 1 +
arch/arm/mach-ixp4xx/wg302v2-setup.c | 1 +
arch/arm/mach-kirkwood/include/mach/io.h | 2 -
arch/arm/mach-ks8695/include/mach/io.h | 19 -----
arch/arm/mach-lpc32xx/include/mach/io.h | 27 -------
arch/arm/mach-mmp/include/mach/addr-map.h | 6 --
arch/arm/mach-mmp/include/mach/io.h | 21 -----
arch/arm/mach-msm/board-halibut.c | 6 ++
arch/arm/mach-msm/board-trout.c | 6 ++
arch/arm/mach-msm/include/mach/io.h | 36 ---------
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 12 +--
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 +
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 4 +
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 +
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 +
arch/arm/mach-msm/include/mach/msm_iomap.h | 6 --
arch/arm/mach-msm/io.c | 8 +-
arch/arm/mach-mv78xx0/include/mach/io.h | 2 -
arch/arm/mach-mxs/include/mach/hardware.h | 6 --
arch/arm/mach-mxs/include/mach/io.h | 22 -----
arch/arm/mach-netx/generic.c | 2 +-
arch/arm/mach-netx/include/mach/hardware.h | 2 +-
arch/arm/mach-netx/include/mach/io.h | 28 -------
arch/arm/mach-netx/include/mach/netx-regs.h | 16 ++--
arch/arm/mach-nomadik/include/mach/io.h | 22 -----
arch/arm/mach-omap1/ams-delta-fiq-handler.S | 1 +
arch/arm/mach-omap1/include/mach/entry-macro.S | 1 -
arch/arm/mach-omap1/include/mach/io.h | 46 -----------
arch/arm/mach-omap1/iomap.h | 6 --
arch/arm/mach-omap1/sleep.S | 2 -
arch/arm/mach-omap1/sram.S | 1 -
arch/arm/mach-omap2/clock3xxx_data.c | 1 +
arch/arm/mach-omap2/clock44xx_data.c | 1 +
arch/arm/mach-omap2/include/mach/io.h | 49 ------------
arch/arm/mach-omap2/iomap.h | 6 --
arch/arm/mach-orion5x/common.h | 9 +++
arch/arm/mach-orion5x/include/mach/io.h | 33 --------
arch/arm/mach-orion5x/pci.c | 1 +
arch/arm/mach-orion5x/tsx09-common.c | 1 +
arch/arm/mach-picoxcell/include/mach/io.h | 22 -----
arch/arm/mach-pnx4008/include/mach/io.h | 21 -----
arch/arm/mach-prima2/include/mach/io.h | 16 ----
arch/arm/mach-pxa/Kconfig | 1 +
arch/arm/mach-pxa/clock-pxa2xx.c | 1 +
arch/arm/mach-pxa/corgi_pm.c | 1 +
arch/arm/mach-pxa/cpufreq-pxa3xx.c | 1 +
arch/arm/mach-pxa/include/mach/hardware.h | 6 --
arch/arm/mach-pxa/include/mach/io.h | 20 -----
arch/arm/mach-pxa/mfp-pxa2xx.c | 1 +
arch/arm/mach-pxa/pxa2xx.c | 1 +
arch/arm/mach-pxa/pxa300.c | 1 +
arch/arm/mach-pxa/pxa320.c | 1 +
arch/arm/mach-pxa/sharpsl_pm.c | 1 +
arch/arm/mach-realview/include/mach/hardware.h | 2 +-
arch/arm/mach-realview/include/mach/io.h | 28 -------
arch/arm/mach-rpc/include/mach/hardware.h | 6 --
arch/arm/mach-rpc/include/mach/io.h | 5 --
arch/arm/mach-s3c24xx/include/mach/io.h | 5 --
arch/arm/mach-s3c64xx/include/mach/io.h | 18 -----
arch/arm/mach-s5p64x0/include/mach/io.h | 25 ------
arch/arm/mach-s5pc100/include/mach/io.h | 18 -----
arch/arm/mach-s5pv210/include/mach/io.h | 26 ------
arch/arm/mach-sa1100/include/mach/io.h | 20 -----
arch/arm/mach-shark/include/mach/io.h | 2 -
arch/arm/mach-shmobile/board-ag5evm.c | 2 +-
arch/arm/mach-shmobile/board-bonito.c | 2 +-
arch/arm/mach-shmobile/board-kota2.c | 2 +-
arch/arm/mach-shmobile/include/mach/io.h | 9 ---
arch/arm/mach-shmobile/intc-r8a7779.c | 4 +-
arch/arm/mach-shmobile/intc-sh73a0.c | 4 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 4 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 20 ++---
arch/arm/mach-spear3xx/clock.c | 1 +
arch/arm/mach-spear3xx/include/mach/io.h | 19 -----
arch/arm/mach-spear6xx/clock.c | 1 +
arch/arm/mach-spear6xx/include/mach/io.h | 20 -----
arch/arm/mach-tegra/Makefile | 1 +
arch/arm/mach-tegra/include/mach/debug-macro.S | 2 -
arch/arm/mach-tegra/include/mach/io.h | 49 ------------
arch/arm/mach-tegra/include/mach/iomap.h | 42 ++++++++++
arch/arm/mach-tegra/io.c | 1 +
arch/arm/mach-tegra/sleep.S | 4 +-
arch/arm/mach-u300/include/mach/io.h | 20 -----
arch/arm/mach-u300/include/mach/u300-regs.h | 6 --
arch/arm/mach-ux500/include/mach/hardware.h | 2 +-
arch/arm/mach-ux500/include/mach/io.h | 22 -----
arch/arm/mach-versatile/include/mach/io.h | 28 -------
arch/arm/mach-vexpress/include/mach/io.h | 26 ------
arch/arm/mach-vt8500/include/mach/io.h | 26 ------
arch/arm/mach-w90x900/include/mach/io.h | 30 -------
arch/arm/mach-zynq/include/mach/io.h | 33 --------
arch/arm/mm/ioremap.c | 17 +++-
arch/arm/mm/nommu.c | 8 +-
arch/arm/plat-mxc/include/mach/hardware.h | 7 +-
arch/arm/plat-mxc/include/mach/io.h | 39 ---------
arch/arm/plat-omap/include/plat/hardware.h | 6 --
arch/arm/plat-omap/include/plat/sdrc.h | 1 -
arch/arm/plat-omap/include/plat/usb.h | 1 -
arch/arm/plat-spear/include/plat/hardware.h | 6 --
arch/arm/plat-spear/include/plat/io.h | 22 -----
drivers/media/video/davinci/vpbe_osd.c | 1 -
drivers/media/video/davinci/vpbe_venc.c | 1 -
drivers/rtc/rtc-sa1100.c | 1 +
drivers/video/omap2/vrfb.c | 1 -
drivers/watchdog/sa1100_wdt.c | 1 +
include/linux/dma-mapping.h | 2 +-
sound/arm/pxa2xx-ac97-lib.c | 1 +
sound/arm/pxa2xx-ac97.c | 1 +
sound/soc/pxa/pxa2xx-ac97.c | 1 +
163 files changed, 337 insertions(+), 1367 deletions(-)
delete mode 100644 arch/arm/mach-at91/include/mach/io.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/io.h
delete mode 100644 arch/arm/mach-clps711x/include/mach/io.h
delete mode 100644 arch/arm/mach-cns3xxx/include/mach/io.h
delete mode 100644 arch/arm/mach-davinci/include/mach/io.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/io.h
delete mode 100644 arch/arm/mach-exynos/include/mach/io.h
delete mode 100644 arch/arm/mach-gemini/include/mach/io.h
delete mode 100644 arch/arm/mach-h720x/include/mach/io.h
delete mode 100644 arch/arm/mach-highbank/include/mach/io.h
create mode 100644 arch/arm/mach-iop13xx/pci.h
delete mode 100644 arch/arm/mach-ks8695/include/mach/io.h
delete mode 100644 arch/arm/mach-lpc32xx/include/mach/io.h
delete mode 100644 arch/arm/mach-mmp/include/mach/io.h
delete mode 100644 arch/arm/mach-msm/include/mach/io.h
delete mode 100644 arch/arm/mach-mxs/include/mach/io.h
delete mode 100644 arch/arm/mach-netx/include/mach/io.h
delete mode 100644 arch/arm/mach-nomadik/include/mach/io.h
delete mode 100644 arch/arm/mach-omap1/include/mach/io.h
delete mode 100644 arch/arm/mach-omap2/include/mach/io.h
delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h
delete mode 100644 arch/arm/mach-picoxcell/include/mach/io.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/io.h
delete mode 100644 arch/arm/mach-prima2/include/mach/io.h
delete mode 100644 arch/arm/mach-pxa/include/mach/io.h
delete mode 100644 arch/arm/mach-realview/include/mach/io.h
delete mode 100644 arch/arm/mach-s3c64xx/include/mach/io.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/io.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/io.h
delete mode 100644 arch/arm/mach-s5pv210/include/mach/io.h
delete mode 100644 arch/arm/mach-sa1100/include/mach/io.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/io.h
delete mode 100644 arch/arm/mach-spear3xx/include/mach/io.h
delete mode 100644 arch/arm/mach-spear6xx/include/mach/io.h
delete mode 100644 arch/arm/mach-u300/include/mach/io.h
delete mode 100644 arch/arm/mach-ux500/include/mach/io.h
delete mode 100644 arch/arm/mach-versatile/include/mach/io.h
delete mode 100644 arch/arm/mach-vexpress/include/mach/io.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/io.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/io.h
delete mode 100644 arch/arm/mach-zynq/include/mach/io.h
delete mode 100644 arch/arm/plat-mxc/include/mach/io.h
delete mode 100644 arch/arm/plat-spear/include/plat/io.h
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 2/5] ARM: More SoC driver updates
2012-03-28 7:13 ` Olof Johansson
(?)
(?)
@ 2012-03-28 7:13 ` Olof Johansson
-1 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 7:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
This branch contains a handful of driver updates, mostly to
the LPC32xx platform but also for Samsung EXYNOS and Davinci.
It had a few context conflicts against patches already merged through
fixes-non-critical. We should have resolved this early during the
development cycle by pulling them in as a dependency, instead I did it
after the fact this time.
-Olof
----------------------------------------------------------------
The following changes since commit 7700a7305fe11c06900bc813df4e49381d429b89:
Merge tag 'cleanup2' into for-next
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/drivers2
for you to fetch changes up to 1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544:
Merge branch 'fixes-non-critical' into next/drivers2
----------------------------------------------------------------
Arnd Bergmann (4):
Merge branches 'lpc32xx/mach-lpc32xx-eth' and 'lpc32xx/mach-lpc32xx-usb' of git://git.antcom.de/linux-2.6 into lpc32xx/drivers
Merge branch 'lpc32xx/drivers' into next/drivers
Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers
Merge branch 'next/soc-exynos5250-gpio' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Manjunath Hadli (2):
ARM: davinci: dm644x: add support for v4l2 video display
ARM: davinci: dm644x evm: add support for VPBE display
Olof Johansson (2):
Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Merge branch 'fixes-non-critical' into next/drivers2
Roland Stigge (12):
ARM: LPC32xx: Added lpc32xx_defconfig
ARM: LPC32xx: clock.c: warning fix
ARM: LPC32xx: clock.c: Fix mutex lock issues
ARM: LPC32XX: Remove broken non-static declaration
ARM: LPC32xx: clock.c: Missing header file
ARM: LPC32xx: clock.c: jiffies wrapping
ARM: LPC32xx: clock.c: Clock registration fixes
Merge branch 'lpc32xx/fixup' of git://git.kernel.org/.../arm/arm-soc into lpc32xx/tmp
Merge branch 'lpc32xx/fixup2' of git://git.kernel.org/.../arm/arm-soc into lpc32xx/tmp
Merge branch 'lpc32xx/drivers' of git://git.kernel.org/.../arm/arm-soc into lpc32xx/tmp
ARM: LPC32xx: USB Support
ARM: LPC32xx: Ethernet support
Sachin Kamat (2):
ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure
ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure
Sangsu Park (3):
ARM: EXYNOS: add support GPIO for EXYNOS5250
gpio/samsung: add support GPIOlib for EXYNOS5250
gpio/samsung: use ioremap() for EXYNOS4 GPIOlib
Wolfram Sang (1):
arm: lpc32xx: phy3250: add rtc & touch device
arch/arm/mach-davinci/board-dm644x-evm.c | 109 ++++-
arch/arm/mach-davinci/davinci.h | 8 +-
arch/arm/mach-davinci/dm644x.c | 166 +++++++-
arch/arm/mach-exynos/common.c | 15 -
arch/arm/mach-exynos/include/mach/gpio.h | 239 ++++++++---
arch/arm/mach-exynos/include/mach/map.h | 4 +
arch/arm/mach-exynos/pm_domains.c | 6 +
arch/arm/mach-lpc32xx/Kconfig | 25 ++
arch/arm/mach-lpc32xx/clock.c | 87 ++--
arch/arm/mach-lpc32xx/common.c | 47 +++
arch/arm/mach-lpc32xx/common.h | 4 +-
arch/arm/mach-lpc32xx/include/mach/board.h | 24 ++
arch/arm/mach-lpc32xx/irq.c | 4 +
arch/arm/mach-lpc32xx/phy3250.c | 3 +
drivers/gpio/gpio-samsung.c | 487 +++++++++++++++++++++--
15 files changed, 1080 insertions(+), 148 deletions(-)
create mode 100644 arch/arm/mach-lpc32xx/include/mach/board.h
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 3/5] ARM: More SoC support updates
2012-03-28 7:13 ` Olof Johansson
` (2 preceding siblings ...)
(?)
@ 2012-03-28 7:14 ` Olof Johansson
-1 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 7:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
This branch contains a handful of updates of SoC base code that had
dependencies on other external trees that have now been merged:
* Support for the new EXYNOS5250 SoC from Samsung
* SMP and power domain support for Tegra3 from NVIDIA
* ux500 updates for exporting SoC information through sysfs
A few context merge conflicts:
arch/arm/mach-tegra/Makefile: localtimer.o was split off to a separate
config option, and later removed.
arch/arm/mach-ux500/Kconfig: Rename of the first machine model conflicts
with addition of select SOC_BUS. Keep MACH_MOP500 and move up the select
SOC_BUS to be included in it.
-Olof
----------------------------------------------------------------
The following changes since commit b806d29eefb520f087e03b58131e686ea320985f:
Merge tag 'drivers2' into for-next
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc2
for you to fetch changes up to 83fe628e16d84efc8df2731bc403eae4e4f53801:
Merge branch 'renesas/soc' into next/soc2
----------------------------------------------------------------
Arnd Bergmann (9):
Merge branch 'depends/driver-core' into next/soc2
Merge branch 'ux500/soc' into next/soc2
Merge tag 'tegra-soc2' of git://git.kernel.org/.../olof/tegra into tegra/soc2
Merge branch 'next/soc-exynos5250-arch' of git://git.kernel.org/.../kgene/linux-samsung into samsung/exynos5
Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2
Merge branch 'samsung/exynos5' into next/soc2
Merge branch 'samsung/soc' into next/soc2
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc
Merge branch 'renesas/soc' into next/soc2
Eunki Kim (1):
ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5
Kukjin Kim (11):
ARM: EXYNOS: to declare static for mach-exynos/common.c
ARM: EXYNOS: use exynos_init_uarts() instead of exynos4_init_uarts()
ARM: EXYNOS: add clock part for EXYNOS5250 SoC
ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5
ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5
ARM: EXYNOS: add support for EXYNOS5250 SoC
ARM: EXYNOS: add interrupt definitions for EXYNOS5250
ARM: EXYNOS: add support get_core_count() for EXYNOS5250
ARM: EXYNOS: add support ARCH_EXYNOS5 for EXYNOS5 SoCs
ARM: EXYNOS: add support device tree enabled board file for EXYNOS5
ARM: dts: add initial dts file for EXYNOS5250, SMDK5250
Kuninori Morimoto (1):
ARM: mach-shmobile: ap4evb: Reserve DMA memory for the frame buffer
Lee Jones (4):
ARM: ux500: pass parent pointer to each platform device
ARM: ux500: export System-on-Chip information ux500 via sysfs
ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX
ARM: ux500: remove intermediary add_platform_device* functions
Olof Johansson (2):
Merge branch 'for-3.4/soc' into for-3.4/t30-smp
Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
Peter De Schrijver (10):
ARM: tegra: cleanup use of chipid register
ARM: tegra: export Tegra chipid
ARM: tegra: initialize Tegra chipid early
ARM: tegra: functions to access the flowcontroller
ARM: tegra: rework Tegra secondary CPU core bringup
ARM: tegra: prepare powergate.c for multiple variants
ARM: tegra: export tegra_powergate_is_powered()
ARM: tegra: add support for Tegra30 powerdomains
ARM: tegra: support for Tegra30 CPU powerdomains
ARM: tegra: support for secondary cores on Tegra30
Stephen Warren (1):
ARM: dt: Explicitly configure all serial ports on Tegra Cardhu
Tushar Behera (2):
ARM: EXYNOS: Add clkdev lookup entry for lcd clock
ARM: EXYNOS: Fix compilation error with mach-exynos4-dt board
arch/arm/Makefile | 1 +
arch/arm/boot/dts/exynos5250-smdk5250.dts | 26 +
arch/arm/boot/dts/exynos5250.dtsi | 413 ++++++
arch/arm/boot/dts/tegra-cardhu.dts | 16 +
arch/arm/mach-exynos/Kconfig | 29 +-
arch/arm/mach-exynos/Makefile | 5 +-
arch/arm/mach-exynos/clock-exynos4.c | 14 +-
arch/arm/mach-exynos/clock-exynos5.c | 1247 ++++++++++++++++++
arch/arm/mach-exynos/common.c | 449 +++++--
arch/arm/mach-exynos/common.h | 37 +-
arch/arm/mach-exynos/dev-ahci.c | 4 +-
arch/arm/mach-exynos/dev-audio.c | 4 +-
arch/arm/mach-exynos/dev-uart.c | 78 ++
arch/arm/mach-exynos/dma.c | 6 +-
arch/arm/mach-exynos/include/mach/debug-macro.S | 9 +-
arch/arm/mach-exynos/include/mach/irqs.h | 597 ++++++---
arch/arm/mach-exynos/include/mach/map.h | 41 +-
arch/arm/mach-exynos/include/mach/regs-clock.h | 62 +
arch/arm/mach-exynos/include/mach/regs-gpio.h | 20 +-
arch/arm/mach-exynos/include/mach/regs-pmu.h | 1 +
arch/arm/mach-exynos/include/mach/uncompress.h | 17 +-
arch/arm/mach-exynos/mach-exynos4-dt.c | 8 +-
arch/arm/mach-exynos/mach-exynos5-dt.c | 78 ++
arch/arm/mach-exynos/mct.c | 23 +-
arch/arm/mach-exynos/platsmp.c | 9 +-
arch/arm/mach-exynos/setup-i2c0.c | 9 +-
arch/arm/mach-shmobile/board-ap4evb.c | 1 +
arch/arm/mach-shmobile/board-mackerel.c | 11 +-
arch/arm/mach-shmobile/setup-sh7372.c | 7 +
arch/arm/mach-tegra/Makefile | 2 +
arch/arm/mach-tegra/board-dt-tegra30.c | 2 +-
arch/arm/mach-tegra/common.c | 4 +
arch/arm/mach-tegra/flowctrl.c | 62 +
arch/arm/mach-tegra/flowctrl.h | 5 +
arch/arm/mach-tegra/fuse.c | 18 +-
arch/arm/mach-tegra/fuse.h | 4 +
arch/arm/mach-tegra/headsmp.S | 167 ++-
arch/arm/mach-tegra/include/mach/iomap.h | 3 +
arch/arm/mach-tegra/include/mach/powergate.h | 15 +-
arch/arm/mach-tegra/platsmp.c | 137 +-
arch/arm/mach-tegra/powergate.c | 53 +-
arch/arm/mach-tegra/reset.c | 84 ++
arch/arm/mach-tegra/reset.h | 50 +
arch/arm/mach-ux500/Kconfig | 1 +
arch/arm/mach-ux500/board-mop500-sdi.c | 31 +-
arch/arm/mach-ux500/board-mop500.c | 74 +-
arch/arm/mach-ux500/board-mop500.h | 8 +-
arch/arm/mach-ux500/board-u5500-sdi.c | 4 +-
arch/arm/mach-ux500/board-u5500.c | 27 +-
arch/arm/mach-ux500/cpu-db5500.c | 36 +-
arch/arm/mach-ux500/cpu-db8500.c | 44 +-
arch/arm/mach-ux500/cpu.c | 75 ++
arch/arm/mach-ux500/devices-common.c | 79 +-
arch/arm/mach-ux500/devices-common.h | 83 +-
arch/arm/mach-ux500/devices-db5500.h | 116 +-
arch/arm/mach-ux500/devices-db8500.h | 176 +--
arch/arm/mach-ux500/dma-db5500.c | 3 +-
arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 +
arch/arm/mach-ux500/include/mach/setup.h | 10 +-
arch/arm/mach-ux500/include/mach/usb.h | 4 +-
arch/arm/mach-ux500/usb.c | 7 +-
arch/arm/plat-s5p/Kconfig | 8 +-
arch/arm/plat-s5p/Makefile | 3 +-
arch/arm/plat-s5p/clock.c | 36 +
arch/arm/plat-s5p/irq-pm.c | 25 +-
arch/arm/plat-samsung/include/plat/cpu.h | 10 +
arch/arm/plat-samsung/include/plat/devs.h | 2 +
arch/arm/plat-samsung/include/plat/s5p-clock.h | 6 +
arch/arm/plat-samsung/include/plat/uncompress.h | 2 +
arch/arm/plat-samsung/irq-vic-timer.c | 16 +
70 files changed, 3998 insertions(+), 719 deletions(-)
create mode 100644 arch/arm/boot/dts/exynos5250-smdk5250.dts
create mode 100644 arch/arm/boot/dts/exynos5250.dtsi
create mode 100644 arch/arm/mach-exynos/clock-exynos5.c
create mode 100644 arch/arm/mach-exynos/dev-uart.c
create mode 100644 arch/arm/mach-exynos/mach-exynos5-dt.c
create mode 100644 arch/arm/mach-tegra/flowctrl.c
create mode 100644 arch/arm/mach-tegra/reset.c
create mode 100644 arch/arm/mach-tegra/reset.h
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 4/5] ARM: More device tree support updates
2012-03-28 7:13 ` Olof Johansson
` (3 preceding siblings ...)
(?)
@ 2012-03-28 7:14 ` Olof Johansson
2012-03-28 19:36 ` Linus Torvalds
-1 siblings, 1 reply; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 7:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
This branch contains a number of updates for device tree support on
several ARM platforms, in particular:
* AT91 continues the device tree conversion adding support for a number of
on-chip drivers and other functionality
* ux500 adds probing of some of the core SoC blocks through device tree
* Initial device tree support for ST SPEAr600 platforms
* kirkwood continues the conversion to device-tree probing
Merge conflicts and proposed solutions:
arch/arm/mach-ux500/Kconfig: Two new config options. Keep both.
drivers/usb/gadget/at91_udc.c: Context changes, linux/prefetch.h has
already been added in a previous commit.
-Olof
----------------------------------------------------------------
The following changes since commit 43b9c8b099be92115b4103271881426d5cef50ff:
Merge tag 'soc2' into for-next
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt2
for you to fetch changes up to 7d1206bc2859c6e9f46e35ae697c138e7d7858a7:
Merge branch 'kirkwood/dt' into next/dt2
----------------------------------------------------------------
Andrew Lunn (2):
ARM: orion: spi: remove enable_clock_fix which is not used
ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.
Arnd Bergmann (12):
Merge branch 'at91-3.4-cleanup2-DT2' of git://github.com/at91linux/linux-at91 into next/dt
Merge branch 'at91-3.4-cleanup2-DT2+USB' of git://github.com/at91linux/linux-at91 into next/dt
Merge branch 'ux500/soc' into ux500/dt
Merge branch 'depends/driver-core' into ux500/dt
ARM: ux500: Initial Device Tree support for Snowball
ARM: ux500: combine the board init functions for DT boot
ARM: ux500: split dts file for snowball into generic part
Merge branch 'ux500/dt' into next/dt2
Merge branch 'kirkwood_dt_for_3.4_v3' of git://git.infradead.org/users/jcooper/linux-kirkwood into kirkwood/dt
Merge branch 'spear/dt' into next/dt2
Merge branch 'for-3.4/dt' of git://git.kernel.org/.../olof/tegra into next/dt2
Merge branch 'kirkwood/dt' into next/dt2
Jason Cooper (7):
ARM: orion: wdt: use resource vice direct access
ARM: kirkwood: fdt: use mrvl ticker symbol
ARM: kirkwood: fdt: absorb kirkwood_init()
ARM: kirkwood: fdt: facilitate new boards during fdt migration
ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
ARM: kirkwood: rtc-mv devicetree bindings
ARM: kirkwood: use devicetree for rtc-mv
Jean-Christophe PLAGNIOL-VILLARD (25):
ATMEL: fix nand ecc support
mtd/atmel_nand: add on_flash_bbt to enable the use of On Flash BBT
ARM: at91: enable on flash bbt for Atmel Reference and DT boards
of: introduce helper to manage boolean
of/mtd/nand: add generic bindings and helpers
atmel/nand: add DT support
ARM: at91: sam9x5 add nand support
i2c/gpio: add DT support
ARM: at91: sam9g20 add i2c DT support
ARM: at91: usb_a9g20 add DT i2c support
ARM: at91: sam9g45 add i2c DT support
ARM: at91: sam9x5 add i2c DT support
ARM: at91/dt: add Calao DAB-MMX daugther board support for USB-A9G20
ARM: at91/dt: add specific DT soc init
ARM: at91: add pmc DT support
ARM: at91: always enable sam9 restart
ARM: at91: add RSTC (Reset Controller) dt support
ARM: at91: add ram controller DT support
ARM: at91: add Shutdown Controller (SHDWC) DT support
ARM: at91: usb ohci add dt support
ARM: at91: dt: enable usb ohci for sam9g20, sam9g45 amd sam9x5
ARM: at91: usb ehci add dt support
ARM: at91: dt: enable usb ehci for sam9g45 and sam9x5
USB: at91: Device udc add dt support
ARM: at91: sam9g20 udc add dt support
Lee Jones (7):
ARM: ux500: CONFIG: Enable Device Tree support for future endeavours
ARM: ux500: db8500: list most devices in the snowball device tree
ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree
ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree
ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree
ARM: ux500: Enable PL022 SSP Controller in Device Tree
ARM: ux500: Provide local timer support for Device Tree
Simon Glass (3):
arm: tegra: dts: Support host/device selection and legacy mode
arm: tegra: dts: Add legacy mode support to Tegra2x USB1 port
arm: tegra: dts: Mark USB1 as an OTG port on Seaboard
Stefan Roese (1):
ARM: SPEAr600: Add device-tree support to SPEAr600 boards
.../devicetree/bindings/arm/atmel-at91.txt | 60 ++++
.../devicetree/bindings/arm/atmel-pmc.txt | 11 +
Documentation/devicetree/bindings/arm/spear.txt | 8 +
.../devicetree/bindings/gpio/gpio_i2c.txt | 32 ++
.../devicetree/bindings/mtd/atmel-nand.txt | 41 +++
Documentation/devicetree/bindings/mtd/nand.txt | 7 +
.../devicetree/bindings/usb/atmel-usb.txt | 49 +++
.../devicetree/bindings/usb/tegra-usb.txt | 13 +
arch/arm/boot/dts/at91sam9g20.dtsi | 63 ++++
arch/arm/boot/dts/at91sam9g25ek.dts | 14 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 64 ++++
arch/arm/boot/dts/at91sam9m10g45ek.dts | 46 ++-
arch/arm/boot/dts/at91sam9x5.dtsi | 88 +++++
arch/arm/boot/dts/at91sam9x5cm.dtsi | 45 +++
arch/arm/boot/dts/db8500.dtsi | 275 +++++++++++++++
arch/arm/boot/dts/kirkwood-dreamplug.dts | 13 +-
arch/arm/boot/dts/kirkwood.dtsi | 34 +-
arch/arm/boot/dts/snowball.dts | 139 ++++++++
arch/arm/boot/dts/spear600-evb.dts | 47 +++
arch/arm/boot/dts/spear600.dtsi | 174 +++++++++
arch/arm/boot/dts/tegra-seaboard.dts | 1 +
arch/arm/boot/dts/tegra20.dtsi | 1 +
arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi | 96 +++++
arch/arm/boot/dts/usb_a9g20.dts | 74 +++-
arch/arm/configs/at91sam9g20_defconfig | 3 +
arch/arm/configs/u8500_defconfig | 1 +
arch/arm/mach-at91/Kconfig | 10 +-
arch/arm/mach-at91/at91sam9260.c | 1 +
arch/arm/mach-at91/at91sam9g45.c | 2 +
arch/arm/mach-at91/at91sam9x5.c | 17 +-
arch/arm/mach-at91/board-afeb-9260v1.c | 1 +
arch/arm/mach-at91/board-cam60.c | 1 +
arch/arm/mach-at91/board-cpu9krea.c | 1 +
arch/arm/mach-at91/board-dt.c | 57 +--
arch/arm/mach-at91/board-kb9202.c | 1 +
arch/arm/mach-at91/board-neocore926.c | 1 +
arch/arm/mach-at91/board-qil-a9260.c | 2 +
arch/arm/mach-at91/board-rm9200dk.c | 2 +
arch/arm/mach-at91/board-sam9-l9260.c | 1 +
arch/arm/mach-at91/board-sam9260ek.c | 2 +
arch/arm/mach-at91/board-sam9261ek.c | 2 +
arch/arm/mach-at91/board-sam9263ek.c | 2 +
arch/arm/mach-at91/board-sam9g20ek.c | 2 +
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +
arch/arm/mach-at91/board-sam9rlek.c | 2 +
arch/arm/mach-at91/board-snapper9260.c | 1 +
arch/arm/mach-at91/board-stamp9g20.c | 1 +
arch/arm/mach-at91/board-usb-a926x.c | 2 +
arch/arm/mach-at91/board-yl-9200.c | 1 +
arch/arm/mach-at91/clock.c | 56 ++-
arch/arm/mach-at91/generic.h | 2 +
arch/arm/mach-at91/include/mach/at91_shdwc.h | 4 +-
arch/arm/mach-at91/include/mach/at91sam9x5.h | 5 -
arch/arm/mach-at91/include/mach/board.h | 15 +-
arch/arm/mach-at91/pm.c | 13 -
arch/arm/mach-at91/setup.c | 158 +++++++++
arch/arm/mach-kirkwood/Makefile | 1 +
arch/arm/mach-kirkwood/board-dreamplug.c | 152 ++++++++
arch/arm/mach-kirkwood/board-dt.c | 151 ++------
arch/arm/mach-kirkwood/common.c | 11 +-
arch/arm/mach-kirkwood/common.h | 15 +
arch/arm/mach-spear6xx/Kconfig | 7 +-
arch/arm/mach-spear6xx/Makefile | 6 -
arch/arm/mach-spear6xx/clock.c | 14 +-
arch/arm/mach-spear6xx/spear600.c | 25 --
arch/arm/mach-spear6xx/spear600_evb.c | 54 ---
arch/arm/mach-spear6xx/spear6xx.c | 132 ++-----
arch/arm/mach-ux500/Kconfig | 6 +
arch/arm/mach-ux500/Makefile.boot | 1 +
arch/arm/mach-ux500/board-mop500.c | 99 +++++-
arch/arm/mach-ux500/cache-l2x0.c | 7 +-
arch/arm/mach-ux500/cpu.c | 14 +-
arch/arm/mach-ux500/timer.c | 11 +-
arch/arm/plat-orion/common.c | 7 +-
arch/arm/plat-orion/include/plat/audio.h | 1 -
arch/avr32/boards/atngw100/setup.c | 1 +
arch/avr32/boards/atstk1000/atstk1002.c | 1 +
arch/avr32/mach-at32ap/include/mach/board.h | 13 +-
drivers/i2c/busses/i2c-gpio.c | 98 +++--
drivers/mtd/nand/atmel_nand.c | 136 +++++--
drivers/of/Kconfig | 4 +
drivers/of/Makefile | 1 +
drivers/of/of_mtd.c | 85 +++++
drivers/rtc/rtc-mv.c | 9 +
drivers/spi/spi-orion.c | 5 -
drivers/usb/Kconfig | 2 +-
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/at91_udc.c | 41 ++-
drivers/usb/host/ehci-atmel.c | 24 +-
drivers/usb/host/ohci-at91.c | 101 +++++-
drivers/watchdog/orion_wdt.c | 24 +-
include/linux/of.h | 16 +
include/linux/of_mtd.h | 19 +
include/linux/platform_data/atmel.h | 27 ++
include/linux/spi/orion_spi.h | 1 -
95 files changed, 2536 insertions(+), 554 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/atmel-pmc.txt
create mode 100644 Documentation/devicetree/bindings/arm/spear.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio_i2c.txt
create mode 100644 Documentation/devicetree/bindings/mtd/atmel-nand.txt
create mode 100644 Documentation/devicetree/bindings/mtd/nand.txt
create mode 100644 Documentation/devicetree/bindings/usb/atmel-usb.txt
create mode 100644 arch/arm/boot/dts/db8500.dtsi
create mode 100644 arch/arm/boot/dts/snowball.dts
create mode 100644 arch/arm/boot/dts/spear600-evb.dts
create mode 100644 arch/arm/boot/dts/spear600.dtsi
create mode 100644 arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi
create mode 100644 arch/arm/mach-kirkwood/board-dreamplug.c
delete mode 100644 arch/arm/mach-spear6xx/spear600.c
delete mode 100644 arch/arm/mach-spear6xx/spear600_evb.c
create mode 100644 drivers/of/of_mtd.c
create mode 100644 include/linux/of_mtd.h
create mode 100644 include/linux/platform_data/atmel.h
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 5/5] drivers/clk: common clock framework
2012-03-28 7:13 ` Olof Johansson
` (4 preceding siblings ...)
(?)
@ 2012-03-28 7:14 ` Olof Johansson
-1 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 7:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
This branch contains patches from Mike Turquette adding a common clock
framework to be shared across platforms. This is part of the work towards
building a common zImage for several ARM platforms.
-Olof
----------------------------------------------------------------
The following changes since commit 414ed6be101239798330565ce49e7ca0fdfdba04:
Merge tag 'dt2' into for-next
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/common-clk-api
for you to fetch changes up to 8fb61e33507e5d76b69467b4f96290338e96b733:
clk: make CONFIG_COMMON_CLK invisible
----------------------------------------------------------------
Arnd Bergmann (1):
clk: make CONFIG_COMMON_CLK invisible
Mike Turquette (3):
Documentation: common clk API
clk: introduce the common clock framework
clk: basic clock hardware types
Documentation/clk.txt | 233 ++++++
drivers/clk/Kconfig | 37 +
drivers/clk/Makefile | 2 +
drivers/clk/clk-divider.c | 200 +++++
drivers/clk/clk-fixed-rate.c | 82 +++
drivers/clk/clk-gate.c | 150 ++++
drivers/clk/clk-mux.c | 116 +++
drivers/clk/clk.c | 1461 +++++++++++++++++++++++++++++++++++++
include/linux/clk-private.h | 196 +++++
include/linux/clk-provider.h | 300 ++++++++
include/linux/clk.h | 68 +-
11 files changed, 2840 insertions(+), 5 deletions(-)
create mode 100644 Documentation/clk.txt
create mode 100644 drivers/clk/clk-divider.c
create mode 100644 drivers/clk/clk-fixed-rate.c
create mode 100644 drivers/clk/clk-gate.c
create mode 100644 drivers/clk/clk-mux.c
create mode 100644 drivers/clk/clk.c
create mode 100644 include/linux/clk-private.h
create mode 100644 include/linux/clk-provider.h
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-28 7:13 ` [GIT PULL 1/5] ARM: cleanups of io includes Olof Johansson
@ 2012-03-28 8:25 ` Russell King - ARM Linux
0 siblings, 0 replies; 29+ messages in thread
From: Russell King - ARM Linux @ 2012-03-28 8:25 UTC (permalink / raw)
To: Olof Johansson; +Cc: Linus Torvalds, arm, linux-arm-kernel, linux-kernel
On Wed, Mar 28, 2012 at 12:13:58AM -0700, Olof Johansson wrote:
> Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
> moving some of the oft-repeated macros to a common location and removing a bunch of
> boiler plate. This is another step closer to a common zImage for multiple platforms.
NAK. Linus, do not pull this. This breaks PXA compilation, which has
been known about for more than a week.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
@ 2012-03-28 8:25 ` Russell King - ARM Linux
0 siblings, 0 replies; 29+ messages in thread
From: Russell King - ARM Linux @ 2012-03-28 8:25 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 28, 2012 at 12:13:58AM -0700, Olof Johansson wrote:
> Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
> moving some of the oft-repeated macros to a common location and removing a bunch of
> boiler plate. This is another step closer to a common zImage for multiple platforms.
NAK. Linus, do not pull this. This breaks PXA compilation, which has
been known about for more than a week.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-28 8:25 ` Russell King - ARM Linux
@ 2012-03-28 9:05 ` Olof Johansson
-1 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 9:05 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Linus Torvalds, arm, linux-arm-kernel, linux-kernel
On Wed, Mar 28, 2012 at 1:25 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Mar 28, 2012 at 12:13:58AM -0700, Olof Johansson wrote:
>> Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
>> moving some of the oft-repeated macros to a common location and removing a bunch of
>> boiler plate. This is another step closer to a common zImage for multiple platforms.
>
> NAK. Linus, do not pull this. This breaks PXA compilation, which has
> been known about for more than a week.
The branch contains fixes for the compilation failures, they were
pulled in right before I staged the tag for the pull request:
http://marc.info/?l=linux-arm-kernel&m=133272592723334
If you prefer to let it sit in linux-next for a day or two before
going in, that's fine. But I verified that the original build problem
introduced was fixed before I sent it out.
Unfortunately, PXA is also broken due to the regulator changes
mentioned in the above referenced mail, which is already upstream and
unrelated to the changes in this branch.
Linus; the rest of the pull requests should be OK to go in
independently of this, so please go ahead with those if you don't
mind. The only changes to those branches in the last few days is the
merge resolution I did to the drivers2 branch/tag.
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
@ 2012-03-28 9:05 ` Olof Johansson
0 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-28 9:05 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 28, 2012 at 1:25 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Mar 28, 2012 at 12:13:58AM -0700, Olof Johansson wrote:
>> Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
>> moving some of the oft-repeated macros to a common location and removing a bunch of
>> boiler plate. This is another step closer to a common zImage for multiple platforms.
>
> NAK. ?Linus, do not pull this. ?This breaks PXA compilation, which has
> been known about for more than a week.
The branch contains fixes for the compilation failures, they were
pulled in right before I staged the tag for the pull request:
http://marc.info/?l=linux-arm-kernel&m=133272592723334
If you prefer to let it sit in linux-next for a day or two before
going in, that's fine. But I verified that the original build problem
introduced was fixed before I sent it out.
Unfortunately, PXA is also broken due to the regulator changes
mentioned in the above referenced mail, which is already upstream and
unrelated to the changes in this branch.
Linus; the rest of the pull requests should be OK to go in
independently of this, so please go ahead with those if you don't
mind. The only changes to those branches in the last few days is the
merge resolution I did to the drivers2 branch/tag.
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-28 9:05 ` Olof Johansson
@ 2012-03-28 12:34 ` Arnd Bergmann
-1 siblings, 0 replies; 29+ messages in thread
From: Arnd Bergmann @ 2012-03-28 12:34 UTC (permalink / raw)
To: Olof Johansson
Cc: Russell King - ARM Linux, Linus Torvalds, arm, linux-arm-kernel,
linux-kernel
On Wednesday 28 March 2012, Olof Johansson wrote:
> If you prefer to let it sit in linux-next for a day or two before
> going in, that's fine. But I verified that the original build problem
> introduced was fixed before I sent it out.
>
> Unfortunately, PXA is also broken due to the regulator changes
> mentioned in the above referenced mail, which is already upstream and
> unrelated to the changes in this branch.
>
> Linus; the rest of the pull requests should be OK to go in
> independently of this, so please go ahead with those if you don't
> mind. The only changes to those branches in the last few days is the
> merge resolution I did to the drivers2 branch/tag.
Yes, sounds good. I've also verified that none of the other branches
depends on this one.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
@ 2012-03-28 12:34 ` Arnd Bergmann
0 siblings, 0 replies; 29+ messages in thread
From: Arnd Bergmann @ 2012-03-28 12:34 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 28 March 2012, Olof Johansson wrote:
> If you prefer to let it sit in linux-next for a day or two before
> going in, that's fine. But I verified that the original build problem
> introduced was fixed before I sent it out.
>
> Unfortunately, PXA is also broken due to the regulator changes
> mentioned in the above referenced mail, which is already upstream and
> unrelated to the changes in this branch.
>
> Linus; the rest of the pull requests should be OK to go in
> independently of this, so please go ahead with those if you don't
> mind. The only changes to those branches in the last few days is the
> merge resolution I did to the drivers2 branch/tag.
Yes, sounds good. I've also verified that none of the other branches
depends on this one.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 0/5] Second batch of arm-soc changes
2012-03-28 7:13 ` Olof Johansson
@ 2012-03-28 14:26 ` Rob Herring
-1 siblings, 0 replies; 29+ messages in thread
From: Rob Herring @ 2012-03-28 14:26 UTC (permalink / raw)
To: Olof Johansson; +Cc: Linus Torvalds, arm, linux-kernel, linux-arm-kernel
On 03/28/2012 02:13 AM, Olof Johansson wrote:
> Hi Linus,
>
> Here is the second batch of arm-soc changes for this merge window. As Arnd
> mentioned with the first cover letter, most of these either had external
> dependencies that have now been pulled in, or just needed a bit more
> linux-next bake time due to getting picked up close to the 3.3 release.
>
>
> There are 128 non-merge patches, with a total diffstat of:
>
> 346 files changed, 10790 insertions(+), 2792 deletions(-)
>
> So, while there's been some good cleanups especially in the first branch,
> there's been a net addition of code:
>
> * New SoC family support for Samsung EXYNOS5250: clock tables, driver
> updates, etc means net gain in code.
> * Added device tree conversions. Once we start to sunset non-device tree
> boards on the enabled platforms, we should see payback in code removal.
> * Common clock framework. As SoCs get converted over to the framework,
> we should see more code removal from this as well.
>
>
> There are a handful of merge conflicts on the branches, nothing that
> should be too messy to sort out. I've described each conflict in the
> corresponding pull request, including how we've resolved them in our
> for-next branch.
>
Why isn't lakml getting copied on emails 1-5? The same thing happened
with Arnd's pull request. Are they getting hung up for moderator approval?
Rob
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 0/5] Second batch of arm-soc changes
@ 2012-03-28 14:26 ` Rob Herring
0 siblings, 0 replies; 29+ messages in thread
From: Rob Herring @ 2012-03-28 14:26 UTC (permalink / raw)
To: linux-arm-kernel
On 03/28/2012 02:13 AM, Olof Johansson wrote:
> Hi Linus,
>
> Here is the second batch of arm-soc changes for this merge window. As Arnd
> mentioned with the first cover letter, most of these either had external
> dependencies that have now been pulled in, or just needed a bit more
> linux-next bake time due to getting picked up close to the 3.3 release.
>
>
> There are 128 non-merge patches, with a total diffstat of:
>
> 346 files changed, 10790 insertions(+), 2792 deletions(-)
>
> So, while there's been some good cleanups especially in the first branch,
> there's been a net addition of code:
>
> * New SoC family support for Samsung EXYNOS5250: clock tables, driver
> updates, etc means net gain in code.
> * Added device tree conversions. Once we start to sunset non-device tree
> boards on the enabled platforms, we should see payback in code removal.
> * Common clock framework. As SoCs get converted over to the framework,
> we should see more code removal from this as well.
>
>
> There are a handful of merge conflicts on the branches, nothing that
> should be too messy to sort out. I've described each conflict in the
> corresponding pull request, including how we've resolved them in our
> for-next branch.
>
Why isn't lakml getting copied on emails 1-5? The same thing happened
with Arnd's pull request. Are they getting hung up for moderator approval?
Rob
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 0/5] Second batch of arm-soc changes
2012-03-28 14:26 ` Rob Herring
@ 2012-03-28 14:59 ` Arnd Bergmann
-1 siblings, 0 replies; 29+ messages in thread
From: Arnd Bergmann @ 2012-03-28 14:59 UTC (permalink / raw)
To: Rob Herring
Cc: Olof Johansson, Linus Torvalds, arm, linux-kernel, linux-arm-kernel
On Wednesday 28 March 2012, Rob Herring wrote:
> On 03/28/2012 02:13 AM, Olof Johansson wrote:
> > There are a handful of merge conflicts on the branches, nothing that
> > should be too messy to sort out. I've described each conflict in the
> > corresponding pull request, including how we've resolved them in our
> > for-next branch.
> >
>
> Why isn't lakml getting copied on emails 1-5? The same thing happened
> with Arnd's pull request. Are they getting hung up for moderator approval?
For some reason, the mailing list rejected the emails with 'suspicious header'
warnings, but did not list which headers were suspicious. I think I've
had this problem before and solved it, but don't remember the solution
any more now. linux-kernel took the emails though.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 0/5] Second batch of arm-soc changes
@ 2012-03-28 14:59 ` Arnd Bergmann
0 siblings, 0 replies; 29+ messages in thread
From: Arnd Bergmann @ 2012-03-28 14:59 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 28 March 2012, Rob Herring wrote:
> On 03/28/2012 02:13 AM, Olof Johansson wrote:
> > There are a handful of merge conflicts on the branches, nothing that
> > should be too messy to sort out. I've described each conflict in the
> > corresponding pull request, including how we've resolved them in our
> > for-next branch.
> >
>
> Why isn't lakml getting copied on emails 1-5? The same thing happened
> with Arnd's pull request. Are they getting hung up for moderator approval?
For some reason, the mailing list rejected the emails with 'suspicious header'
warnings, but did not list which headers were suspicious. I think I've
had this problem before and solved it, but don't remember the solution
any more now. linux-kernel took the emails though.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-28 9:05 ` Olof Johansson
@ 2012-03-28 19:28 ` Russell King - ARM Linux
-1 siblings, 0 replies; 29+ messages in thread
From: Russell King - ARM Linux @ 2012-03-28 19:28 UTC (permalink / raw)
To: Olof Johansson; +Cc: Linus Torvalds, arm, linux-arm-kernel, linux-kernel
On Wed, Mar 28, 2012 at 02:05:50AM -0700, Olof Johansson wrote:
> On Wed, Mar 28, 2012 at 1:25 AM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > On Wed, Mar 28, 2012 at 12:13:58AM -0700, Olof Johansson wrote:
> >> Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
> >> moving some of the oft-repeated macros to a common location and removing a bunch of
> >> boiler plate. This is another step closer to a common zImage for multiple platforms.
> >
> > NAK. Linus, do not pull this. This breaks PXA compilation, which has
> > been known about for more than a week.
>
> The branch contains fixes for the compilation failures, they were
> pulled in right before I staged the tag for the pull request:
>
> http://marc.info/?l=linux-arm-kernel&m=133272592723334
>
> If you prefer to let it sit in linux-next for a day or two before
> going in, that's fine. But I verified that the original build problem
> introduced was fixed before I sent it out.
Right, having merged the latest arm-soc tree this evening into the build
tree and forced a rebuild, the errors induced by Rob's patches are now
gone, so I'm fine with this going in now.
> Unfortunately, PXA is also broken due to the regulator changes
> mentioned in the above referenced mail, which is already upstream and
> unrelated to the changes in this branch.
Yes, I noticed that appearing when I updated the build tree on the 27th.
Not impressed by that.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
@ 2012-03-28 19:28 ` Russell King - ARM Linux
0 siblings, 0 replies; 29+ messages in thread
From: Russell King - ARM Linux @ 2012-03-28 19:28 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 28, 2012 at 02:05:50AM -0700, Olof Johansson wrote:
> On Wed, Mar 28, 2012 at 1:25 AM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > On Wed, Mar 28, 2012 at 12:13:58AM -0700, Olof Johansson wrote:
> >> Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
> >> moving some of the oft-repeated macros to a common location and removing a bunch of
> >> boiler plate. This is another step closer to a common zImage for multiple platforms.
> >
> > NAK. ?Linus, do not pull this. ?This breaks PXA compilation, which has
> > been known about for more than a week.
>
> The branch contains fixes for the compilation failures, they were
> pulled in right before I staged the tag for the pull request:
>
> http://marc.info/?l=linux-arm-kernel&m=133272592723334
>
> If you prefer to let it sit in linux-next for a day or two before
> going in, that's fine. But I verified that the original build problem
> introduced was fixed before I sent it out.
Right, having merged the latest arm-soc tree this evening into the build
tree and forced a rebuild, the errors induced by Rob's patches are now
gone, so I'm fine with this going in now.
> Unfortunately, PXA is also broken due to the regulator changes
> mentioned in the above referenced mail, which is already upstream and
> unrelated to the changes in this branch.
Yes, I noticed that appearing when I updated the build tree on the 27th.
Not impressed by that.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 4/5] ARM: More device tree support updates
2012-03-28 7:14 ` [GIT PULL 4/5] ARM: More device tree " Olof Johansson
@ 2012-03-28 19:36 ` Linus Torvalds
0 siblings, 0 replies; 29+ messages in thread
From: Linus Torvalds @ 2012-03-28 19:36 UTC (permalink / raw)
To: Olof Johansson; +Cc: arm, linux-arm-kernel, linux-kernel
On Wed, Mar 28, 2012 at 12:14 AM, Olof Johansson <olof@lixom.net> wrote:
>
> Merge conflicts and proposed solutions:
>
> arch/arm/mach-ux500/Kconfig: Two new config options. Keep both.
Guys, I'm seeing merge problems that go way beyond this.
Look at that MACH_U8500 config option. It got renamed to MACH_MOP500,
but it continues to live in the tree.
This rename conflict happened earlier and I didn't notice (grep for
it: it's used by a staging driver), so it's already in my pushed out
tree. But it seems to be getting worse, and your proposed merge
solution doesn't cover it.
I'll try to fix things up, but you need to verify my merge. And you
guys should have noticed and noted it, rather than leave it to my
random bumbling about.
Linus
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 4/5] ARM: More device tree support updates
@ 2012-03-28 19:36 ` Linus Torvalds
0 siblings, 0 replies; 29+ messages in thread
From: Linus Torvalds @ 2012-03-28 19:36 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 28, 2012 at 12:14 AM, Olof Johansson <olof@lixom.net> wrote:
>
> Merge conflicts and proposed solutions:
>
> arch/arm/mach-ux500/Kconfig: Two new config options. Keep both.
Guys, I'm seeing merge problems that go way beyond this.
Look at that MACH_U8500 config option. It got renamed to MACH_MOP500,
but it continues to live in the tree.
This rename conflict happened earlier and I didn't notice (grep for
it: it's used by a staging driver), so it's already in my pushed out
tree. But it seems to be getting worse, and your proposed merge
solution doesn't cover it.
I'll try to fix things up, but you need to verify my merge. And you
guys should have noticed and noted it, rather than leave it to my
random bumbling about.
Linus
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 4/5] ARM: More device tree support updates
2012-03-28 19:36 ` Linus Torvalds
@ 2012-03-28 20:58 ` Arnd Bergmann
-1 siblings, 0 replies; 29+ messages in thread
From: Arnd Bergmann @ 2012-03-28 20:58 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Olof Johansson, arm, linux-arm-kernel, linux-kernel
On Wednesday 28 March 2012, Linus Torvalds wrote:
> On Wed, Mar 28, 2012 at 12:14 AM, Olof Johansson <olof@lixom.net> wrote:
> >
> > Merge conflicts and proposed solutions:
> >
> > arch/arm/mach-ux500/Kconfig: Two new config options. Keep both.
>
> Guys, I'm seeing merge problems that go way beyond this.
>
> Look at that MACH_U8500 config option. It got renamed to MACH_MOP500,
> but it continues to live in the tree.
>
> This rename conflict happened earlier and I didn't notice (grep for
> it: it's used by a staging driver), so it's already in my pushed out
> tree. But it seems to be getting worse, and your proposed merge
> solution doesn't cover it.
Your solution looks good. I had the MACH_UX500_DT option above U5500
instead of below it in our for-next branch, but either way makes sense.
> I'll try to fix things up, but you need to verify my merge. And you
> guys should have noticed and noted it, rather than leave it to my
> random bumbling about.
Yes, noted for next time. We had a lot of merge conflicts because of
being relatively late in the merge window (this one was purely
self made though), and it's not always easy to decide which ones
to eliminate in advance, leave in or describe the resolution we found.
Since we usually see the same conflicts and resolve them in the
for-next branch, I guess it's easy enough to just always provide
the branch with the resolutions as a help for cases like this one.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 4/5] ARM: More device tree support updates
@ 2012-03-28 20:58 ` Arnd Bergmann
0 siblings, 0 replies; 29+ messages in thread
From: Arnd Bergmann @ 2012-03-28 20:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 28 March 2012, Linus Torvalds wrote:
> On Wed, Mar 28, 2012 at 12:14 AM, Olof Johansson <olof@lixom.net> wrote:
> >
> > Merge conflicts and proposed solutions:
> >
> > arch/arm/mach-ux500/Kconfig: Two new config options. Keep both.
>
> Guys, I'm seeing merge problems that go way beyond this.
>
> Look at that MACH_U8500 config option. It got renamed to MACH_MOP500,
> but it continues to live in the tree.
>
> This rename conflict happened earlier and I didn't notice (grep for
> it: it's used by a staging driver), so it's already in my pushed out
> tree. But it seems to be getting worse, and your proposed merge
> solution doesn't cover it.
Your solution looks good. I had the MACH_UX500_DT option above U5500
instead of below it in our for-next branch, but either way makes sense.
> I'll try to fix things up, but you need to verify my merge. And you
> guys should have noticed and noted it, rather than leave it to my
> random bumbling about.
Yes, noted for next time. We had a lot of merge conflicts because of
being relatively late in the merge window (this one was purely
self made though), and it's not always easy to decide which ones
to eliminate in advance, leave in or describe the resolution we found.
Since we usually see the same conflicts and resolve them in the
for-next branch, I guess it's easy enough to just always provide
the branch with the resolutions as a help for cases like this one.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-28 19:28 ` Russell King - ARM Linux
@ 2012-03-30 0:09 ` Linus Torvalds
-1 siblings, 0 replies; 29+ messages in thread
From: Linus Torvalds @ 2012-03-30 0:09 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Olof Johansson, arm, linux-arm-kernel, linux-kernel
On Wed, Mar 28, 2012 at 12:28 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
>
> Right, having merged the latest arm-soc tree this evening into the build
> tree and forced a rebuild, the errors induced by Rob's patches are now
> gone, so I'm fine with this going in now.
Ok, I'm getting back to this pull request, and apparently everything
is ok with it.
Holler if not, because it's not back on my queue of trees to merge
(but I haven't actually gotten to it yet - this is just a heads-up
that I will get to it later today).
Linus
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
@ 2012-03-30 0:09 ` Linus Torvalds
0 siblings, 0 replies; 29+ messages in thread
From: Linus Torvalds @ 2012-03-30 0:09 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 28, 2012 at 12:28 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
>
> Right, having merged the latest arm-soc tree this evening into the build
> tree and forced a rebuild, the errors induced by Rob's patches are now
> gone, so I'm fine with this going in now.
Ok, I'm getting back to this pull request, and apparently everything
is ok with it.
Holler if not, because it's not back on my queue of trees to merge
(but I haven't actually gotten to it yet - this is just a heads-up
that I will get to it later today).
Linus
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-30 0:09 ` Linus Torvalds
@ 2012-03-30 0:27 ` Olof Johansson
-1 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-30 0:27 UTC (permalink / raw)
To: Linus Torvalds
Cc: Russell King - ARM Linux, arm, linux-arm-kernel, linux-kernel
On Thu, Mar 29, 2012 at 5:09 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Wed, Mar 28, 2012 at 12:28 PM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
>>
>> Right, having merged the latest arm-soc tree this evening into the build
>> tree and forced a rebuild, the errors induced by Rob's patches are now
>> gone, so I'm fine with this going in now.
>
> Ok, I'm getting back to this pull request, and apparently everything
> is ok with it.
>
> Holler if not, because it's not back on my queue of trees to merge
> (but I haven't actually gotten to it yet - this is just a heads-up
> that I will get to it later today).
I was going to send a fresh pull request for it and include some of
the other PXA breakage fixes with it, but I haven't received those
from the PXA maintainer yet. I'll send a separate pull request for a
fixes branch when I get it instead (this pull request does not add any
new breakage).
So please, go ahead and pull. It hasn't grown any new merge conflicts
since before as of now, so see the original pull request for those.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
@ 2012-03-30 0:27 ` Olof Johansson
0 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-30 0:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 29, 2012 at 5:09 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Wed, Mar 28, 2012 at 12:28 PM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
>>
>> Right, having merged the latest arm-soc tree this evening into the build
>> tree and forced a rebuild, the errors induced by Rob's patches are now
>> gone, so I'm fine with this going in now.
>
> Ok, I'm getting back to this pull request, and apparently everything
> is ok with it.
>
> Holler if not, because it's not back on my queue of trees to merge
> (but I haven't actually gotten to it yet - this is just a heads-up
> that I will get to it later today).
I was going to send a fresh pull request for it and include some of
the other PXA breakage fixes with it, but I haven't received those
from the PXA maintainer yet. I'll send a separate pull request for a
fixes branch when I get it instead (this pull request does not add any
new breakage).
So please, go ahead and pull. It hasn't grown any new merge conflicts
since before as of now, so see the original pull request for those.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [GIT PULL 1/5] ARM: cleanups of io includes
2012-03-30 0:27 ` Olof Johansson
@ 2012-03-30 0:34 ` Olof Johansson
-1 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-30 0:34 UTC (permalink / raw)
To: Linus Torvalds
Cc: Russell King - ARM Linux, arm, linux-arm-kernel, linux-kernel
On Thu, Mar 29, 2012 at 5:27 PM, Olof Johansson <olof@lixom.net> wrote:
> It hasn't grown any new merge conflicts
> since before as of now, so see the original pull request for those.
D'oh, I did a git remote update but didn't checkout the new head for
your tree when I verified the merge conflict situation. It does have a
couple of new trivial ones:
* arch/arm/mach-tegra/Makefile: keep reset.o, remove localtimer.o
* arch/arm/mach-vexpress/include/mach/io.h: line remove vs file remove
conflict: file is gone, but a patch in rmk's tree had removed a line
from it. It's safe to still remove the file.
+ the previous ones from original pull request:
arch/arm/Kconfig: New selects added for ARCH_S3C24X. Include both
sides of the merge.
arch/arm/mach-shmobile/smp-sh73a0.c: A readl vs readw fix collided
with the io accessor cleanup. Ditch the __io() use but keep readl.
arch/arm/mach-tegra/include/mach/debug-macro.S: include of mach/io.h
is going away, iomap.h is kept.
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
* [GIT PULL 1/5] ARM: cleanups of io includes
@ 2012-03-30 0:34 ` Olof Johansson
0 siblings, 0 replies; 29+ messages in thread
From: Olof Johansson @ 2012-03-30 0:34 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 29, 2012 at 5:27 PM, Olof Johansson <olof@lixom.net> wrote:
> It hasn't grown any new merge conflicts
> since before as of now, so see the original pull request for those.
D'oh, I did a git remote update but didn't checkout the new head for
your tree when I verified the merge conflict situation. It does have a
couple of new trivial ones:
* arch/arm/mach-tegra/Makefile: keep reset.o, remove localtimer.o
* arch/arm/mach-vexpress/include/mach/io.h: line remove vs file remove
conflict: file is gone, but a patch in rmk's tree had removed a line
from it. It's safe to still remove the file.
+ the previous ones from original pull request:
arch/arm/Kconfig: New selects added for ARCH_S3C24X. Include both
sides of the merge.
arch/arm/mach-shmobile/smp-sh73a0.c: A readl vs readw fix collided
with the io accessor cleanup. Ditch the __io() use but keep readl.
arch/arm/mach-tegra/include/mach/debug-macro.S: include of mach/io.h
is going away, iomap.h is kept.
-Olof
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2012-03-30 0:34 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-28 7:13 [GIT PULL 0/5] Second batch of arm-soc changes Olof Johansson
2012-03-28 7:13 ` Olof Johansson
2012-03-28 7:13 ` [GIT PULL 1/5] ARM: cleanups of io includes Olof Johansson
2012-03-28 8:25 ` Russell King - ARM Linux
2012-03-28 8:25 ` Russell King - ARM Linux
2012-03-28 9:05 ` Olof Johansson
2012-03-28 9:05 ` Olof Johansson
2012-03-28 12:34 ` Arnd Bergmann
2012-03-28 12:34 ` Arnd Bergmann
2012-03-28 19:28 ` Russell King - ARM Linux
2012-03-28 19:28 ` Russell King - ARM Linux
2012-03-30 0:09 ` Linus Torvalds
2012-03-30 0:09 ` Linus Torvalds
2012-03-30 0:27 ` Olof Johansson
2012-03-30 0:27 ` Olof Johansson
2012-03-30 0:34 ` Olof Johansson
2012-03-30 0:34 ` Olof Johansson
2012-03-28 7:13 ` [GIT PULL 2/5] ARM: More SoC driver updates Olof Johansson
2012-03-28 7:14 ` [GIT PULL 3/5] ARM: More SoC support updates Olof Johansson
2012-03-28 7:14 ` [GIT PULL 4/5] ARM: More device tree " Olof Johansson
2012-03-28 19:36 ` Linus Torvalds
2012-03-28 19:36 ` Linus Torvalds
2012-03-28 20:58 ` Arnd Bergmann
2012-03-28 20:58 ` Arnd Bergmann
2012-03-28 7:14 ` [GIT PULL 5/5] drivers/clk: common clock framework Olof Johansson
2012-03-28 14:26 ` [GIT PULL 0/5] Second batch of arm-soc changes Rob Herring
2012-03-28 14:26 ` Rob Herring
2012-03-28 14:59 ` Arnd Bergmann
2012-03-28 14:59 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.