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

Merge tag 'arm-soc/for-5.8/devicetree' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM-based SoCs Device Tree changes
for v5.8, please pull the following:

- Nicolas updates the Raspberry Pi 4 board DTS to include the GPIO
  controlling power to the SD card, adds support for the vmmc regulator
  for the emmc2 controller and finally updates the power management
  provider for V3D to use the firmware to solve instabilities.

* tag 'arm-soc/for-5.8/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm283x: Use firmware PM driver for V3D
  ARM: dts: bcm2711: Add vmmc regulator in emmc2
  ARM: dts: bcm2711: Update expgpio's GPIO labels

Link: https://lore.kernel.org/r/20200511210522.28243-2-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9c7ae8ed 460227c3

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

+12 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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 → 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";

CRA Git | Maintained and supported by SUSTech CRA and CCSE