- First patch updates RPi4's expgpio's GPIO labels, adding the SD power rail.

- Second patch adds a fixed regulator that controls the SD power and
 hooks it up with emmc2.
 
 - Third patch rolls back to the firmware based power driver as the MMIO
 version is unstable.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEErOkkGDHCg2EbPcGjlfZmHno8x/4FAl5+ZkYACgkQlfZmHno8
 x/51Iwf/XKTwPJsNu3qaPeLZP6r3sMUSpIkb09+uF48ecYT2kKltMSWy4AMRILx1
 GuPVyfhH9EOL7kf2pui+DotWfZ6V0w8QXmw+h5jmvrSL7HmNj7t+AUvlX765h/9/
 tb+6/3Yum+GJwrG7mSmBCXvV4S5ReCdifmNse1WujgX5AfLZ/8SSdLl7/vwl5UTn
 xkhGyGjGNwiabqwVZGAbhnv12IBsWPm7KAjpkPZRp6Yuyf9uawgnoNlIh4HDmH78
 PBsXVoBlqlfBdroIVjjiUtcrqQIXxm4vcAwlCTXVKYC0boZib226a7D+bjrbVtRY
 ou521MEikPI+tnydzQErBq7Ktj0SiA==
 =q1oY
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl6U7XMACgkQh9CWnEQH
 BwTZFRAAj6RJzy61lcjwEALvCGZqTs/n17Ecpnd7BD+nfv8Ug2umEYrvDalvVOAg
 uTPKGM2feA/eWks+bFSgF8auPnHdO+XBm8FmDJAMr8/fN6mP5Fm8pcBqS59U9lOb
 ASRzIBjOK06SFkFzMas0AVtLMaRo/DwsASqx8Bc6UHxI9ZMKIaBRHChdaDTiH3md
 5JinxSmOkPaAX+wB0rcpVIL/T3pSf5I6DrXCkhU0dsER2NxRiYdvnAdyE12i4emn
 FCVplHyUCyzicU/qtwMBNqBfpTVOZ5PT9WAotMN329Csy0D95QKTUPuri0F3qOXW
 UeuE9UPex1ZOF3kNhLlFmlZRBaPaQsih2EEQOdKenZWffj5RXLVjGjmAYoHj6rew
 7BoEpEiPCAZWPAOyEWg9OqvOd5z7Dj7Xr1ukfGuf1UZ01ZsmTvrUyNIELRPFpRg9
 6Z+X2iH/pU9VwvBhloT/8lWKdRF0TAE8PJR5NnXFn2SFKZ+Fue2ubaJ0dMjAeAqK
 /mQFod5+QbKcZkG65L2GY6+C1rj3ZVxEx+dUZxtfTQqPDsTPRjl08YjvFgmzT6LD
 VhzVnw+dzUPo0BM0MrjxwjryRkdQW1iMijvXzRa7qsYbRW4dZc/kig57Xft6L0zQ
 hi9dvfPgJYbEnwn24WYkbksbPt1jTCAwekNm1V5ks9o/mOSogSA=
 =Aotf
 -----END PGP SIGNATURE-----

Merge tag 'tags/bcm2835-dt-next-2020-03-27' into devicetree/next

- First patch updates RPi4's expgpio's GPIO labels, adding the SD power rail.

- Second patch adds a fixed regulator that controls the SD power and
hooks it up with emmc2.

- Third patch rolls back to the firmware based power driver as the MMIO
version is unstable.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

@@ -56,6 +56,16 @@
 			  3300000 0x0>;
 		status = "okay";
 	};
+
+	sd_vcc_reg: sd_vcc_reg {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-sd";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		enable-active-high;
+		gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &firmware {
@@ -69,7 +79,7 @@
 				  "GLOBAL_RESET",
 				  "VDD_SD_IO_SEL",
 				  "CAM_GPIO",
-				  "",
+				  "SD_PWR_ON",
 				  "";
 		status = "okay";
 	};
@@ -174,6 +184,7 @@
 /* EMMC2 is used to drive the SD card */
 &emmc2 {
 	vqmmc-supply = <&sd_io_1v8_reg>;
+	vmmc-supply = <&sd_vcc_reg>;
 	broken-cd;
 	status = "okay";
 };

arch/arm/boot/dts/bcm2835-common.dtsi

@@ -130,7 +130,6 @@
 			compatible = "brcm,bcm2835-v3d";
 			reg = <0x7ec00000 0x1000>;
 			interrupts = <1 10>;
-			power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
 		};
 
 		vc4: gpu {

arch/arm/boot/dts/bcm2835-rpi-common.dtsi

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This include file covers the common peripherals and configuration between
+ * bcm2835, bcm2836 and bcm2837 implementations that interact with RPi's
+ * firmware interface.
+ */
+
+#include <dt-bindings/power/raspberrypi-power.h>
+
+&v3d {
+	power-domains = <&power RPI_POWER_DOMAIN_V3D>;
+};

arch/arm/boot/dts/bcm2835.dtsi

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "bcm283x.dtsi"
 #include "bcm2835-common.dtsi"
+#include "bcm2835-rpi-common.dtsi"
 
 / {
 	compatible = "brcm,bcm2835";

arch/arm/boot/dts/bcm2836.dtsi

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "bcm283x.dtsi"
 #include "bcm2835-common.dtsi"
+#include "bcm2835-rpi-common.dtsi"
 
 / {
 	compatible = "brcm,bcm2836";

arch/arm/boot/dts/bcm2837.dtsi

@@ -1,5 +1,6 @@
 #include "bcm283x.dtsi"
 #include "bcm2835-common.dtsi"
+#include "bcm2835-rpi-common.dtsi"
 
 / {
 	compatible = "brcm,bcm2837";