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

6fa52ed3 · Linus Torvalds <[email protected]> · 2013-05-04 12:31:18 -07:00

Pull ARM SoC driver changes from Olof Johansson:
 "This is a rather large set of patches for device drivers that for one
  reason or another the subsystem maintainer preferred to get merged
  through the arm-soc tree.  There are both new drivers as well as
  existing drivers that are getting converted from platform-specific
  code into standalone drivers using the appropriate subsystem specific
  interfaces.

  In particular, we can now have pinctrl, clk, clksource and irqchip
  drivers in one file per driver, without the need to call into platform
  specific interface, or to get called from platform specific code, as
  long as all information about the hardware is provided through a
  device tree.

  Most of the drivers we touch this time are for clocksource.  Since now
  most of them are part of drivers/clocksource, I expect that we won't
  have to touch these again from arm-soc and can let the clocksource
  maintainers take care of these in the future.

  Another larger part of this series is specific to the exynos platform,
  which is seeing some significant effort in upstreaming and
  modernization of its device drivers this time around, which
  unfortunately is also the cause for the churn and a lot of the merge
  conflicts.

  There is one new subsystem that gets merged as part of this series:
  the reset controller interface, which is a very simple interface for
  taking devices on the SoC out of reset or back into reset.  Patches to
  use this interface on i.MX follow later in this merge window, and we
  are going to have other platforms (at least tegra and sirf) get
  converted in 3.11.  This will let us get rid of platform specific
  callbacks in a number of platform independent device drivers."

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (256 commits)
  irqchip: s3c24xx: add missing __init annotations
  ARM: dts: Disable the RTC by default on exynos5
  clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3}
  ARM: exynos: restore mach/regs-clock.h for exynos5
  clocksource: exynos_mct: fix build error on non-DT
  pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()
  irqchip: vt8500: Convert arch-vt8500 to new irqchip infrastructure
  reset: NULL deref on allocation failure
  reset: Add reset controller API
  dt: describe base reset signal binding
  ARM: EXYNOS: Add arm-pmu DT binding for exynos421x
  ARM: EXYNOS: Add arm-pmu DT binding for exynos5250
  ARM: EXYNOS: Enable PMUs for exynos4
  irqchip: exynos-combiner: Correct combined IRQs for exynos4
  irqchip: exynos-combiner: Add set_irq_affinity function for combiner_irq
  ARM: EXYNOS: fix compilation error introduced due to common clock migration
  clk: exynos5250: Fix divider values for sclk_mmc{0,1,2,3}
  clk: exynos4: export clocks required for fimc-is
  clk: samsung: Fix compilation error
  clk: tegra: fix enum tegra114_clk to match binding
  ...

Commit: 6fa52ed33bea997374a88dbacbba5bf8c7ac4fef
Parents: 1db77221 · bc8fd900

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

Changes

253 files changed · +16930 −7331

