renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-23 22:25:40 +08:00
Code

This pull request brings in Raspberry Pi 3 B+ support and connects

Browse Source 
HDMI hotplug, LEDs, and wifi/bluetooth on the Raspberry Pi 3.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAlrniUwACgkQtdYpNtH8
 nuiUFQ//aReHsqRDyBT+l+yt3pFw1OQx57jm3kob5+iZ9Uu7NkCqOgJy7WrFjFe5
 Sia/LbBVvhQPZpl64ATM14AII/3EOBx9HswW8OPuPveRjB/AyQTUaYVR7kg3TN0L
 GvUukj0GeGl24TXWSBvzKaLmgf/B6Ka+xRqLl1S9rhsnZ7Eqh95Qv2j3JXtfXASs
 y00823QHTexk2lPmDZ8Ifo/iRfv0lKYQNh1WFqG2WAVYn+z4xdQWIg4cvR+pwiQR
 TImkfhFHZUTtAnQjwY9K+cCZAke0nppe56iato29k0Vx4eUzzFzMST09kUnWjvZN
 XskLREq6BiHOFRYc7DOVX74Cq9QtbnxceSxe5ULIQ6K9Z0fBpNtPFktL8WHSQg0z
 L+UG3dOiNsS8y8HAGQGBacLbx9YsA0f3r7I7Y/JdRdm2Z+4bOhZl0SuZmcygmRVT
 VO03ZRyiyPInutSRo0iFCr2kqTVXbPGsH/7nidUXxuV9LQ0KnQ5LbAkRL1rZQYg/
 cOMv374B1Dm4w8ALNVdmCJTh8CIjrbJFkg1lVhglt+MVzxkV8d0vk2BPfOVUlW0j
 aPRhGdSZpfoI+NVZdlJUy/d20xOdcrA1LJ79YnW9PaIrKi38PbHbvFLZxxoOhvLw
 oNDMB+SHpSouuXEHPRWA/pdN2HMbryhF89VArwxkxftqRZqY26A=
 =EMX9
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJa6LdwAAoJEIfQlpxEBwcEsG0P/Ai3CtXPVClbP6XBdL2FODaz
 6b7TzdMTbYlc6MHyNEts6pTDVCbt1BEBUCbGbIcY736ZZ9mGQf+58twJQ1+Lv/n1
 ltGMGvALIiZ9cGSdLcFBpzX8QZ4HEeMTAdFFdSIyI5mqroUQgYmMHlm43fIvBUAc
 OrcTPMLraOUf6C0kok9K8gBXEFLHaBwra4FgEsMaS2PvQxLXOuNT94vAUHkChu5n
 YVk/TsPdrsDNt9OM1SY2Yf69+qSz/jFjUr8qGSjt5WOWDVfKCtE1f4F+IEucmKyP
 8Z4m4kORQCfECH9UDY41VKOE3bXBpNfV8OMwhhQORQc4VtgolTXun6gwO70upU2/
 SEsGDIT3CSAHJtlbv5GL8A+3+uZ84jXQhO8K9Z+1Vn5YbAAPhGeSD4E8afQnW7Hr
 H2qKjuWNZ2FEqFUiqUi52XBC6aZ/CGXpYoGk0dafRRbcU4LaDkzdkVqpMwtLLMxz
 0rdaMFNiK7re946HNFPAoqW9UV+8NSqdv+4QZXIVxgRxVqzHNajArSfwGLrFuSYR
 2T3GjAgEGm/aUFnDvFBV5QfqFWT1RNGKoW3+0O/CLLbqT9q+bos5Qav/mOCRK11C
 cxLEsGyqzWJBeHR9/QlTX+8W9CCib7/lmD3X/eeJueCzoJVuXy2v9MLytwtzcQm1
 JMNUDhNvxcPHLs2DVKgk
 =LwM8
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-dt-next-2018-04-30' into devicetree/next

This pull request brings in Raspberry Pi 3 B+ support and connects
HDMI hotplug, LEDs, and wifi/bluetooth on the Raspberry Pi 3.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2018-05-01 11:52:23 -07:00
commit 98dcd5d4f2
14 changed files with 205 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
View File

