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

Unverified Commit 4a78f71c authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2018-02-28' into devicetree/next 



This pull request adds automatic BT probing to the Pi Zero W, OTG mode
for the Zero W, the GPIO expander on the Pi3, and fixes I2S probe
(which is disabled by default, but often used downstream)

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 7928b2cb bcc76c40

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

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ Example: 


bcm2835_i2s: i2s@7e203000 {

	compatible = "brcm,bcm2835-i2s";

	reg = <	0x7e203000 0x20>,

	      < 0x7e101098 0x02>;

	reg = <	0x7e203000 0x24>;

	clocks = <&clocks BCM2835_CLOCK_PCM>;



	dmas = <&dma 2>,

	       <&dma 3>;

Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt

+4 −5
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 


Required properties:

- compatible: "brcm,bcm2835-i2s"

- reg: A list of base address and size entries:

	* The first entry should cover the PCM registers

	* The second entry should cover the PCM clock registers

- reg: Should contain PCM registers location and length.

- clocks: the (PCM) clock to use

- dmas: List of DMA controller phandle and DMA request line ordered pairs.

- dma-names: Identifier string for each DMA request line in the dmas property.

  These strings correspond 1:1 with the ordered pairs in dmas.
@@ -16,8 +15,8 @@ Example: 


bcm2835_i2s: i2s@7e203000 {

	compatible = "brcm,bcm2835-i2s";

	reg = <0x7e203000 0x20>,

	      <0x7e101098 0x02>;

	reg = <0x7e203000 0x24>;

	clocks = <&clocks BCM2835_CLOCK_PCM>;



	dmas = <&dma 2>,

	       <&dma 3>;

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

+14 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-usb-host.dtsi"

#include "bcm283x-rpi-usb-otg.dtsi"



/ {

	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
@@ -131,6 +131,18 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	pinctrl-0 = <&uart0_gpio32 &uart0_ctsrts_gpio30>;

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		max-speed = <2000000>;

		shutdown-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;

	};

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_gpio14>;

	status = "okay";

};

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

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 


	soc {

		firmware: firmware {

			compatible = "raspberrypi,bcm2835-firmware";

			compatible = "raspberrypi,bcm2835-firmware", "simple-bus";

			#address-cells = <0>;

			#size-cells = <0>;

			mboxes = <&mailbox>;

		};

arch/arm/boot/dts/bcm2837-rpi-3-b.dts

+17 −0
Original line number Diff line number Diff line
@@ -25,6 +25,23 @@ 
	};

};



&firmware {

	expgpio: gpio {

		compatible = "raspberrypi,firmware-gpio";

		gpio-controller;

		#gpio-cells = <2>;

		gpio-line-names = "BT_ON",

				  "WL_ON",

				  "STATUS_LED",

				  "LAN_RUN",

				  "HPD_N",

				  "CAM_GPIO0",

				  "CAM_GPIO1",

				  "PWR_LOW_N";

		status = "okay";

	};

};



/* uart0 communicates with the BT module */

&uart0 {

	pinctrl-names = "default";