]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - arch/arm/boot/dts/armada-385-linksys.dtsi
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[karo-tx-linux.git] / arch / arm / boot / dts / armada-385-linksys.dtsi
index 2306c45685b1f14788e4e5f3e0927a7724ca554d..e1f355ffc8f7e07cbbc3912b13e7436f9ac4f407 100644 (file)
@@ -52,7 +52,7 @@
 
        memory {
                device_type = "memory";
-               reg = <0x00000000 0x20000000>; /* 512 MB */
+               reg = <0x00000000 0x20000000>; /* 512 MiB */
        };
 
        soc {
                          MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
-
-               internal-regs {
-                       i2c@11000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&i2c0_pins>;
-                               status = "okay";
-
-                               tmp421@4c {
-                                       compatible = "ti,tmp421";
-                                       reg = <0x4c>;
-                               };
-
-                               pca9635@68 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       compatible = "nxp,pca9635";
-                                       reg = <0x68>;
-                               };
-                       };
-
-                       /* J10: VCC, NC, RX, NC, TX, GND  */
-                       serial@12000 {
-                               status = "okay";
-                       };
-
-                       ethernet@70000 {
-                               status = "okay";
-                               phy-mode = "rgmii-id";
-                               buffer-manager = <&bm>;
-                               bm,pool-long = <2>;
-                               bm,pool-short = <3>;
-                               fixed-link {
-                                       speed = <1000>;
-                                       full-duplex;
-                               };
-                       };
-
-                       ethernet@34000 {
-                               status = "okay";
-                               phy-mode = "sgmii";
-                               buffer-manager = <&bm>;
-                               bm,pool-long = <0>;
-                               bm,pool-short = <1>;
-                               fixed-link {
-                                       speed = <1000>;
-                                       full-duplex;
-                               };
-                       };
-
-                       mdio@72004 {
-                               status = "okay";
-
-                               switch@0 {
-                                       compatible = "marvell,mv88e6085";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       reg = <0>;
-
-                                       ports {
-                                               #address-cells = <1>;
-                                               #size-cells = <0>;
-
-                                               port@0 {
-                                                       reg = <0>;
-                                                       label = "lan4";
-                                               };
-
-                                               port@1 {
-                                                       reg = <1>;
-                                                       label = "lan3";
-                                               };
-
-                                               port@2 {
-                                                       reg = <2>;
-                                                       label = "lan2";
-                                               };
-
-                                               port@3 {
-                                                       reg = <3>;
-                                                       label = "lan1";
-                                               };
-
-                                               port@4 {
-                                                       reg = <4>;
-                                                       label = "wan";
-                                               };
-
-                                               port@5 {
-                                                       reg = <5>;
-                                                       label = "cpu";
-                                                       ethernet = <&eth2>;
-
-                                                       fixed-link {
-                                                               speed = <1000>;
-                                                               full-duplex;
-                                                       };
-                                               };
-                                       };
-                               };
-                       };
-
-                       sata@a8000 {
-                               status = "okay";
-                       };
-
-                       bm@c8000 {
-                               status = "okay";
-                       };
-
-                       /* USB part of the eSATA/USB 2.0 port */
-                       usb@58000 {
-                               status = "okay";
-                       };
-
-                       usb3@f8000 {
-                               status = "okay";
-                               usb-phy = <&usb3_phy>;
-                       };
-
-                       flash@d0000 {
-                               status = "okay";
-                               num-cs = <1>;
-                               marvell,nand-keep-config;
-                               marvell,nand-enable-arbiter;
-                               nand-on-flash-bbt;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0000000 0x200000>;  /* 2MB */
-                                       read-only;
-                               };
-
-                               partition@100000 {
-                                       label = "u_env";
-                                       reg = <0x200000 0x40000>;    /* 256KB */
-                               };
-
-                               partition@140000 {
-                                       label = "s_env";
-                                       reg = <0x240000 0x40000>;    /* 256KB */
-                               };
-
-                               partition@900000 {
-                                       label = "devinfo";
-                                       reg = <0x900000 0x100000>;   /* 1MB */
-                                       read-only;
-                               };
-
-                               /* kernel1 overlaps with rootfs1 by design */
-                               partition@a00000 {
-                                       label = "kernel1";
-                                       reg = <0xa00000 0x2800000>;  /* 40MB */
-                               };
-
-                               partition@1000000 {
-                                       label = "rootfs1";
-                                       reg = <0x1000000 0x2200000>;  /* 34MB */
-                               };
-
-                               /* kernel2 overlaps with rootfs2 by design */
-                               partition@3200000 {
-                                       label = "kernel2";
-                                       reg = <0x3200000 0x2800000>; /* 40MB */
-                               };
-
-                               partition@3800000 {
-                                       label = "rootfs2";
-                                       reg = <0x3800000 0x2200000>; /* 34MB */
-                               };
-
-                               /*
-                                * 38MB, last MB is for the BBT, not writable
-                                */
-                               partition@5a00000 {
-                                       label = "syscfg";
-                                       reg = <0x5a00000 0x2600000>;
-                               };
-
-                               /*
-                                * Unused area between "s_env" and "devinfo".
-                                * Moved here because otherwise the renumbered
-                                * partitions would break the bootloader
-                                * supplied bootargs
-                                */
-                               partition@180000 {
-                                       label = "unused_area";
-                                       reg = <0x280000 0x680000>;   /* 6.5MB */
-                               };
-                       };
-               };
-
-               bm-bppi {
-                       status = "okay";
-               };
-
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               /* Marvell 88W8864, 5GHz-only */
-                               status = "okay";
-                       };
-
-                       pcie@2,0 {
-                               /* Marvell 88W8864, 2GHz-only */
-                               status = "okay";
-                       };
-               };
        };
 
