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

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

Merge tag 'rpi-dt-for-armsoc-v4.2' of... 

Merge tag 'rpi-dt-for-armsoc-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi into next/dt

Merge "RaspberryPi Device Tree changes due for v4.2" from Lee Jones:

* tag 'rpi-dt-for-armsoc-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi:
  ARM: bcm2835: dt: Use 0x4 prefix for DMA bus addresses to SDRAM.
  ARM: bcm2835: dt: Add the mailbox to the device tree
  ARM: bcm2835: dt: Fix i2c0 node name
  ARM: bcm2835: dt: Use pinctrl header
  ARM: bcm2835: dt: Add header file for pinctrl constants
  ARM: bcm2835: dt: Add root properties for Raspberry Pi
  ARM: bcm2835: dt: Add vendor prefix for Raspberry Pi
parents 48793410 1215baa7

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

+29 −2
Original line number Original line Diff line number Diff line 
Broadcom BCM2835 device tree bindings

Broadcom BCM2835 device tree bindings

-------------------------------------------

-------------------------------------------





Boards with the BCM2835 SoC shall have the following properties:

Raspberry Pi Model A

Required root node properties:

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





Required root node property:

Raspberry Pi Model A+

Required root node properties:

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





Raspberry Pi Model B

Required root node properties:

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



Raspberry Pi Model B (no P5)

early model B with I2C0 rather than I2C1 routed to the expansion header

Required root node properties:

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



Raspberry Pi Model B rev2

Required root node properties:

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



Raspberry Pi Model B+

Required root node properties:

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



Raspberry Pi Compute Module

Required root node properties:

compatible = "raspberrypi,compute-module", "brcm,bcm2835";



Generic BCM2835 board

Required root node properties:

compatible = "brcm,bcm2835";
 
compatible = "brcm,bcm2835";

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -160,6 +160,7 @@ radxa Radxa 
raidsonic	RaidSonic Technology GmbH

raidsonic	RaidSonic Technology GmbH

ralink	Mediatek/Ralink Technology Corp.

ralink	Mediatek/Ralink Technology Corp.

ramtron	Ramtron International

ramtron	Ramtron International

raspberrypi	Raspberry Pi Foundation

realtek Realtek Semiconductor Corp.

realtek Realtek Semiconductor Corp.

renesas	Renesas Electronics Corporation

renesas	Renesas Electronics Corporation

ricoh	Ricoh Co. Ltd.

ricoh	Ricoh Co. Ltd.

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

+2 −2
Original line number Original line Diff line number Diff line 
/dts-v1/;

/dts-v1/;

/include/ "bcm2835-rpi.dtsi"

#include "bcm2835-rpi.dtsi"





/ {

/ {

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

	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
@@ -25,6 +25,6 @@ 
	/* I2S interface */

	/* I2S interface */

	i2s_alt0: i2s_alt0 {

	i2s_alt0: i2s_alt0 {

		brcm,pins = <18 19 20 21>;

		brcm,pins = <18 19 20 21>;

		brcm,function = <4>; /* alt0 */

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

	};

};
 
};

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

+2 −2
Original line number Original line Diff line number Diff line 
/dts-v1/;

/dts-v1/;

/include/ "bcm2835-rpi.dtsi"

#include "bcm2835-rpi.dtsi"





/ {

/ {

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

	compatible = "raspberrypi,model-b", "brcm,bcm2835";
@@ -18,6 +18,6 @@ 
	/* I2S interface */

	/* I2S interface */

	i2s_alt2: i2s_alt2 {

	i2s_alt2: i2s_alt2 {

		brcm,pins = <28 29 30 31>;

		brcm,pins = <28 29 30 31>;

		brcm,function = <6>; /* alt2 */

		brcm,function = <BCM2835_FSEL_ALT2>;

	};

	};

};
 
};

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

+4 −4
Original line number Original line Diff line number Diff line 
/include/ "bcm2835.dtsi"

#include "bcm2835.dtsi"





/ {

/ {

	memory {

	memory {
@@ -21,17 +21,17 @@ 




	gpioout: gpioout {

	gpioout: gpioout {

		brcm,pins = <6>;

		brcm,pins = <6>;

		brcm,function = <1>; /* GPIO out */

		brcm,function = <BCM2835_FSEL_GPIO_OUT>;

	};

	};





	alt0: alt0 {

	alt0: alt0 {

		brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>;

		brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>;

		brcm,function = <4>; /* alt0 */

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

	};





	alt3: alt3 {

	alt3: alt3 {

		brcm,pins = <48 49 50 51 52 53>;

		brcm,pins = <48 49 50 51 52 53>;

		brcm,function = <7>; /* alt3 */

		brcm,function = <BCM2835_FSEL_ALT3>;

	};

	};

};

};