Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

3883cbb6 · Linus Torvalds <[email protected]> · 2013-07-02 13:43:38 -07:00

Pull ARM SoC specific changes from Arnd Bergmann:
 "These changes are all to SoC-specific code, a total of 33 branches on
  17 platforms were pulled into this.  Like last time, Renesas sh-mobile
  is now the platform with the most changes, followed by OMAP and
  EXYNOS.

  Two new platforms, TI Keystone and Rockchips RK3xxx are added in this
  branch, both containing almost no platform specific code at all, since
  they are using generic subsystem interfaces for clocks, pinctrl,
  interrupts etc.  The device drivers are getting merged through the
  respective subsystem maintainer trees.

  One more SoC (u300) is now multiplatform capable and several others
  (shmobile, exynos, msm, integrator, kirkwood, clps711x) are moving
  towards that goal with this series but need more work.

  Also noteworthy is the work on PCI here, which is traditionally part
  of the SoC specific code.  With the changes done by Thomas Petazzoni,
  we can now more easily have PCI host controller drivers as loadable
  modules and keep them separate from the platform code in
  drivers/pci/host.  This has already led to the discovery that three
  platforms (exynos, spear and imx) are actually using an identical PCIe
  host controller and will be able to share a driver once support for
  spear and imx is added."

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (480 commits)
  ARM: integrator: let pciv3 use mem/premem from device tree
  ARM: integrator: set local side PCI addresses right
  ARM: dts: Add pcie controller node for exynos5440-ssdk5440
  ARM: dts: Add pcie controller node for Samsung EXYNOS5440 SoC
  ARM: EXYNOS: Enable PCIe support for Exynos5440
  pci: Add PCIe driver for Samsung Exynos
  ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data
  ARM: keystone: Move CPU bringup code to dedicated asm file
  ARM: multiplatform: always pick one CPU type
  ARM: imx: select syscon for IMX6SL
  ARM: keystone: select ARM_ERRATA_798181 only for SMP
  ARM: imx: Synertronixx scb9328 needs to select SOC_IMX1
  ARM: OMAP2+: AM43x: resolve SMP related build error
  dmaengine: edma: enable build for AM33XX
  ARM: edma: Add EDMA crossbar event mux support
  ARM: edma: Add DT and runtime PM support to the private EDMA API
  dmaengine: edma: Add TI EDMA device tree binding
  arm: add basic support for Rockchip RK3066a boards
  arm: add debug uarts for rockchip rk29xx and rk3xxx series
  arm: Add basic clocks for Rockchip rk3066a SoCs
  ...

Commit: 3883cbb6c1bda013a3ce2dbdab7dc97c52e4a232
Parents: d2033f2c · 1eb92b24

Merge commit. Changes below are compared with the first parent: d2033f2c.

Changes

479 files changed · +34791 −19470

