Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.2.2
diff -u -p -r1.1.1.5 -r1.1.1.5.2.2
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi	2018/06/27 16:27:08	1.1.1.5
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi	2020/04/08 14:08:37	1.1.1.5.2.2
@@ -114,11 +114,14 @@
 
 	bus-width = <4>;
 	cap-sd-highspeed;
-	max-frequency = <100000000>;
+	max-frequency = <50000000>;
 
 	non-removable;
 	disable-wp;
 
+	/* WiFi firmware requires power to be kept while in suspend */
+	keep-power-in-suspend;
+
 	mmc-pwrseq = <&sdio_pwrseq>;
 
 	vmmc-supply = <&vddao_3v3>;
@@ -134,11 +137,10 @@
 
 	bus-width = <4>;
 	cap-sd-highspeed;
-	max-frequency = <100000000>;
+	max-frequency = <50000000>;
 	disable-wp;
 
-	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
-	cd-inverted;
+	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
 
 	vmmc-supply = <&vddao_3v3>;
 	vqmmc-supply = <&vddio_boot>;
@@ -189,3 +191,10 @@
 &usb0 {
 	status = "okay";
 };
+
+&usb2_phy0 {
+	/*
+	 * HDMI_5V is also used as supply for the USB VBUS.
+	 */
+	phy-supply = <&hdmi_5v>;
+};