File	Status	Add	Del	Content
Documentation/devicetree/bindings/bus/ti-gpmc.txt	modified	+75	−28	View file
Documentation/devicetree/bindings/clock/exynos4-clock.txt	added	+288	−0	View file
Documentation/devicetree/bindings/clock/exynos5250-clock.txt	added	+177	−0	View file
Documentation/devicetree/bindings/clock/exynos5440-clock.txt	added	+61	−0	View file
Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt	added	+303	−0	View file
Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt	modified	+2	−2	View file
Documentation/devicetree/bindings/gpio/gpio-vt8500.txt	deleted	+0	−24	View before deletion
Documentation/devicetree/bindings/interrupt-controller/samsung,s3c24xx-irq.txt	added	+53	−0	View file
Documentation/devicetree/bindings/media/s5p-mfc.txt	modified	+21	−0	View file
Documentation/devicetree/bindings/mtd/gpmc-nor.txt	added	+98	−0	View file
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt	modified	+3	−0	View file
Documentation/devicetree/bindings/net/gpmc-eth.txt	added	+97	−0	View file
Documentation/devicetree/bindings/pinctrl/pinctrl-vt8500.txt	added	+57	−0	View file
Documentation/devicetree/bindings/reset/reset.txt	added	+75	−0	View file
Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt	added	+17	−0	View file
Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt	added	+68	−0	View file
Documentation/devicetree/bindings/usb/exynos-usb.txt	added	+40	−0	View file
arch/arm/Kconfig	modified	+12	−4	View file
arch/arm/boot/dts/Makefile	modified	+3	−0	View file
arch/arm/boot/dts/cros5250-common.dtsi	modified	+138	−0	View file
arch/arm/boot/dts/exynos4.dtsi	modified	+58	−0	View file
arch/arm/boot/dts/exynos4210-origen.dts	modified	+18	−0	View file
arch/arm/boot/dts/exynos4210-smdkv310.dts	modified	+18	−0	View file
arch/arm/boot/dts/exynos4210-trats.dts	modified	+12	−0	View file
arch/arm/boot/dts/exynos4210.dtsi	modified	+36	−0	View file
arch/arm/boot/dts/exynos4212.dtsi	modified	+22	−0	View file
arch/arm/boot/dts/exynos4412-odroidx.dts	added	+111	−0	View file
arch/arm/boot/dts/exynos4412-origen.dts	added	+432	−0	View file
arch/arm/boot/dts/exynos4412-smdk4412.dts	modified	+25	−0	View file
arch/arm/boot/dts/exynos4412.dtsi	modified	+26	−0	View file
arch/arm/boot/dts/exynos4x12.dtsi	modified	+6	−0	View file
arch/arm/boot/dts/exynos5250-arndale.dts	added	+129	−0	View file
arch/arm/boot/dts/exynos5250-smdk5250.dts	modified	+20	−0	View file
arch/arm/boot/dts/exynos5250-snow.dts	modified	+11	−0	View file
arch/arm/boot/dts/exynos5250.dtsi	modified	+149	−0	View file
arch/arm/boot/dts/exynos5440-ssdk5440.dts	modified	+5	−14	View file
arch/arm/boot/dts/exynos5440.dtsi	modified	+42	−25	View file
arch/arm/boot/dts/omap3-beagle.dts	modified	+71	−0	View file
arch/arm/boot/dts/omap3.dtsi	modified	+31	−0	View file
arch/arm/boot/dts/omap4.dtsi	modified	+30	−0	View file
arch/arm/boot/dts/tegra114-dalmore.dts	modified	+0	−1	View file
arch/arm/boot/dts/tegra114-pluto.dts	modified	+0	−1	View file
arch/arm/boot/dts/tegra114.dtsi	modified	+7	−1	View file
arch/arm/boot/dts/vt8500.dtsi	modified	+6	−4	View file
arch/arm/boot/dts/wm8505.dtsi	modified	+6	−4	View file
arch/arm/boot/dts/wm8650.dtsi	modified	+6	−4	View file
arch/arm/boot/dts/wm8850.dtsi	modified	+6	−4	View file
arch/arm/boot/dts/zynq-7000.dtsi	modified	+6	−39	View file
arch/arm/boot/dts/zynq-zc702.dts	modified	+0	−10	View file
arch/arm/mach-at91/at91sam9261.c	modified	+2	−0	View file
arch/arm/mach-at91/at91sam9261_devices.c	modified	+5	−1	View file
arch/arm/mach-at91/at91sam9263.c	modified	+1	−0	View file
arch/arm/mach-at91/at91sam9263_devices.c	modified	+1	−1	View file
arch/arm/mach-at91/at91sam9g45.c	modified	+2	−0	View file
arch/arm/mach-at91/at91sam9g45_devices.c	modified	+5	−1	View file
arch/arm/mach-at91/at91sam9rl.c	modified	+1	−0	View file
arch/arm/mach-at91/at91sam9rl_devices.c	modified	+1	−1	View file
arch/arm/mach-exynos/Kconfig	modified	+5	−7	View file
arch/arm/mach-exynos/Makefile	modified	+0	−6	View file
arch/arm/mach-exynos/clock-exynos4.c	deleted	+0	−1601	View before deletion
arch/arm/mach-exynos/clock-exynos4.h	deleted	+0	−35	View before deletion
arch/arm/mach-exynos/clock-exynos4210.c	deleted	+0	−187	View before deletion
arch/arm/mach-exynos/clock-exynos4212.c	deleted	+0	−201	View before deletion
arch/arm/mach-exynos/clock-exynos5.c	deleted	+0	−1645	View before deletion
arch/arm/mach-exynos/common.c	modified	+46	−42	View file
arch/arm/mach-exynos/common.h	modified	+9	−1	View file
arch/arm/mach-exynos/include/mach/irqs.h	modified	+10	−9	View file
arch/arm/mach-exynos/include/mach/map.h	modified	+0	−1	View file
arch/arm/mach-exynos/include/mach/regs-mct.h	deleted	+0	−53	View before deletion
arch/arm/mach-exynos/mach-armlex4210.c	modified	+1	−2	View file
arch/arm/mach-exynos/mach-exynos4-dt.c	modified	+20	−102	View file
arch/arm/mach-exynos/mach-exynos5-dt.c	modified	+3	−138	View file
arch/arm/mach-exynos/mach-nuri.c	modified	+3	−2	View file
arch/arm/mach-exynos/mach-origen.c	modified	+3	−2	View file
arch/arm/mach-exynos/mach-smdk4x12.c	modified	+2	−3	View file
arch/arm/mach-exynos/mach-smdkv310.c	modified	+4	−3	View file
arch/arm/mach-exynos/mach-universal_c210.c	modified	+5	−4	View file
arch/arm/mach-omap2/board-3430sdp.c	modified	+15	−6	View file
arch/arm/mach-omap2/board-3630sdp.c	modified	+15	−6	View file
arch/arm/mach-omap2/board-am3517crane.c	modified	+10	−14	View file
arch/arm/mach-omap2/board-am3517evm.c	modified	+10	−7	View file
arch/arm/mach-omap2/board-cm-t35.c	modified	+14	−6	View file
arch/arm/mach-omap2/board-cm-t3517.c	modified	+15	−7	View file
arch/arm/mach-omap2/board-devkit8000.c	modified	+0	−8	View file
arch/arm/mach-omap2/board-generic.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-igep0020.c	modified	+18	−14	View file
arch/arm/mach-omap2/board-omap3beagle.c	modified	+22	−10	View file
arch/arm/mach-omap2/board-omap3evm.c	modified	+13	−12	View file
arch/arm/mach-omap2/board-omap3pandora.c	modified	+12	−9	View file
arch/arm/mach-omap2/board-omap3stalker.c	modified	+10	−7	View file
arch/arm/mach-omap2/board-omap3touchbook.c	modified	+10	−7	View file
arch/arm/mach-omap2/board-omap4panda.c	modified	+21	−34	View file
arch/arm/mach-omap2/board-overo.c	modified	+10	−6	View file
arch/arm/mach-omap2/board-zoom.c	modified	+10	−6	View file
arch/arm/mach-omap2/common.h	modified	+1	−2	View file
arch/arm/mach-omap2/gpmc-nand.c	modified	+29	−13	View file
arch/arm/mach-omap2/gpmc-onenand.c	modified	+59	−59	View file
arch/arm/mach-omap2/gpmc-smc91x.c	modified	+17	−13	View file
arch/arm/mach-omap2/gpmc.c	modified	+394	−150	View file
arch/arm/mach-omap2/gpmc.h	modified	+29	−14	View file
arch/arm/mach-omap2/timer.c	modified	+63	−65	View file
arch/arm/mach-omap2/usb-host.c	modified	+158	−2	View file
arch/arm/mach-omap2/usb-tusb6010.c	modified	+30	−32	View file
arch/arm/mach-omap2/usb.h	modified	+9	−0	View file
arch/arm/mach-s3c24xx/Kconfig	modified	+7	−0	View file
arch/arm/mach-s3c24xx/Makefile	modified	+4	−4	View file
arch/arm/mach-s3c24xx/common.h	modified	+4	−0	View file
arch/arm/mach-s3c24xx/include/mach/entry-macro.S	deleted	+0	−70	View before deletion
arch/arm/mach-s3c24xx/include/mach/irqs.h	modified	+31	−27	View file
arch/arm/mach-s3c24xx/irq-s3c2412.c	deleted	+0	−215	View before deletion
arch/arm/mach-s3c24xx/irq-s3c2440.c	deleted	+0	−128	View before deletion
arch/arm/mach-s3c24xx/irq-s3c244x.c	deleted	+0	−142	View before deletion
arch/arm/mach-s3c24xx/mach-amlm5900.c	modified	+5	−2	View file
arch/arm/mach-s3c24xx/mach-anubis.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-at2440evb.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-bast.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-gta02.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-h1940.c	modified	+4	−8	View file
arch/arm/mach-s3c24xx/mach-jive.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-mini2440.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-n30.c	modified	+6	−4	View file
arch/arm/mach-s3c24xx/mach-nexcoder.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-osiris.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-otom.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-qt2410.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-rx1950.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-rx3715.c	modified	+4	−7	View file
arch/arm/mach-s3c24xx/mach-smdk2410.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-smdk2413.c	modified	+8	−6	View file
arch/arm/mach-s3c24xx/mach-smdk2416.c	modified	+3	−1	View file
arch/arm/mach-s3c24xx/mach-smdk2440.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-smdk2443.c	modified	+3	−1	View file
arch/arm/mach-s3c24xx/mach-tct_hammer.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-vr1000.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/mach-vstms.c	modified	+4	−2	View file
arch/arm/mach-s3c24xx/pm-s3c2412.c	modified	+8	−0	View file
arch/arm/mach-s3c64xx/Kconfig	modified	+2	−0	View file
arch/arm/mach-s3c64xx/mach-anw6410.c	modified	+3	−1	View file
arch/arm/mach-s3c64xx/mach-crag6410.c	modified	+3	−1	View file
arch/arm/mach-s3c64xx/mach-hmt.c	modified	+3	−1	View file
arch/arm/mach-s3c64xx/mach-mini6410.c	modified	+3	−1	View file
arch/arm/mach-s3c64xx/mach-ncp.c	modified	+3	−1	View file
arch/arm/mach-s3c64xx/mach-real6410.c	modified	+3	−1	View file
arch/arm/mach-s3c64xx/mach-smartq.c	modified	+2	−0	View file
arch/arm/mach-s3c64xx/mach-smartq5.c	modified	+2	−1	View file
arch/arm/mach-s3c64xx/mach-smartq7.c	modified	+2	−1	View file
arch/arm/mach-s3c64xx/mach-smdk6400.c	modified	+3	−1	View file
arch/arm/mach-s3c64xx/mach-smdk6410.c	modified	+3	−1	View file
arch/arm/mach-s5p64x0/Kconfig	modified	+2	−2	View file
arch/arm/mach-s5p64x0/mach-smdk6440.c	modified	+3	−3	View file
arch/arm/mach-s5p64x0/mach-smdk6450.c	modified	+3	−3	View file
arch/arm/mach-s5pc100/Kconfig	modified	+1	−0	View file
arch/arm/mach-s5pc100/mach-smdkc100.c	modified	+3	−1	View file
arch/arm/mach-s5pv210/Kconfig	modified	+1	−1	View file
arch/arm/mach-s5pv210/mach-aquila.c	modified	+3	−3	View file
arch/arm/mach-s5pv210/mach-goni.c	modified	+3	−3	View file
arch/arm/mach-s5pv210/mach-smdkc110.c	modified	+3	−3	View file
arch/arm/mach-s5pv210/mach-smdkv210.c	modified	+3	−3	View file
arch/arm/mach-s5pv210/mach-torbreck.c	modified	+3	−3	View file
arch/arm/mach-shmobile/Kconfig	modified	+2	−0	View file
arch/arm/mach-shmobile/board-kzm9g.c	modified	+7	−7	View file
arch/arm/mach-shmobile/include/mach/common.h	modified	+1	−0	View file
arch/arm/mach-shmobile/include/mach/irqs.h	modified	+4	−0	View file
arch/arm/mach-shmobile/intc-r8a7779.c	modified	+52	−1	View file
arch/arm/mach-shmobile/intc-sh73a0.c	modified	+0	−117	View file
arch/arm/mach-shmobile/setup-sh73a0.c	modified	+126	−0	View file
arch/arm/mach-tegra/tegra.c	modified	+3	−0	View file
arch/arm/mach-ux500/board-mop500-pins.c	modified	+26	−8	View file
arch/arm/mach-vt8500/Kconfig	modified	+1	−0	View file
arch/arm/mach-vt8500/Makefile	modified	+1	−1	View file
arch/arm/mach-vt8500/common.h	modified	+0	−6	View file
arch/arm/mach-vt8500/vt8500.c	modified	+2	−12	View file
arch/arm/mach-zynq/Kconfig	modified	+1	−0	View file
arch/arm/mach-zynq/Makefile	modified	+1	−1	View file
arch/arm/mach-zynq/common.c	modified	+2	−1	View file
arch/arm/mach-zynq/common.h	modified	+0	−2	View file
arch/arm/mach-zynq/timer.c	deleted	+0	−324	View before deletion
arch/arm/plat-samsung/Kconfig	modified	+3	−3	View file
arch/arm/plat-samsung/Makefile	modified	+1	−2	View file
arch/arm/plat-samsung/devs.c	modified	+1	−1	View file
arch/arm/plat-samsung/include/plat/cpu.h	modified	+10	−5	View file
arch/arm/plat-samsung/include/plat/s5p-time.h	deleted	+0	−40	View before deletion
arch/arm/plat-samsung/include/plat/samsung-time.h	added	+53	−0	View file
arch/arm/plat-samsung/s5p-time.c → arch/arm/plat-samsung/samsung-time.c	renamed	+69	−69	View file
arch/arm/plat-samsung/time.c	deleted	+0	−287	View before deletion
arch/avr32/mach-at32ap/at32ap700x.c	modified	+4	−2	View file
drivers/Kconfig	modified	+2	−0	View file
drivers/Makefile	modified	+3	−0	View file
drivers/clk/Makefile	modified	+1	−0	View file
drivers/clk/samsung/Makefile	added	+8	−0	View file
drivers/clk/samsung/clk-exynos4.c	added	+1091	−0	View file
drivers/clk/samsung/clk-exynos5250.c	added	+523	−0	View file
drivers/clk/samsung/clk-exynos5440.c	added	+139	−0	View file
drivers/clk/samsung/clk-pll.c	added	+419	−0	View file
drivers/clk/samsung/clk-pll.h	added	+41	−0	View file
drivers/clk/samsung/clk.c	added	+320	−0	View file
drivers/clk/samsung/clk.h	added	+289	−0	View file
drivers/clk/tegra/Makefile	modified	+1	−0	View file
drivers/clk/tegra/clk-periph-gate.c	modified	+10	−1	View file
drivers/clk/tegra/clk-periph.c	modified	+9	−5	View file
drivers/clk/tegra/clk-pll.c	modified	+1064	−130	View file
drivers/clk/tegra/clk-tegra114.c	added	+2085	−0	View file
drivers/clk/tegra/clk-tegra20.c	modified	+99	−85	View file
drivers/clk/tegra/clk-tegra30.c	modified	+145	−131	View file
drivers/clk/tegra/clk.c	modified	+13	−1	View file
drivers/clk/tegra/clk.h	modified	+90	−8	View file
drivers/clocksource/Kconfig	modified	+8	−0	View file
drivers/clocksource/Makefile	modified	+2	−0	View file
drivers/clocksource/cadence_ttc_timer.c	added	+436	−0	View file
drivers/clocksource/em_sti.c	modified	+12	−1	View file
arch/arm/mach-exynos/mct.c → drivers/clocksource/exynos_mct.c	renamed	+150	−67	View file
drivers/clocksource/sh_cmt.c	modified	+118	−71	View file
drivers/clocksource/sh_mtu2.c	modified	+1	−1	View file
drivers/clocksource/sh_tmu.c	modified	+1	−1	View file
drivers/gpio/Kconfig	modified	+0	−6	View file
drivers/gpio/Makefile	modified	+0	−1	View file
drivers/gpio/gpio-samsung.c	modified	+7	−2	View file
drivers/gpio/gpio-vt8500.c	deleted	+0	−355	View before deletion
drivers/irqchip/Kconfig	modified	+8	−0	View file
drivers/irqchip/Makefile	modified	+4	−0	View file
drivers/irqchip/exynos-combiner.c	modified	+62	−18	View file
drivers/irqchip/irq-renesas-intc-irqpin.c	added	+547	−0	View file
drivers/irqchip/irq-renesas-irqc.c	added	+307	−0	View file
arch/arm/mach-s3c24xx/irq.c → drivers/irqchip/irq-s3c24xx.c	renamed	+613	−78	View file
arch/arm/mach-vt8500/irq.c → drivers/irqchip/irq-vt8500.c	renamed	+6	−0	View file
drivers/of/base.c	modified	+76	−35	View file
drivers/pinctrl/Kconfig	modified	+1	−0	View file
drivers/pinctrl/Makefile	modified	+1	−0	View file
drivers/pinctrl/pinctrl-bcm2835.c	modified	+11	−8	View file
drivers/pinctrl/pinctrl-exynos.c	modified	+108	−0	View file
drivers/pinctrl/pinctrl-samsung.c	modified	+2	−0	View file
drivers/pinctrl/pinctrl-samsung.h	modified	+1	−0	View file
drivers/pinctrl/sh-pfc/pfc-sh73a0.c	modified	+3	−3	View file
drivers/pinctrl/vt8500/Kconfig	added	+52	−0	View file
drivers/pinctrl/vt8500/Makefile	added	+8	−0	View file
drivers/pinctrl/vt8500/pinctrl-vt8500.c	added	+501	−0	View file
drivers/pinctrl/vt8500/pinctrl-wm8505.c	added	+532	−0	View file
drivers/pinctrl/vt8500/pinctrl-wm8650.c	added	+370	−0	View file
drivers/pinctrl/vt8500/pinctrl-wm8750.c	added	+409	−0	View file
drivers/pinctrl/vt8500/pinctrl-wm8850.c	added	+388	−0	View file
drivers/pinctrl/vt8500/pinctrl-wmt.c	added	+632	−0	View file
drivers/pinctrl/vt8500/pinctrl-wmt.h	added	+79	−0	View file
drivers/reset/Kconfig	added	+13	−0	View file
drivers/reset/Makefile	added	+1	−0	View file
drivers/reset/core.c	added	+297	−0	View file
drivers/video/atmel_lcdfb.c	modified	+92	−28	View file
include/linux/clk/tegra.h	modified	+1	−0	View file
include/linux/of.h	modified	+9	−0	View file
include/linux/platform_data/irq-renesas-intc-irqpin.h	added	+29	−0	View file
include/linux/platform_data/irq-renesas-irqc.h	added	+27	−0	View file
include/linux/reset-controller.h	added	+51	−0	View file
include/linux/reset.h	added	+17	−0	View file
include/video/atmel_lcdc.h	modified	+3	−1	View file

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

