[U-Boot] [PATCH] ARM: dts: rmobile: Zap redundant USB/SDHI nodes on M3N

Marek Vasut
2019-03-07T00:53:29Z

On 3/6/19 6:55 PM, Eugeniu Rosca wrote:
> v2019.01 commit cbff9f80cedd ("ARM: dts: rmobile: Sync Gen3 DTs with
> Linux 4.19.6") made the sdhi/usb nodes available in r8a77965.dtsi.
>
> Hence, remove the SDHI/USB nodes from r8a77965-u-boot.dtsi. This is
> equivalent to partially reverting below v2019.01 commits:
> - f529bc551b6d ("ARM: dts: rmobile: Extract USB nodes on M3N")
> - 830b94f76867 ("ARM: dts: rmobile: Extract SDHI nodes on M3N")
>
> Not doing that results in MMC devices being undetected on M3NULCB:

M3N ULCB is not supported yet, so how can this be broken ?

I am planning to add support for it [1], however that is work in
progress and the patches still need more work. Can you rebase your
changes on top of that branch and if you have M3N ULCB, test it ?
The branch also contains sync with Linux 5.0 DTs, however it is also
work in progress and there's likely to be breakage.

[1] https://github.com/marex/u-boot-sh/tree/m3nulcb-v1

> => mmc list
> No MMC device available
>
> Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> ---
> arch/arm/dts/r8a77965-u-boot.dtsi | 99 -------------------------------
> 1 file changed, 99 deletions(-)
>
> diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi
> index cbd29b3aed68..ca80ef8f29ee 100644
> --- a/arch/arm/dts/r8a77965-u-boot.dtsi
> +++ b/arch/arm/dts/r8a77965-u-boot.dtsi
> @@ -19,103 +19,4 @@
> bank-width = <2>;
> status = "disabled";
> };
> -
> - sdhi0: sd at ee100000 {
> - compatible = "renesas,sdhi-r8a77965";
> - reg = <0 0xee100000 0 0x2000>;
> - interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 314>;
> - max-frequency = <200000000>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 314>;
> - status = "disabled";
> - };
> -
> - sdhi1: sd at ee120000 {
> - compatible = "renesas,sdhi-r8a77965";
> - reg = <0 0xee120000 0 0x2000>;
> - interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 313>;
> - max-frequency = <200000000>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 313>;
> - status = "disabled";
> - };
> -
> - sdhi2: sd at ee140000 {
> - compatible = "renesas,sdhi-r8a77965";
> - reg = <0 0xee140000 0 0x2000>;
> - interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 312>;
> - max-frequency = <200000000>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 312>;
> - status = "disabled";
> - };
> -
> - sdhi3: sd at ee160000 {
> - compatible = "renesas,sdhi-r8a77965";
> - reg = <0 0xee160000 0 0x2000>;
> - interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 311>;
> - max-frequency = <200000000>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 311>;
> - status = "disabled";
> - };
> -
> - ehci0: usb at ee080100 {
> - compatible = "generic-ehci";
> - reg = <0 0xee080100 0 0x100>;
> - interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 703>;
> - phys = <&usb2_phy0>;
> - phy-names = "usb";
> - companion= <&ohci0>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 703>;
> - };
> -
> - usb2_phy0: usb-phy at ee080200 {
> - compatible = "renesas,usb2-phy-r8a77965",
> - "renesas,rcar-gen3-usb2-phy";
> - reg = <0 0xee080200 0 0x700>;
> - interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 703>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 703>;
> - #phy-cells = <0>;
> - };
> -
> - ehci1: usb at ee0a0100 {
> - compatible = "generic-ehci";
> - reg = <0 0xee0a0100 0 0x100>;
> - interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 702>;
> - phys = <&usb2_phy1>;
> - phy-names = "usb";
> - companion= <&ohci1>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 702>;
> - };
> -
> - usb2_phy1: usb-phy at ee0a0200 {
> - compatible = "renesas,usb2-phy-r8a77965",
> - "renesas,rcar-gen3-usb2-phy";
> - reg = <0 0xee0a0200 0 0x700>;
> - clocks = <&cpg CPG_MOD 702>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 702>;
> - #phy-cells = <0>;
> - };
> -
> - xhci0: usb at ee000000 {
> - compatible = "renesas,xhci-r8a77965",
> - "renesas,rcar-gen3-xhci";
> - reg = <0 0xee000000 0 0xc00>;
> - interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cpg CPG_MOD 328>;
> - power-domains = <&sysc 32>;
> - resets = <&cpg 328>;
> - };
> };
>

--
Best regards,
Marek Vasut