File	Status	Add	Del	Content
Documentation/arm/sunxi/README	modified	+4	−0	View file
Documentation/devicetree/bindings/arm/cci.txt	added	+172	−0	View file
Documentation/devicetree/bindings/arm/keystone/keystone.txt	added	+10	−0	View file
Documentation/devicetree/bindings/arm/rtsm-dcscb.txt	added	+19	−0	View file
Documentation/devicetree/bindings/arm/ste-u300.txt	added	+46	−0	View file
Documentation/devicetree/bindings/clock/imx5-clock.txt	modified	+13	−0	View file
Documentation/devicetree/bindings/clock/imx6q-clock.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/clock/imx6sl-clock.txt	added	+10	−0	View file
Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt	added	+80	−0	View file
Documentation/devicetree/bindings/clock/vf610-clock.txt	added	+26	−0	View file
Documentation/devicetree/bindings/clock/zynq-7000.txt	modified	+86	−37	View file
Documentation/devicetree/bindings/dma/ste-coh901318.txt	added	+32	−0	View file
Documentation/devicetree/bindings/dma/ti-edma.txt	added	+34	−0	View file
Documentation/devicetree/bindings/gpio/gpio-clps711x.txt	added	+28	−0	View file
Documentation/devicetree/bindings/gpio/gpio-stericsson-coh901.txt	added	+7	−0	View file
Documentation/devicetree/bindings/i2c/i2c-st-ddci2c.txt	added	+15	−0	View file
Documentation/devicetree/bindings/pci/designware-pcie.txt	added	+73	−0	View file
Documentation/devicetree/bindings/pci/mvebu-pci.txt	added	+221	−0	View file
Documentation/devicetree/bindings/pci/pci.txt	added	+9	−0	View file
Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt	added	+15	−0	View file
Documentation/devicetree/bindings/rtc/dw-apb.txt	modified	+19	−0	View file
Documentation/devicetree/bindings/timer/stericsson-u300-apptimer.txt	added	+18	−0	View file
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/watchdog/stericsson-coh901327.txt	added	+19	−0	View file
arch/arm/Kconfig	modified	+35	−29	View file
arch/arm/Kconfig-nommu	modified	+1	−1	View file
arch/arm/Kconfig.debug	modified	+97	−4	View file
arch/arm/Makefile	modified	+4	−0	View file
arch/arm/boot/compressed/head-shmobile.S	modified	+2	−19	View file
arch/arm/boot/dts/Makefile	modified	+3	−0	View file
arch/arm/boot/dts/exynos5440-ssdk5440.dts	modified	+8	−0	View file
arch/arm/boot/dts/exynos5440.dtsi	modified	+39	−1	View file
arch/arm/boot/dts/integratorap.dts	modified	+41	−0	View file
arch/arm/boot/dts/keystone.dts	added	+117	−0	View file
arch/arm/boot/dts/kirkwood-6281.dtsi	modified	+31	−0	View file
arch/arm/boot/dts/kirkwood-6282.dtsi	modified	+48	−0	View file
arch/arm/boot/dts/kirkwood-db-88f6281.dts	added	+30	−0	View file
arch/arm/boot/dts/kirkwood-db-88f6282.dts	added	+34	−0	View file
arch/arm/boot/dts/kirkwood-db.dtsi	added	+89	−0	View file
arch/arm/boot/dts/kirkwood-iconnect.dts	modified	+8	−0	View file
arch/arm/boot/dts/kirkwood-mplcec4.dts	modified	+8	−0	View file
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts	modified	+8	−0	View file
arch/arm/boot/dts/kirkwood-nsa310.dts	modified	+8	−0	View file
arch/arm/boot/dts/kirkwood-ts219-6281.dts	modified	+2	−1	View file
arch/arm/boot/dts/kirkwood-ts219-6282.dts	modified	+2	−1	View file
arch/arm/boot/dts/kirkwood-ts219.dtsi	modified	+7	−2	View file
arch/arm/boot/dts/kirkwood.dtsi	modified	+1	−0	View file
arch/arm/boot/dts/rk3066a-clocks.dtsi	added	+299	−0	View file
arch/arm/boot/dts/rk3066a.dtsi	added	+390	−0	View file
arch/arm/boot/dts/ste-u300.dts	added	+473	−0	View file
arch/arm/boot/dts/zynq-7000.dtsi	modified	+21	−50	View file
arch/arm/boot/dts/zynq-zc702.dts	modified	+0	−4	View file
arch/arm/common/Kconfig	modified	+3	−0	View file
arch/arm/common/Makefile	modified	+1	−0	View file
arch/arm/mach-davinci/dma.c → arch/arm/common/edma.c	renamed	+272	−96	View file
arch/arm/configs/ap4evb_defconfig	deleted	+0	−56	View before deletion
arch/arm/configs/bonito_defconfig	deleted	+0	−72	View before deletion
arch/arm/configs/clps711x_defconfig	modified	+4	−4	View file
arch/arm/configs/exynos_defconfig	modified	+3	−0	View file
arch/arm/configs/imx_v6_v7_defconfig	modified	+10	−0	View file
arch/arm/configs/keystone_defconfig	added	+157	−0	View file
arch/arm/configs/kirkwood_defconfig	modified	+7	−3	View file
arch/arm/configs/multi_v7_defconfig	modified	+2	−0	View file
arch/arm/configs/mvebu_defconfig	modified	+4	−2	View file
arch/arm/configs/u300_defconfig	modified	+6	−8	View file
arch/arm/include/asm/assembler.h	modified	+16	−1	View file
arch/arm/include/asm/cp15.h	modified	+14	−0	View file
arch/arm/include/asm/cputype.h	modified	+42	−2	View file
arch/arm/include/asm/glue-cache.h	modified	+27	−0	View file
arch/arm/include/asm/glue-df.h	modified	+8	−0	View file
arch/arm/include/asm/glue-proc.h	modified	+9	−0	View file
arch/arm/include/asm/hardware/pci_v3.h	deleted	+0	−186	View before deletion
arch/arm/include/asm/irqflags.h	modified	+16	−6	View file
arch/arm/include/asm/mach/arch.h	modified	+5	−0	View file
arch/arm/include/asm/mach/pci.h	modified	+11	−6	View file
arch/arm/include/asm/psci.h	modified	+9	−0	View file
arch/arm/include/asm/ptrace.h	modified	+4	−0	View file
arch/arm/include/asm/system_info.h	modified	+1	−0	View file
arch/arm/include/asm/v7m.h	added	+44	−0	View file
arch/arm/include/debug/imx-uart.h	modified	+10	−0	View file
arch/arm/include/debug/keystone.S	added	+43	−0	View file
arch/arm/include/debug/mvebu.S	modified	+5	−0	View file
arch/arm/include/debug/rockchip.S	added	+42	−0	View file
arch/arm/mach-u300/include/mach/debug-macro.S → arch/arm/include/debug/u300.S	renamed	+3	−6	View file
arch/arm/include/uapi/asm/ptrace.h	modified	+27	−8	View file
arch/arm/kernel/Makefile	modified	+11	−2	View file
arch/arm/kernel/bios32.c	modified	+5	−4	View file
arch/arm/kernel/entry-common.S	modified	+4	−0	View file
arch/arm/kernel/entry-header.S	modified	+124	−0	View file
arch/arm/kernel/entry-v7m.S	added	+143	−0	View file
arch/arm/kernel/head-nommu.S	modified	+7	−3	View file
arch/arm/kernel/psci.c	modified	+3	−4	View file
arch/arm/mach-virt/platsmp.c → arch/arm/kernel/psci_smp.c	renamed	+53	−19	View file
arch/arm/kernel/setup.c	modified	+23	−3	View file
arch/arm/kernel/traps.c	modified	+8	−0	View file
arch/arm/mach-clps711x/Kconfig	modified	+1	−2	View file
arch/arm/mach-clps711x/Makefile	modified	+1	−4	View file
arch/arm/mach-clps711x/board-autcpu12.c	modified	+118	−15	View file
arch/arm/mach-clps711x/board-cdb89712.c	modified	+3	−0	View file
arch/arm/mach-clps711x/board-clep7312.c	modified	+1	−0	View file
arch/arm/mach-clps711x/board-edb7211.c	modified	+30	−4	View file
arch/arm/mach-clps711x/board-fortunet.c	modified	+1	−0	View file
arch/arm/mach-clps711x/board-p720t.c	modified	+199	−55	View file
arch/arm/mach-clps711x/common.c	modified	+62	−27	View file
arch/arm/mach-clps711x/common.h	modified	+1	−0	View file
arch/arm/mach-clps711x/devices.c	added	+68	−0	View file
include/linux/clk/mvebu.h → arch/arm/mach-clps711x/devices.h	renamed	+5	−15	View file
arch/arm/mach-clps711x/include/mach/autcpu12.h	deleted	+0	−59	View before deletion
arch/arm/mach-clps711x/include/mach/clps711x.h	modified	+2	−86	View file
arch/arm/mach-clps711x/include/mach/hardware.h	modified	+0	−7	View file
arch/arm/mach-clps711x/include/mach/memory.h	deleted	+0	−41	View before deletion
arch/arm/mach-clps711x/include/mach/syspld.h	deleted	+0	−116	View before deletion
arch/arm/mach-davinci/Makefile	modified	+1	−1	View file
arch/arm/mach-davinci/board-tnetv107x-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/davinci.h	modified	+15	−15	View file
arch/arm/mach-davinci/devices-da8xx.c	modified	+4	−4	View file
arch/arm/mach-davinci/devices-tnetv107x.c	modified	+3	−3	View file
arch/arm/mach-davinci/devices.c	modified	+5	−1	View file
arch/arm/mach-davinci/dm355.c	modified	+3	−3	View file
arch/arm/mach-davinci/dm365.c	modified	+3	−3	View file
arch/arm/mach-davinci/dm644x.c	modified	+3	−3	View file
arch/arm/mach-davinci/dm646x.c	modified	+3	−3	View file
arch/arm/mach-davinci/include/mach/cp_intc.h	modified	+2	−2	View file
arch/arm/mach-davinci/include/mach/da8xx.h	modified	+9	−9	View file
arch/arm/mach-davinci/include/mach/tnetv107x.h	modified	+3	−3	View file
arch/arm/mach-dove/Kconfig	modified	+1	−2	View file
arch/arm/mach-dove/board-dt.c	modified	+1	−2	View file
arch/arm/mach-dove/common.c	modified	+0	−1	View file
arch/arm/mach-exynos/Kconfig	modified	+11	−341	View file
arch/arm/mach-exynos/Makefile	modified	+0	−33	View file
arch/arm/mach-exynos/common.c	modified	+9	−538	View file
arch/arm/mach-exynos/common.h	modified	+1	−3	View file
arch/arm/mach-exynos/dev-ahci.c	deleted	+0	−255	View before deletion
arch/arm/mach-exynos/dev-audio.c	deleted	+0	−254	View before deletion
arch/arm/mach-exynos/dev-ohci.c	deleted	+0	−52	View before deletion
arch/arm/mach-exynos/dev-uart.c	deleted	+0	−55	View before deletion
arch/arm/mach-exynos/dma.c	deleted	+0	−322	View before deletion
arch/arm/mach-exynos/firmware.c	modified	+10	−12	View file
arch/arm/mach-exynos/include/mach/gpio.h	deleted	+0	−289	View before deletion
arch/arm/mach-exynos/include/mach/irqs.h	deleted	+0	−476	View before deletion
arch/arm/mach-exynos/include/mach/map.h	modified	+0	−214	View file
arch/arm/mach-exynos/include/mach/pm-core.h	modified	+6	−6	View file
arch/arm/mach-exynos/include/mach/regs-gpio.h	deleted	+0	−40	View before deletion
arch/arm/mach-exynos/include/mach/regs-usb-phy.h	deleted	+0	−74	View before deletion
arch/arm/mach-exynos/mach-armlex4210.c	deleted	+0	−207	View before deletion
arch/arm/mach-exynos/mach-exynos4-dt.c	modified	+1	−7	View file
arch/arm/mach-exynos/mach-exynos5-dt.c	modified	+1	−7	View file
arch/arm/mach-exynos/mach-nuri.c	deleted	+0	−1388	View before deletion
arch/arm/mach-exynos/mach-origen.c	deleted	+0	−823	View before deletion
arch/arm/mach-exynos/mach-smdk4x12.c	deleted	+0	−396	View before deletion
arch/arm/mach-exynos/mach-smdkv310.c	deleted	+0	−444	View before deletion
arch/arm/mach-exynos/mach-universal_c210.c	deleted	+0	−1159	View before deletion
arch/arm/mach-exynos/platsmp.c	modified	+1	−1	View file
arch/arm/mach-exynos/pm.c	modified	+0	−1	View file
arch/arm/mach-exynos/pm_domains.c	modified	+1	−100	View file
arch/arm/mach-exynos/setup-fimc.c	deleted	+0	−44	View before deletion
arch/arm/mach-exynos/setup-fimd0.c	deleted	+0	−43	View before deletion
arch/arm/mach-exynos/setup-i2c0.c	deleted	+0	−29	View before deletion
arch/arm/mach-exynos/setup-i2c1.c	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/setup-i2c2.c	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/setup-i2c3.c	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/setup-i2c4.c	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/setup-i2c5.c	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/setup-i2c6.c	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/setup-i2c7.c	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/setup-keypad.c	deleted	+0	−36	View before deletion
arch/arm/mach-exynos/setup-sdhci-gpio.c	deleted	+0	−152	View before deletion
arch/arm/mach-exynos/setup-spi.c	deleted	+0	−45	View before deletion
arch/arm/mach-exynos/setup-usb-phy.c	deleted	+0	−223	View before deletion
arch/arm/mach-imx/Kconfig	modified	+49	−16	View file
arch/arm/mach-imx/Makefile	modified	+3	−1	View file
arch/arm/mach-imx/clk-imx51-imx53.c	modified	+36	−37	View file
arch/arm/mach-imx/clk-imx6q.c	modified	+26	−22	View file
arch/arm/mach-imx/clk-imx6sl.c	added	+267	−0	View file
arch/arm/mach-imx/clk-pllv3.c	modified	+0	−10	View file
arch/arm/mach-imx/clk-vf610.c	added	+319	−0	View file
arch/arm/mach-imx/clk.c	modified	+35	−0	View file
arch/arm/mach-imx/clk.h	modified	+3	−1	View file
arch/arm/mach-imx/common.h	modified	+1	−1	View file
arch/arm/mach-imx/hardware.h	modified	+1	−0	View file
arch/arm/mach-imx/imx25-dt.c	modified	+2	−0	View file
arch/arm/mach-imx/imx27-dt.c	modified	+2	−0	View file
arch/arm/mach-imx/imx31-dt.c	modified	+2	−0	View file
arch/arm/mach-imx/imx51-dt.c	modified	+2	−0	View file
arch/arm/mach-imx/irq-common.c	modified	+1	−0	View file
arch/arm/mach-imx/mach-imx53.c	modified	+3	−0	View file
arch/arm/mach-imx/mach-imx6q.c	modified	+79	−2	View file
arch/arm/mach-imx/mach-imx6sl.c	added	+52	−0	View file
arch/arm/mach-imx/mach-pca100.c	modified	+2	−2	View file
arch/arm/mach-imx/mach-vf610.c	added	+48	−0	View file
arch/arm/mach-imx/mm-imx1.c	modified	+1	−1	View file
arch/arm/mach-imx/mm-imx21.c	modified	+1	−1	View file
arch/arm/mach-imx/mm-imx25.c	modified	+1	−1	View file
arch/arm/mach-imx/mm-imx27.c	modified	+1	−1	View file
arch/arm/mach-imx/mm-imx3.c	modified	+2	−2	View file
arch/arm/mach-imx/mm-imx5.c	modified	+1	−2	View file
arch/arm/mach-imx/system.c	modified	+37	−10	View file
arch/arm/mach-imx/ulpi.c	deleted	+0	−118	View before deletion
arch/arm/mach-imx/ulpi.h	modified	+7	−4	View file
arch/arm/mach-integrator/Makefile	modified	+1	−1	View file
arch/arm/mach-integrator/include/mach/platform.h	modified	+0	−23	View file
arch/arm/mach-integrator/integrator_ap.c	modified	+8	−23	View file
arch/arm/mach-integrator/pci.c	deleted	+0	−113	View before deletion
arch/arm/mach-integrator/pci_v3.c	modified	+498	−66	View file
arch/arm/mach-integrator/pci_v3.h	added	+2	−0	View file
arch/arm/mach-keystone/Kconfig	added	+15	−0	View file
arch/arm/mach-keystone/Makefile	added	+6	−0	View file
arch/arm/mach-keystone/Makefile.boot	added	+1	−0	View file
arch/arm/mach-keystone/keystone.c	added	+75	−0	View file
arch/arm/mach-keystone/keystone.h	added	+23	−0	View file
arch/arm/mach-keystone/platsmp.c	added	+43	−0	View file
arch/arm/mach-keystone/smc.S	added	+29	−0	View file
arch/arm/mach-kirkwood/Kconfig	modified	+8	−16	View file
arch/arm/mach-kirkwood/Makefile	modified	+1	−2	View file
arch/arm/mach-kirkwood/board-nsa310.c → arch/arm/mach-kirkwood/board-db88f628x-bp.c	renamed	+9	−10	View file
arch/arm/mach-kirkwood/board-dt.c	modified	+10	−8	View file
arch/arm/mach-kirkwood/board-iconnect.c	modified	+0	−8	View file
arch/arm/mach-kirkwood/board-mplcec4.c	modified	+0	−1	View file
arch/arm/mach-kirkwood/board-readynas.c	modified	+0	−1	View file
arch/arm/mach-kirkwood/common.c	modified	+23	−24	View file
arch/arm/mach-kirkwood/common.h	modified	+8	−0	View file
arch/arm/mach-kirkwood/db88f6281-bp-setup.c	deleted	+0	−108	View before deletion
arch/arm/mach-kirkwood/include/mach/bridge-regs.h	modified	+2	−0	View file
arch/arm/mach-kirkwood/pcie.c	modified	+22	−0	View file
arch/arm/mach-mvebu/Kconfig	modified	+4	−3	View file
arch/arm/mach-mvebu/armada-370-xp.c	modified	+28	−25	View file
arch/arm/mach-mvebu/armada-370-xp.h	modified	+0	−10	View file
arch/arm/mach-mvebu/coherency.c	modified	+23	−22	View file
arch/arm/mach-mvebu/coherency.h	modified	+0	−4	View file
arch/arm/mach-mvebu/common.h	modified	+2	−0	View file
arch/arm/mach-mvebu/headsmp.S	modified	+8	−8	View file
arch/arm/mach-mvebu/platsmp.c	modified	+9	−1	View file
arch/arm/mach-omap2/Kconfig	modified	+9	−0	View file
arch/arm/mach-omap2/Makefile	modified	+15	−4	View file
arch/arm/mach-omap2/am33xx.h	modified	+1	−0	View file
arch/arm/mach-omap2/board-generic.c	modified	+16	−0	View file
arch/arm/mach-omap2/cclock33xx_data.c	modified	+30	−0	View file
arch/arm/mach-omap2/cclock3xxx_data.c	modified	+0	−11	View file
arch/arm/mach-omap2/clockdomain.h	modified	+1	−0	View file
arch/arm/mach-omap2/clockdomains54xx_data.c	added	+464	−0	View file
arch/arm/mach-omap2/cm-regbits-54xx.h	added	+1737	−0	View file
arch/arm/mach-omap2/cm1_44xx.h	modified	+2	−5	View file
arch/arm/mach-omap2/cm1_54xx.h	added	+213	−0	View file
arch/arm/mach-omap2/cm2_44xx.h	modified	+2	−5	View file
arch/arm/mach-omap2/cm2_54xx.h	added	+389	−0	View file
arch/arm/mach-omap2/cm33xx.h	modified	+1	−1	View file
arch/arm/mach-omap2/cm_44xx_54xx.h	added	+36	−0	View file
arch/arm/mach-omap2/common.h	modified	+3	−2	View file
arch/arm/mach-omap2/control.h	modified	+12	−0	View file
arch/arm/mach-omap2/id.c	modified	+29	−3	View file
arch/arm/mach-omap2/io.c	modified	+22	−3	View file
arch/arm/mach-omap2/omap-headsmp.S	modified	+4	−4	View file
arch/arm/mach-omap2/omap-mpuss-lowpower.c	modified	+56	−13	View file
arch/arm/mach-omap2/omap-smp.c	modified	+3	−3	View file
arch/arm/mach-omap2/omap4-common.c	modified	+0	−16	View file
arch/arm/mach-omap2/omap4-restart.c	added	+27	−0	View file
arch/arm/mach-omap2/omap_hwmod.h	modified	+1	−0	View file
arch/arm/mach-omap2/omap_hwmod_33xx_data.c	modified	+2	−1	View file
arch/arm/mach-omap2/omap_hwmod_54xx_data.c	added	+2150	−0	View file
arch/arm/mach-omap2/pm44xx.c	modified	+48	−10	View file
arch/arm/mach-omap2/powerdomain.h	modified	+1	−0	View file
arch/arm/mach-omap2/powerdomains3xxx_data.c	modified	+62	−0	View file
arch/arm/mach-omap2/powerdomains54xx_data.c	added	+331	−0	View file
arch/arm/mach-omap2/prcm-common.h	modified	+11	−0	View file
arch/arm/mach-omap2/prcm44xx.h	modified	+6	−0	View file
arch/arm/mach-omap2/prcm_mpu44xx.h	modified	+1	−13	View file
arch/arm/mach-omap2/prcm_mpu54xx.h	added	+87	−0	View file
arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h	added	+36	−0	View file
arch/arm/mach-omap2/prm-regbits-54xx.h	added	+2701	−0	View file
arch/arm/mach-omap2/prm44xx.h	modified	+1	−32	View file
arch/arm/mach-omap2/prm44xx_54xx.h	added	+58	−0	View file
arch/arm/mach-omap2/prm54xx.h	added	+421	−0	View file
arch/arm/mach-omap2/scrm54xx.h	added	+231	−0	View file
arch/arm/mach-omap2/soc.h	modified	+26	−0	View file
arch/arm/mach-omap2/sram.c	modified	+3	−0	View file
arch/arm/mach-omap2/timer.c	modified	+1	−1	View file
arch/arm/mach-omap2/voltage.h	modified	+1	−0	View file
arch/arm/mach-omap2/voltagedomains54xx_data.c	added	+92	−0	View file
arch/arm/mach-picoxcell/Kconfig	modified	+0	−1	View file
arch/arm/mach-picoxcell/common.c	modified	+0	−2	View file
arch/arm/mach-rockchip/Kconfig	added	+16	−0	View file
arch/arm/mach-rockchip/Makefile	added	+1	−0	View file
arch/arm/mach-rockchip/rockchip.c	added	+52	−0	View file
arch/arm/mach-s3c24xx/dma-s3c2412.c	modified	+15	−41	View file
arch/arm/mach-s3c24xx/dma-s3c2443.c	modified	+2	−1	View file
arch/arm/mach-s3c24xx/dma.c	modified	+0	−3	View file
arch/arm/mach-shmobile/Kconfig	modified	+6	−59	View file
arch/arm/mach-shmobile/Makefile	modified	+0	−2	View file
arch/arm/mach-shmobile/Makefile.boot	modified	+16	−2	View file
arch/arm/mach-shmobile/board-ap4evb.c	deleted	+0	−1332	View before deletion
arch/arm/mach-shmobile/board-armadillo800eva.c	modified	+49	−67	View file
arch/arm/mach-shmobile/board-bockw.c	modified	+21	−0	View file
arch/arm/mach-shmobile/board-bonito.c	deleted	+0	−495	View before deletion
arch/arm/mach-shmobile/board-kzm9g-reference.c	modified	+0	−1	View file
arch/arm/mach-shmobile/board-kzm9g.c	modified	+4	−7	View file
arch/arm/mach-shmobile/board-lager.c	modified	+15	−0	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+69	−102	View file
arch/arm/mach-shmobile/board-marzen.c	modified	+8	−180	View file
arch/arm/mach-shmobile/clock-r8a73a4.c	modified	+371	−16	View file
arch/arm/mach-shmobile/clock-r8a7740.c	modified	+8	−3	View file
arch/arm/mach-shmobile/clock-r8a7778.c	modified	+169	−14	View file
arch/arm/mach-shmobile/clock-r8a7779.c	modified	+3	−1	View file
arch/arm/mach-shmobile/clock-r8a7790.c	modified	+248	−7	View file
arch/arm/mach-shmobile/clock-sh73a0.c	modified	+109	−2	View file
arch/arm/mach-shmobile/headsmp-scu.S	modified	+11	−18	View file
arch/arm/mach-shmobile/headsmp.S	modified	+10	−3	View file
arch/arm/mach-shmobile/include/mach/clock.h	modified	+4	−4	View file
arch/arm/mach-shmobile/include/mach/common.h	modified	+4	−2	View file
arch/arm/mach-shmobile/include/mach/head-ap4evb.txt	deleted	+0	−93	View before deletion
arch/arm/mach-shmobile/include/mach/irqs.h	modified	+5	−0	View file
arch/arm/mach-shmobile/include/mach/memory.h	deleted	+0	−7	View before deletion
arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h	deleted	+0	−29	View before deletion
arch/arm/mach-shmobile/include/mach/mmc.h	modified	+1	−3	View file
arch/arm/mach-shmobile/include/mach/r8a7740.h	modified	+0	−488	View file
arch/arm/mach-shmobile/include/mach/r8a7778.h	modified	+11	−0	View file
arch/arm/mach-shmobile/include/mach/r8a7779.h	modified	+3	−0	View file
arch/arm/mach-shmobile/include/mach/sh7372.h	modified	+2	−391	View file
arch/arm/mach-shmobile/include/mach/zboot.h	modified	+2	−4	View file
arch/arm/mach-shmobile/pm-sh7372.c	modified	+3	−0	View file
arch/arm/mach-shmobile/setup-r8a7740.c	modified	+5	−19	View file
arch/arm/mach-shmobile/setup-r8a7778.c	modified	+251	−11	View file
arch/arm/mach-shmobile/setup-r8a7779.c	modified	+197	−18	View file
arch/arm/mach-shmobile/setup-r8a7790.c	modified	+35	−1	View file
arch/arm/mach-shmobile/setup-sh73a0.c	modified	+24	−71	View file
arch/arm/mach-shmobile/sleep-sh7372.S	modified	+4	−1	View file
arch/arm/mach-shmobile/smp-emev2.c	modified	+4	−2	View file
arch/arm/mach-shmobile/smp-r8a7779.c	modified	+4	−2	View file
arch/arm/mach-shmobile/smp-sh73a0.c	modified	+4	−2	View file
arch/arm/mach-socfpga/Kconfig	modified	+1	−1	View file
arch/arm/mach-socfpga/socfpga.c	modified	+0	−2	View file
arch/arm/mach-sunxi/sunxi.c	modified	+1	−0	View file
arch/arm/mach-tegra/Makefile	modified	+1	−0	View file
arch/arm/mach-tegra/common.c	modified	+2	−0	View file
arch/arm/mach-tegra/common.h	modified	+1	−0	View file
arch/arm/mach-tegra/cpuidle-tegra20.c	modified	+3	−7	View file
arch/arm/mach-tegra/cpuidle-tegra30.c	modified	+3	−7	View file
arch/arm/mach-tegra/cpuidle.c	modified	+7	−12	View file
arch/arm/mach-tegra/cpuidle.h	modified	+3	−12	View file
arch/arm/mach-tegra/flowctrl.h	modified	+1	−0	View file
arch/arm/mach-tegra/fuse.h	modified	+12	−10	View file
arch/arm/mach-tegra/hotplug.c	modified	+13	−0	View file
arch/arm/mach-tegra/platsmp.c	modified	+25	−1	View file
arch/arm/mach-tegra/pm.c	modified	+21	−4	View file
arch/arm/mach-tegra/pm.h	modified	+2	−2	View file
arch/arm/mach-tegra/reset-handler.S	modified	+28	−23	View file
arch/arm/mach-tegra/sleep-tegra30.S	modified	+25	−5	View file
arch/arm/mach-tegra/sleep.S	modified	+5	−3	View file
arch/arm/mach-tegra/sleep.h	modified	+29	−6	View file
arch/arm/mach-tegra/tegra2_emc.c	modified	+1	−1	View file
arch/arm/mach-u300/Kconfig	modified	+26	−6	View file
arch/arm/mach-u300/Makefile	modified	+0	−2	View file
arch/arm/mach-u300/core.c	modified	+237	−522	View file
arch/arm/mach-u300/dummyspichip.c	modified	+7	−13	View file
arch/arm/mach-u300/i2c.c	deleted	+0	−285	View before deletion
arch/arm/mach-u300/i2c.h	deleted	+0	−23	View before deletion
arch/arm/mach-u300/include/mach/hardware.h	deleted	+0	−5	View before deletion
arch/arm/mach-u300/include/mach/irqs.h	deleted	+0	−80	View before deletion
arch/arm/mach-u300/include/mach/syscon.h	deleted	+0	−592	View before deletion
arch/arm/mach-u300/include/mach/timex.h	deleted	+0	−17	View before deletion
arch/arm/mach-u300/include/mach/u300-regs.h	deleted	+0	−165	View before deletion
arch/arm/mach-u300/include/mach/uncompress.h	deleted	+0	−45	View before deletion
arch/arm/mach-u300/regulator.c	modified	+56	−11	View file
arch/arm/mach-u300/spi.c	deleted	+0	−102	View before deletion
arch/arm/mach-u300/spi.h	deleted	+0	−26	View before deletion
arch/arm/mach-u300/timer.c	modified	+70	−43	View file
arch/arm/mach-u300/timer.h	deleted	+0	−1	View before deletion
arch/arm/mach-u300/u300-gpio.h	deleted	+0	−70	View before deletion
arch/arm/mach-vexpress/Kconfig	modified	+9	−0	View file
arch/arm/mach-vexpress/Makefile	modified	+1	−0	View file
arch/arm/mach-vexpress/core.h	modified	+2	−0	View file
arch/arm/mach-vexpress/dcscb.c	added	+253	−0	View file
arch/arm/mach-vexpress/dcscb_setup.S	added	+38	−0	View file
arch/arm/mach-vexpress/platsmp.c	modified	+20	−0	View file
arch/arm/mach-vexpress/v2m.c	modified	+1	−0	View file
arch/arm/mach-virt/Makefile	modified	+0	−1	View file
arch/arm/mach-virt/virt.c	modified	+0	−3	View file
arch/arm/mach-zynq/slcr.c	modified	+1	−1	View file
arch/arm/mm/Kconfig	modified	+20	−1	View file
arch/arm/mm/Makefile	modified	+2	−0	View file
arch/arm/mm/cache-nop.S	added	+50	−0	View file
arch/arm/mm/nommu.c	modified	+7	−0	View file
arch/arm/mm/proc-v7m.S	added	+157	−0	View file
arch/arm/plat-samsung/Kconfig	modified	+37	−10	View file
arch/arm/plat-samsung/Makefile	modified	+6	−5	View file
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h	modified	+0	−5	View file
arch/arm/plat-samsung/include/plat/pm.h	modified	+5	−0	View file
arch/arm/plat-samsung/init.c	modified	+5	−3	View file
arch/arm/plat-samsung/pm-gpio.c	modified	+3	−2	View file
arch/arm/plat-samsung/pm.c	modified	+6	−2	View file
arch/arm/plat-samsung/s5p-dev-mfc.c	modified	+10	−1	View file
drivers/bus/Kconfig	modified	+7	−0	View file
drivers/bus/Makefile	modified	+2	−0	View file
drivers/bus/arm-cci.c	added	+533	−0	View file
drivers/clk/Makefile	modified	+1	−1	View file
drivers/clk/clk-u300.c	modified	+583	−135	View file
drivers/clk/clk-zynq.c	deleted	+0	−378	View before deletion
drivers/clk/mvebu/Kconfig	modified	+20	−5	View file
drivers/clk/mvebu/Makefile	modified	+6	−2	View file
drivers/clk/mvebu/armada-370.c	added	+176	−0	View file
drivers/clk/mvebu/armada-xp.c	added	+210	−0	View file
drivers/clk/mvebu/clk-core.c	deleted	+0	−675	View before deletion
drivers/clk/mvebu/clk-core.h	deleted	+0	−18	View before deletion
drivers/clk/mvebu/clk-gating-ctrl.c	deleted	+0	−250	View before deletion
drivers/clk/mvebu/clk-gating-ctrl.h	deleted	+0	−22	View before deletion
drivers/clk/mvebu/clk.c	deleted	+0	−23	View before deletion
drivers/clk/mvebu/common.c	added	+163	−0	View file
drivers/clk/mvebu/common.h	added	+48	−0	View file
drivers/clk/mvebu/dove.c	added	+194	−0	View file
drivers/clk/mvebu/kirkwood.c	added	+247	−0	View file
drivers/clk/socfpga/clk.c	modified	+185	−9	View file
drivers/clk/tegra/clk-tegra114.c	modified	+22	−1	View file
drivers/clk/zynq/Makefile	added	+3	−0	View file
drivers/clk/zynq/clkc.c	added	+533	−0	View file
drivers/clk/zynq/pll.c	added	+235	−0	View file
drivers/clocksource/Kconfig	modified	+2	−0	View file
drivers/clocksource/cadence_ttc_timer.c	modified	+18	−5	View file
drivers/clocksource/dw_apb_timer_of.c	modified	+63	−32	View file
drivers/cpuidle/cpuidle-calxeda.c	modified	+0	−14	View file
drivers/dma/Kconfig	modified	+1	−1	View file
drivers/dma/coh901318.c	modified	+43	−0	View file
drivers/dma/edma.c	modified	+1	−1	View file
drivers/gpio/Kconfig	modified	+11	−1	View file
drivers/gpio/Makefile	modified	+1	−1	View file
drivers/gpio/gpio-clps711x.c	modified	+68	−168	View file
drivers/gpio/gpio-rcar.c	modified	+22	−6	View file
drivers/i2c/busses/i2c-stu300.c	modified	+13	−3	View file
drivers/media/platform/Kconfig	modified	+3	−3	View file
drivers/media/platform/exynos4-is/Kconfig	modified	+2	−1	View file
drivers/media/platform/s5p-tv/Kconfig	modified	+1	−1	View file
drivers/mfd/syscon.c	modified	+3	−0	View file
drivers/mmc/host/davinci_mmc.c	modified	+1	−0	View file
drivers/mtd/maps/Kconfig	modified	+0	−7	View file
drivers/mtd/maps/Makefile	modified	+0	−1	View file
drivers/mtd/maps/autcpu12-nvram.c	deleted	+0	−129	View before deletion
drivers/pci/Kconfig	modified	+2	−0	View file
drivers/pci/Makefile	modified	+3	−0	View file
drivers/pci/host/Kconfig	added	+17	−0	View file
drivers/pci/host/Makefile	added	+2	−0	View file
drivers/pci/host/pci-mvebu.c	added	+914	−0	View file
drivers/pci/host/pcie-designware.c	added	+1057	−0	View file
drivers/pinctrl/Kconfig	modified	+3	−2	View file
drivers/pinctrl/pinctrl-coh901.c	modified	+19	−16	View file
drivers/pinctrl/pinctrl-u300.c	modified	+7	−0	View file
drivers/pinctrl/sh-pfc/Kconfig	modified	+11	−2	View file
drivers/pinctrl/sh-pfc/Makefile	modified	+2	−0	View file
drivers/pinctrl/sh-pfc/core.c	modified	+21	−1	View file
drivers/pinctrl/sh-pfc/core.h	modified	+4	−0	View file
drivers/pinctrl/sh-pfc/pfc-r8a7740.c	modified	+1337	−586	View file
drivers/pinctrl/sh-pfc/pfc-r8a7778.c	added	+2783	−0	View file
drivers/pinctrl/sh-pfc/pfc-r8a7779.c	modified	+357	−136	View file
drivers/pinctrl/sh-pfc/pfc-r8a7790.c	added	+3835	−0	View file
drivers/pinctrl/sh-pfc/pfc-sh7372.c	modified	+1244	−408	View file
drivers/pinctrl/sh-pfc/pfc-sh73a0.c	modified	+347	−395	View file
drivers/pinctrl/sh-pfc/sh_pfc.h	modified	+3	−1	View file
drivers/rtc/rtc-coh901331.c	modified	+6	−0	View file
drivers/spi/spi-pl022.c	modified	+1	−0	View file
drivers/thermal/exynos_thermal.c	modified	+2	−1	View file
drivers/tty/serial/xilinx_uartps.c	modified	+67	−18	View file
drivers/usb/host/Kconfig	modified	+1	−1	View file
drivers/usb/host/ehci-platform.c	modified	+6	−0	View file
drivers/usb/phy/Kconfig	modified	+5	−5	View file
drivers/usb/phy/phy-rcar-usb.c	modified	+82	−46	View file
drivers/watchdog/coh901327_wdt.c	modified	+9	−3	View file
include/dt-bindings/clock/imx6sl-clock.h	added	+148	−0	View file
include/dt-bindings/clock/vf610-clock.h	added	+163	−0	View file
include/linux/arm-cci.h	added	+61	−0	View file
include/linux/clk/zynq.h	modified	+7	−1	View file
include/linux/dw_apb_timer.h	modified	+0	−1	View file
include/linux/mfd/davinci_voicecodec.h	modified	+1	−2	View file
include/linux/mfd/syscon/clps711x.h	added	+94	−0	View file
arch/arm/mach-davinci/include/mach/edma.h → include/linux/platform_data/edma.h	renamed	+5	−89	View file
include/linux/platform_data/gpio-rcar.h	modified	+4	−1	View file
include/linux/platform_data/pinctrl-coh901.h	deleted	+0	−22	View before deletion
include/linux/platform_data/spi-davinci.h	modified	+1	−1	View file
include/linux/platform_data/usb-rcar-phy.h	added	+28	−0	View file
include/linux/usb/ehci_pdriver.h	modified	+4	−0	View file
sound/soc/davinci/davinci-evm.c	modified	+1	−0	View file
sound/soc/davinci/davinci-pcm.c	modified	+1	−0	View file
sound/soc/davinci/davinci-pcm.h	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/sunxi/README