Documentation/devicetree/bindings/bus/ti-gpmc.txt

View file

diff --git a/Documentation/devicetree/bindings/bus/ti-gpmc.txt b/Documentation/devicetree/bindings/bus/ti-gpmc.txt
index 5ddb2e9..4b87ea1 100644
--- a/Documentation/devicetree/bindings/bus/ti-gpmc.txt
+++ b/Documentation/devicetree/bindings/bus/ti-gpmc.txt
@@ -35,36 +35,83 @@ Required properties:
 
 Timing properties for child nodes. All are optional and default to 0.
 
- - gpmc,sync-clk:	Minimum clock period for synchronous mode, in picoseconds
-
- Chip-select signal timings corresponding to GPMC_CONFIG2:
- - gpmc,cs-on:		Assertion time
- - gpmc,cs-rd-off:	Read deassertion time
- - gpmc,cs-wr-off:	Write deassertion time
-
- ADV signal timings corresponding to GPMC_CONFIG3:
- - gpmc,adv-on:		Assertion time
- - gpmc,adv-rd-off:	Read deassertion time
- - gpmc,adv-wr-off:	Write deassertion time
-
- WE signals timings corresponding to GPMC_CONFIG4:
- - gpmc,we-on:		Assertion time
- - gpmc,we-off:		Deassertion time
-
- OE signals timings corresponding to GPMC_CONFIG4:
- - gpmc,oe-on:		Assertion time
- - gpmc,oe-off:		Deassertion time
-
- Access time and cycle time timings corresponding to GPMC_CONFIG5:
- - gpmc,page-burst-access: Multiple access word delay
- - gpmc,access:		Start-cycle to first data valid delay
- - gpmc,rd-cycle:	Total read cycle time
- - gpmc,wr-cycle:	Total write cycle time
+ - gpmc,sync-clk-ps:	Minimum clock period for synchronous mode, in picoseconds
+
+ Chip-select signal timings (in nanoseconds) corresponding to GPMC_CONFIG2:
+ - gpmc,cs-on-ns:	Assertion time
+ - gpmc,cs-rd-off-ns:	Read deassertion time
+ - gpmc,cs-wr-off-ns:	Write deassertion time
+
+ ADV signal timings (in nanoseconds) corresponding to GPMC_CONFIG3:
+ - gpmc,adv-on-ns:	Assertion time
+ - gpmc,adv-rd-off-ns:	Read deassertion time
+ - gpmc,adv-wr-off-ns:	Write deassertion time
+
+ WE signals timings (in nanoseconds) corresponding to GPMC_CONFIG4:
+ - gpmc,we-on-ns	Assertion time
+ - gpmc,we-off-ns:	Deassertion time
+
+ OE signals timings (in nanoseconds) corresponding to GPMC_CONFIG4:
+ - gpmc,oe-on-ns:	Assertion time
+ - gpmc,oe-off-ns:	Deassertion time
+
+ Access time and cycle time timings (in nanoseconds) corresponding to
+ GPMC_CONFIG5:
+ - gpmc,page-burst-access-ns: 	Multiple access word delay
+ - gpmc,access-ns:		Start-cycle to first data valid delay
+ - gpmc,rd-cycle-ns:		Total read cycle time
+ - gpmc,wr-cycle-ns:		Total write cycle time
+ - gpmc,bus-turnaround-ns:	Turn-around time between successive accesses
+ - gpmc,cycle2cycle-delay-ns:	Delay between chip-select pulses
+ - gpmc,clk-activation-ns: 	GPMC clock activation time
+ - gpmc,wait-monitoring-ns:	Start of wait monitoring with regard to valid
+				data
+
+Boolean timing parameters. If property is present parameter enabled and
+disabled if omitted:
+ - gpmc,adv-extra-delay:	ADV signal is delayed by half GPMC clock
+ - gpmc,cs-extra-delay:		CS signal is delayed by half GPMC clock
+ - gpmc,cycle2cycle-diffcsen:	Add "cycle2cycle-delay" between successive
+				accesses to a different CS
+ - gpmc,cycle2cycle-samecsen:	Add "cycle2cycle-delay" between successive
+				accesses to the same CS
+ - gpmc,oe-extra-delay:		OE signal is delayed by half GPMC clock
+ - gpmc,we-extra-delay:		WE signal is delayed by half GPMC clock
+ - gpmc,time-para-granularity:	Multiply all access times by 2
 
 The following are only applicable to OMAP3+ and AM335x:
