openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJWxNEzAAoJELXWKTbR/J7oNq0P/jE23t6R9eEZFcTCyhgLqgtA
 X5/fVBMlCB4s6njH/Uja747+2DTA8003W+6AonJ3a5N/Bko7FV67IYPN18yXmGto
 FU0a/zFBT+7ls+06xz4kdzJa0RNWDd2D0YGM9ayBmifOidcuSOzN52aFcLZsRXSm
 JeBAAGpjiCcL9gcOAXC/ZBp9gYNztLD6r8eruYIisR1No7qwZCXAfwyqIgwoiDzh
 VNjWuM+p3YoJQu8MG+cnpJTGD47KnbGArncJuvnFgYvUwIzu4JUsW8ua7N1rGmOf
 UO6sIMrdfBJaKk8rk4/P1OvzF3Tf02iBe09X4f6mQXkLrDWUN2qBUyiugwWG91y5
 7sQfJx/YxySJMf7RAVTRa9lBtSbqOqvuxrGhPGSXEx70X2itbYGjgWgKhg+T8D15
 v7SxPa8V9o600IJ5PTkRUVaipCgwLztAAZjfdP6b39sJNqKt72jaA2K8BW5cAyNz
 fo8bPkLH36Va9sbV4ei/YSoJqmHGut8nutszF9KVSQmWwA49B6uWqaAFa9BjJJev
 HOlcokwQDK9xRvcrO0qsLmnLFO8FPkSKCWb36OmJmpFoYLKBri6GDhw4s6063DAv
 djy1MegvFA2YoeshyH88HnOGn/wv5wbS9v0pNhzLhzV79yHFacLLEdhI0iAApIzc
 5v/56QQiivu6acF05Wr8
 =MTTP
 -----END PGP SIGNATURE-----

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: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2016-02-20 11:05:55 -08:00
parent 7c3fe8a1f6 1305141d1a
commit ac07c41c9a
4 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/Makefile
View File

@ -60,6 +60,7 @@ dtb-$(CONFIG_ARCH_AXXIA) += \
axm5516-amarillo.dtb axm5516-amarillo.dtb
dtb-$(CONFIG_ARCH_BCM2835) += \ dtb-$(CONFIG_ARCH_BCM2835) += \
bcm2835-rpi-b.dtb \ bcm2835-rpi-b.dtb \
bcm2835-rpi-a.dtb \
bcm2835-rpi-b-rev2.dtb \ bcm2835-rpi-b-rev2.dtb \
bcm2835-rpi-b-plus.dtb \ bcm2835-rpi-b-plus.dtb \
bcm2835-rpi-a-plus.dtb \ bcm2835-rpi-a-plus.dtb \

24
arch/arm/boot/dts/bcm2835-rpi-a.dts Normal file
View File

@ -0,0 +1,24 @@
/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>;
};
};

16
arch/arm/boot/dts/bcm2835-rpi.dtsi
View File

@ -1,3 +1,5 @@
#include <dt-bindings/power/raspberrypi-power.h>
/ { / {
memory { memory {
reg = <0 0x10000000>; reg = <0 0x10000000>;
@ -18,6 +20,12 @@ firmware: firmware {
compatible = "raspberrypi,bcm2835-firmware"; compatible = "raspberrypi,bcm2835-firmware";
mboxes = <&mailbox>; mboxes = <&mailbox>;
}; };
power: power {
compatible = "raspberrypi,bcm2835-power";
firmware = <&firmware>;
#power-domain-cells = <1>;
};
}; };
}; };
@ -58,3 +66,11 @@ &sdhci {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
}; };
&pwm {
status = "okay";
};
&usb {
power-domains = <&power RPI_POWER_DOMAIN_USB>;
};

43
arch/arm/boot/dts/bcm283x.dtsi
View File

@ -1,5 +1,6 @@
#include <dt-bindings/pinctrl/bcm2835.h> #include <dt-bindings/pinctrl/bcm2835.h>
#include <dt-bindings/clock/bcm2835.h> #include <dt-bindings/clock/bcm2835.h>
#include <dt-bindings/clock/bcm2835-aux.h>
#include "skeleton.dtsi" #include "skeleton.dtsi"
/* This include file covers the common peripherals and configuration between /* This include file covers the common peripherals and configuration between
@ -111,7 +112,7 @@ gpio: gpio@7e200000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
uart0: uart@7e201000 { uart0: serial@7e201000 {
compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
reg = <0x7e201000 0x1000>; reg = <0x7e201000 0x1000>;
interrupts = <2 25>; interrupts = <2 25>;
@ -159,6 +160,44 @@ aux: aux@0x7e215000 {
clocks = <&clocks BCM2835_CLOCK_VPU>; 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 { sdhci: sdhci@7e300000 {
compatible = "brcm,bcm2835-sdhci"; compatible = "brcm,bcm2835-sdhci";
reg = <0x7e300000 0x100>; reg = <0x7e300000 0x100>;
@ -187,7 +226,7 @@ i2c2: i2c@7e805000 {
status = "disabled"; status = "disabled";
}; };
usb@7e980000 { usb: usb@7e980000 {
compatible = "brcm,bcm2835-usb"; compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>; reg = <0x7e980000 0x10000>;
interrupts = <1 9>; interrupts = <1 9>;