View file

diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
index d9a372d..e3f93fb 100644
--- a/Documentation/arm/sunxi/README
+++ b/Documentation/arm/sunxi/README
@@ -17,6 +17,10 @@ SunXi family
 	+ User Manual
 	  http://dl.linux-sunxi.org/A10/A10%20User%20Manual%20-%20v1.20%20%282012-04-09%2c%20DECRYPTED%29.pdf
 
+      - Allwinner A10s (sun5i)
+        + Datasheet
+          http://dl.linux-sunxi.org/A10s/A10s%20Datasheet%20-%20v1.20%20%282012-03-27%29.pdf
+
       - Allwinner A13 (sun5i)
         + Datasheet
 	  http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf

Documentation/devicetree/bindings/arm/cci.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/cci.txt b/Documentation/devicetree/bindings/arm/cci.txt
new file mode 100644
index 0000000..92d36e2
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/cci.txt
@@ -0,0 +1,172 @@
+=======================================================
+ARM CCI cache coherent interconnect binding description
+=======================================================
+
+ARM multi-cluster systems maintain intra-cluster coherency through a
+cache coherent interconnect (CCI) that is capable of monitoring bus
+transactions and manage coherency, TLB invalidations and memory barriers.
+
+It allows snooping and distributed virtual memory message broadcast across
+clusters, through memory mapped interface, with a global control register
+space and multiple sets of interface control registers, one per slave
+interface.
+
+Bindings for the CCI node follow the ePAPR standard, available from:
+
+www.power.org/documentation/epapr-version-1-1/
+
+with the addition of the bindings described in this document which are
+specific to ARM.
+
+* CCI interconnect node
+
+	Description: Describes a CCI cache coherent Interconnect component
+
+	Node name must be "cci".
+	Node's parent must be the root node /, and the address space visible
+	through the CCI interconnect is the same as the one seen from the
+	root node (ie from CPUs perspective as per DT standard).
+	Every CCI node has to define the following properties:
+
+	- compatible
+		Usage: required
+		Value type: <string>
+		Definition: must be set to
+			    "arm,cci-400"
+
+	- reg
+		Usage: required
+		Value type: <prop-encoded-array>
+		Definition: A standard property. Specifies base physical
+			    address of CCI control registers common to all
+			    interfaces.
+
+	- ranges:
+		Usage: required
+		Value type: <prop-encoded-array>
+		Definition: A standard property. Follow rules in the ePAPR for
+			    hierarchical bus addressing. CCI interfaces
+			    addresses refer to the parent node addressing
+			    scheme to declare their register bases.
+
+	CCI interconnect node can define the following child nodes:
+
+	- CCI control interface nodes
+
+		Node name must be "slave-if".
+		Parent node must be CCI interconnect node.
+
+		A CCI control interface node must contain the following
+		properties:
+
+		- compatible
+			Usage: required
+			Value type: <string>
+			Definition: must be set to
+				    "arm,cci-400-ctrl-if"
+
+		- interface-type:
+			Usage: required
+			Value type: <string>
+			Definition: must be set to one of {"ace", "ace-lite"}
+				    depending on the interface type the node
+				    represents.
+
+		- reg:
+			Usage: required
+			Value type: <prop-encoded-array>
+			Definition: the base address and size of the
+				    corresponding interface programming
+				    registers.
+
+* CCI interconnect bus masters
+
+	Description: masters in the device tree connected to a CCI port
+		     (inclusive of CPUs and their cpu nodes).
+
+	A CCI interconnect bus master node must contain the following
+	properties:
+
+	- cci-control-port:
+		Usage: required
+		Value type: <phandle>
+		Definition: a phandle containing the CCI control interface node
+			    the master is connected to.
+
+Example:
+
+	cpus {
+		#size-cells = <0>;
+		#address-cells = <1>;
+
+		CPU0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a15";
+			cci-control-port = <&cci_control1>;
+			reg = <0x0>;
+		};
+
+		CPU1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a15";
+			cci-control-port = <&cci_control1>;
+			reg = <0x1>;
+		};
+
+		CPU2: cpu@100 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a7";
+			cci-control-port = <&cci_control2>;
+			reg = <0x100>;
+		};
+
+		CPU3: cpu@101 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a7";
+			cci-control-port = <&cci_control2>;
+			reg = <0x101>;
+		};
+
+	};
+
+	dma0: dma@3000000 {
+		compatible = "arm,pl330", "arm,primecell";
+		cci-control-port = <&cci_control0>;
+		reg = <0x0 0x3000000 0x0 0x1000>;
+		interrupts = <10>;
+		#dma-cells = <1>;
+		#dma-channels = <8>;
+		#dma-requests = <32>;
+	};
+
+	cci@2c090000 {
+		compatible = "arm,cci-400";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0x0 0x2c090000 0 0x1000>;
+		ranges = <0x0 0x0 0x2c090000 0x6000>;
+
+		cci_control0: slave-if@1000 {
+			compatible = "arm,cci-400-ctrl-if";
+			interface-type = "ace-lite";
+			reg = <0x1000 0x1000>;
+		};
+
+		cci_control1: slave-if@4000 {
+			compatible = "arm,cci-400-ctrl-if";
+			interface-type = "ace";
+			reg = <0x4000 0x1000>;
+		};
+
+		cci_control2: slave-if@5000 {
+			compatible = "arm,cci-400-ctrl-if";
+			interface-type = "ace";
+			reg = <0x5000 0x1000>;
+		};
+	};
+
+This CCI node corresponds to a CCI component whose control registers sits
+at address 0x000000002c090000.
+CCI slave interface @0x000000002c091000 is connected to dma controller dma0.
+CCI slave interface @0x000000002c094000 is connected to CPUs {CPU0, CPU1};
+CCI slave interface @0x000000002c095000 is connected to CPUs {CPU2, CPU3};

