Unverified Commit f1bace1e authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'tags/bcm2835-dt-next-2019-08-15' into devicetree/next 



This pull request prepares the BCM2835 DTS files for the introduction
of the new SoC BCM2711.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 5f9e832c 60c833d5

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

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

	compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";

	model = "Raspberry Pi Model A+";

	model = "Raspberry Pi Model A+";





	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

	leds {

		act {

		act {

			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;

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




&hdmi {

&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};

};





&pwm {

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

	status = "okay";

};

};





&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	pinctrl-0 = <&uart0_gpio14>;

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

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

	compatible = "raspberrypi,model-a", "brcm,bcm2835";

	model = "Raspberry Pi Model A";

	model = "Raspberry Pi Model A";





	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

	leds {

		act {

		act {

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

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




&hdmi {

&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};

};





&pwm {

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

	status = "okay";

};

};





&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	pinctrl-0 = <&uart0_gpio14>;

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

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

	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";

	model = "Raspberry Pi Model B+";

	model = "Raspberry Pi Model B+";





	memory@0 {

		device_type = "memory";

		reg = <0 0x20000000>;

	};



	leds {

	leds {

		act {

		act {

			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;

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




&hdmi {

&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};

};





&pwm {

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

	status = "okay";

};

};





&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	pinctrl-0 = <&uart0_gpio14>;

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

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

	compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";

	model = "Raspberry Pi Model B rev2";

	model = "Raspberry Pi Model B rev2";





	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

	leds {

		act {

		act {

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

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




&hdmi {

&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};

};





&pwm {

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

	status = "okay";

};

};





&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	pinctrl-0 = <&uart0_gpio14>;

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

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

	compatible = "raspberrypi,model-b", "brcm,bcm2835";

	model = "Raspberry Pi Model B";

	model = "Raspberry Pi Model B";





	memory@0 {

		device_type = "memory";

		reg = <0 0x10000000>;

	};



	leds {

	leds {

		act {

		act {

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

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




&hdmi {

&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};

};





&pwm {

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

	status = "okay";

};

};





&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	status = "okay";

};



&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	pinctrl-0 = <&uart0_gpio14>;