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

Commit ac07c41c authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2016-02-17' into devicetree/next 



This pull request covers mostly DT changes that didn't make it into
4.5 because required header files went through other trees, plus the
AUX uart support this time around.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 7c3fe8a1 1305141d

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ dtb-$(CONFIG_ARCH_AXXIA) += \ 
	axm5516-amarillo.dtb

dtb-$(CONFIG_ARCH_BCM2835) += \

	bcm2835-rpi-b.dtb \

	bcm2835-rpi-a.dtb \

	bcm2835-rpi-b-rev2.dtb \

	bcm2835-rpi-b-plus.dtb \

	bcm2835-rpi-a-plus.dtb \

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

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"



/ {

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

	model = "Raspberry Pi Model A";



	leds {

		act {

			gpios = <&gpio 16 1>;

		};

	};

};



&gpio {

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



	/* I2S interface */

	i2s_alt2: i2s_alt2 {

		brcm,pins = <28 29 30 31>;

		brcm,function = <BCM2835_FSEL_ALT2>;

	};

};

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

+16 −0
Original line number Diff line number Diff line 
#include <dt-bindings/power/raspberrypi-power.h>



/ {

	memory {

		reg = <0 0x10000000>;
@@ -18,6 +20,12 @@ 
			compatible = "raspberrypi,bcm2835-firmware";

			mboxes = <&mailbox>;

		};



		power: power {

			compatible = "raspberrypi,bcm2835-power";

			firmware = <&firmware>;

			#power-domain-cells = <1>;

		};

	};

};
@@ -58,3 +66,11 @@ 
	status = "okay";

	bus-width = <4>;

};



&pwm {

	status = "okay";

};



&usb {

	power-domains = <&power RPI_POWER_DOMAIN_USB>;

};

arch/arm/boot/dts/bcm283x.dtsi

+41 −2
Original line number Diff line number Diff line 
#include <dt-bindings/pinctrl/bcm2835.h>

#include <dt-bindings/clock/bcm2835.h>

#include <dt-bindings/clock/bcm2835-aux.h>

#include "skeleton.dtsi"



/* This include file covers the common peripherals and configuration between
@@ -111,7 +112,7 @@ 
			#interrupt-cells = <2>;

		};



		uart0: uart@7e201000 {

		uart0: serial@7e201000 {

			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";

			reg = <0x7e201000 0x1000>;

			interrupts = <2 25>;
@@ -159,6 +160,44 @@ 
			clocks = <&clocks BCM2835_CLOCK_VPU>;

		};



		uart1: serial@7e215040 {

			compatible = "brcm,bcm2835-aux-uart";

			reg = <0x7e215040 0x40>;

			interrupts = <1 29>;

			clocks = <&aux BCM2835_AUX_CLOCK_UART>;

			status = "disabled";

		};



		spi1: spi@7e215080 {

			compatible = "brcm,bcm2835-aux-spi";

			reg = <0x7e215080 0x40>;

			interrupts = <1 29>;

			clocks = <&aux BCM2835_AUX_CLOCK_SPI1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		spi2: spi@7e2150c0 {

			compatible = "brcm,bcm2835-aux-spi";

			reg = <0x7e2150c0 0x40>;

			interrupts = <1 29>;

			clocks = <&aux BCM2835_AUX_CLOCK_SPI2>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		pwm: pwm@7e20c000 {

			compatible = "brcm,bcm2835-pwm";

			reg = <0x7e20c000 0x28>;

			clocks = <&clocks BCM2835_CLOCK_PWM>;

			assigned-clocks = <&clocks BCM2835_CLOCK_PWM>;

			assigned-clock-rates = <10000000>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		sdhci: sdhci@7e300000 {

			compatible = "brcm,bcm2835-sdhci";

			reg = <0x7e300000 0x100>;
@@ -187,7 +226,7 @@ 
			status = "disabled";

		};



		usb@7e980000 {

		usb: usb@7e980000 {

			compatible = "brcm,bcm2835-usb";

			reg = <0x7e980000 0x10000>;

			interrupts = <1 9>;