Documentation/devicetree/bindings/arm/keystone/keystone.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/keystone/keystone.txt b/Documentation/devicetree/bindings/arm/keystone/keystone.txt
new file mode 100644
index 0000000..63c0e6a
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/keystone/keystone.txt
@@ -0,0 +1,10 @@
+TI Keystone Platforms Device Tree Bindings
+-----------------------------------------------
+
+Boards with Keystone2 based devices (TCI66xxK2H) SOC shall have the
+following properties.
+
+Required properties:
+ - compatible: All TI specific devices present in Keystone SOC should be in
+   the form "ti,keystone-*". Generic devices like gic, arch_timers, ns16550
+   type UART should use the specified compatible for those devices.

Documentation/devicetree/bindings/arm/rtsm-dcscb.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt b/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt
new file mode 100644
index 0000000..3b8fbf3
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt
@@ -0,0 +1,19 @@
+ARM Dual Cluster System Configuration Block
+-------------------------------------------
+
+The Dual Cluster System Configuration Block (DCSCB) provides basic
+functionality for controlling clocks, resets and configuration pins in
+the Dual Cluster System implemented by the Real-Time System Model (RTSM).
+
+Required properties:
+
+- compatible : should be "arm,rtsm,dcscb"
+
+- reg : physical base address and the size of the registers window
+
+Example:
+
+	dcscb@60000000 {
+		compatible = "arm,rtsm,dcscb";
+		reg = <0x60000000 0x1000>;
+	};

