diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2020-04-13 15:53:28 -0700 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2020-04-13 15:53:28 -0700 |
| commit | 460227c329e5bd39103b9f7ba01cbad69b14c4c4 (patch) | |
| tree | 15935ee8a659b5c7b8ea5c4c40a17b87ae4a8a59 /arch/arm/boot/dts/bcm2711-rpi-4-b.dts | |
| parent | Linux 5.7-rc1 (diff) | |
| parent | ARM: dts: bcm283x: Use firmware PM driver for V3D (diff) | |
| download | linux-dev-460227c329e5bd39103b9f7ba01cbad69b14c4c4.tar.xz linux-dev-460227c329e5bd39103b9f7ba01cbad69b14c4c4.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/bcm2711-rpi-4-b.dts')
| -rw-r--r-- | arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts index e26ea9006378..c7f1d97e69bb 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/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"; }; |