From: Arnd Bergmann Date: Thu, 20 Jun 2013 20:10:52 +0000 (+0200) Subject: Merge branch 'next/dt' into for-next X-Git-Tag: next-20130628~18^2~35 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=59f26c0311cb5b5959aa43f0092f705c83cb087b;p=karo-tx-linux.git Merge branch 'next/dt' into for-next Conflicts: arch/arm/boot/dts/kirkwood-6281.dtsi arch/arm/mach-mxs/mach-mxs.c --- 59f26c0311cb5b5959aa43f0092f705c83cb087b diff --cc arch/arm/boot/dts/armada-370-xp.dtsi index 52a1f5efc086,a679b6697a98..90b117624abb --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@@ -94,17 -103,17 +103,17 @@@ reg = <0x72004 0x4>; }; - ethernet@70000 { + eth0: ethernet@70000 { compatible = "marvell,armada-370-neta"; - reg = <0x70000 0x2500>; + reg = <0x70000 0x4000>; interrupts = <8>; clocks = <&gateclk 4>; status = "disabled"; }; - ethernet@74000 { + eth1: ethernet@74000 { compatible = "marvell,armada-370-neta"; - reg = <0x74000 0x2500>; + reg = <0x74000 0x4000>; interrupts = <10>; clocks = <&gateclk 3>; status = "disabled"; diff --cc arch/arm/boot/dts/armada-xp-mv78460.dtsi index 488ca5eb9a55,386f0ce48453..c7b1f4d5c1c7 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi @@@ -105,9 -106,9 +106,9 @@@ interrupts = <91>; }; - ethernet@34000 { + eth3: ethernet@34000 { compatible = "marvell,armada-370-neta"; - reg = <0x34000 0x2500>; + reg = <0x34000 0x4000>; interrupts = <14>; clocks = <&gateclk 1>; status = "disabled"; diff --cc arch/arm/boot/dts/armada-xp.dtsi index 1ee8540b0eba,e481d54b565c..416eb9481844 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@@ -86,9 -90,9 +90,9 @@@ reg = <0x18200 0x500>; }; - ethernet@30000 { + eth2: ethernet@30000 { compatible = "marvell,armada-370-neta"; - reg = <0x30000 0x2500>; + reg = <0x30000 0x4000>; interrupts = <12>; clocks = <&gateclk 2>; status = "disabled"; diff --cc arch/arm/boot/dts/kirkwood-6281.dtsi index 51376683dbcd,0ed2f56a91f1..1e5bef0bead7 --- a/arch/arm/boot/dts/kirkwood-6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi @@@ -41,35 -41,32 +41,63 @@@ }; }; + pcie-controller { + compatible = "marvell,kirkwood-pcie"; + status = "disabled"; + device_type = "pci"; + + #address-cells = <3>; + #size-cells = <2>; + + bus-range = <0x00 0xff>; + + ranges = <0x82000000 0 0x00040000 0x00040000 0 0x00002000 /* Port 0.0 registers */ + 0x82000000 0 0xe0000000 0xe0000000 0 0x08000000 /* non-prefetchable memory */ + 0x81000000 0 0 0xe8000000 0 0x00100000>; /* downstream I/O */ + + pcie@1,0 { + device_type = "pci"; + assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>; + reg = <0x0800 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + ranges; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &intc 9>; + marvell,pcie-port = <0>; + marvell,pcie-lane = <0>; + clocks = <&gate_clk 2>; + status = "disabled"; + }; + }; ++ + rtc@10300 { + compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; + reg = <0x10300 0x20>; + interrupts = <53>; + clocks = <&gate_clk 7>; + }; + + sata@80000 { + compatible = "marvell,orion-sata"; + reg = <0x80000 0x5000>; + interrupts = <21>; + clocks = <&gate_clk 14>, <&gate_clk 15>; + clock-names = "0", "1"; + status = "disabled"; + }; + + mvsdio@90000 { + compatible = "marvell,orion-sdio"; + reg = <0x90000 0x200>; + interrupts = <28>; + clocks = <&gate_clk 4>; + bus-width = <4>; + cap-sdio-irq; + cap-sd-highspeed; + cap-mmc-highspeed; + status = "disabled"; + }; }; }; diff --cc arch/arm/boot/dts/kirkwood-mplcec4.dts index 90501cf129bb,211916a5a0fe..6179333fd71f --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts @@@ -136,17 -131,9 +131,17 @@@ pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>; pinctrl-names = "default"; status = "okay"; - cd-gpios = <&gpio1 15 0>; + cd-gpios = <&gpio1 15 1>; /* No WP GPIO */ }; + + pcie-controller { + status = "okay"; + + pcie@1,0 { + status = "okay"; + }; + }; }; gpio-leds { diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi index 09c820fc177f,b9325d45be78..0c9a94cd666c --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi @@@ -28,14 -34,13 +32,18 @@@ serial@12100 { clock-frequency = <200000000>; status = "okay"; + pinctrl-0 = <&pmx_uart1>; + pinctrl-names = "default"; }; + poweroff@12100 { + compatible = "qnap,power-off"; + reg = <0x12000 0x100>; + clocks = <&gate_clk 7>; + }; spi@10600 { status = "okay"; + pinctrl-0 = <&pmx_spi>; + pinctrl-names = "default"; m25p128@0 { #address-cells = <1>; diff --cc arch/arm/mach-mxs/mach-mxs.c index d67ecc1c8847,ba227cb2c93b..7fa611c1b287 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@@ -434,7 -544,7 +544,6 @@@ static const char *mxs_dt_compat[] __in }; DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") - .init_irq = irqchip_init, - .map_io = debug_ll_io_init, .handle_irq = icoll_handle_irq, .init_time = mxs_timer_init, .init_machine = mxs_machine_init, diff --cc arch/arm/mach-nomadik/cpu-8815.c index 46cce9baa129,89e2c03db178..2df209ed1a07 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@@ -25,10 -25,9 +25,8 @@@ #include #include #include -#include #include - #include - #include - #include + #include #include #include #include