- - gpmc,wr-access
- - gpmc,wr-data-mux-bus
-
+ - gpmc,wr-access-ns:		In synchronous write mode, for single or
+				burst accesses, defines the number of
+				GPMC_FCLK cycles from start access time
+				to the GPMC_CLK rising edge used by the
+				memory device for the first data capture.
+ - gpmc,wr-data-mux-bus-ns:	In address-data multiplex mode, specifies
+				the time when the first data is driven on
+				the address-data bus.
+
+GPMC chip-select settings properties for child nodes. All are optional.
+
+- gpmc,burst-length	Page/burst length. Must be 4, 8 or 16.
+- gpmc,burst-wrap	Enables wrap bursting
+- gpmc,burst-read	Enables read page/burst mode
+- gpmc,burst-write	Enables write page/burst mode
+- gpmc,device-nand	Device is NAND
+- gpmc,device-width	Total width of device(s) connected to a GPMC
+			chip-select in bytes. The GPMC supports 8-bit
+			and 16-bit devices and so this property must be
+			1 or 2.
+- gpmc,mux-add-data	Address and data multiplexing configuration.
+			Valid values are 1 for address-address-data
+			multiplexing mode and 2 for address-data
+			multiplexing mode.
+- gpmc,sync-read	Enables synchronous read. Defaults to asynchronous
+			is this is not set.
+- gpmc,sync-write	Enables synchronous writes. Defaults to asynchronous
+			is this is not set.
+- gpmc,wait-pin		Wait-pin used by client. Must be less than
+			"gpmc,num-waitpins".
+- gpmc,wait-on-read	Enables wait monitoring on reads.
+- gpmc,wait-on-write	Enables wait monitoring on writes.
 
 Example for an AM33xx board:
 

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