Documentation/devicetree/bindings/arm/ste-u300.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/ste-u300.txt b/Documentation/devicetree/bindings/arm/ste-u300.txt
new file mode 100644
index 0000000..69b5ab0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/ste-u300.txt
@@ -0,0 +1,46 @@
+ST-Ericsson U300 Device Tree Bindings
+
+For various board the "board" node may contain specific properties
+that pertain to this particular board, such as board-specific GPIOs
+or board power regulator supplies.
+
+Required root node property:
+
+compatible="stericsson,u300";
+
+Required node: syscon
+This contains the system controller.
+- compatible: must be "stericsson,u300-syscon".
+- reg: the base address and size of the system controller.
+
+Boards with the U300 SoC include:
+
+S365 "Small Board U365":
+
+Required node: s365
+This contains the board-specific information.
+- compatible: must be "stericsson,s365".
+- vana15-supply: the regulator supplying the 1.5V to drive the
+  board.
+- syscon: a pointer to the syscon node so we can acccess the
+  syscon registers to set the board as self-powered.
+
+Example:
+
+/ {
+	model = "ST-Ericsson U300";
+	compatible = "stericsson,u300";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	s365 {
+		compatible = "stericsson,s365";
+		vana15-supply = <&ab3100_ldo_d_reg>;
+		syscon = <&syscon>;
+	};
+
+	syscon: syscon@c0011000 {
+		compatible = "stericsson,u300-syscon";
+		reg = <0xc0011000 0x1000>;
+	};
+};

