Re: [U-Boot] [PATCH 2/4] arm: mvebu: clearfog: use the microsom .dtsi

[Dennis Gilmore]

Reviewed-by: Dennis Gilmore 
Tested-by: Dennis Gilmore 

On Thu, 2018-06-14 at 18:17 +0300, Baruch Siach wrote:
> Use hardware description from the recently introduced microsom .dtsi
> file to reduce duplication.
> 
> Signed-off-by: Baruch Siach 
> ---
>  arch/arm/dts/armada-388-clearfog.dts | 63 +++---
> --
>  1 file changed, 6 insertions(+), 57 deletions(-)
> 
> diff --git a/arch/arm/dts/armada-388-clearfog.dts
> b/arch/arm/dts/armada-388-clearfog.dts
> index a0b566a5ae0e..1403600e5b02 100644
> --- a/arch/arm/dts/armada-388-clearfog.dts
> +++ b/arch/arm/dts/armada-388-clearfog.dts
> @@ -50,6 +50,7 @@
>  #include 
>  #include 
>  #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 = <0x 0x1000>; /* 256 MB */
> - };
> -
>   reg_3p3v: regulator-3p3v {
>   compatible = "regulator-fixed";
>   regulator-name = "3P3V";
> @@ -84,11 +80,6 @@
>   };
>  
>   soc {
> - ranges =  -   MBUS_ID(0x01, 0x1d) 0 0xfff0 0x10
> -   MBUS_ID(0x09, 0x19) 0 0xf110 0x1
> -   MBUS_ID(0x09, 0x15) 0 0xf111 0x1>;
> -
>   internal-regs {
>   ethernet@3 {
>   mac-address = [00 50 43 02 02 02];
> @@ -108,15 +99,6 @@
>   status = "okay";
>   };
>  
> - ethernet@7 {
> - mac-address = [00 50 43 02 02 01];
> - pinctrl-0 = <_rgmii_pins>;
> - pinctrl-names = "default";
> - phy = <_dedicated>;
> - phy-mode = "rgmii-id";
> - status = "okay";
> - };
> -
>   i2c@11000 {
>   /* Is there anything on this? */
>   clock-frequency = <10>;
> @@ -226,22 +208,6 @@
>   status = "okay";
>   };
>  
> - mdio@72004 {
> - pinctrl-0 = <_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 = < 20
> GPIO_ACTIVE_LOW>;
>   no-1-8-v;
> - pinctrl-0 = <_sdhci_pins
> + pinctrl-0 = <_sdhci_pins
>_sdhci_cd_pins
> >;
>   pinctrl-names = "default";
>   status = "okay";
> @@ -319,13 +279,6 @@
>   wp-inverted;
>   };
>  
> - serial@12000 {
> - pinctrl-0 = <_pins>;
> - pinctrl-names = "default";
> - status = "okay";
> - u-boot,dm-pre-reloc;
> - };
> -
>   

[U-Boot] [PATCH 2/4] arm: mvebu: clearfog: use the microsom .dtsi

[Baruch Siach]

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

Signed-off-by: Baruch Siach 
---
 arch/arm/dts/armada-388-clearfog.dts | 63 +++-
 1 file changed, 6 insertions(+), 57 deletions(-)

diff --git a/arch/arm/dts/armada-388-clearfog.dts 
b/arch/arm/dts/armada-388-clearfog.dts
index a0b566a5ae0e..1403600e5b02 100644
--- a/arch/arm/dts/armada-388-clearfog.dts
+++ b/arch/arm/dts/armada-388-clearfog.dts
@@ -50,6 +50,7 @@
 #include 
 #include 
 #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 = <0x 0x1000>; /* 256 MB */
-   };
-
reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed";
regulator-name = "3P3V";
@@ -84,11 +80,6 @@
};
 
soc {
-   ranges = ;
-
internal-regs {
ethernet@3 {
mac-address = [00 50 43 02 02 02];
@@ -108,15 +99,6 @@
status = "okay";
};
 
-   ethernet@7 {
-   mac-address = [00 50 43 02 02 01];
-   pinctrl-0 = <_rgmii_pins>;
-   pinctrl-names = "default";
-   phy = <_dedicated>;
-   phy-mode = "rgmii-id";
-   status = "okay";
-   };
-
i2c@11000 {
/* Is there anything on this? */
clock-frequency = <10>;
@@ -226,22 +208,6 @@
status = "okay";
};
 
-   mdio@72004 {
-   pinctrl-0 = <_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 = < 20 GPIO_ACTIVE_LOW>;
no-1-8-v;
-   pinctrl-0 = <_sdhci_pins
+   pinctrl-0 = <_sdhci_pins
 _sdhci_cd_pins>;
pinctrl-names = "default";
status = "okay";
@@ -319,13 +279,6 @@
wp-inverted;
};
 
-   serial@12000 {
-   pinctrl-0 = <_pins>;
-   pinctrl-names = "default";
-   status = "okay";
-   u-boot,dm-pre-reloc;
-   };
-
serial@12100 {
/* mikrobus uart */
pinctrl-0 = <_uart_pins>;
@@ -342,14 +295,6 @@
pinctrl-0 = <_pins _spi1_cs_pins 
_spi_pins>;
pinctrl-names = "default";
status = "okay";
-
-   spi-flash@0 {
-