View file

diff --git a/Documentation/devicetree/bindings/clock/exynos4-clock.txt b/Documentation/devicetree/bindings/clock/exynos4-clock.txt
new file mode 100644
index 0000000..ea5e26f
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/exynos4-clock.txt
@@ -0,0 +1,288 @@
+* Samsung Exynos4 Clock Controller
+
+The Exynos4 clock controller generates and supplies clock to various controllers
+within the Exynos4 SoC. The clock binding described here is applicable to all
+SoC's in the Exynos4 family.
+
+Required Properties:
+
+- comptible: should be one of the following.
+  - "samsung,exynos4210-clock" - controller compatible with Exynos4210 SoC.
+  - "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC.
+
+- reg: physical base address of the controller and length of memory mapped
+  region.
+
+- #clock-cells: should be 1.
+
+The following is the list of clocks generated by the controller. Each clock is
+assigned an identifier and client nodes use this identifier to specify the
+clock which they consume. Some of the clocks are available only on a particular
+Exynos4 SoC and this is specified where applicable.
+
+
+		 [Core Clocks]
+
+  Clock               ID      SoC (if specific)
+  -----------------------------------------------
+
+  xxti                1
+  xusbxti             2
+  fin_pll             3
+  fout_apll           4
+  fout_mpll           5
+  fout_epll           6
+  fout_vpll           7
+  sclk_apll           8
+  sclk_mpll           9
+  sclk_epll           10
+  sclk_vpll           11
+  arm_clk             12
+  aclk200             13
+  aclk100             14
+  aclk160             15
+  aclk133             16
+  mout_mpll_user_t    17      Exynos4x12
+  mout_mpll_user_c    18      Exynos4x12
+  mout_core           19
+  mout_apll           20
+
+
+            [Clock Gate for Special Clocks]
+
+  Clock               ID      SoC (if specific)
+  -----------------------------------------------
+
+  sclk_fimc0          128
+  sclk_fimc1          129
+  sclk_fimc2          130
+  sclk_fimc3          131
+  sclk_cam0           132
+  sclk_cam1           133
+  sclk_csis0          134
+  sclk_csis1          135
+  sclk_hdmi           136
+  sclk_mixer          137
+  sclk_dac            138
+  sclk_pixel          139
+  sclk_fimd0          140
+  sclk_mdnie0         141     Exynos4412
+  sclk_mdnie_pwm0 12  142     Exynos4412
+  sclk_mipi0          143
+  sclk_audio0         144
+  sclk_mmc0           145
+  sclk_mmc1           146
+  sclk_mmc2           147
+  sclk_mmc3           148
+  sclk_mmc4           149
+  sclk_sata           150     Exynos4210
+  sclk_uart0          151
+  sclk_uart1          152
+  sclk_uart2          153
+  sclk_uart3          154
+  sclk_uart4          155
+  sclk_audio1         156
+  sclk_audio2         157
+  sclk_spdif          158
+  sclk_spi0           159
+  sclk_spi1           160
+  sclk_spi2           161
+  sclk_slimbus        162
+  sclk_fimd1          163     Exynos4210
+  sclk_mipi1          164     Exynos4210
+  sclk_pcm1           165
+  sclk_pcm2           166
+  sclk_i2s1           167
+  sclk_i2s2           168
+  sclk_mipihsi        169     Exynos4412
+  sclk_mfc            170
+  sclk_pcm0           171
+  sclk_g3d            172
+  sclk_pwm_isp        173     Exynos4x12
+  sclk_spi0_isp       174     Exynos4x12
+  sclk_spi1_isp       175     Exynos4x12
+  sclk_uart_isp       176     Exynos4x12
+
+	      [Peripheral Clock Gates]
+
+  Clock               ID      SoC (if specific)
+  -----------------------------------------------
+
+  fimc0               256
+  fimc1               257
+  fimc2               258
+  fimc3               259
+  csis0               260
+  csis1               261
+  jpeg                262
+  smmu_fimc0          263
+  smmu_fimc1          264
+  smmu_fimc2          265
+  smmu_fimc3          266
+  smmu_jpeg           267
+  vp                  268
+  mixer               269
+  tvenc               270     Exynos4210
+  hdmi                271
+  smmu_tv             272
+  mfc                 273
+  smmu_mfcl           274
+  smmu_mfcr           275
+  g3d                 276
+  g2d                 277     Exynos4210
+  rotator             278     Exynos4210
+  mdma                279     Exynos4210
+  smmu_g2d            280     Exynos4210
+  smmu_rotator        281     Exynos4210
+  smmu_mdma           282     Exynos4210
+  fimd0               283
+  mie0                284
+  mdnie0              285     Exynos4412
+  dsim0               286
+  smmu_fimd0          287
+  fimd1               288     Exynos4210
+  mie1                289     Exynos4210
+  dsim1               290     Exynos4210
+  smmu_fimd1          291     Exynos4210
+  pdma0               292
+  pdma1               293
+  pcie_phy            294
+  sata_phy            295     Exynos4210
+  tsi                 296
+  sdmmc0              297
+  sdmmc1              298
+  sdmmc2              299
+  sdmmc3              300
+  sdmmc4              301
+  sata                302     Exynos4210
+  sromc               303
+  usb_host            304
+  usb_device          305
+  pcie                306
+  onenand             307
+  nfcon               308
+  smmu_pcie           309
+  gps                 310
+  smmu_gps            311
+  uart0               312
+  uart1               313
+  uart2               314
+  uart3               315
+  uart4               316
+  i2c0                317
+  i2c1                318
+  i2c2                319
+  i2c3                320
+  i2c4                321
+  i2c5                322
+  i2c6                323
+  i2c7                324
+  i2c_hdmi            325
+  tsadc               326
+  spi0                327
+  spi1                328
+  spi2                329
+  i2s1                330
+  i2s2                331
+  pcm0                332
+  i2s0                333
+  pcm1                334
+  pcm2                335
+  pwm                 336
+  slimbus             337
+  spdif               338
+  ac97                339
+  modemif             340
+  chipid              341
+  sysreg              342
+  hdmi_cec            343
+  mct                 344
+  wdt                 345
+  rtc                 346
+  keyif               347
+  audss               348
+  mipi_hsi            349     Exynos4210
+  mdma2               350     Exynos4210
+  pixelasyncm0        351
+  pixelasyncm1        352
+  fimc_lite0          353     Exynos4x12
+  fimc_lite1          354     Exynos4x12
+  ppmuispx            355     Exynos4x12
+  ppmuispmx           356     Exynos4x12
+  fimc_isp            357     Exynos4x12
+  fimc_drc            358     Exynos4x12
+  fimc_fd             359     Exynos4x12
+  mcuisp              360     Exynos4x12
+  gicisp              361     Exynos4x12
+  smmu_isp            362     Exynos4x12
+  smmu_drc            363     Exynos4x12
+  smmu_fd             364     Exynos4x12
+  smmu_lite0          365     Exynos4x12
+  smmu_lite1          366     Exynos4x12
+  mcuctl_isp          367     Exynos4x12
+  mpwm_isp            368     Exynos4x12
+  i2c0_isp            369     Exynos4x12
+  i2c1_isp            370     Exynos4x12
+  mtcadc_isp          371     Exynos4x12
+  pwm_isp             372     Exynos4x12
+  wdt_isp             373     Exynos4x12
+  uart_isp            374     Exynos4x12
+  asyncaxim           375     Exynos4x12
+  smmu_ispcx          376     Exynos4x12
+  spi0_isp            377     Exynos4x12
+  spi1_isp            378     Exynos4x12
+  pwm_isp_sclk        379     Exynos4x12
+  spi0_isp_sclk       380     Exynos4x12
+  spi1_isp_sclk       381     Exynos4x12
+  uart_isp_sclk       382     Exynos4x12
+
+		[Mux Clocks]
+
+  Clock			ID	SoC (if specific)
+  -----------------------------------------------
+
+  mout_fimc0		384
+  mout_fimc1		385
+  mout_fimc2		386
+  mout_fimc3		387
+  mout_cam0		388
+  mout_cam1		389
+  mout_csis0		390
+  mout_csis1		391
+  mout_g3d0		392
+  mout_g3d1		393
+  mout_g3d		394
+  aclk400_mcuisp	395	Exynos4x12
+
+		[Div Clocks]
+
+  Clock			ID	SoC (if specific)
+  -----------------------------------------------
+
+  div_isp0		450	Exynos4x12
+  div_isp1		451	Exynos4x12
+  div_mcuisp0		452	Exynos4x12
+  div_mcuisp1		453	Exynos4x12
+  div_aclk200		454	Exynos4x12
+  div_aclk400_mcuisp	455	Exynos4x12
+
+
+Example 1: An example of a clock controller node is listed below.
+
+	clock: clock-controller@0x10030000 {
+		compatible = "samsung,exynos4210-clock";
+		reg = <0x10030000 0x20000>;
+		#clock-cells = <1>;
+	};
+
+Example 2: UART controller node that consumes the clock generated by the clock
+	   controller. Refer to the standard clock bindings for information
+	   about 'clocks' and 'clock-names' property.
+
+	serial@13820000 {
+		compatible = "samsung,exynos4210-uart";
+		reg = <0x13820000 0x100>;
+		interrupts = <0 54 0>;
+		clocks = <&clock 314>, <&clock 153>;
+		clock-names = "uart", "clk_uart_baud0";
+	};

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