Documentation/devicetree/bindings/clock/imx5-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/imx5-clock.txt b/Documentation/devicetree/bindings/clock/imx5-clock.txt
index d71b4b2..f46f562 100644
--- a/Documentation/devicetree/bindings/clock/imx5-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx5-clock.txt
@@ -184,6 +184,19 @@ clocks and IDs.
 	cko2			170
 	srtc_gate		171
 	pata_gate		172
+	sata_gate		173
+	spdif_xtal_sel		174
+	spdif0_sel		175
+	spdif1_sel		176
+	spdif0_pred		177
+	spdif0_podf		178
+	spdif1_pred		179
+	spdif1_podf		180
+	spdif0_com_sel		181
+	spdif1_com_sel		182
+	spdif0_gate		183
+	spdif1_gate		184
+	spdif_ipg_gate		185
 
 Examples (for mx53):
 

Documentation/devicetree/bindings/clock/imx6q-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
index 6deb6fd..a0e104f 100644
--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -208,6 +208,7 @@ clocks and IDs.
 	pll4_post_div		193
 	pll5_post_div		194
 	pll5_video_div		195
+	eim_slow      		196
 
 Examples:
 

Documentation/devicetree/bindings/clock/imx6sl-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/imx6sl-clock.txt b/Documentation/devicetree/bindings/clock/imx6sl-clock.txt
new file mode 100644
index 0000000..15e40bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/imx6sl-clock.txt
@@ -0,0 +1,10 @@
+* Clock bindings for Freescale i.MX6 SoloLite
+
+Required properties:
+- compatible: Should be "fsl,imx6sl-ccm"
+- reg: Address and length of the register set
+- #clock-cells: Should be <1>
+
+The clock consumer should specify the desired clock by having the clock
+ID in its "clocks" phandle cell.  See include/dt-bindings/clock/imx6sl-clock.h
+for the full list of i.MX6 SoloLite clock IDs.

Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt b/Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt
new file mode 100644
index 0000000..7cafcb9
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt
@@ -0,0 +1,80 @@
+Clock bindings for ST-Ericsson U300 System Controller Clocks
+
+Bindings for the gated system controller clocks:
+
+Required properties:
+- compatible: must be "stericsson,u300-syscon-clk"
+- #clock-cells: must be <0>
+- clock-type: specifies the type of clock:
+  0 = slow clock
+  1 = fast clock
+  2 = rest/remaining clock
+- clock-id: specifies the clock in the type range
+
+Optional properties:
+- clocks: parent clock(s)
+
+The available clocks per type are as follows:
+
+Type:  ID:   Clock:
+-------------------
+0      0     Slow peripheral bridge clock
+0      1     UART0 clock
+0      4     GPIO clock
+0      6     RTC clock
+0      7     Application timer clock
+0      8     Access timer clock
+
+1      0     Fast peripheral bridge clock
+1      1     I2C bus 0 clock
+1      2     I2C bus 1 clock
+1      5     MMC interface peripheral (silicon) clock
+1      6     SPI clock
+
+2      3     CPU clock
+2      4     DMA controller clock
+2      5     External Memory Interface (EMIF) clock
+2      6     NAND flask interface clock
+2      8     XGAM graphics engine clock
+2      9     Shared External Memory Interface (SEMI) clock
+2      10    AHB Subsystem Bridge clock
+2      12    Interrupt controller clock
+
+Example:
+
+gpio_clk: gpio_clk@13M {
+	#clock-cells = <0>;
+	compatible = "stericsson,u300-syscon-clk";
+	clock-type = <0>; /* Slow */
+	clock-id = <4>;
+	clocks = <&slow_clk>;
+};
+
+gpio: gpio@c0016000 {
+	compatible = "stericsson,gpio-coh901";
+	(...)
+	clocks = <&gpio_clk>;
+};
+
+
+Bindings for the MMC/SD card clock:
+
+Required properties:
+- compatible: must be "stericsson,u300-syscon-mclk"
+- #clock-cells: must be <0>
+
+Optional properties:
+- clocks: parent clock(s)
+
+mmc_mclk: mmc_mclk {
+	#clock-cells = <0>;
+	compatible = "stericsson,u300-syscon-mclk";
+	clocks = <&mmc_pclk>;
+};
+
+mmcsd: mmcsd@c0001000 {
+	compatible = "arm,pl18x", "arm,primecell";
+	clocks = <&mmc_pclk>, <&mmc_mclk>;
+	clock-names = "apb_pclk", "mclk";
+	(...)
+};

