arm: mvebu: clearfog: use the microsom .dtsi

Use hardware description from the recently introduced microsom .dtsi
file to reduce duplication.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Dennis Gilmore <dennis@ausil.us>
Tested-by: Dennis Gilmore <dennis@ausil.us>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-388-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts
index a0b566a5ae0e51f8031b70dd3886285ff3b2c49d..1403600e5b02076e76aaaeba20cf2a1c5ca47d01 100644 (file)
--- a/arch/arm/dts/armada-388-clearfog.dts
+++ b/arch/arm/dts/armada-388-clearfog.dts
@@ -50,6 +50,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "armada-388.dtsi"
+#include "armada-38x-solidrun-microsom.dtsi"
 
 / {
        model = "SolidRun Clearfog A1";
@@ -70,11 +71,6 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
-               device_type = "memory";
-               reg = <0x00000000 0x10000000>; /* 256 MB */
-       };
-
        reg_3p3v: regulator-3p3v {
                compatible = "regulator-fixed";
                regulator-name = "3P3V";
@@ -84,11 +80,6 @@
        };
 
        soc {
-               ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
-                         MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
-                         MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
-                         MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
-
                internal-regs {
                        ethernet@30000 {
                                mac-address = [00 50 43 02 02 02];
@@ -108,15 +99,6 @@
                                status = "okay";
                        };
 
-                       ethernet@70000 {
-                               mac-address = [00 50 43 02 02 01];
-                               pinctrl-0 = <&ge0_rgmii_pins>;
-                               pinctrl-names = "default";
-                               phy = <&phy_dedicated>;
-                               phy-mode = "rgmii-id";
-                               status = "okay";
-                       };
-
                        i2c@11000 {
                                /* Is there anything on this? */
                                clock-frequency = <100000>;
@@ -226,22 +208,6 @@
                                status = "okay";
                        };
 
-                       mdio@72004 {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-
-                               phy_dedicated: ethernet-phy@0 {
-                                       /*
-                                        * Annoyingly, the marvell phy driver
-                                        * configures the LED register, rather
-                                        * than preserving reset-loaded setting.
-                                        * We undo that rubbish here.
-                                        */
-                                       marvell,reg-init = <3 16 0 0x101e>;
-                                       reg = <0>;
-                               };
-                       };
-
                        pinctrl@18000 {
                                clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {
                                        marvell,pins = "mpp46";
@@ -260,12 +226,6 @@
                                        marvell,pins = "mpp20";
                                        marvell,function = "gpio";
                                };
-                               clearfog_sdhci_pins: clearfog-sdhci-pins {
-                                       marvell,pins = "mpp21", "mpp28",
-                                                      "mpp37", "mpp38",
-                                                      "mpp39", "mpp40";
-                                       marvell,function = "sd0";
-                               };
                                clearfog_spi1_cs_pins: spi1-cs-pins {
                                        marvell,pins = "mpp55";
                                        marvell,function = "spi1";
@@ -311,7 +271,7 @@
                                bus-width = <4>;
                                cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                                no-1-8-v;
-                               pinctrl-0 = <&clearfog_sdhci_pins
+                               pinctrl-0 = <&microsom_sdhci_pins
                                             &clearfog_sdhci_cd_pins>;
                                pinctrl-names = "default";
                                status = "okay";
@@ -319,13 +279,6 @@
                                wp-inverted;
                        };
 
-                       serial@12000 {
-                               pinctrl-0 = <&uart0_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-                               u-boot,dm-pre-reloc;
-                       };
-
                        serial@12100 {
                                /* mikrobus uart */
                                pinctrl-0 = <&mikro_uart_pins>;
@@ -342,14 +295,6 @@
                                pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>;
                                pinctrl-names = "default";
                                status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       compatible = "w25q32", "jedec,spi-nor", "spi-flash";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <3000000>;
-                               };
                        };
 
                        usb3@f8000 {
@@ -457,6 +402,10 @@
        };
 };
 
+&w25q32 {
+       status = "okay";
+};
+
 /*
 +#define A38x_CUSTOMER_BOARD_1_MPP16_23         0x00400011
 MPP18: gpio            ? (pca9655 int?)