@ -34,6 +34,10 @@ Raspberry Pi 3 Model B
Required root node properties:
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
Raspberry Pi 3 Model B+
Required root node properties:
compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
Raspberry Pi Compute Module
Required root node properties:
compatible = "raspberrypi,compute-module", "brcm,bcm2835";

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

@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
bcm2835-rpi-a-plus.dtb \
bcm2836-rpi-2-b.dtb \
bcm2837-rpi-3-b.dtb \
bcm2837-rpi-3-b-plus.dtb \
bcm2835-rpi-zero.dtb \
bcm2835-rpi-zero-w.dtb
dtb-$(CONFIG_ARCH_BCM_5301X) += \

6
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
View File

@ -101,6 +101,12 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

6
arch/arm/boot/dts/bcm2835-rpi-a.dts
View File

@ -96,6 +96,12 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

6
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View File

@ -103,6 +103,12 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

6
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
View File

@ -96,6 +96,12 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

6
arch/arm/boot/dts/bcm2835-rpi-b.dts
View File

@ -91,6 +91,12 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

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

@ -83,12 +83,6 @@
bus-width = <4>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
&usb {
power-domains = <&power RPI_POWER_DOMAIN_USB>;
};

6
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
View File

@ -41,6 +41,12 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

108
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts Normal file
View File

@ -0,0 +1,108 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm283x-rpi-lan7515.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
/ {
compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
model = "Raspberry Pi 3 Model B+";
chosen {
/* 8250 auxiliary UART instead of pl011 */
stdout-path = "serial1:115200n8";
};
memory {
reg = <0 0x40000000>;
};
leds {
act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
};
pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
};
};
wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
};
};
&firmware {
expgpio: gpio {
compatible = "raspberrypi,firmware-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio-line-names = "BT_ON",
"WL_ON",
"STATUS_LED",
"LAN_RUN",
"",
"CAM_GPIO0",
"CAM_GPIO1",
"";
status = "okay";
};
};
&hdmi {
hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
status = "okay";
};
/* SDHCI is used to control the SDIO for wireless */
&sdhci {
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio34>;
status = "okay";
bus-width = <4>;
non-removable;
mmc-pwrseq = <&wifi_pwrseq>;
brcmf: wifi@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
};
};
/* SDHOST is used to drive the SD card */
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
status = "okay";
bus-width = <4>;
};
/* uart0 communicates with the BT module */
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32 &gpclk2_gpio43>;
status = "okay";
bluetooth {
compatible = "brcm,bcm43438-bt";
max-speed = <2000000>;
shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
};
};
/* uart1 is mapped to the pin header */
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_gpio14>;
status = "okay";
};

26
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
View File

@ -20,9 +20,14 @@
leds {
act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
};
};
wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
};
};
&firmware {
@ -42,6 +47,16 @@
};
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
status = "okay";
};
&hdmi {
hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>;
};
/* uart0 communicates with the BT module */
&uart0 {
pinctrl-names = "default";
@ -51,6 +66,7 @@
bluetooth {
compatible = "brcm,bcm43438-bt";
max-speed = <2000000>;
shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
};
};
@ -63,11 +79,19 @@
/* SDHCI is used to control the SDIO for wireless */
&sdhci {
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio34>;
status = "okay";
bus-width = <4>;
non-removable;
mmc-pwrseq = <&wifi_pwrseq>;
brcmf: wifi@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
};
};
/* SDHOST is used to drive the SD card */

27
arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi Normal file
View File

@ -0,0 +1,27 @@
// SPDX-License-Identifier: GPL-2.0
/ {
aliases {
ethernet0 = &ethernet;
};
};
&usb {
usb-port@1 {
compatible = "usb424,2514";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
usb-port@1 {
compatible = "usb424,2514";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
ethernet: ethernet@1 {
compatible = "usb424,7800";
reg = <1>;
};
};
};
};

3
arch/arm64/boot/dts/broadcom/Makefile
View File

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \
bcm2837-rpi-3-b-plus.dtb
subdir-y += northstar2
subdir-y += stingray

2
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts Normal file
View File

@ -0,0 +1,2 @@
// SPDX-License-Identifier: GPL-2.0
#include "arm/bcm2837-rpi-3-b-plus.dts"