Unverified Commit 460227c3 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 8f3d9f35 3ac395a5

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

+12 −1
Original line number Diff line number Diff line
@@ -56,6 +56,16 @@ sd_io_1v8_reg: sd_io_1v8_reg { 
			  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 @@ expgpio: gpio { 
				  "GLOBAL_RESET",

				  "VDD_SD_IO_SEL",

				  "CAM_GPIO",

				  "",

				  "SD_PWR_ON",

				  "";

		status = "okay";

	};
@@ -174,6 +184,7 @@ brcmf: wifi@1 { 
/* 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

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ v3d: v3d@7ec00000 { 
			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 → 100644
+12 −0
Original line number Diff line number Diff line 
// 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 −0
Original line number Diff line number Diff line 
// 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 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "bcm283x.dtsi"

#include "bcm2835-common.dtsi"

#include "bcm2835-rpi-common.dtsi"



/ {

	compatible = "brcm,bcm2836";