View file

diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt
new file mode 100644
index 0000000..781a627
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt
@@ -0,0 +1,177 @@
+* Samsung Exynos5250 Clock Controller
+
+The Exynos5250 clock controller generates and supplies clock to various
+controllers within the Exynos5250 SoC.
+
+Required Properties:
+
+- comptible: should be one of the following.
+  - "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC.
+
+- reg: physical base address of the controller and length of memory mapped
+  region.
+
+- #clock-cells: should be 1.
+
+The following is the list of clocks generated by the controller. Each clock is
+assigned an identifier and client nodes use this identifier to specify the
+clock which they consume.
+
+
+       [Core Clocks]
+
+  Clock			ID
+  ----------------------------
+
+  fin_pll		1
+
+  [Clock Gate for Special Clocks]
+
+  Clock			ID
+  ----------------------------
+
+  sclk_cam_bayer	128
+  sclk_cam0		129
+  sclk_cam1		130
+  sclk_gscl_wa		131
+  sclk_gscl_wb		132
+  sclk_fimd1		133
+  sclk_mipi1		134
+  sclk_dp		135
+  sclk_hdmi		136
+  sclk_pixel		137
+  sclk_audio0		138
+  sclk_mmc0		139
+  sclk_mmc1		140
+  sclk_mmc2		141
+  sclk_mmc3		142
+  sclk_sata		143
+  sclk_usb3		144
+  sclk_jpeg		145
+  sclk_uart0		146
+  sclk_uart1		147
+  sclk_uart2		148
+  sclk_uart3		149
+  sclk_pwm		150
+  sclk_audio1		151
+  sclk_audio2		152
+  sclk_spdif		153
+  sclk_spi0		154
+  sclk_spi1		155
+  sclk_spi2		156
+
+
+   [Peripheral Clock Gates]
+
+  Clock			ID
+  ----------------------------
+
+  gscl0			256
+  gscl1			257
+  gscl2			258
+  gscl3			259
+  gscl_wa		260
+  gscl_wb		261
+  smmu_gscl0		262
+  smmu_gscl1		263
+  smmu_gscl2		264
+  smmu_gscl3		265
+  mfc			266
+  smmu_mfcl		267
+  smmu_mfcr		268
+  rotator		269
+  jpeg			270
+  mdma1			271
+  smmu_rotator		272
+  smmu_jpeg		273
+  smmu_mdma1		274
+  pdma0			275
+  pdma1			276
+  sata			277
+  usbotg		278
+  mipi_hsi		279
+  sdmmc0		280
+  sdmmc1		281
+  sdmmc2		282
+  sdmmc3		283
+  sromc			284
+  usb2			285
+  usb3			286
+  sata_phyctrl		287
+  sata_phyi2c		288
+  uart0			289
+  uart1			290
+  uart2			291
+  uart3			292
+  uart4			293
+  i2c0			294
+  i2c1			295
+  i2c2			296
+  i2c3			297
+  i2c4			298
+  i2c5			299
+  i2c6			300
+  i2c7			301
+  i2c_hdmi		302
+  adc			303
+  spi0			304
+  spi1			305
+  spi2			306
+  i2s1			307
+  i2s2			308
+  pcm1			309
+  pcm2			310
+  pwm			311
+  spdif			312
+  ac97			313
+  hsi2c0		314
+  hsi2c1		315
+  hs12c2		316
+  hs12c3		317
+  chipid		318
+  sysreg		319
+  pmu			320
+  cmu_top		321
+  cmu_core		322
+  cmu_mem		323
+  tzpc0			324
+  tzpc1			325
+  tzpc2			326
+  tzpc3			327
+  tzpc4			328
+  tzpc5			329
+  tzpc6			330
+  tzpc7			331
+  tzpc8			332
+  tzpc9			333
+  hdmi_cec		334
+  mct			335
+  wdt			336
+  rtc			337
+  tmu			338
+  fimd1			339
+  mie1			340
+  dsim0			341
+  dp			342
+  mixer			343
+  hdmi			345
+
+Example 1: An example of a clock controller node is listed below.
+
+	clock: clock-controller@0x10010000 {
+		compatible = "samsung,exynos5250-clock";
+		reg = <0x10010000 0x30000>;
+		#clock-cells = <1>;
+	};
+
+Example 2: UART controller node that consumes the clock generated by the clock
+	   controller. Refer to the standard clock bindings for information
+	   about 'clocks' and 'clock-names' property.
+
+	serial@13820000 {
+		compatible = "samsung,exynos4210-uart";
+		reg = <0x13820000 0x100>;
+		interrupts = <0 54 0>;
+		clocks = <&clock 314>, <&clock 153>;
+		clock-names = "uart", "clk_uart_baud0";
+	};

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

View file

diff --git a/Documentation/devicetree/bindings/clock/exynos5440-clock.txt b/Documentation/devicetree/bindings/clock/exynos5440-clock.txt
new file mode 100644
index 0000000..4499e99
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/exynos5440-clock.txt
@@ -0,0 +1,61 @@
+* Samsung Exynos5440 Clock Controller

This diff is incomplete. Download the complete patch.