-       usb3_phy: usb3_phy {
+       usb3_1_phy: usb3_1-phy {
                compatible = "usb-nop-xceiv";
-               vcc-supply = <&reg_xhci0_vbus>;
+               vcc-supply = <&usb3_1_vbus>;
        };
 
-       reg_xhci0_vbus: xhci0-vbus {
+       usb3_1_vbus: usb3_1-vbus {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
-               pinctrl-0 = <&xhci0_vbus_pins>;
-               regulator-name = "xhci0-vbus";
+               pinctrl-0 = <&usb3_1_vbus_pins>;
+               regulator-name = "usb3_1-vbus";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
                enable-active-high;
                gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
        };
 
-       gpio_keys {
+       gpio_keys: gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-0 = <&keys_pin>;
+               pinctrl-0 = <&gpio_keys_pins>;
                pinctrl-names = "default";
 
-               button@1 {
+               wps {
                        label = "WPS";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
                };
 
-               button@2 {
+               reset {
                        label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
                };
        };
 
-       gpio-leds {
+       gpio_leds: gpio-leds {
                compatible = "gpio-leds";
-               pinctrl-0 = <&power_led_pin &sata_led_pin>;
+               pinctrl-0 = <&gpio_leds_pins>;
                pinctrl-names = "default";
 
                power {
                        linux,default-trigger = "disk-activity";
                };
        };
+};
 
-       dsa@0 {
-               status = "disabled";
+&ahci0 {
+       status = "okay";
+};
+
+&bm {
+       status = "okay";
+};
 
-               compatible = "marvell,dsa";
-               #address-cells = <2>;
+&bm_bppi {
+       status = "okay";
+};
+
+&eth0 {
+       status = "okay";
+       phy-mode = "rgmii-id";
+       buffer-manager = <&bm>;
+       bm,pool-long = <0>;
+       bm,pool-short = <1>;
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&eth2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       buffer-manager = <&bm>;
+       bm,pool-long = <2>;
+       bm,pool-short = <3>;
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&i2c0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c0_pins>;
+       status = "okay";
+
+       tmp421@4c {
+               compatible = "ti,tmp421";
+               reg = <0x4c>;
+       };
+
+       expander0: pca9635@68 {
+               #address-cells = <1>;
                #size-cells = <0>;
+               compatible = "nxp,pca9635";
+               reg = <0x68>;
+       };
+};
+
+&nand {
+       /* 128MiB or 256MiB */
+       status = "okay";
+       num-cs = <1>;
+       marvell,nand-keep-config;
+       marvell,nand-enable-arbiter;
+       nand-on-flash-bbt;
+};
 
-               dsa,ethernet = <&eth2>;
-               dsa,mii-bus = <&mdio>;
+&mdio {
+       status = "okay";
 
-               switch@0 {
+       switch@0 {
+               compatible = "marvell,mv88e6085";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+
+               ports {
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       reg = <0x0 0>;  /* MDIO address 0, switch 0 in tree */
 
                        port@0 {
                                reg = <0>;
                        port@5 {
                                reg = <5>;
                                label = "cpu";
+                               ethernet = <&eth2>;
+
+                               fixed-link {
+                                       speed = <1000>;
+                                       full-duplex;
+                               };
                        };
                };
        };
 };
 
+&pciec {
+       status = "okay";
+};
+
+&pcie1 {
+       /* Marvell 88W8864, 5GHz-only */
+       status = "okay";
+};
+
+&pcie2 {
+       /* Marvell 88W8864, 2GHz-only */
+       status = "okay";
+};
+
 &pinctrl {
-       keys_pin: keys-pin {
+       gpio_keys_pins: gpio-keys-pins {
+               /* mpp24: wps, mpp29: reset */
                marvell,pins = "mpp24", "mpp29";
                marvell,function = "gpio";
        };
 
-       power_led_pin: power-led-pin {
-               marvell,pins = "mpp55";
-               marvell,function = "gpio";
-       };
-
-       sata_led_pin: sata-led-pin {
-               marvell,pins = "mpp54";
+       gpio_leds_pins: gpio-leds-pins {
+               /* mpp54: sata, mpp55: power */
+               marvell,pins = "mpp54", "mpp55";
                marvell,function = "gpio";
        };
 
-       xhci0_vbus_pins: xhci0-vbus-pins {
+       usb3_1_vbus_pins: usb3_1-vbus-pins {
                marvell,pins = "mpp50";
                marvell,function = "gpio";
        };
 &spi0 {
        status = "disabled";
 };
+
+&uart0 {
+       /* J10: VCC, NC, RX, NC, TX, GND  */
+       status = "okay";
+};
+
+&usb0 {
+       /* USB part of the eSATA/USB 2.0 port */
+       status = "okay";
+};
+
+&usb3_1 {
+       status = "okay";
+       usb-phy = <&usb3_1_phy>;
+};