ARM: dts: i.MX6QDL: icore-rqs: Fix eMMC detection during SPL

[oweals/u-boot.git] / arch / arm / dts / armada-cp110-master.dtsi

diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi
index 7da98bf5cbc05cd65173e5dcfbe6fe27438df7e8..8c336f2c38fd0ba0277c4a9e4b3f38c35af3de92 100644 (file)
--- a/arch/arm/dts/armada-cp110-master.dtsi
+++ b/arch/arm/dts/armada-cp110-master.dtsi
@@ -61,6 +61,43 @@
                        interrupt-parent = <&gic>;
                        ranges = <0x0 0x0 0xf2000000 0x2000000>;
 
+                       cpm_ethernet: ethernet@0 {
+                               compatible = "marvell,armada-7k-pp22";
+                               reg = <0x0 0x100000>, <0x129000 0xb000>;
+                               clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>;
+                               clock-names = "pp_clk", "gop_clk", "mg_clk";
+                               status = "disabled";
+                               dma-coherent;
+
+                               cpm_eth0: eth0 {
+                                       interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+                                       port-id = <0>;
+                                       gop-port-id = <0>;
+                                       status = "disabled";
+                               };
+
+                               cpm_eth1: eth1 {
+                                       interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
+                                       port-id = <1>;
+                                       gop-port-id = <2>;
+                                       status = "disabled";
+                               };
+
+                               cpm_eth2: eth2 {
+                                       interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
+                                       port-id = <2>;
+                                       gop-port-id = <3>;
+                                       status = "disabled";
+                               };
+                       };
+
+                       cpm_mdio: mdio@12a200 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "marvell,orion-mdio";
+                               reg = <0x12a200 0x10>;
+                       };
+
                        cpm_syscon0: system-controller@440000 {
                                compatible = "marvell,cp110-system-controller0",
                                             "syscon";
@@ -81,6 +118,60 @@
                                        "cpm-usb3dev", "cpm-eip150", "cpm-eip197";
                        };
 
+                       cpm_pinctl: cpm-pinctl@440000 {
+                               compatible = "marvell,mvebu-pinctrl",
+                                            "marvell,a70x0-pinctrl",
+                                            "marvell,a80x0-cp0-pinctrl";
+                               bank-name ="cp0-110";
+                               reg = <0x440000 0x20>;
+                               pin-count = <63>;
+                               max-func = <0xf>;
+
+                               cpm_i2c0_pins: cpm-i2c-pins-0 {
+                                       marvell,pins = < 37 38 >;
+                                       marvell,function = <2>;
+                               };
+                               cpm_i2c1_pins: cpm-i2c-pins-1 {
+                                       marvell,pins = < 35 36 >;
+                                       marvell,function = <2>;
+                               };
+                               cpm_ge2_rgmii_pins: cpm-ge-rgmii-pins-0 {
+                                       marvell,pins = < 44 45 46 47 48 49 50 51
+                                                        52 53 54 55 >;
+                                       marvell,function = <1>;
+                               };
+                               pca0_pins: cpm-pca0_pins {
+                                       marvell,pins = <62>;
+                                       marvell,function = <0>;
+                               };
+                               cpm_sdhci_pins: cpm-sdhi-pins-0 {
+                                       marvell,pins = < 56 57 58 59 60 61 >;
+                                       marvell,function = <14>;
+                               };
+                               cpm_spi0_pins: cpm-spi-pins-0 {
+                                       marvell,pins = < 13 14 15 16 >;
+                                       marvell,function = <3>;
+                               };
+                       };
+
+                       cpm_gpio0: gpio@440100 {
+                               compatible = "marvell,orion-gpio";
+                               reg = <0x440100 0x40>;
+                               ngpios = <32>;
+                               gpiobase = <20>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                       };
+
+                       cpm_gpio1: gpio@440140 {
+                               compatible = "marvell,orion-gpio";
+                               reg = <0x440140 0x40>;
+                               ngpios = <31>;
+                               gpiobase = <52>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                       };
+
                        cpm_sata0: sata@540000 {
                                compatible = "marvell,armada-8k-ahci";
                                reg = <0x540000 0x30000>;
@@ -149,7 +240,7 @@
                                status = "disabled";
                        };
 
-                       comphy_cp110: comphy@441000 {
+                       cpm_comphy: comphy@441000 {
                                compatible = "marvell,mvebu-comphy", "marvell,comphy-cp110";
                                reg = <0x441000 0x8>,
                                      <0x120000 0x8>;
@@ -157,23 +248,45 @@
                                max-lanes = <6>;
                        };
 
-                       utmi0: utmi@580000 {
+                       cpm_utmi0: utmi@580000 {
                                compatible = "marvell,mvebu-utmi-2.6.0";
                                reg = <0x580000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
                                      <0x440440 0x4>;           /* utmi-cfg */
-                               utmi-port = <UTMI_PHY_TO_USB_HOST0>;
+                               utmi-port = <UTMI_PHY_TO_USB3_HOST0>;
                                status = "disabled";
                        };
 
-                       utmi1: utmi@581000 {
+                       cpm_utmi1: utmi@581000 {
                                compatible = "marvell,mvebu-utmi-2.6.0";
                                reg = <0x581000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
                                      <0x440444 0x4>;           /* utmi-cfg */
-                               utmi-port = <UTMI_PHY_TO_USB_HOST1>;
+                               utmi-port = <UTMI_PHY_TO_USB3_HOST1>;
+                               status = "disabled";
+                       };
+
+                       cpm_sdhci0: sdhci@780000 {
+                               compatible = "marvell,armada-8k-sdhci";
+                               reg = <0x780000 0x300>;
+                               interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                               dma-coherent;
                                status = "disabled";
                        };
+
+                       cpm_nand: nand@720000 {
+                               compatible = "marvell,mvebu-pxa3xx-nand";
+                               reg = <0x720000 0x100>;
+                               #address-cells = <1>;
+
+                               clocks = <&cpm_syscon0 1 2>;
+                               nand-enable-arbiter;
+                               num-cs = <1>;
+                               nand-ecc-strength = <4>;
+                               nand-ecc-step-size = <512>;
+                               status = "disabled";
+                       };
+
                };
 
                cpm_pcie0: pcie@f2600000 {