On 3/9/19 2:04 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")
>
> Duplicating the nodes from <soc>.dtsi to <soc>-u-boot.dtsi is obviously:
> - not needed if no U-boot-specific changes are needed in those nodes.
> - potentially dangerous/error-prone, since the duplicated properties
> override the properties originally defined in <soc>.dtsi. One
> possible consequence is that <soc>.dtsi is getting an update from
> Linux, while <soc>-u-boot.dtsi stays unchanged. In this situation,
> the obsolete property values from <soc>-u-boot.dtsi will take
> precedence masking some of the <soc>.dtsi updates, potentially
> leading to all kind of obscure issues.
>
> Below is the dtdiff of r8a77965-salvator-x-u-boot.dtb (the only "user"
> of r8a77965-u-boot.dtsi) before and after the patch (slightly
> reformatted to avoid 'git am/apply' issues and to reduce the width).
>
> What below output means is there is already a mismatch in some of
> SDHI/USB nodes between r8a77965.dtsi and r8a77965-u-boot.dtsi. Since no
> U-Boot customization is needed in SDHI/USB DT nodes, get rid of them in
> r8a77965-u-boot.dtsi.
>
> $> dtdiff before-r8a77965-salvator-x-u-boot.dtb \
> after-r8a77965-salvator-x-u-boot.dtb
> --- /dev/fd/63 2019-03-09 12:57:40.877963983 +0100
> +++ /dev/fd/62 2019-03-09 12:57:40.877963983 +0100
> @@ -1471,7 +1471,7 @@
> bus-width = <0x4>;
> cd-gpios = <0x51 0xc 0x1>;
> clocks = <0x6 0x1 0x13a>;
> - compatible = "renesas,sdhi-r8a77965";
> + compatible = "renesas,sdhi-r8a77965", "renesas,rcar-gen3-sdhi";
> interrupts = <0x0 0xa5 0x4>;
> max-frequency = <0xc65d400>;
> pinctrl-0 = <0x4d>;
> @@ -1492,7 +1492,7 @@
>
> sd@ee120000 {
> clocks = <0x6 0x1 0x139>;
> - compatible = "renesas,sdhi-r8a77965";
> + compatible = "renesas,sdhi-r8a77965", "renesas,rcar-gen3-sdhi";
> interrupts = <0x0 0xa6 0x4>;
> max-frequency = <0xbebc200>;
> power-domains = <0x1 0x20>;
> @@ -1504,7 +1504,7 @@
> sd@ee140000 {
> bus-width = <0x8>;
> clocks = <0x6 0x1 0x138>;
> - compatible = "renesas,sdhi-r8a77965";
> + compatible = "renesas,sdhi-r8a77965", "renesas,rcar-gen3-sdhi";
> fixed-emmc-driver-type = <0x1>;
> interrupts = <0x0 0xa7 0x4>;
> max-frequency = <0xbebc200>;
> @@ -1526,7 +1526,7 @@
> bus-width = <0x4>;
> cd-gpios = <0x5a 0xf 0x1>;
> clocks = <0x6 0x1 0x137>;
> - compatible = "renesas,sdhi-r8a77965";
> + compatible = "renesas,sdhi-r8a77965", "renesas,rcar-gen3-sdhi";
> interrupts = <0x0 0xa8 0x4>;
> max-frequency = <0xc65d400>;
> pinctrl-0 = <0x56>;
> @@ -1868,14 +1868,14 @@
>
> usb-phy@ee0a0200 {
> #phy-cells = <0x0>;
> - clocks = <0x6 0x1 0x2be>;
> + clocks = <0x6 0x1 0x2bf>;
> compatible = "renesas,usb2-phy-r8a77965",
> "renesas,rcar-gen3-usb2-phy";
> phandle = <0x47>;
> pinctrl-0 = <0x4c>;
> pinctrl-names = "default";
> power-domains = <0x1 0x20>;
> reg = <0x0 0xee0a0200 0x0 0x700>;
> - resets = <0x6 0x2be>;
> + resets = <0x6 0x2bf>;
> status = "okay";
> };
Applied, thanks.
--
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
