Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20dcfe69 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

This pull request contains Broadcom ARM-based SoCs Device Tree updates
for 5.4, please pull the following:

- Stefan does a bunch of preparatory work for supporting the Raspberry
  Pi 4in the next merge window correct register ranges (SPI, I2C,
  UART), define memory, HDMI and MMC properties at the board level

* tag 'arm-soc/for-5.4/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm283x: Enable HDMI at board level
  ARM: dts: bcm283x: Define memory at board level
  ARM: dts: bcm283x: Define MMC interfaces at board level
  ARM: bcm283x: Reduce register ranges for UART, SPI and I2C
parents 3563b783 f1bace1e

arch/arm/boot/dts/bcm2835-rpi-a-plus.dts

+14 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 
	compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";

	model = "Raspberry Pi Model A+";



	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

		act {

			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
@@ -99,6 +104,8 @@ 


&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};



&pwm {
@@ -107,6 +114,13 @@ 
	status = "okay";

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

arch/arm/boot/dts/bcm2835-rpi-a.dts

+14 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 
	compatible = "raspberrypi,model-a", "brcm,bcm2835";

	model = "Raspberry Pi Model A";



	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

		act {

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@@ -94,6 +99,8 @@ 


&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};



&pwm {
@@ -102,6 +109,13 @@ 
	status = "okay";

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

arch/arm/boot/dts/bcm2835-rpi-b-plus.dts

+14 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ 
	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";

	model = "Raspberry Pi Model B+";



	memory@0 {

		device_type = "memory";

		reg = <0 0x20000000>;

	};



	leds {

		act {

			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
@@ -101,6 +106,8 @@ 


&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};



&pwm {
@@ -109,6 +116,13 @@ 
	status = "okay";

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

+14 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ 
	compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";

	model = "Raspberry Pi Model B rev2";



	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

		act {

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@@ -94,6 +99,8 @@ 


&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};



&pwm {
@@ -102,6 +109,13 @@ 
	status = "okay";

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

arch/arm/boot/dts/bcm2835-rpi-b.dts

+14 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ 
	compatible = "raspberrypi,model-b", "brcm,bcm2835";

	model = "Raspberry Pi Model B";



	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

		act {

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@@ -89,6 +94,8 @@ 


&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};



&pwm {
@@ -97,6 +104,13 @@ 
	status = "okay";

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;