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

Unverified Commit 509f8342 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2016-11-18' into devicetree/next 



This pull request brings in DT changes for BCM2835: pinctrl setup
cleanups, GPIO line naming, and the node for the new thermal driver.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 1480986d 3a1689ea

Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 


Example:



mailbox: mailbox@7e00b800 {

mailbox: mailbox@7e00b880 {

	compatible = "brcm,bcm2835-mbox";

	reg = <0x7e00b880 0x40>;

	interrupts = <0 1>;

Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Binding for Thermal Sensor driver for BCM2835 SoCs.



Required parameters:

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



compatible: 	should be one of: "brcm,bcm2835-thermal",

		"brcm,bcm2836-thermal" or "brcm,bcm2837-thermal"

reg:		Address range of the thermal registers.

clocks: 	Phandle of the clock used by the thermal sensor.



Example:



thermal: thermal@7e212000 {

	compatible = "brcm,bcm2835-thermal";

	reg = <0x7e212000 0x8>;

	clocks = <&clocks BCM2835_CLOCK_TSENS>;

};

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

+66 −1
Original line number Diff line number Diff line
@@ -22,7 +22,72 @@ 
};



&gpio {

	pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;

	/*

	 * This is based on the unreleased schematic for the Model A+.

	 *

	 * Legend:

	 * "NC" = not connected (no rail from the SoC)

	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */

	gpio-line-names = "SDA0",

			  "SCL0",

			  "SDA1",

			  "SCL1",

			  "GPIO_GCLK",

			  "GPIO5",

			  "GPIO6",

			  "SPI_CE1_N",

			  "SPI_CE0_N",

			  "SPI_MISO",

			  "SPI_MOSI",

			  "SPI_SCLK",

			  "GPIO12",

			  "GPIO13",

			  /* Serial port */

			  "TXD0",

			  "RXD0",

			  "GPIO16",

			  "GPIO17",

			  "GPIO18",

			  "GPIO19",

			  "GPIO20",

			  "GPIO21",

			  "GPIO22",

			  "GPIO23",

			  "GPIO24",

			  "GPIO25",

			  "GPIO26",

			  "GPIO27",

			  "SDA0",

			  "SCL0",

			  "NC", /* GPIO30 */

			  "NC", /* GPIO31 */

			  "CAM_GPIO1", /* GPIO32 */

			  "NC", /* GPIO33 */

			  "NC", /* GPIO34 */

			  "PWR_LOW_N", /* GPIO35 */

			  "NC", /* GPIO36 */

			  "NC", /* GPIO37 */

			  "USB_LIMIT", /* GPIO38 */

			  "NC", /* GPIO39 */

			  "PWM0_OUT", /* GPIO40 */

			  "CAM_GPIO0", /* GPIO41 */

			  "NC", /* GPIO42 */

			  "NC", /* GPIO43 */

			  "NC", /* GPIO44 */

			  "PWM1_OUT", /* GPIO45 */

			  "HDMI_HPD_N",

			  "STATUS_LED",

			  /* Used by SD Card */

			  "SD_CLK_R",

			  "SD_CMD_R",

			  "SD_DATA0_R",

			  "SD_DATA1_R",

			  "SD_DATA2_R",

			  "SD_DATA3_R";



	pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;



	/* I2S interface */

	i2s_alt0: i2s_alt0 {

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

+68 −1
Original line number Diff line number Diff line
@@ -15,7 +15,74 @@ 
};



&gpio {

	pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;

	/*

	 * Taken from Raspberry-Pi-Rev-1.0-Model-AB-Schematics.pdf

	 * RPI00021 sheet 02

	 *

	 * Legend:

	 * "NC" = not connected (no rail from the SoC)

	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */

	gpio-line-names = "SDA0",

			  "SCL0",

			  "SDA1",

			  "SCL1",

			  "GPIO_GCLK",

			  "CAM_GPIO1",

			  "LAN_RUN",

			  "SPI_CE1_N",

			  "SPI_CE0_N",

			  "SPI_MISO",

			  "SPI_MOSI",

			  "SPI_SCLK",

			  "NC", /* GPIO12 */

			  "NC", /* GPIO13 */

			  /* Serial port */

			  "TXD0",

			  "RXD0",

			  "STATUS_LED_N",

			  "GPIO17",

			  "GPIO18",

			  "NC", /* GPIO19 */

			  "NC", /* GPIO20 */

			  "GPIO21",

			  "GPIO22",

			  "GPIO23",

			  "GPIO24",

			  "GPIO25",

			  "NC", /* GPIO26 */

			  "CAM_GPIO0",

			  /* Binary number representing build/revision */

			  "CONFIG0",

			  "CONFIG1",

			  "CONFIG2",

			  "CONFIG3",

			  "NC", /* GPIO32 */

			  "NC", /* GPIO33 */

			  "NC", /* GPIO34 */

			  "NC", /* GPIO35 */

			  "NC", /* GPIO36 */

			  "NC", /* GPIO37 */

			  "NC", /* GPIO38 */

			  "NC", /* GPIO39 */

			  "PWM0_OUT",

			  "NC", /* GPIO41 */

			  "NC", /* GPIO42 */

			  "NC", /* GPIO43 */

			  "NC", /* GPIO44 */

			  "PWM1_OUT",

			  "HDMI_HPD_P",

			  "SD_CARD_DET",

			  /* Used by SD Card */

			  "SD_CLK_R",

			  "SD_CMD_R",

			  "SD_DATA0_R",

			  "SD_DATA1_R",

			  "SD_DATA2_R",

			  "SD_DATA3_R";



	pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;



	/* I2S interface */

	i2s_alt2: i2s_alt2 {

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

+67 −1
Original line number Diff line number Diff line
@@ -23,7 +23,73 @@ 
};



&gpio {

	pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;

	/*

	 * Taken from Raspberry-Pi-B-Plus-V1.2-Schematics.pdf

	 * RPI-BPLUS sheet 1

	 *

	 * Legend:

	 * "NC" = not connected (no rail from the SoC)

	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */

	gpio-line-names = "SDA0",

			  "SCL0",

			  "SDA1",

			  "SCL1",

			  "GPIO_GCLK",

			  "GPIO5",

			  "GPIO6",

			  "SPI_CE1_N",

			  "SPI_CE0_N",

			  "SPI_MISO",

			  "SPI_MOSI",

			  "SPI_SCLK",

			  "GPIO12",

			  "GPIO13",

			  /* Serial port */

			  "TXD0",

			  "RXD0",

			  "GPIO16",

			  "GPIO17",

			  "GPIO18",

			  "GPIO19",

			  "GPIO20",

			  "GPIO21",

			  "GPIO22",

			  "GPIO23",

			  "GPIO24",

			  "GPIO25",

			  "GPIO26",

			  "GPIO27",

			  "SDA0",

			  "SCL0",

			  "NC", /* GPIO30 */

			  "LAN_RUN", /* GPIO31 */

			  "CAM_GPIO1", /* GPIO32 */

			  "NC", /* GPIO33 */

			  "NC", /* GPIO34 */

			  "PWR_LOW_N", /* GPIO35 */

			  "NC", /* GPIO36 */

			  "NC", /* GPIO37 */

			  "USB_LIMIT", /* GPIO38 */

			  "NC", /* GPIO39 */

			  "PWM0_OUT", /* GPIO40 */

			  "CAM_GPIO0", /* GPIO41 */

			  "NC", /* GPIO42 */

			  "NC", /* GPIO43 */

			  "ETHCLK", /* GPIO44 */

			  "PWM1_OUT", /* GPIO45 */

			  "HDMI_HPD_N",

			  "STATUS_LED",

			  /* Used by SD Card */

			  "SD_CLK_R",

			  "SD_CMD_R",

			  "SD_DATA0_R",

			  "SD_DATA1_R",

			  "SD_DATA2_R",

			  "SD_DATA3_R";



	pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;



	/* I2S interface */

	i2s_alt0: i2s_alt0 {