Hi Jagan, On 2023-07-17 17:42, Jagan Teki wrote:
Sync the linux-next from below commit, commit <1642bf66e270> ("arm64: dts: rockchip: add USB2 to rk3588s-rock5a")
Eugen sent a sync patch earlier, guess this contains a newer sync with more features/nodes :-) See https://patchwork.ozlabs.org/project/uboot/patch/20230529073423.24371-1-euge...
Also rops the duplicate usb nodes from rk3588s-u-boot.dtsi
nit: drops
Signed-off-by: Jagan Teki jagan@edgeble.ai
arch/arm/dts/rk3588-edgeble-neu6a.dtsi | 1 - arch/arm/dts/rk3588-edgeble-neu6b-io.dts | 66 +++ arch/arm/dts/rk3588-edgeble-neu6b.dtsi | 359 ++++++++++- arch/arm/dts/rk3588-evb1-v10.dts | 720 ++++++++++++++++++++++- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 13 - arch/arm/dts/rk3588-rock-5b.dts | 578 +++++++++++++++++- arch/arm/dts/rk3588.dtsi | 112 ++++ arch/arm/dts/rk3588s-u-boot.dtsi | 119 ---- arch/arm/dts/rk3588s.dtsi | 499 +++++++++++++++- include/dt-bindings/ata/ahci.h | 20 + 10 files changed, 2346 insertions(+), 141 deletions(-) create mode 100644 include/dt-bindings/ata/ahci.h
[...]
diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index 1cd8a57a6f..03d1560564 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -99,11 +99,6 @@ bootph-all; };
-&sdmmc {
- bus-width = <4>;
- status = "okay";
-};
&sdmmc_bus4 { bootph-all; }; @@ -120,14 +115,6 @@ bootph-all; };
-&sdhci {
- cap-mmc-highspeed;
- mmc-ddr-1_8v;
- mmc-hs200-1_8v;
- pinctrl-names = "default";
- pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_data_strobe &emmc_rstnout>;
-};
This should not be removed, the missing modes and pinctrl has still not been sent upstream, please leave this node.
Regards, Jonas
&sfc { bootph-pre-ram; u-boot,spl-sfc-no-dma;
[...]