[GIT PULL 0/8] Second batch of arm-soc branches for 3.5
11 messages,
2 authors,
2012-05-26
· open the first message on its own page
Hi Linus,
This is the second and last large set of arm-soc branches for the 3.5
merge window. There will likely be a couple of small pull requests next
week (and thereafter fixes).
Descriptions of each branch are in the corresponding request.
Most of them have some trivial merge conflicts with earlier branches or
other code that has gone in since they were staged. Notes below are for
the slightly trickier cases. Just like with the last batch I've pushed
up resolved/<tagname> branches with proposed resolutions if you want
to compare.
cleanup2 branch:
omap_init_clocksource_32k(): Keep the version from this branch but add
in the register_persistent_clock() addition from bd0493e.
clock branch:
An awkward add/remove conflict in mach-kirkwood/common.c. Code is removed
here that was fixed in one of our earlier branches. The right thing to
do is to still just remove the code.
dt2 branch:
gpio-mxs.c: Keep the (port) side but change false -> 0 on the last arg.
soc2 branch:
gpio-samsung.c: Slightly awkward move/change conflict. Essentially
re-apply the second hunk of f10590c9 in the moved function
(exynos5_gpiolib_init()).
cleanup-initcall branch:
Trivial conflict deltas and a deleted file conflict. The removed file
should remain removed.
Thanks!
-Olof
For the first time, we have one branch that collects just updates to
defconfig files, mostly for adapting to changes in other subsystems.
----------------------------------------------------------------
The following changes since commit 786f02b719f2285e2c0350b6a04dab4a1a0871a1:
Merge tag 'x86-mce-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/defconfig
for you to fetch changes up to 4a230408e83698a3d7ff0a9988a58675c2c92cb9:
ARM: PRIMA2: add prima2_defconfig for CSR SiRFprimaII
----------------------------------------------------------------
Arnd Bergmann (2):
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
Merge branch 'for-3.5/defconfig2' of git://git.kernel.org/.../swarren/linux-tegra into next/defconfig
Barry Song (1):
ARM: PRIMA2: add prima2_defconfig for CSR SiRFprimaII
Fabio Estevam (2):
ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default
ARM: imx_v6_v7_defconfig: Add SPI NOR support
Laxman Dewangan (1):
ARM: tegra: update defconfig
Olof Johansson (1):
Merge branch 'for-3.5/defconfig' of git://git.kernel.org/.../swarren/linux-tegra into next/defconfig
Stephen Warren (1):
ARM: tegra: update defconfig
arch/arm/configs/imx_v4_v5_defconfig | 1 +
arch/arm/configs/imx_v6_v7_defconfig | 6 +++
arch/arm/configs/prima2_defconfig | 69 +++++++++++++++++++++++++++++++
arch/arm/configs/tegra_defconfig | 11 ++++-
4 files changed, 86 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/configs/prima2_defconfig
More cleanups, continuing an earlier set with omap and samsung specific
cleanups. These could not go into the first set because they have
dependencies on various other series that in turn depend on the first
cleanups.
----------------------------------------------------------------
The following changes since commit 2f31a25ab6ccffb07990e36576fc47f4b6661ccf:
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into HEAD
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 424663566c43ce87e8b33228860bf882f1ea61bf:
Merge branch 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup2
----------------------------------------------------------------
Arnd Bergmann (2):
Merge branch 'exynos/sysmmu' into next/cleanup2
Merge branch 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup2
Heiko Stuebner (4):
ARM: S3C24XX: move plat-s3c24xx/cpu.c
ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c
ARM: S3C24XX: move common power-management code to mach-s3c24xx
ARM: S3C24XX: move common clock init into common.c
Kevin Hilman (4):
ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505
ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
Kukjin Kim (9):
ARM: SAMSUNG: move clock part for common s5p into plat-samsung
ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung
ARM: SAMSUNG: move pm part for common s5p into plat-samsung
ARM: SAMSUNG: move hr timer for common s5p into plat-samsung
ARM: SAMSUNG: move platform device for s5p uart into plat-samsung
ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung
ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig
ARM: SAMSUNG: merge plat-s5p into plat-samsung
Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
Olof Johansson (4):
Merge tag 'omap-cleanup-for-v3.5' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
Merge tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
Merge tag 'omap-cleanup-devices-for-v3.5' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
Merge tag 'omap-cleanup-timer-for-v3.5' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
R Sricharan (1):
ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.
Santosh Shilimkar (6):
ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds.
ARM: OMAP2+: Clean up wrapping multiple objects in Makefile
ARM: OMAP4: Remove un-used WakeupGen register defines.
ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.
ARM: All OMAP2PLUS machines use omap2 directory so just add one entry
ARM: OMAP4: Reduce the static IO mapping
Tarun Kanti DebBarma (1):
ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore
Tony Lindgren (10):
Merge branch 'for_3.5/omap_misc_cleanup' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into cleanup-soc
Merge branch 'devel-hwmod' into cleanup
Merge branch 'fixes-non-critical' into cleanup-devices
ARM: OMAP1: Move omap_init_audio() to keep the devices in alphabetical order
ARM: OMAP1: Move omap_init_uwire to mach-omap1
ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2
ARM: OMAP2: Use hwmod to initialize mmc for 2420
ARM: OMAP: Move omap_mmc_add() to mach-omap1
ARM: OMAP1: Pass dma request lines in platform data to MMC driver
Merge branch 'cleanup-soc' into cleanup
Tushar Behera (1):
ARM: S3C24XX: Use common macro to define resources on dev-uart.c
Vaibhav Hiremath (3):
ARM: OMAP1: Add checks for possible error condition in timer_init
ARM: OMAP2+: Replace space with underscore in the name field of system timers
ARM: OMAP: Make OMAP clocksource source selection using kernel param
Yegor Yefremov (1):
GPMC: add ECC control definitions
arch/arm/Kconfig | 1 -
arch/arm/Makefile | 6 +-
arch/arm/mach-omap1/common.h | 11 +-
arch/arm/mach-omap1/devices.c | 121 ++++++++++++--
arch/arm/mach-omap1/time.c | 16 +-
arch/arm/mach-omap1/timer32k.c | 28 +++-
arch/arm/mach-omap2/Kconfig | 8 +-
arch/arm/mach-omap2/Makefile | 167 +++++++++----------
arch/arm/mach-omap2/common.h | 4 +-
arch/arm/mach-omap2/devices.c | 19 ++-
arch/arm/mach-omap2/dma.c | 11 +-
arch/arm/mach-omap2/dsp.c | 27 ++-
arch/arm/mach-omap2/gpmc.c | 30 +++-
arch/arm/mach-omap2/hsmmc.c | 8 +-
arch/arm/mach-omap2/id.c | 7 +-
.../mach-omap2/include/mach/omap-wakeupgen.h | 8 -
arch/arm/mach-omap2/io.c | 38 +----
arch/arm/mach-omap2/iomap.h | 28 ----
arch/arm/mach-omap2/irq.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +-
arch/arm/mach-omap2/timer.c | 118 ++++++++++---
arch/arm/mach-omap2/usb-musb.c | 2 +-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +-
arch/arm/mach-s3c24xx/Makefile | 6 +
.../cpu.c => mach-s3c24xx/common.c} | 69 +++++++-
.../arm/{plat-s3c24xx => mach-s3c24xx}/irq-pm.c | 0
arch/arm/{plat-s3c24xx => mach-s3c24xx}/pm.c | 0
arch/arm/{plat-s3c24xx => mach-s3c24xx}/sleep.S | 0
arch/arm/plat-omap/counter_32k.c | 93 +++++------
arch/arm/plat-omap/devices.c | 122 --------------
arch/arm/plat-omap/dma.c | 4 +-
arch/arm/plat-omap/dmtimer.c | 2 -
arch/arm/plat-omap/include/plat/common.h | 2 +-
arch/arm/plat-omap/include/plat/cpu.h | 8 +
arch/arm/plat-omap/include/plat/dma.h | 5 +
arch/arm/plat-omap/include/plat/dmtimer.h | 1 -
arch/arm/plat-omap/include/plat/mmc.h | 9 -
arch/arm/plat-s3c24xx/Makefile | 6 -
arch/arm/plat-s3c24xx/clock.c | 59 -------
arch/arm/plat-s3c24xx/dev-uart.c | 100 -----------
arch/arm/plat-s5p/Kconfig | 132 ---------------
arch/arm/plat-s5p/Makefile | 27 ---
arch/arm/plat-samsung/Kconfig | 140 ++++++++++++++++
arch/arm/plat-samsung/Makefile | 13 ++
.../clock.c => plat-samsung/s5p-clock.c} | 3 +-
.../dev-mfc.c => plat-samsung/s5p-dev-mfc.c} | 4 +-
.../dev-uart.c => plat-samsung/s5p-dev-uart.c} | 78 ++-------
.../irq-eint.c => plat-samsung/s5p-irq-eint.c} | 3 +-
.../s5p-irq-gpioint.c} | 3 +-
.../irq-pm.c => plat-samsung/s5p-irq-pm.c} | 3 +-
.../{plat-s5p/irq.c => plat-samsung/s5p-irq.c} | 3 +-
.../{plat-s5p/pm.c => plat-samsung/s5p-pm.c} | 3 +-
.../sleep.S => plat-samsung/s5p-sleep.S} | 3 +-
arch/arm/{plat-s5p => plat-samsung}/s5p-time.c | 3 +-
.../{plat-s5p => plat-samsung}/setup-mipiphy.c | 0
drivers/net/ethernet/ti/Kconfig | 2 +-
57 files changed, 720 insertions(+), 852 deletions(-)
rename arch/arm/{plat-s3c24xx/cpu.c => mach-s3c24xx/common.c} (76%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/irq-pm.c (100%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/pm.c (100%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/sleep.S (100%)
delete mode 100644 arch/arm/plat-s3c24xx/clock.c
delete mode 100644 arch/arm/plat-s3c24xx/dev-uart.c
delete mode 100644 arch/arm/plat-s5p/Kconfig
delete mode 100644 arch/arm/plat-s5p/Makefile
rename arch/arm/{plat-s5p/clock.c => plat-samsung/s5p-clock.c} (99%)
rename arch/arm/{plat-s5p/dev-mfc.c => plat-samsung/s5p-dev-mfc.c} (97%)
rename arch/arm/{plat-s5p/dev-uart.c => plat-samsung/s5p-dev-uart.c} (57%)
rename arch/arm/{plat-s5p/irq-eint.c => plat-samsung/s5p-irq-eint.c} (99%)
rename arch/arm/{plat-s5p/irq-gpioint.c => plat-samsung/s5p-irq-gpioint.c} (99%)
rename arch/arm/{plat-s5p/irq-pm.c => plat-samsung/s5p-irq-pm.c} (98%)
rename arch/arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} (96%)
rename arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c} (95%)
rename arch/arm/{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} (98%)
rename arch/arm/{plat-s5p => plat-samsung}/s5p-time.c (99%)
rename arch/arm/{plat-s5p => plat-samsung}/setup-mipiphy.c (100%)
The new clock subsystem was merged in linux-3.4 without any users, this
now moves the first three platforms over to it: imx, mxs and spear.
The series also contains the changes for the clock subsystem itself,
since Mike preferred to have it together with the platforms that require
these changes, in order to avoid interdependencies and conflicts.
----------------------------------------------------------------
The following changes since commit d4a80a59ed34bd8c099099e8a8320f49a7e6dc7a:
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/clock
for you to fetch changes up to 3c0dec5f58b3c7b3627715126d1bf9b030a076f0:
Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/linux into next/clock
----------------------------------------------------------------
Andrew Lunn (14):
ARM: Orion: Add clocks using the generic clk infrastructure.
ARM: Orion: SPI: Add clk/clkdev support.
ARM: Orion: Eth: Add clk/clkdev support.
ARM: Orion: WDT: Add clk/clkdev support
ARM: Orion: UART: Get the clock rate via clk_get_rate().
ARM: Orion: SATA: Add per channel clk/clkdev support.
ARM: Orion: EHCI: Add support for enabling clocks
ARM: Orion: NAND: Add support for clk, if there is one.
ARM: Orion: SDIO: Add support for clk.
ARM: Orion: CESA: Add support for clk
ARM: Orion: XOR: Add support for clk
ARM: Orion: PCIE: Add support for clk
ARM: Orion: Audio: Add clk/clkdev support
ARM: Kirkwood: Replace clock gating
Arnd Bergmann (10):
Merge branch 'depends/clk/clk-next' into next/clock
Merge branch 'depends/rmk/clkdev' into next/clock
Merge tag 'imx-common-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clock
Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock
Merge branch 'spear/clock' into next/clock
Merge branch 'imx/pinctrl' into imx/clock
Merge branch 'spear/pinctrl' into spear/clock
Merge branch 'spear/dt' into spear/clock
Merge branches 'spear/clock' and 'imx/clock' into next/clock
Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/linux into next/clock
Mark Brown (3):
clk: Remove comment for end of CONFIG_COMMON_CLK section
clk: Constify parent name arrays
clk: Provide dummy clk_unregister()
Mike Turquette (10):
clk: core: correct clk_set_rate kerneldoc
clk: core: remove dead code paths
clk: core: clk_calc_new_rates handles NULL parents
clk: core: enforce clk_ops consistency
clk: core: copy parent_names & return error codes
clk: basic: improve parent_names & return errors
MAINTAINERS: add entry for common clk framework
clk: prevent spurious parent rate propagation
clk: remove COMMON_CLK_DISABLE_UNUSED
clk: mux: assign init data
Rajendra Nayak (2):
clk: Make clk_get_rate() return 0 on error
clk: constify parent name arrays in macros
Rob Herring (2):
clk: select CLKDEV_LOOKUP for COMMON_CLK
clk: remove trailing whitespace from clk.h
Saravana Kannan (2):
clk: Use a separate struct for holding init data.
clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
Sascha Hauer (31):
dmaengine i.MX SDMA: do not depend on grouped clocks
spi i.MX: do not depend on grouped clocks
video imxfb: do not depend on grouped clocks
net fec: do not depend on grouped clocks
mmc mxcmmc: do not depend on grouped clocks
mmc sdhc i.MX: do not depend on grouped clocks
serial i.MX: do not depend on grouped clocks
mtd mxc_nand: prepare/unprepare clock
USB ehci mxc: prepare/unprepare clock
USB ehci mxc: sanitize clock handling
w1 i.MX: prepare/unprepare clock
watchdog imx2: prepare clk before enabling it
media mx3 camera: prepare clk before enabling it
dmaengine i.MX ipu: clk_prepare/unprepare clock
rtc: imx dryice: Add missing clk_prepare
ARM i.MX5: prepare gpc_dvfs_clk
ARM i.MX timer: request correct clock
ARM i.MX3: Make ccm base address a variable
ARM i.MX: prepare for common clock framework
ARM i.MX: Add common clock support for pllv1
ARM i.MX: Add common clock support for pllv2
ARM i.MX: Add common clock support for 2bit gate
ARM i.MX25: implement clocks using common clock framework
ARM i.MX1: implement clocks using common clock framework
ARM i.MX21: implement clocks using common clock framework
ARM i.MX27: implement clocks using common clock framework
ARM i.MX31: implement clocks using common clock framework
clk: add a fixed factor clock
ARM i.MX5: implement clocks using common clock framework
ARM i.MX35: implement clocks using common clock framework
ARM i.MX: remove now unused clock files
Shawn Guo (19):
clk: use kzalloc in clk_register_mux
clk: remove unnecessary EXPORT_SYMBOL_GPL
clk: add "const" for clk_ops of basic clks
clk: declare clk_ops of basic clks in clk-provider.h
clk: always pass parent_rate into .round_rate
clk: pass parent_rate into .set_rate
clk: propagate round_rate for CLK_SET_RATE_PARENT case
ARM: imx: add common clock support for pllv3
ARM: imx: add common clock support for pfd
ARM: imx: add common clock support for clk busy
clk: mxs: add mxs specific clocks
clk: mxs: add clock support for imx23
clk: mxs: add clock support for imx28
ARM: mxs: request clock for timer
ARM: mxs: change the lookup name for fec phy clock
ARM: mxs: switch to common clk framework
ARM: mxs: remove old clock support
ARM: mxs: remove now unused timer_clk argument from mxs_timer_init
ARM: i.MX6: implement clocks using common clock framework
Viresh Kumar (14):
clk: Fix typo in comment
clk: clk-gate: Create clk_gate_endisable()
clk: clk-private: Add DEFINE_CLK macro
clk: Don't set clk->new_rate twice
clk: clk_set_rate() must fail if CLK_SET_RATE_GATE is set and clk is enabled
SPEAr: Add DT bindings for SPEAr's timer
SPEAr: clk: Add VCO-PLL Synthesizer clock
SPEAr: clk: Add Auxiliary Synthesizer clock
SPEAr: clk: Add Fractional Synthesizer clock
SPEAr: clk: Add General Purpose Timer Synthesizer clock
SPEAr: Call clk_prepare() before calling clk_enable
SPEAr: Switch to common clock framework
SPEAr: Add SMI NOR partition info in dts files
SPEAr: Update defconfigs
.../devicetree/bindings/arm/spear-timer.txt | 18 +
MAINTAINERS | 14 +-
arch/arm/Kconfig | 3 +
arch/arm/boot/dts/spear300-evb.dts | 25 +
arch/arm/boot/dts/spear310-evb.dts | 20 +-
arch/arm/boot/dts/spear320-evb.dts | 25 +
arch/arm/boot/dts/spear3xx.dtsi | 6 +
arch/arm/boot/dts/spear600-evb.dts | 29 +
arch/arm/boot/dts/spear600.dtsi | 6 +
arch/arm/configs/spear3xx_defconfig | 4 +
arch/arm/configs/spear6xx_defconfig | 5 +-
arch/arm/mach-dove/common.c | 39 +-
arch/arm/mach-dove/dove-db-setup.c | 1 -
arch/arm/mach-imx/Kconfig | 8 +
arch/arm/mach-imx/Makefile | 19 +-
arch/arm/mach-imx/clk-busy.c | 189 ++
arch/arm/mach-imx/clk-gate2.c | 118 +
arch/arm/mach-imx/clk-imx1.c | 115 +
arch/arm/mach-imx/clk-imx21.c | 186 ++
arch/arm/mach-imx/clk-imx25.c | 248 ++
arch/arm/mach-imx/clk-imx27.c | 290 +++
arch/arm/mach-imx/clk-imx31.c | 182 ++
arch/arm/mach-imx/clk-imx35.c | 278 +++
arch/arm/mach-imx/clk-imx51-imx53.c | 466 ++++
arch/arm/mach-imx/clk-imx6q.c | 439 ++++
arch/arm/mach-imx/clk-pfd.c | 147 ++
arch/arm/mach-imx/clk-pllv1.c | 66 +
arch/arm/mach-imx/clk-pllv2.c | 249 +++
arch/arm/mach-imx/clk-pllv3.c | 419 ++++
arch/arm/mach-imx/clk.h | 83 +
arch/arm/mach-imx/clock-imx1.c | 636 ------
arch/arm/mach-imx/clock-imx21.c | 1239 ----------
arch/arm/mach-imx/clock-imx25.c | 346 ---
arch/arm/mach-imx/clock-imx27.c | 785 -------
arch/arm/mach-imx/clock-imx31.c | 630 ------
arch/arm/mach-imx/clock-imx35.c | 536 -----
arch/arm/mach-imx/clock-imx6q.c | 2111 ------------------
arch/arm/mach-imx/clock-mx51-mx53.c | 1675 --------------
arch/arm/mach-imx/crmregs-imx3.h | 79 +-
arch/arm/mach-imx/mm-imx3.c | 6 +
arch/arm/mach-imx/mm-imx5.c | 1 +
arch/arm/mach-imx/pm-imx3.c | 4 +-
arch/arm/mach-kirkwood/board-dreamplug.c | 1 -
arch/arm/mach-kirkwood/board-dt.c | 3 +
arch/arm/mach-kirkwood/common.c | 285 ++-
arch/arm/mach-kirkwood/common.h | 1 +
.../mach-kirkwood/include/mach/bridge-regs.h | 16 +
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 1 -
arch/arm/mach-kirkwood/pcie.c | 25 +-
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 1 -
arch/arm/mach-kirkwood/t5325-setup.c | 1 -
arch/arm/mach-kirkwood/tsx1x-common.c | 1 -
arch/arm/mach-mv78xx0/common.c | 45 +-
arch/arm/mach-mxs/Makefile | 5 +-
arch/arm/mach-mxs/clock-mx23.c | 536 -----
arch/arm/mach-mxs/clock-mx28.c | 803 -------
arch/arm/mach-mxs/clock.c | 211 --
arch/arm/mach-mxs/include/mach/clock.h | 62 -
arch/arm/mach-mxs/include/mach/common.h | 6 +-
arch/arm/mach-mxs/mach-mx28evk.c | 2 +-
arch/arm/mach-mxs/regs-clkctrl-mx23.h | 331 ---
arch/arm/mach-mxs/regs-clkctrl-mx28.h | 486 ----
arch/arm/mach-mxs/system.c | 16 -
arch/arm/mach-mxs/timer.c | 11 +-
arch/arm/mach-orion5x/common.c | 27 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
arch/arm/mach-spear3xx/Makefile | 2 +-
arch/arm/mach-spear3xx/clock.c | 892 --------
arch/arm/mach-spear3xx/include/mach/generic.h | 21 +-
arch/arm/mach-spear3xx/include/mach/irqs.h | 1 -
arch/arm/mach-spear3xx/include/mach/misc_regs.h | 2 +
arch/arm/mach-spear3xx/include/mach/spear.h | 14 +-
arch/arm/mach-spear3xx/spear300.c | 1 -
arch/arm/mach-spear3xx/spear310.c | 1 -
arch/arm/mach-spear3xx/spear320.c | 12 +-
arch/arm/mach-spear3xx/spear3xx.c | 4 +-
arch/arm/mach-spear6xx/Makefile | 2 +-
arch/arm/mach-spear6xx/clock.c | 789 -------
arch/arm/mach-spear6xx/include/mach/generic.h | 2 +-
arch/arm/mach-spear6xx/include/mach/irqs.h | 3 -
arch/arm/mach-spear6xx/include/mach/misc_regs.h | 2 +
arch/arm/mach-spear6xx/include/mach/spear.h | 1 -
arch/arm/mach-spear6xx/spear6xx.c | 7 +-
arch/arm/plat-mxc/clock.c | 11 +
arch/arm/plat-mxc/include/mach/clock.h | 4 +
arch/arm/plat-mxc/time.c | 14 +
arch/arm/plat-orion/common.c | 104 +-
arch/arm/plat-orion/include/plat/common.h | 34 +-
arch/arm/plat-orion/include/plat/orion_wdt.h | 18 -
arch/arm/plat-orion/pcie.c | 4 +-
arch/arm/plat-spear/Makefile | 2 +-
arch/arm/plat-spear/clock.c | 1005 ---------
arch/arm/plat-spear/include/plat/clock.h | 249 ---
arch/arm/plat-spear/time.c | 39 +-
drivers/ata/sata_mv.c | 40 +-
drivers/clk/Kconfig | 12 +-
drivers/clk/Makefile | 5 +-
drivers/clk/clk-divider.c | 68 +-
drivers/clk/clk-fixed-factor.c | 95 +
drivers/clk/clk-fixed-rate.c | 49 +-
drivers/clk/clk-gate.c | 104 +-
drivers/clk/clk-mux.c | 27 +-
drivers/clk/clk.c | 279 ++-
drivers/clk/mxs/Makefile | 8 +
drivers/clk/mxs/clk-div.c | 110 +
drivers/clk/mxs/clk-frac.c | 139 ++
drivers/clk/mxs/clk-imx23.c | 204 ++
drivers/clk/mxs/clk-imx28.c | 337 +++
drivers/clk/mxs/clk-pll.c | 116 +
drivers/clk/mxs/clk-ref.c | 154 ++
drivers/clk/mxs/clk.c | 28 +
drivers/clk/mxs/clk.h | 66 +
drivers/clk/spear/Makefile | 8 +
drivers/clk/spear/clk-aux-synth.c | 198 ++
drivers/clk/spear/clk-frac-synth.c | 165 ++
drivers/clk/spear/clk-gpt-synth.c | 154 ++
drivers/clk/spear/clk-vco-pll.c | 363 +++
drivers/clk/spear/clk.c | 36 +
drivers/clk/spear/clk.h | 134 ++
drivers/clk/spear/spear3xx_clock.c | 612 +++++
drivers/clk/spear/spear6xx_clock.c | 342 +++
drivers/crypto/mv_cesa.c | 14 +
drivers/dma/imx-sdma.c | 40 +-
drivers/dma/ipu/ipu_idmac.c | 6 +-
drivers/dma/mv_xor.c | 15 +
drivers/dma/mv_xor.h | 1 +
drivers/media/video/mx3_camera.c | 4 +-
drivers/mmc/host/mvsdio.c | 14 +
drivers/mmc/host/mxcmmc.c | 39 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 42 +-
drivers/mtd/nand/mxc_nand.c | 6 +-
drivers/mtd/nand/orion_nand.c | 18 +
drivers/net/ethernet/freescale/fec.c | 35 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 42 +-
drivers/rtc/rtc-imxdi.c | 6 +-
drivers/spi/spi-imx.c | 30 +-
drivers/spi/spi-orion.c | 30 +-
drivers/tty/serial/imx.c | 38 +-
drivers/usb/host/ehci-mxc.c | 62 +-
drivers/usb/host/ehci-orion.c | 16 +
drivers/video/imxfb.c | 50 +-
drivers/w1/masters/mxc_w1.c | 4 +-
drivers/watchdog/imx2_wdt.c | 2 +-
drivers/watchdog/orion_wdt.c | 16 +-
include/linux/clk-private.h | 99 +-
include/linux/clk-provider.h | 120 +-
include/linux/clk.h | 6 +-
include/linux/mv643xx_eth.h | 1 -
include/linux/spi/orion_spi.h | 17 -
sound/soc/kirkwood/kirkwood-i2s.c | 13 +
sound/soc/kirkwood/kirkwood.h | 1 +
151 files changed, 8310 insertions(+), 14192 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/spear-timer.txt
create mode 100644 arch/arm/mach-imx/clk-busy.c
create mode 100644 arch/arm/mach-imx/clk-gate2.c
create mode 100644 arch/arm/mach-imx/clk-imx1.c
create mode 100644 arch/arm/mach-imx/clk-imx21.c
create mode 100644 arch/arm/mach-imx/clk-imx25.c
create mode 100644 arch/arm/mach-imx/clk-imx27.c
create mode 100644 arch/arm/mach-imx/clk-imx31.c
create mode 100644 arch/arm/mach-imx/clk-imx35.c
create mode 100644 arch/arm/mach-imx/clk-imx51-imx53.c
create mode 100644 arch/arm/mach-imx/clk-imx6q.c
create mode 100644 arch/arm/mach-imx/clk-pfd.c
create mode 100644 arch/arm/mach-imx/clk-pllv1.c
create mode 100644 arch/arm/mach-imx/clk-pllv2.c
create mode 100644 arch/arm/mach-imx/clk-pllv3.c
create mode 100644 arch/arm/mach-imx/clk.h
delete mode 100644 arch/arm/mach-imx/clock-imx1.c
delete mode 100644 arch/arm/mach-imx/clock-imx21.c
delete mode 100644 arch/arm/mach-imx/clock-imx25.c
delete mode 100644 arch/arm/mach-imx/clock-imx27.c
delete mode 100644 arch/arm/mach-imx/clock-imx31.c
delete mode 100644 arch/arm/mach-imx/clock-imx35.c
delete mode 100644 arch/arm/mach-imx/clock-imx6q.c
delete mode 100644 arch/arm/mach-imx/clock-mx51-mx53.c
delete mode 100644 arch/arm/mach-mxs/clock-mx23.c
delete mode 100644 arch/arm/mach-mxs/clock-mx28.c
delete mode 100644 arch/arm/mach-mxs/clock.c
delete mode 100644 arch/arm/mach-mxs/include/mach/clock.h
delete mode 100644 arch/arm/mach-mxs/regs-clkctrl-mx23.h
delete mode 100644 arch/arm/mach-mxs/regs-clkctrl-mx28.h
delete mode 100644 arch/arm/mach-spear3xx/clock.c
delete mode 100644 arch/arm/mach-spear6xx/clock.c
delete mode 100644 arch/arm/plat-orion/include/plat/orion_wdt.h
delete mode 100644 arch/arm/plat-spear/clock.c
delete mode 100644 arch/arm/plat-spear/include/plat/clock.h
create mode 100644 drivers/clk/clk-fixed-factor.c
create mode 100644 drivers/clk/mxs/Makefile
create mode 100644 drivers/clk/mxs/clk-div.c
create mode 100644 drivers/clk/mxs/clk-frac.c
create mode 100644 drivers/clk/mxs/clk-imx23.c
create mode 100644 drivers/clk/mxs/clk-imx28.c
create mode 100644 drivers/clk/mxs/clk-pll.c
create mode 100644 drivers/clk/mxs/clk-ref.c
create mode 100644 drivers/clk/mxs/clk.c
create mode 100644 drivers/clk/mxs/clk.h
create mode 100644 drivers/clk/spear/Makefile
create mode 100644 drivers/clk/spear/clk-aux-synth.c
create mode 100644 drivers/clk/spear/clk-frac-synth.c
create mode 100644 drivers/clk/spear/clk-gpt-synth.c
create mode 100644 drivers/clk/spear/clk-vco-pll.c
create mode 100644 drivers/clk/spear/clk.c
create mode 100644 drivers/clk/spear/clk.h
create mode 100644 drivers/clk/spear/spear3xx_clock.c
create mode 100644 drivers/clk/spear/spear6xx_clock.c
delete mode 100644 include/linux/spi/orion_spi.h
On Sat, May 26, 2012 at 12:22 AM, Olof Johansson [off-list ref] wrote:
?151 files changed, 8310 insertions(+), 14192 deletions(-)
Judging by the diffstat, I think we resolved this differently.
I also removed the
#include <linux/of.h>
from mach-kirkwood/common.c, since the OF users all got removed. You
have one less lines deleted than I do, which makes me think you didn't
remove that header file include.
But I didn't actually check. I thought I'd mention it, just so that it
doesn't come back (or, assuming I did the wrong thing, you fix it up
and put it back)
Linus
On Sat, May 26, 2012 at 12:47 PM, Linus Torvalds
[off-list ref] wrote: On Sat, May 26, 2012 at 12:22 AM, Olof Johansson [off-list ref] wrote: quoted
?151 files changed, 8310 insertions(+), 14192 deletions(-)
Judging by the diffstat, I think we resolved this differently.
I also removed the
?#include <linux/of.h>
from mach-kirkwood/common.c, since the OF users all got removed. You
have one less lines deleted than I do, which makes me think you didn't
remove that header file include.
But I didn't actually check. I thought I'd mention it, just so that it
doesn't come back (or, assuming I did the wrong thing, you fix it up
and put it back)
Good catch. Yes, I did indeed keep it and there is no need to do so
since it was only used in the code that got removed. Your resolution
is good. Thanks for the heads up.
Regards,
-Olof
A number of devices are using a common register layout, this adds support
code for it in lib/stmp_device.c so we do not need to duplicate it in
each driver.
----------------------------------------------------------------
The following changes since commit 0ac1de7ff6397b16530c23fcd31961a21498cff0:
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/stmp-dev
for you to fetch changes up to 3f81b2c49d31e763a9c1da831ceb6cef087cf6c6:
Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev
----------------------------------------------------------------
Arnd Bergmann (1):
Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev
Wolfram Sang (2):
lib: add support for stmp-style devices
i2c: mxs: use global reset function
drivers/i2c/busses/Kconfig | 1 +
drivers/i2c/busses/i2c-mxs.c | 7 +---
include/linux/stmp_device.h | 20 ++++++++++
lib/Kconfig | 3 ++
lib/Makefile | 2 +
lib/stmp_device.c | 80 +++++++++++++++++++++++++++++++++++++++
6 files changed, 108 insertions(+), 5 deletions(-)
create mode 100644 include/linux/stmp_device.h
create mode 100644 lib/stmp_device.c
These continue the device tree work from part 1, this set is for the
tegra, mxs and imx platforms, all of which have dependencies on clock
or pinctrl changes submitted earlier.
----------------------------------------------------------------
The following changes since commit 672b9ea0bd2e9c8ac957b888cdb08d1f29d332e8:
Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into HEAD
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 deb88cc3c69975cbd9875ed9fac259b351f6b64d:
Merge branch 'drivers/mmc' into next/dt2
----------------------------------------------------------------
Arnd Bergmann (4):
Merge branch 'imx/pinctrl' into imx/dt
Merge branch 'imx/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6.git into next/dt2
Merge branch 'for-3.5/dt2' of git://git.kernel.org/.../swarren/linux-tegra into for-next
Merge branch 'drivers/mmc' into next/dt2
Dirk Behme (1):
ARM: imx6: Add UART2 for low-level debug
Dong Aisheng (6):
ARM: dts: imx6q-arm2: add pinctrl state for usdhc
ARM: mxs: add initial device tree support for imx28-evk board
dma: mxs-dma: use global stmp_device functionality
dma: mxs-dma: add device tree probe support
ARM: mxs: do not add dma device by default
ARM: mxs: add mxs-dma dt support
Fabio Estevam (4):
ARM: dts: imx: Remove bootargs field
ARM: imx6q-arm2: Remove hardcoded mac address
ARM: dts: Add basic support for imx6q-sabresd
ARM: dts: imx6q-sabrelite: Add SPI NOR support
Hiroshi DOYU (1):
ARM: dt: tegra: Add device tree support for AHB
Laxman Dewangan (2):
ARM: dt: tegra: enable als and proximity sensor
ARM: dt: tegra: cardhu: register core regulator tps62361
Olof Johansson (3):
ARM: dt: tegra seaboard: add i2c devices
Merge branch 'for-3.5/dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt2
Merge branch 'mxs/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2
Richard Zhao (9):
ARM: imx6q: move imx6q_sabrelite specific code to a dedicated function
ARM: dts: imx6q-sabrelite: add ssi device
ARM: dts: imx6q-sabrelite: add audmux device
ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support
ARM: dts: imx6q-sabrelite: add audmux pinctrl support
ARM: imx6q: add ssi1_ipg clk_lookup
ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000
ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000
ARM: dts: imx6q-sabrelite: add serial2 pinctrl support
Shawn Guo (29):
ARM: imx: rename uart and fec device tree nodes
ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled
ARM: imx: add more imx5 ssi clocks
ARM: imx: add audmux pad setting for imx51-babbage
ARM: imx: add audio codec clk lookup for imx53-qsb
ARM: dts: imx51-babbage: enable audio support
ARM: dts: imx53-qsb: enable audio support
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
ARM: mxs: add initial device tree support for imx23-evk board
ARM: mxs: always build in device tree support
dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter
dma: mxs-dma: make platform_device_id more generic
gpio/mxs: use devm_* helpers to make error handling simple
gpio/mxs: get rid of the use of cpu_is_xxx
gpio/mxs: add device tree probe
ARM: mxs: add gpio support for device tree boot
mmc: mxs-mmc: use global stmp_device functionality
mmc: mxs-mmc: let ssp_is_old take host as parameter
mmc: mxs-mmc: get rid of the use of cpu_is_xxx
mmc: mxs-mmc: move header from mach into linux folder
mmc: mxs-mmc: use devm_* helper to make cleanup simpler
mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_host
mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host
mmc: mxs-mmc: add device tree support
ARM: dts: enable mmc for imx23-evk
ARM: dts: enable mmc for imx28-evk
i2c: mxs: add device tree probe support
ARM: dts: enable i2c device for imx28-evk
ARM: dts: enable audio support for imx28-evk
Stephen Warren (17):
ARM: dt: tegra seaboard: fix I2C2 SCL rate
ARM: dt: tegra seaboard: configure I2C2 pinmux
ARM: dt: tegra trimslice: add RTC I2C device
ARM: dt: tegra trimslice: enable SDHCI1 controller
ARM: dt: tegra trimslice: add support for audio
Merge branch 'for-3.5/usb-ulpi' into for-3.5/dt2-new
Merge branch 'for-3.5/dt' into for-3.5/dt2-new
ARM: dt: tegra cardhu: fix typo in SDHCI node name
ARM: dt: tegra: whitespace cleanup
ARM: dt: tegra: remove unnecessary unit addresses
ARM: dt: tegra: gpio comment cleanup
ARM: dt: tegra: format regs properties consistently
ARM: dt: tegra: consistenly use lower-case for hex constants
ARM: dt: tegra: remove duplicate device_type property
ARM: dt: tegra: sort nodes based on bus order
ARM: dt: tegra: consistent basic property ordering
ARM: dt: tegra: invert status=disable vs status=okay
Ying-Chun Liu (PaulLiu) (2):
ARM: dts: imx6q: add anatop regulators
ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC support
hdoyu at nvidia.com (4):
ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
ARM: dt: tegra20.dtsi: Add GART node
ARM: dt: tegra30.dtsi: Add SMMU node
Documentation/devicetree/bindings/arm/fsl.txt | 12 +
.../devicetree/bindings/dma/fsl-mxs-dma.txt | 19 +
.../devicetree/bindings/gpio/gpio-mxs.txt | 87 ++++
.../devicetree/bindings/i2c/i2c-mxs.txt | 16 +
.../devicetree/bindings/mmc/mxs-mmc.txt | 25 +
.../devicetree/bindings/net/fsl-fec.txt | 2 +-
.../bindings/tty/serial/fsl-imx-uart.txt | 2 +-
arch/arm/Kconfig | 1 +
arch/arm/Kconfig.debug | 8 +
arch/arm/boot/dts/imx23-evk.dts | 43 ++
arch/arm/boot/dts/imx23.dtsi | 295 +++++++++++
arch/arm/boot/dts/imx27-phytec-phycore.dts | 8 +-
arch/arm/boot/dts/imx27.dtsi | 14 +-
arch/arm/boot/dts/imx28-evk.dts | 114 +++++
arch/arm/boot/dts/imx28.dtsi | 497 +++++++++++++++++++
arch/arm/boot/dts/imx51-babbage.dts | 40 +-
arch/arm/boot/dts/imx51.dtsi | 41 +-
arch/arm/boot/dts/imx53-ard.dts | 6 +-
arch/arm/boot/dts/imx53-evk.dts | 8 +-
arch/arm/boot/dts/imx53-qsb.dts | 121 ++++-
arch/arm/boot/dts/imx53-smd.dts | 12 +-
arch/arm/boot/dts/imx53.dtsi | 45 +-
arch/arm/boot/dts/imx6q-arm2.dts | 13 +-
arch/arm/boot/dts/imx6q-sabrelite.dts | 50 +-
arch/arm/boot/dts/imx6q-sabresd.dts | 53 ++
arch/arm/boot/dts/imx6q.dtsi | 171 ++++++-
arch/arm/boot/dts/tegra-cardhu.dts | 85 ++--
arch/arm/boot/dts/tegra-harmony.dts | 104 ++--
arch/arm/boot/dts/tegra-paz00.dts | 112 ++---
arch/arm/boot/dts/tegra-seaboard.dts | 213 ++++----
arch/arm/boot/dts/tegra-trimslice.dts | 83 ++--
arch/arm/boot/dts/tegra-ventana.dts | 102 ++--
arch/arm/boot/dts/tegra20.dtsi | 275 +++++-----
arch/arm/boot/dts/tegra30.dtsi | 292 ++++++-----
arch/arm/configs/mxs_defconfig | 1 +
arch/arm/mach-imx/Makefile.boot | 3 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 40 ++
arch/arm/mach-imx/clk-imx6q.c | 35 +-
arch/arm/mach-imx/imx53-dt.c | 19 +
arch/arm/mach-imx/lluart.c | 6 +
arch/arm/mach-imx/mach-imx6q.c | 55 +-
arch/arm/mach-imx/mach-mx51_babbage.c | 6 +
arch/arm/mach-mxs/Kconfig | 10 +
arch/arm/mach-mxs/Makefile | 1 +
arch/arm/mach-mxs/devices/Kconfig | 1 -
arch/arm/mach-mxs/devices/platform-dma.c | 21 +-
arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 24 +-
arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 21 +-
arch/arm/mach-mxs/include/mach/common.h | 7 +-
arch/arm/mach-mxs/include/mach/devices-common.h | 3 +-
arch/arm/mach-mxs/mach-mxs.c | 121 +++++
arch/arm/mach-mxs/mm.c | 16 +
arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +
arch/arm/plat-mxc/include/mach/mx6q.h | 2 +
drivers/clk/mxs/clk-imx23.c | 9 +-
drivers/clk/mxs/clk-imx28.c | 13 +-
drivers/dma/Kconfig | 1 +
drivers/dma/mxs-dma.c | 188 ++++---
drivers/gpio/gpio-mxs.c | 156 +++---
drivers/i2c/busses/i2c-mxs.c | 13 +
drivers/mmc/host/mxs-mmc.c | 197 ++++----
include/linux/fsl/mxs-dma.h | 12 +-
.../mach/mmc.h => include/linux/mmc/mxs-mmc.h | 7 +-
63 files changed, 2972 insertions(+), 987 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mxs.txt
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mxs.txt
create mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.txt
create mode 100644 arch/arm/boot/dts/imx23-evk.dts
create mode 100644 arch/arm/boot/dts/imx23.dtsi
create mode 100644 arch/arm/boot/dts/imx28-evk.dts
create mode 100644 arch/arm/boot/dts/imx28.dtsi
create mode 100644 arch/arm/boot/dts/imx6q-sabresd.dts
create mode 100644 arch/arm/mach-mxs/mach-mxs.c
rename arch/arm/mach-mxs/include/mach/mmc.h => include/linux/mmc/mxs-mmc.h (81%)
This adds support for the spear13xx platform, which has first been under
review a long time ago and finally been completed after generic spear
work has gone into the clock, dt and pinctrl branches.
Also a number of updates for the samsung socs are part of this branch.
----------------------------------------------------------------
The following changes since commit 56e16c5e06b624d0ec7e958b212c368864a78504:
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into HEAD
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 820f3dd7964f1889baaaaa0c2ba45d05bb619f66:
ARM: exynos: fix building with CONFIG_OF disabled
----------------------------------------------------------------
Arnd Bergmann (6):
Merge branch 'spear/13xx' into next/soc2
Merge branch 'exynos/iommu' into next/soc2
Merge branch 'next/devel-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/soc2
Merge branch 'samsung/cleanup-plat-s5p' into next/soc2
Merge branch 'next/devel-exynos5250-1' of git://git.kernel.org/.../kgene/linux-samsung into next/soc2
ARM: exynos: fix building with CONFIG_OF disabled
Boojin Kim (1):
ARM: EXYNOS: Support DMA for EXYNOS5250 SoC
Changhwan Youn (2):
ARM: EXYNOS: Modify the GIC physical address for static io-mapping
ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
Heiko Stuebner (6):
ARM: S3C24XX: Add forgotten clock lookup table to S3C2443
ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443
ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices
ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi
ARM: S3C24XX: Add HSSPI setup callback for s3c64xx-spi driver
spi/s3c64xx: Allow usage for ARCH_S3C24XX
Inderpal Singh (1):
ARM: EXYNOS: Support Suspend/Resume for EXYNOS4412
Kisoo Yu (1):
ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
Kukjin Kim (4):
Merge branch 'next/devel-samsung-iommu' into next/devel-samsung
Merge branch 'next/devel-s3c24xx-hsspi' into next/devel-samsung
Merge branch 'next/cleanup-plat-s5p' into next/devel-exynos5250-1
ARM: EXYNOS: update irqs for EXYNOS5250 SoC
Kyoungil Kim (1):
ARM: EXYNOS: To use common config for EXYNOS4 and EXYNOS5 SPI
Marek Szyprowski (1):
ARM: EXYNOS: add platform device for core DRM subsystem
Olof Johansson (1):
ARM: EXYNOS: add dts files to dtbs target
Sangsu Park (1):
ARM: EXYNOS: add GPC4 bank instance
Sylwester Nawrocki (1):
ARM: EXYNOS: Add platform resource definitions for FIMC-LITE
Thomas Abraham (6):
ARM: EXYNOS: Add watchdog timer clock instance
ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
ARM: EXYNOS: Add irq_domain support for interrupt combiner
ARM: EXYNOS: Add device tree support for interrupt combiner
ARM: dts: Update device tree source files for EXYNOS5250
ARM: EXYNOS: Add AUXDATA for i2c controllers
Viresh Kumar (10):
SPEAr13xx: Add header files
SPEAr13xx: Add source files
SPEAr13xx: Add common clock framework support
pinctrl: SPEAr: Create macro for declaring GPIO PINS
pinctrl: Add SPEAr13xx pinctrl drivers
SPEAr13xx: Add dts and dtsi files
SPEAr13xx: Add compilation support
SPEAr13xx: Add defconfig
SPEAr: Update MAINTAINERS and Documentation
pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
Documentation/arm/SPEAr/overview.txt | 32 +-
.../bindings/arm/samsung/interrupt-combiner.txt | 52 +
Documentation/devicetree/bindings/arm/spear.txt | 14 +-
.../bindings/pinctrl/pinctrl_spear.txt | 47 +
MAINTAINERS | 13 +
arch/arm/Makefile | 2 +
arch/arm/boot/dts/exynos5250-smdk5250.dts | 48 +
arch/arm/boot/dts/exynos5250.dtsi | 60 +-
arch/arm/boot/dts/spear1310-evb.dts | 292 +++
arch/arm/boot/dts/spear1310.dtsi | 184 ++
arch/arm/boot/dts/spear1340-evb.dts | 308 +++
arch/arm/boot/dts/spear1340.dtsi | 56 +
arch/arm/boot/dts/spear13xx.dtsi | 262 +++
arch/arm/configs/spear13xx_defconfig | 95 +
arch/arm/mach-exynos/Kconfig | 14 +-
arch/arm/mach-exynos/Makefile | 7 +-
arch/arm/mach-exynos/Makefile.boot | 3 +
arch/arm/mach-exynos/clock-exynos4212.c | 10 +
arch/arm/mach-exynos/clock-exynos5.c | 51 +-
arch/arm/mach-exynos/common.c | 182 +-
arch/arm/mach-exynos/dev-drm.c | 29 +
arch/arm/mach-exynos/dma.c | 141 +-
arch/arm/mach-exynos/include/mach/gpio.h | 9 +-
arch/arm/mach-exynos/include/mach/irqs.h | 40 +-
arch/arm/mach-exynos/include/mach/map.h | 7 +-
arch/arm/mach-exynos/include/mach/regs-clock.h | 2 +
arch/arm/mach-exynos/include/mach/regs-pmu.h | 10 +-
arch/arm/mach-exynos/include/mach/spi-clocks.h | 2 +-
arch/arm/mach-exynos/mach-exynos5-dt.c | 4 +
arch/arm/mach-exynos/mct.c | 17 +-
arch/arm/mach-exynos/pm.c | 4 +-
arch/arm/mach-exynos/pmu.c | 24 +-
arch/arm/mach-s3c24xx/Kconfig | 5 +
arch/arm/mach-s3c24xx/Makefile | 1 +
arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 +
arch/arm/mach-s3c24xx/clock-s3c2443.c | 6 +
arch/arm/mach-s3c24xx/common-s3c2443.c | 15 +-
arch/arm/mach-s3c24xx/dma-s3c2443.c | 16 +-
arch/arm/mach-s3c24xx/include/mach/dma.h | 4 +
arch/arm/mach-s3c24xx/include/mach/map.h | 5 +
arch/arm/mach-s3c24xx/setup-spi.c | 39 +
arch/arm/mach-spear13xx/Kconfig | 20 +
arch/arm/mach-spear13xx/Makefile | 10 +
arch/arm/mach-spear13xx/Makefile.boot | 6 +
arch/arm/mach-spear13xx/headsmp.S | 47 +
arch/arm/mach-spear13xx/hotplug.c | 119 +
.../mach-spear13xx/include/mach/debug-macro.S | 14 +
arch/arm/mach-spear13xx/include/mach/dma.h | 128 +
arch/arm/mach-spear13xx/include/mach/generic.h | 49 +
arch/arm/mach-spear13xx/include/mach/gpio.h | 19 +
arch/arm/mach-spear13xx/include/mach/hardware.h | 1 +
arch/arm/mach-spear13xx/include/mach/irqs.h | 20 +
arch/arm/mach-spear13xx/include/mach/spear.h | 62 +
arch/arm/mach-spear13xx/include/mach/timex.h | 19 +
.../mach-spear13xx/include/mach/uncompress.h | 19 +
arch/arm/mach-spear13xx/platsmp.c | 127 +
arch/arm/mach-spear13xx/spear1310.c | 88 +
arch/arm/mach-spear13xx/spear1340.c | 192 ++
arch/arm/mach-spear13xx/spear13xx.c | 197 ++
arch/arm/plat-samsung/Kconfig | 2 +-
arch/arm/plat-samsung/include/plat/cpu.h | 2 +-
arch/arm/plat-samsung/include/plat/devs.h | 2 +
arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 +
arch/arm/plat-samsung/include/plat/s5p-clock.h | 4 +
arch/arm/plat-samsung/s5p-clock.c | 30 +
arch/arm/plat-spear/Kconfig | 12 +
arch/arm/plat-spear/Makefile | 5 +-
arch/arm/plat-spear/restart.c | 5 +
drivers/clk/spear/Makefile | 2 +
drivers/clk/spear/spear1310_clock.c | 1106 +++++++++
drivers/clk/spear/spear1340_clock.c | 964 ++++++++
drivers/gpio/gpio-samsung.c | 11 +-
drivers/pinctrl/spear/Kconfig | 10 +
drivers/pinctrl/spear/Makefile | 2 +
drivers/pinctrl/spear/pinctrl-spear.h | 251 ++
drivers/pinctrl/spear/pinctrl-spear1310.c | 2198 ++++++++++++++++++
drivers/pinctrl/spear/pinctrl-spear1340.c | 1989 ++++++++++++++++
drivers/pinctrl/spear/pinctrl-spear3xx.c | 103 +-
drivers/spi/Kconfig | 2 +-
79 files changed, 9648 insertions(+), 303 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt
create mode 100644 arch/arm/boot/dts/spear1310-evb.dts
create mode 100644 arch/arm/boot/dts/spear1310.dtsi
create mode 100644 arch/arm/boot/dts/spear1340-evb.dts
create mode 100644 arch/arm/boot/dts/spear1340.dtsi
create mode 100644 arch/arm/boot/dts/spear13xx.dtsi
create mode 100644 arch/arm/configs/spear13xx_defconfig
create mode 100644 arch/arm/mach-exynos/dev-drm.c
create mode 100644 arch/arm/mach-s3c24xx/setup-spi.c
create mode 100644 arch/arm/mach-spear13xx/Kconfig
create mode 100644 arch/arm/mach-spear13xx/Makefile
create mode 100644 arch/arm/mach-spear13xx/Makefile.boot
create mode 100644 arch/arm/mach-spear13xx/headsmp.S
create mode 100644 arch/arm/mach-spear13xx/hotplug.c
create mode 100644 arch/arm/mach-spear13xx/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-spear13xx/include/mach/dma.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/generic.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/gpio.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/hardware.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/irqs.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/spear.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/timex.h
create mode 100644 arch/arm/mach-spear13xx/include/mach/uncompress.h
create mode 100644 arch/arm/mach-spear13xx/platsmp.c
create mode 100644 arch/arm/mach-spear13xx/spear1310.c
create mode 100644 arch/arm/mach-spear13xx/spear1340.c
create mode 100644 arch/arm/mach-spear13xx/spear13xx.c
create mode 100644 drivers/clk/spear/spear1310_clock.c
create mode 100644 drivers/clk/spear/spear1340_clock.c
create mode 100644 drivers/pinctrl/spear/pinctrl-spear1310.c
create mode 100644 drivers/pinctrl/spear/pinctrl-spear1340.c
This is a patch series from Shawn Guo that moves from individual
late_initcalls() to using a member in the machine structure to invoke
a platform's late initcalls.
This cleanup is a step in the move towards multiplatform kernels since
it would reduce the need to check for compatible platforms in each and
every initcall.
----------------------------------------------------------------
The following changes since commit 7ff2e2e928102ba1bd0d375a649dec5980c3a130:
Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/cleanup-initcall
for you to fetch changes up to 80b9abf973462499c1a0110df47f62cc90361e2c:
Merge branch 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6 into staging/cleanup
----------------------------------------------------------------
Olof Johansson (1):
Merge branch 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6 into staging/cleanup
Shawn Guo (15):
ARM: provide a late_initcall hook for platform initialization
ARM: davinci: use machine specific hook for late init
ARM: ep93xx: use machine specific hook for late init
ARM: exynos: use machine specific hook for late init
ARM: imx: use machine specific hook for late init
ARM: msm: use machine specific hook for late init
ARM: omap1: use machine specific hook for late init
ARM: omap2: use machine specific hook for late init
ARM: pnx4008: use machine specific hook for late init
ARM: prima2: use machine specific hook for late init
ARM: s3c64xx: use machine specific hook for late init
ARM: sa1100: use machine specific hook for late init
ARM: shmobile: use machine specific hook for late init
ARM: tegra: use machine specific hook for late init
ARM: ux500: use machine specific hook for late init
arch/arm/include/asm/mach/arch.h | 1 +
arch/arm/kernel/setup.c | 8 +++
arch/arm/mach-davinci/board-da830-evm.c | 1 +
arch/arm/mach-davinci/board-da850-evm.c | 1 +
arch/arm/mach-davinci/board-dm355-evm.c | 1 +
arch/arm/mach-davinci/board-dm355-leopard.c | 1 +
arch/arm/mach-davinci/board-dm365-evm.c | 1 +
arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
arch/arm/mach-davinci/board-dm646x-evm.c | 2 +
arch/arm/mach-davinci/board-mityomapl138.c | 1 +
arch/arm/mach-davinci/board-neuros-osd2.c | 1 +
arch/arm/mach-davinci/board-omapl138-hawk.c | 1 +
arch/arm/mach-davinci/board-sffsdr.c | 1 +
arch/arm/mach-davinci/board-tnetv107x-evm.c | 1 +
arch/arm/mach-davinci/clock.c | 3 +-
arch/arm/mach-davinci/common.c | 7 +++
arch/arm/mach-davinci/cpufreq.c | 3 +-
arch/arm/mach-davinci/include/mach/common.h | 19 +++++++
arch/arm/mach-davinci/pm.c | 3 +-
arch/arm/mach-ep93xx/adssphere.c | 1 +
arch/arm/mach-ep93xx/core.c | 5 ++
arch/arm/mach-ep93xx/crunch.c | 4 +-
arch/arm/mach-ep93xx/edb93xx.c | 8 +++
arch/arm/mach-ep93xx/gesbc9312.c | 1 +
arch/arm/mach-ep93xx/include/mach/platform.h | 7 +++
arch/arm/mach-ep93xx/micro9.c | 4 ++
arch/arm/mach-ep93xx/simone.c | 1 +
arch/arm/mach-ep93xx/snappercl15.c | 1 +
arch/arm/mach-ep93xx/ts72xx.c | 1 +
arch/arm/mach-ep93xx/vision_ep9307.c | 1 +
arch/arm/mach-exynos/common.c | 5 ++
arch/arm/mach-exynos/common.h | 7 +++
arch/arm/mach-exynos/mach-armlex4210.c | 1 +
arch/arm/mach-exynos/mach-exynos4-dt.c | 1 +
arch/arm/mach-exynos/mach-exynos5-dt.c | 1 +
arch/arm/mach-exynos/mach-nuri.c | 1 +
arch/arm/mach-exynos/mach-origen.c | 1 +
arch/arm/mach-exynos/mach-smdk4x12.c | 1 +
arch/arm/mach-exynos/mach-smdkv310.c | 1 +
arch/arm/mach-exynos/mach-universal_c210.c | 1 +
arch/arm/mach-exynos/pm_domains.c | 3 +-
arch/arm/mach-imx/cpu-imx5.c | 6 +--
arch/arm/mach-imx/imx51-dt.c | 1 +
arch/arm/mach-imx/mach-cpuimx51sd.c | 1 +
arch/arm/mach-imx/mach-mx51_3ds.c | 1 +
arch/arm/mach-imx/mach-mx51_babbage.c | 1 +
arch/arm/mach-imx/mach-mx51_efikamx.c | 42 ++++++++-------
arch/arm/mach-imx/mach-mx51_efikasb.c | 28 +++++-----
arch/arm/mach-imx/mach-pcm037.c | 6 +++
arch/arm/mach-imx/mach-pcm037_eet.c | 5 +-
arch/arm/mach-imx/mm-imx5.c | 5 ++
arch/arm/mach-imx/pcm037.h | 6 +++
arch/arm/mach-msm/board-halibut.c | 6 +++
arch/arm/mach-msm/board-mahimahi.c | 6 +++
arch/arm/mach-msm/board-msm7x27.c | 9 ++++
arch/arm/mach-msm/board-msm7x30.c | 8 +++
arch/arm/mach-msm/board-msm8960.c | 7 +++
arch/arm/mach-msm/board-msm8x60.c | 10 ++++
arch/arm/mach-msm/board-qsd8x50.c | 7 +++
arch/arm/mach-msm/board-sapphire.c | 6 +++
arch/arm/mach-msm/board-trout.c | 6 +++
arch/arm/mach-msm/include/mach/board.h | 6 +++
arch/arm/mach-msm/smd_debug.c | 3 +-
arch/arm/mach-omap1/board-ams-delta.c | 8 ++-
arch/arm/mach-omap1/board-fsample.c | 1 +
arch/arm/mach-omap1/board-generic.c | 1 +
arch/arm/mach-omap1/board-h2.c | 1 +
arch/arm/mach-omap1/board-h3.c | 1 +
arch/arm/mach-omap1/board-htcherald.c | 1 +
arch/arm/mach-omap1/board-innovator.c | 1 +
arch/arm/mach-omap1/board-nokia770.c | 1 +
arch/arm/mach-omap1/board-osk.c | 1 +
arch/arm/mach-omap1/board-palmte.c | 1 +
arch/arm/mach-omap1/board-palmtt.c | 1 +
arch/arm/mach-omap1/board-palmz71.c | 1 +
arch/arm/mach-omap1/board-perseus2.c | 1 +
arch/arm/mach-omap1/board-sx1.c | 1 +
arch/arm/mach-omap1/board-voiceblue.c | 1 +
arch/arm/mach-omap1/common.h | 10 ++++
arch/arm/mach-omap1/io.c | 5 ++
arch/arm/mach-omap1/serial.c | 3 +-
arch/arm/mach-omap2/board-2430sdp.c | 1 +
arch/arm/mach-omap2/board-3430sdp.c | 1 +
arch/arm/mach-omap2/board-3630sdp.c | 1 +
arch/arm/mach-omap2/board-4430sdp.c | 1 +
arch/arm/mach-omap2/board-am3517crane.c | 1 +
arch/arm/mach-omap2/board-am3517evm.c | 1 +
arch/arm/mach-omap2/board-apollon.c | 1 +
arch/arm/mach-omap2/board-cm-t35.c | 2 +
arch/arm/mach-omap2/board-cm-t3517.c | 1 +
arch/arm/mach-omap2/board-devkit8000.c | 1 +
arch/arm/mach-omap2/board-generic.c | 1 +
arch/arm/mach-omap2/board-h4.c | 1 +
arch/arm/mach-omap2/board-igep0020.c | 2 +
arch/arm/mach-omap2/board-ldp.c | 1 +
arch/arm/mach-omap2/board-n8x0.c | 3 ++
arch/arm/mach-omap2/board-omap3beagle.c | 1 +
arch/arm/mach-omap2/board-omap3evm.c | 1 +
arch/arm/mach-omap2/board-omap3logic.c | 2 +
arch/arm/mach-omap2/board-omap3pandora.c | 1 +
arch/arm/mach-omap2/board-omap3stalker.c | 1 +
arch/arm/mach-omap2/board-omap3touchbook.c | 1 +
arch/arm/mach-omap2/board-omap4panda.c | 1 +
arch/arm/mach-omap2/board-overo.c | 1 +
arch/arm/mach-omap2/board-rm680.c | 2 +
arch/arm/mach-omap2/board-rx51.c | 1 +
arch/arm/mach-omap2/board-ti8168evm.c | 2 +
arch/arm/mach-omap2/board-zoom.c | 2 +
arch/arm/mach-omap2/common.h | 47 +++++++++++++++++
arch/arm/mach-omap2/io.c | 63 +++++++++++++++++++++++
arch/arm/mach-omap2/mux.c | 3 +-
arch/arm/mach-omap2/pm.c | 3 +-
arch/arm/mach-omap2/pm24xx.c | 17 ++----
arch/arm/mach-omap2/pm34xx.c | 7 +--
arch/arm/mach-omap2/pm44xx.c | 6 +--
arch/arm/mach-pnx4008/core.c | 12 +++++
arch/arm/mach-pnx4008/pm.c | 4 +-
arch/arm/mach-prima2/common.h | 6 +++
arch/arm/mach-prima2/pm.c | 3 +-
arch/arm/mach-prima2/prima2.c | 6 +++
arch/arm/mach-s3c64xx/common.c | 5 ++
arch/arm/mach-s3c64xx/common.h | 7 +++
arch/arm/mach-s3c64xx/mach-anw6410.c | 1 +
arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
arch/arm/mach-s3c64xx/mach-hmt.c | 1 +
arch/arm/mach-s3c64xx/mach-mini6410.c | 1 +
arch/arm/mach-s3c64xx/mach-ncp.c | 1 +
arch/arm/mach-s3c64xx/mach-real6410.c | 1 +
arch/arm/mach-s3c64xx/mach-smartq5.c | 1 +
arch/arm/mach-s3c64xx/mach-smartq7.c | 1 +
arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 +
arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 +
arch/arm/mach-s3c64xx/pm.c | 3 +-
arch/arm/mach-sa1100/assabet.c | 1 +
arch/arm/mach-sa1100/badge4.c | 1 +
arch/arm/mach-sa1100/cerf.c | 1 +
arch/arm/mach-sa1100/collie.c | 1 +
arch/arm/mach-sa1100/generic.c | 4 ++
arch/arm/mach-sa1100/generic.h | 7 +++
arch/arm/mach-sa1100/h3100.c | 1 +
arch/arm/mach-sa1100/h3600.c | 1 +
arch/arm/mach-sa1100/hackkit.c | 1 +
arch/arm/mach-sa1100/jornada720.c | 1 +
arch/arm/mach-sa1100/lart.c | 1 +
arch/arm/mach-sa1100/nanoengine.c | 1 +
arch/arm/mach-sa1100/pleb.c | 1 +
arch/arm/mach-sa1100/pm.c | 4 +-
arch/arm/mach-sa1100/shannon.c | 1 +
arch/arm/mach-sa1100/simpad.c | 1 +
arch/arm/mach-shmobile/Makefile | 2 +-
arch/arm/mach-shmobile/board-ag5evm.c | 1 +
arch/arm/mach-shmobile/board-ap4evb.c | 1 +
arch/arm/mach-shmobile/board-bonito.c | 1 +
arch/arm/mach-shmobile/board-g3evm.c | 1 +
arch/arm/mach-shmobile/board-g4evm.c | 1 +
arch/arm/mach-shmobile/board-kota2.c | 1 +
arch/arm/mach-shmobile/board-mackerel.c | 1 +
arch/arm/mach-shmobile/board-marzen.c | 1 +
arch/arm/mach-shmobile/common.c | 24 +++++++++
arch/arm/mach-shmobile/cpuidle.c | 3 +-
arch/arm/mach-shmobile/include/mach/common.h | 14 +++++
arch/arm/mach-shmobile/suspend.c | 3 +-
arch/arm/mach-tegra/board-dt-tegra20.c | 1 +
arch/arm/mach-tegra/board-dt-tegra30.c | 1 +
arch/arm/mach-tegra/board-harmony.c | 1 +
arch/arm/mach-tegra/board-paz00.c | 1 +
arch/arm/mach-tegra/board-seaboard.c | 3 ++
arch/arm/mach-tegra/board-trimslice.c | 1 +
arch/arm/mach-tegra/board.h | 14 +++++
arch/arm/mach-tegra/clock.c | 3 +-
arch/arm/mach-tegra/common.c | 6 +++
arch/arm/mach-tegra/powergate.c | 4 +-
arch/arm/mach-ux500/board-mop500.c | 4 ++
arch/arm/mach-ux500/clock.c | 6 +--
arch/arm/mach-ux500/clock.h | 12 +++++
arch/arm/mach-ux500/cpu.c | 6 +++
arch/arm/mach-ux500/include/mach/setup.h | 1 +
arch/arm/plat-mxc/include/mach/common.h | 7 +++
178 files changed, 614 insertions(+), 106 deletions(-)
create mode 100644 arch/arm/mach-shmobile/common.c
These changes are specific to some driver that may be used by multiple
boards or socs. The most significant change in here is the move of the
samsung iommu code from a platform specific in-kernel interface to the
generic iommu subsystem.
----------------------------------------------------------------
The following changes since commit cfda982fa8b2affe2b42ab5bb7d5737736fa8caf:
Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/drivers
for you to fetch changes up to 046fae440d32cc6dec8148c7e06a8b4b987f8a2f:
Merge branch 'next/devel-samsung-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
----------------------------------------------------------------
Allen Martin (1):
ARM: tegra: Add pllc clock init table
Arnd Bergmann (7):
Merge branch 'keyboard' of git://github.com/hzhuang1/linux into next/drivers
Merge branch 'next/cleanup-samsung-iommu' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Merge branch 'omap/dt-missed-3.4' into drivers/mmc
mmc: dt: Consolidate DT bindings
Merge branch 'for-3.5/ahb' of git://git.kernel.org/.../swarren/linux-tegra into next/drivers
Merge branch 'drivers/mmc' into next/drivers
Merge branch 'next/devel-samsung-iommu' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Chao Xie (4):
Input: pxa27x_keypad keep clock on as wakeup source
Input: pxa27x_keypad bug fix for direct_key_mask
Input: pxa27x_keypad direct key may be low active
Input: pxa27x_keypad add choice to set direct_key_mask
Hiroshi DOYU (2):
ARM: tegra: Add Tegra AHB driver
ARM: tegra: Add SMMU enabler in AHB
KyongHo Cho (3):
S5P: SYSMMU: Remove System MMU device driver
ARM: EXYNOS: Change System MMU platform device definitions
iommu/exynos: Add iommu driver for EXYNOS Platforms
Olof Johansson (5):
Merge branch 'for-3.5/usb-ulpi' of git://git.kernel.org/.../swarren/linux-tegra into next/drivers
Merge branch 'for-3.5/tegra30-audio' of git://git.kernel.org/.../swarren/linux-tegra into next/drivers
Merge branch 'for-3.5/debug' of git://git.kernel.org/.../swarren/linux-tegra into next/drivers
Merge tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers
Merge tag 'ep93xx-fixes-for-3.5' of git://github.com/RyanMallon/linux-ep93xx into next/drivers
Peter De Schrijver (1):
ARM: tegra: Initialize pll_p_out1
Rafal Prylowski (2):
arm: ep93xx: Don't try to release not acquired GPIO lines
dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels
Sebastian Andrzej Siewior (1):
ARM: davinci: optimize the DMA ISR
Stephen Warren (12):
ARM: tegra: uncompress.h: Implement TEGRA_DEBUG_UART_AUTO_ODMDATA
ARM: tegra: provide clock aliases for AHUB configlink
ARM: tegra: set up audio clocks for tegra30 dt
ARM: tegra: add AUXDATA required for audio
ARM: dt: tegra30.dtsi: Add audio-related nodes
ARM: dt: tegra cardhu: basic audio support
ARM: tegra: reparent sclk to pll_c_out1
ARM: tegra: fix pclk rate
ARM: tegra: change pll_p_out4's rate to 24MHz
ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
ARM: tegra: add USB ULPI PHY reset GPIO to device tree
ARM: dt: tegra: pinmux changes for USB ULPI
Uwe Kleine-K?nig (1):
ARM: davinci: implement DEBUG_LL port choice
.../bindings/arm/tegra/nvidia,tegra20-ahb.txt | 11 +
.../devicetree/bindings/mmc/fsl-esdhc.txt | 6 +-
.../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 2 +-
.../devicetree/bindings/mmc/mmc-spi-slot.txt | 3 +-
Documentation/devicetree/bindings/mmc/mmc.txt | 27 +
.../devicetree/bindings/mmc/nvidia-sdhci.txt | 4 +-
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 4 +-
.../devicetree/bindings/usb/tegra-usb.txt | 3 +
arch/arm/Kconfig.debug | 29 +
arch/arm/boot/dts/imx53-smd.dts | 4 +-
arch/arm/boot/dts/imx6q-arm2.dts | 2 +-
arch/arm/boot/dts/omap3-beagle.dts | 2 +-
arch/arm/boot/dts/omap4-panda.dts | 4 +-
arch/arm/boot/dts/omap4-sdp.dts | 6 +-
arch/arm/boot/dts/tegra-cardhu.dts | 65 ++
arch/arm/boot/dts/tegra-harmony.dts | 26 +-
arch/arm/boot/dts/tegra-paz00.dts | 20 +-
arch/arm/boot/dts/tegra-seaboard.dts | 6 +
arch/arm/boot/dts/tegra-trimslice.dts | 22 +-
arch/arm/boot/dts/tegra-ventana.dts | 6 +
arch/arm/boot/dts/tegra30.dtsi | 41 +
arch/arm/mach-davinci/dma.c | 69 +-
.../arm/mach-davinci/include/mach/debug-macro.S | 58 +-
arch/arm/mach-davinci/include/mach/hardware.h | 2 +-
arch/arm/mach-davinci/include/mach/serial.h | 10 -
arch/arm/mach-davinci/include/mach/uncompress.h | 30 +-
arch/arm/mach-ep93xx/core.c | 2 +-
arch/arm/mach-exynos/Kconfig | 10 +-
arch/arm/mach-exynos/Makefile | 2 +-
arch/arm/mach-exynos/clock-exynos4.c | 79 +-
arch/arm/mach-exynos/clock-exynos4.h | 2 +
arch/arm/mach-exynos/clock-exynos4210.c | 11 +
arch/arm/mach-exynos/clock-exynos4212.c | 28 +-
arch/arm/mach-exynos/clock-exynos5.c | 90 ++
arch/arm/mach-exynos/dev-sysmmu.c | 457 ++++----
arch/arm/mach-exynos/include/mach/irqs.h | 25 +-
arch/arm/mach-exynos/include/mach/map.h | 38 +
arch/arm/mach-exynos/include/mach/regs-clock.h | 5 +
arch/arm/mach-exynos/include/mach/regs-sysmmu.h | 28 -
arch/arm/mach-exynos/include/mach/sysmmu.h | 88 +-
arch/arm/mach-exynos/mach-armlex4210.c | 1 -
arch/arm/mach-exynos/mach-smdkv310.c | 1 -
arch/arm/mach-tegra/Kconfig | 37 +-
arch/arm/mach-tegra/board-dt-tegra30.c | 10 +
arch/arm/mach-tegra/board-paz00.c | 3 +-
arch/arm/mach-tegra/board-trimslice.c | 2 +
arch/arm/mach-tegra/common.c | 22 +-
arch/arm/mach-tegra/devices.c | 5 +-
arch/arm/mach-tegra/devices.h | 4 +
arch/arm/mach-tegra/include/mach/tegra-ahb.h | 19 +
arch/arm/mach-tegra/include/mach/uncompress.h | 176 ++-
arch/arm/mach-tegra/include/mach/usb_phy.h | 4 +-
arch/arm/mach-tegra/tegra2_clocks.c | 4 +
arch/arm/mach-tegra/tegra30_clocks.c | 9 +
arch/arm/mach-tegra/usb_phy.c | 15 +-
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | 4 +
arch/arm/plat-s5p/Kconfig | 8 -
arch/arm/plat-s5p/Makefile | 1 -
arch/arm/plat-s5p/sysmmu.c | 313 -----
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/sysmmu.h | 95 --
arch/powerpc/boot/dts/mpc8569mds.dts | 1 +
drivers/Makefile | 2 +-
drivers/amba/Makefile | 4 +-
drivers/amba/tegra-ahb.c | 293 +++++
drivers/dma/ep93xx_dma.c | 117 +-
drivers/input/keyboard/pxa27x_keypad.c | 52 +-
drivers/iommu/Kconfig | 21 +
drivers/iommu/Makefile | 1 +
drivers/iommu/exynos-iommu.c | 1076 ++++++++++++++++++
drivers/mmc/host/omap_hsmmc.c | 2 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
drivers/mmc/host/sdhci-pltfm.c | 8 +-
drivers/usb/host/ehci-tegra.c | 5 +-
74 files changed, 2630 insertions(+), 1015 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt
create mode 100644 Documentation/devicetree/bindings/mmc/mmc.txt
delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h
create mode 100644 arch/arm/mach-tegra/include/mach/tegra-ahb.h
delete mode 100644 arch/arm/plat-s5p/sysmmu.c
delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h
create mode 100644 drivers/amba/tegra-ahb.c
create mode 100644 drivers/iommu/exynos-iommu.c