Documentation/devicetree/bindings/clock/vf610-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/vf610-clock.txt b/Documentation/devicetree/bindings/clock/vf610-clock.txt
new file mode 100644
index 0000000..c80863d
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/vf610-clock.txt
@@ -0,0 +1,26 @@
+* Clock bindings for Freescale Vybrid VF610 SOC
+
+Required properties:
+- compatible: Should be "fsl,vf610-ccm"
+- reg: Address and length of the register set
+- #clock-cells: Should be <1>
+
+The clock consumer should specify the desired clock by having the clock
+ID in its "clocks" phandle cell. See include/dt-bindings/clock/vf610-clock.h
+for the full list of VF610 clock IDs.
+
+Examples:
+
+clks: ccm@4006b000 {
+	compatible = "fsl,vf610-ccm";
+	reg = <0x4006b000 0x1000>;
+	#clock-cells = <1>;
+};
+
+uart1: serial@40028000 {
+	compatible = "fsl,vf610-uart";
+	reg = <0x40028000 0x1000>;
+	interrupts = <0 62 0x04>;
+	clocks = <&clks VF610_CLK_UART1>;
+	clock-names = "ipg";
+};

Documentation/devicetree/bindings/clock/zynq-7000.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt b/Documentation/devicetree/bindings/clock/zynq-7000.txt
index 23ae1db..d99af87 100644
--- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
+++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
@@ -6,50 +6,99 @@ The purpose of this document is to document their usage.
 See clock_bindings.txt for more information on the generic clock bindings.
 See Chapter 25 of Zynq TRM for more information about Zynq clocks.
 
