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

Linux Kernel / Linux Kernel - Linus Torvalds [linux-foundation.org] - 6 September 2013 15:26 EDT

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

.../devicetree/bindings/arm/bcm/bcm,kona-timer.txt | 19 -
.../devicetree/bindings/arm/bcm/bcm11351.txt | 3 +-
.../devicetree/bindings/arm/bcm/kona-timer.txt | 20 +
.../devicetree/bindings/arm/bcm/kona-wdt.txt | 15 +
.../devicetree/bindings/media/s5p-mfc.txt | 10 +-
Documentation/devicetree/bindings/misc/smc.txt | 5 +-
.../devicetree/bindings/mmc/bcm,kona-sdhci.txt | 16 -
.../devicetree/bindings/mmc/kona-sdhci.txt | 17 +
.../bindings/pinctrl/nvidia,tegra114-pinmux.txt | 11 +
.../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 11 +
.../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 12 +
.../devicetree/bindings/pinctrl/ste,nomadik.txt | 6 +-
Documentation/devicetree/bindings/rtc/dw-apb.txt | 34 +-
.../devicetree/bindings/serial/altera_jtaguart.txt | 3 +-
.../devicetree/bindings/serial/altera_uart.txt | 3 +-
.../devicetree/bindings/serio/altera_ps2.txt | 3 +-
.../devicetree/bindings/spi/spi_altera.txt | 3 +-
.../devicetree/bindings/vendor-prefixes.txt | 1 +
arch/arm/Makefile | 1 +
arch/arm/boot/dts/Makefile | 30 +-
arch/arm/boot/dts/at91rm9200.dtsi | 1 +
arch/arm/boot/dts/at91rm9200_pqfp.dtsi | 17 +
arch/arm/boot/dts/at91sam9260.dtsi | 1 +
arch/arm/boot/dts/at91sam9n12.dtsi | 20 +
arch/arm/boot/dts/at91sam9n12ek.dts | 18 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 3 +
arch/arm/boot/dts/at91sam9x5ek.dtsi | 24 +
arch/arm/boot/dts/bcm11351-brt.dts | 8 +-
arch/arm/boot/dts/bcm11351.dtsi | 33 +-
arch/arm/boot/dts/bcm28155-ap.dts | 45 ++
arch/arm/boot/dts/ccu8540.dts | 41 -
arch/arm/boot/dts/ccu9540.dts | 72 --
arch/arm/boot/dts/dbx5x0.dtsi | 781 -------------------
arch/arm/boot/dts/emev2-kzm9d-reference.dts | 57 ++
arch/arm/boot/dts/emev2-kzm9d.dts | 2 +-
arch/arm/boot/dts/emev2.dtsi | 59 ++
arch/arm/boot/dts/exynos4.dtsi | 122 ++-
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 23 +
arch/arm/boot/dts/exynos4210-trats.dts | 100 ++-
arch/arm/boot/dts/exynos4210.dtsi | 30 +
arch/arm/boot/dts/exynos4412-origen.dts | 5 +
arch/arm/boot/dts/exynos4412-trats2.dts | 579 ++++++++++++++
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 61 +-
arch/arm/boot/dts/exynos4x12.dtsi | 103 +++
arch/arm/boot/dts/exynos5.dtsi | 19 +
arch/arm/boot/dts/exynos5250-arndale.dts | 105 ++-
arch/arm/boot/dts/exynos5250-smdk5250.dts | 32 +-
arch/arm/boot/dts/exynos5250.dtsi | 38 +-
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 +
arch/arm/boot/dts/exynos5420-smdk5420.dts | 31 +
arch/arm/boot/dts/exynos5420.dtsi | 75 +-
arch/arm/boot/dts/exynos5440.dtsi | 27 +
arch/arm/boot/dts/href.dtsi | 301 --------
arch/arm/boot/dts/hrefprev60.dts | 56 --
arch/arm/boot/dts/hrefv60plus.dts | 210 -----
arch/arm/boot/dts/imx23-evk.dts | 15 +
arch/arm/boot/dts/imx23-olinuxino.dts | 4 +
arch/arm/boot/dts/imx23.dtsi | 17 +-
arch/arm/boot/dts/imx28-cfa10036.dts | 7 +-
arch/arm/boot/dts/imx28-cfa10037.dts | 19 +-
arch/arm/boot/dts/imx28-cfa10049.dts | 73 +-
arch/arm/boot/dts/imx28-cfa10055.dts | 38 +-
arch/arm/boot/dts/imx28-cfa10056.dts | 119 +++
arch/arm/boot/dts/imx28-cfa10057.dts | 23 +-
arch/arm/boot/dts/imx28-cfa10058.dts | 141 ++++
arch/arm/boot/dts/imx28-m28evk.dts | 13 +
arch/arm/boot/dts/imx28.dtsi | 143 ++--
arch/arm/boot/dts/pxa3xx.dtsi | 11 +
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 22 +
arch/arm/boot/dts/r8a73a4.dtsi | 133 ++++
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 34 +
arch/arm/boot/dts/r8a7740.dtsi | 8 +
arch/arm/boot/dts/r8a7778.dtsi | 66 ++
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 49 ++
arch/arm/boot/dts/r8a7779.dtsi | 90 +++
arch/arm/boot/dts/r8a7790.dtsi | 132 ++++
arch/arm/boot/dts/sama5d3.dtsi | 5 +
arch/arm/boot/dts/sh7372.dtsi | 8 +
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 90 ++-
arch/arm/boot/dts/sh73a0.dtsi | 8 +
arch/arm/boot/dts/snowball.dts | 361 ---------
arch/arm/boot/dts/socfpga.dtsi | 8 +-
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 +++++
arch/arm/boot/dts/ste-ccu8540.dts | 86 +++
arch/arm/boot/dts/ste-ccu9540.dts | 72 ++
arch/arm/boot/dts/ste-dbx5x0.dtsi | 809 ++++++++++++++++++++
arch/arm/boot/dts/ste-href.dtsi | 301 ++++++++
arch/arm/boot/dts/ste-hrefprev60.dts | 56 ++
arch/arm/boot/dts/ste-hrefv60plus.dts | 210 +++++
arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 95 +++
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 42 +-
arch/arm/boot/dts/ste-snowball.dts | 347 +++++++++
arch/arm/boot/dts/ste-stuib.dtsi | 80 ++
arch/arm/boot/dts/stuib.dtsi | 80 --
arch/arm/boot/dts/sun4i-a10-a1000.dts | 101 +++
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +-
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +-
arch/arm/boot/dts/sun4i-a10.dtsi | 3 +-
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 27 +-
arch/arm/boot/dts/sun5i-a10s.dtsi | 57 +-
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 +-
arch/arm/boot/dts/sun5i-a13.dtsi | 3 +-
arch/arm/boot/dts/sun6i-a31-colombus.dts | 30 +
arch/arm/boot/dts/sun6i-a31.dtsi | 156 ++++
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 34 +
arch/arm/boot/dts/sun7i-a20.dtsi | 172 +++++
arch/arm/boot/dts/tegra114-dalmore.dts | 237 +++++-
arch/arm/boot/dts/tegra114-pluto.dts | 33 -
arch/arm/boot/dts/tegra114.dtsi | 62 ++
arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +-
arch/arm/boot/dts/tegra20-harmony.dts | 22 +-
arch/arm/boot/dts/tegra20-paz00.dts | 2 +-
arch/arm/boot/dts/tegra20-seaboard.dts | 4 +-
arch/arm/boot/dts/tegra20-tamonten.dtsi | 19 +-
arch/arm/boot/dts/tegra20-tec.dts | 8 +
arch/arm/boot/dts/tegra20-trimslice.dts | 32 +-
arch/arm/boot/dts/tegra20-ventana.dts | 2 +-
arch/arm/boot/dts/tegra20-whistler.dts | 2 +-
arch/arm/boot/dts/tegra20.dtsi | 55 ++
arch/arm/boot/dts/tegra30-beaver.dts | 64 +-
arch/arm/boot/dts/tegra30-cardhu.dtsi | 64 +-
arch/arm/boot/dts/tegra30.dtsi | 156 ++++
arch/arm/boot/dts/u9540.dts | 72 --
arch/arm/boot/dts/zynq-7000.dtsi | 4 +-
arch/arm/mach-nomadik/Kconfig | 1 +
arch/arm/mach-pxa/pxa-dt.c | 2 +-
arch/arm/mach-shmobile/Kconfig | 64 +-
arch/arm/mach-shmobile/Makefile | 34 +-
arch/arm/mach-shmobile/Makefile.boot | 1 +
.../board-armadillo800eva-reference.c | 18 +-
arch/arm/mach-shmobile/board-kzm9d-reference.c | 47 ++
arch/arm/mach-shmobile/board-kzm9d.c | 2 -
arch/arm/mach-shmobile/board-kzm9g-reference.c | 47 --
arch/arm/mach-shmobile/board-marzen-reference.c | 28 -
arch/arm/mach-shmobile/include/mach/emev2.h | 1 -
arch/arm/mach-shmobile/setup-emev2.c | 26 +-
arch/arm/mach-shmobile/smp-emev2.c | 17 +-
arch/arm/mach-ux500/cpu-db8500.c | 8 +-
drivers/input/serio/altera_ps2.c | 1 +
drivers/spi/spi-altera.c | 1 +
drivers/tty/serial/altera_jtaguart.c | 1 +
drivers/tty/serial/altera_uart.c | 1 +
include/dt-bindings/pinctrl/nomadik.h | 36 +
144 files changed, 6575 insertions(+), 2536 deletions(-)

Upstream: git.kernel.org


  • Share