Commit dae29d66 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64-3' of... 

Merge tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: amlogic updates for v5.9 (round3)
- minor fixes

* tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: fix mmc0 tuning error on Khadas VIM3
  arm64: dts: meson: misc fixups for w400 dtsi

Link: https://lore.kernel.org/r/7h5za746al.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9141b3ca f1bb924e

arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -336,9 +336,11 @@ 


	bus-width = <4>;

	cap-sd-highspeed;

	sd-uhs-sdr50;

	max-frequency = <100000000>;



	/* WiFi firmware requires power to be kept while in suspend */

	keep-power-in-suspend;



	non-removable;

	disable-wp;

arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ 


	bus-width = <4>;

	cap-sd-highspeed;

	sd-uhs-sdr50;

	max-frequency = <100000000>;



	non-removable;

arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts

+4 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ 
	status = "okay";

};



&sd_emmc_a {

	sd-uhs-sdr50;

};



&usb {

	phys = <&usb2_phy0>, <&usb2_phy1>;

	phy-names = "usb2-phy0", "usb2-phy1";

CRA Git | Maintained and supported by SUSTech CRA and CCSE