-== PLLs ==
-
-Used to describe the ARM_PLL, DDR_PLL, and IO_PLL.
+== Clock Controller ==
+The clock controller is a logical abstraction of Zynq's clock tree. It reads
+required input clock frequencies from the devicetree and acts as clock provider
+for all clock consumers of PS clocks.
 
 Required properties:
-- #clock-cells : shall be 0 (only one clock is output from this node)
-- compatible : "xlnx,zynq-pll"
-- reg : pair of u32 values, which are the address offsets within the SLCR
-        of the relevant PLL_CTRL register and PLL_CFG register respectively
-- clocks : phandle for parent clock.  should be the phandle for ps_clk
+ - #clock-cells : Must be 1
+ - compatible : "xlnx,ps7-clkc"
+ - ps-clk-frequency : Frequency of the oscillator providing ps_clk in HZ
+		      (usually 33 MHz oscillators are used for Zynq platforms)
+ - clock-output-names : List of strings used to name the clock outputs. Shall be
+			a list of the outputs given below.
 
 Optional properties:
-- clock-output-names : name of the output clock
-
-Example:
-	armpll: armpll {
-		#clock-cells = <0>;
-		compatible = "xlnx,zynq-pll";
-		clocks = <&ps_clk>;
-		reg = <0x100 0x110>;
-		clock-output-names = "armpll";
-	};
-
-== Peripheral clocks ==
+ - clocks : as described in the clock bindings
+ - clock-names : as described in the clock bindings
 
-Describes clock node for the SDIO, SMC, SPI, QSPI, and UART clocks.
+Clock inputs:
+The following strings are optional parameters to the 'clock-names' property in
+order to provide an optional (E)MIO clock source.
+ - swdt_ext_clk
+ - gem0_emio_clk
+ - gem1_emio_clk
+ - mio_clk_XX		# with XX = 00..53
+...
 
-Required properties:
-- #clock-cells : shall be 1
-- compatible : "xlnx,zynq-periph-clock"
-- reg : a single u32 value, describing the offset within the SLCR where
-        the CLK_CTRL register is found for this peripheral
-- clocks : phandle for parent clocks.  should hold phandles for
-           the IO_PLL, ARM_PLL, and DDR_PLL in order
-- clock-output-names : names of the output clock(s).  For peripherals that have
-                       two output clocks (for example, the UART), two clocks
-                       should be listed.
+Clock outputs:
+ 0:  armpll
+ 1:  ddrpll
+ 2:  iopll
+ 3:  cpu_6or4x
+ 4:  cpu_3or2x
+ 5:  cpu_2x
+ 6:  cpu_1x
+ 7:  ddr2x
+ 8:  ddr3x
+ 9:  dci
+ 10: lqspi
+ 11: smc
+ 12: pcap
+ 13: gem0
+ 14: gem1
+ 15: fclk0
+ 16: fclk1
+ 17: fclk2
+ 18: fclk3
+ 19: can0
+ 20: can1
+ 21: sdio0
+ 22: sdio1
+ 23: uart0
+ 24: uart1
+ 25: spi0
+ 26: spi1
+ 27: dma
+ 28: usb0_aper
+ 29: usb1_aper
+ 30: gem0_aper
+ 31: gem1_aper
+ 32: sdio0_aper
+ 33: sdio1_aper
+ 34: spi0_aper
+ 35: spi1_aper
+ 36: can0_aper
+ 37: can1_aper
+ 38: i2c0_aper
+ 39: i2c1_aper
+ 40: uart0_aper
+ 41: uart1_aper
+ 42: gpio_aper
+ 43: lqspi_aper
+ 44: smc_aper
+ 45: swdt
+ 46: dbg_trc
+ 47: dbg_apb
 
 Example:
-	uart_clk: uart_clk {
+	clkc: clkc {
 		#clock-cells = <1>;
-		compatible = "xlnx,zynq-periph-clock";
-		clocks = <&iopll &armpll &ddrpll>;
-		reg = <0x154>;
-		clock-output-names = "uart0_ref_clk",
-				     "uart1_ref_clk";
+		compatible = "xlnx,ps7-clkc";
+		ps-clk-frequency = <33333333>;
+		clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",
+				"cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",
+				"dci", "lqspi", "smc", "pcap", "gem0", "gem1",
+				"fclk0", "fclk1", "fclk2", "fclk3", "can0", "can1",
+				"sdio0", "sdio1", "uart0", "uart1", "spi0", "spi1",
+				"dma", "usb0_aper", "usb1_aper", "gem0_aper",
+				"gem1_aper", "sdio0_aper", "sdio1_aper",
+				"spi0_aper", "spi1_aper", "can0_aper", "can1_aper",
+				"i2c0_aper", "i2c1_aper", "uart0_aper", "uart1_aper",
+				"gpio_aper", "lqspi_aper", "smc_aper", "swdt",
+				"dbg_trc", "dbg_apb";
+		# optional props
+		clocks = <&clkc 16>, <&clk_foo>;
+		clock-names = "gem1_emio_clk", "can_mio_clk_23";
 	};

Documentation/devicetree/bindings/dma/ste-coh901318.txt

View file

diff --git a/Documentation/devicetree/bindings/dma/ste-coh901318.txt b/Documentation/devicetree/bindings/dma/ste-coh901318.txt
new file mode 100644
index 0000000..091ad05

This diff is incomplete. Download the complete patch.