mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

This pull request contains Broadcom ARM-based SoCs Device Tree changes

Browse source 
for 4.20, please pull the following:
 
 - Rafal updates the Broadcom BCM5301x (Northstar) DTS files to use the
   new style partition parser and removes the unsupported/undocumented
   linux,part-probe properties that were previously introduced
 
 - Stefan adds supports for the Raspberry Pi Compute Module 3/3Lite, he
   also updates the Raspberry Pi 3B+ USB Ethernet adapter to have proper
   LED configuration
 
 - Rob fixes a bunch of SPI bus warnings in the Northstar Plus and
   Hurricane 2 DTS files
 
 - Florian documents the Broadcom roboswitch Switch Register Access Block
   (SRAB) interrupts, adds the switch interrupts to the Northstar Plus
   DTS include file and finally updates the BCM958625HR reference board to
   have the proper SFP module definition
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAlucSx0ACgkQh9CWnEQH
 BwSd4hAA0Gyrmn7RyiBh3pDplLtmTvUhdpA3cfr0u0mO1CT3MuM55etbMUfWi9f1
 rHIljyvJVESqwGLPcNXRGh1Yn03uZjEjjKAkUNkcQTapH99I7JRkfAThh/m6QdAu
 wpRCVNdKY36CLTpoeH1DX0X5U4sty4wZzhfRY/zjcl9jIk5jYeXqJ31uaFiMvMWX
 EBuigbyVjKb36cJgNT6eNuS88Hw8pqYP1DAxR0GR4kVxedFm8DE0kAqAmNOfXjsV
 zgUEaXawU7qXHQrlucxS41xHtpSvRD+Gki1vQAKiY9jMNYfPO9J2lcc7DMD8Ljtu
 cQ3zeC/9zYssJSJQbWoqtc7mIeEtsyyyFdhwyO9JfJREeLHgfT52gdbAt6TGo6N8
 6ovK1vn0Ng4GqCIFtiXoJgZN19E9Qk7r89HefMZB/nRUluyUVNAeuV2XaKas7Y++
 XmSMfQ1eNtkHGmKnsSabYHUpVESO/N0aUJomM2hln1pK9+KmW0D0SB2AWhi2BuXF
 11n4UHcMLU5gCQ7KFEWr4CDhHKQLNJoEaAT/k3cNQ7qzpisupyLngpQrQYGb/Yfv
 59nafPEMutzRovyGNPUxQVeOliPQ+ROT05ScXFDeKZS/pxunL/Tdh6aazRP9vYIK
 GJv5q+lDQA0rqKul9saS1gh5HwM8ja7xZZXwciStSmIibCfKAeQ=
 =OpXM
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.20/devicetree' of https://github.com/Broadcom/stblinux into next/dt

This pull request contains Broadcom ARM-based SoCs Device Tree changes
for 4.20, please pull the following:

- Rafal updates the Broadcom BCM5301x (Northstar) DTS files to use the
  new style partition parser and removes the unsupported/undocumented
  linux,part-probe properties that were previously introduced

- Stefan adds supports for the Raspberry Pi Compute Module 3/3Lite, he
  also updates the Raspberry Pi 3B+ USB Ethernet adapter to have proper
  LED configuration

- Rob fixes a bunch of SPI bus warnings in the Northstar Plus and
  Hurricane 2 DTS files

- Florian documents the Broadcom roboswitch Switch Register Access Block
  (SRAB) interrupts, adds the switch interrupts to the Northstar Plus
  DTS include file and finally updates the BCM958625HR reference board to
  have the proper SFP module definition

* tag 'arm-soc/for-4.20/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm: Fix SPI bus warnings
  ARM: dts: NSP: Wire up switch interrupts
  dt-bindings: net: dsa: Document B53 SRAB interrupts and registers
  ARM: dts: NSP: Enable SFP on bcm958625hr
  ARM: dts: bcm283x-rpi-lan7515: Enable Ethernet LEDs
  ARM: dts: BCM5301X: Specify flash partitions
  ARM: dts: add Raspberry Pi Compute Module 3 and IO board
  dt-bindings: bcm: Add Raspberry Pi CM3 and CM3L

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-09-23 06:24:28 -07:00
commit 6125a690fa
14 changed files with 351 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
View file

@ -42,6 +42,14 @@ Raspberry Pi Compute Module
Required root node properties:
compatible = "raspberrypi,compute-module", "brcm,bcm2835";
Raspberry Pi Compute Module 3
Required root node properties:
compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";
Raspberry Pi Compute Module 3 Lite
Required root node properties:
compatible = "raspberrypi,3-compute-module-lite", "brcm,bcm2837";
Raspberry Pi Zero
Required root node properties:
compatible = "raspberrypi,model-zero", "brcm,bcm2835";

36
Documentation/devicetree/bindings/net/dsa/b53.txt
View file

@ -46,6 +46,42 @@ Required properties:
"brcm,bcm6328-switch"
"brcm,bcm6368-switch" and the mandatory "brcm,bcm63xx-switch"
Required properties for BCM585xx/586xx/88312 SoCs:
- reg: a total of 3 register base addresses, the first one must be the
Switch Register Access block base, the second is the port 5/4 mux
configuration register and the third one is the SGMII configuration
and status register base address.
- interrupts: a total of 13 interrupts must be specified, in the following
order: port 0-5, 7-8 link status change, then the integrated PHY interrupt,
then the timestamping interrupt and the sleep timer interrupts for ports
5,7,8.
Optional properties for BCM585xx/586xx/88312 SoCs:
- reg-names: a total of 3 names matching the 3 base register address, must
be in the following order:
"srab"
"mux_config"
"sgmii_config"
- interrupt-names: a total of 13 names matching the 13 interrupts specified
must be in the following order:
"link_state_p0"
"link_state_p1"
"link_state_p2"
"link_state_p3"
"link_state_p4"
"link_state_p5"
"link_state_p7"
"link_state_p8"
"phy"
"ts"
"imp_sleep_timer_p5"
"imp_sleep_timer_p7"
"imp_sleep_timer_p8"
See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional
required and optional properties.

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

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

2
arch/arm/boot/dts/bcm-hr2.dtsi
View file

@ -216,7 +216,7 @@ rng: rng@33000 {
reg = <0x33000 0x14>;
};
qspi: qspi@27200 {
qspi: spi@27200 {
compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
reg = <0x027200 0x184>,
<0x027000 0x124>,

33
arch/arm/boot/dts/bcm-nsp.dtsi
View file

@ -273,7 +273,7 @@ nand: nand@26000 {
brcm,nand-has-wp;
};
qspi: qspi@27200 {
qspi: spi@27200 {
compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
reg = <0x027200 0x184>,
<0x027000 0x124>,
@ -377,7 +377,36 @@ ccbtimer1: timer@35000 {
srab: srab@36000 {
compatible = "brcm,nsp-srab";
reg = <0x36000 0x1000>;
reg = <0x36000 0x1000>,
<0x3f308 0x8>,
<0x3f410 0xc>;
reg-names = "srab", "mux_config", "sgmii";
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "link_state_p0",
"link_state_p1",
"link_state_p2",
"link_state_p3",
"link_state_p4",
"link_state_p5",
"link_state_p7",
"link_state_p8",
"phy",
"ts",
"imp_sleep_timer_p5",
"imp_sleep_timer_p7",
"imp_sleep_timer_p8";
#address-cells = <1>;
#size-cells = <0>;

87
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts Normal file
View file

@ -0,0 +1,87 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2837-rpi-cm3.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"
/ {
compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";
model = "Raspberry Pi Compute Module 3 IO board V3.0";
};
&gpio {
/*
* This is based on the official GPU firmware DT blob.
*
* 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 = "GPIO0",
"GPIO1",
"GPIO2",
"GPIO3",
"GPIO4",
"GPIO5",
"GPIO6",
"GPIO7",
"GPIO8",
"GPIO9",
"GPIO10",
"GPIO11",
"GPIO12",
"GPIO13",
"GPIO14",
"GPIO15",
"GPIO16",
"GPIO17",
"GPIO18",
"GPIO19",
"GPIO20",
"GPIO21",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
"GPIO26",
"GPIO27",
"GPIO28",
"GPIO29",
"GPIO30",
"GPIO31",
"GPIO32",
"GPIO33",
"GPIO34",
"GPIO35",
"GPIO36",
"GPIO37",
"GPIO38",
"GPIO39",
"GPIO40",
"GPIO41",
"GPIO42",
"GPIO43",
"GPIO44",
"GPIO45",
"GPIO46",
"GPIO47",
/* Used by eMMC */
"SD_CLK_R",
"SD_CMD_R",
"SD_DATA0_R",
"SD_DATA1_R",
"SD_DATA2_R",
"SD_DATA3_R";
pinctrl-0 = <&gpioout &alt0>;
};
&hdmi {
hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};

52
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi Normal file
View file

@ -0,0 +1,52 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2835-rpi.dtsi"
/ {
memory {
reg = <0 0x40000000>;
};
reg_3v3: fixed-regulator {
compatible = "regulator-fixed";
regulator-name = "3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_1v8: fixed-regulator {
compatible = "regulator-fixed";
regulator-name = "1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
};
&firmware {
expgpio: gpio {
compatible = "raspberrypi,firmware-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio-line-names = "HDMI_HPD_N",
"EMMC_EN_N",
"NC",
"NC",
"NC",
"NC",
"NC",
"NC";
status = "okay";
};
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
vmmc-supply = <&reg_3v3>;
vqmmc-supply = <&reg_1v8>;
status = "okay";
};

14
arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
View file

@ -1,4 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include <dt-bindings/net/microchip-lan78xx.h>
/ {
aliases {
ethernet0 = &ethernet;
@ -21,6 +23,18 @@ usb-port@1 {
ethernet: ethernet@1 {
compatible = "usb424,7800";
reg = <1>;
mdio {
#address-cells = <0x1>;
#size-cells = <0x0>;
eth_phy: ethernet-phy@1 {
reg = <1>;
microchip,led-modes = <
LAN78XX_LINK_1000_ACTIVITY
LAN78XX_LINK_10_100_ACTIVITY
>;
};
};
};
};
};

28
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
View file

@ -94,6 +94,34 @@ restart {
&spi_nor {
status = "okay";
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
boot@0 {
label = "boot";
reg = <0x000000 0x040000>;
read-only;
};
os-image@100000 {
label = "os-image";
reg = <0x040000 0x200000>;
compatible = "brcm,trx";
};
rootfs@240000 {
label = "rootfs";
reg = <0x240000 0xc00000>;
};
nvram@ff0000 {
label = "nvram";
reg = <0xff0000 0x010000>;
};
};
};
&usb2 {

31
arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
View file

@ -66,3 +66,34 @@ restart {
&usb3_phy {
status = "okay";
};
&nandcs {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
boot@0 {
label = "boot";
reg = <0x00000000 0x00080000>;
read-only;
};
nvram@80000 {
label = "nvram";
reg = <0x00080000 0x00180000>;
};
firmware@200000 {
label = "firmware";
reg = <0x00200000 0x07cc0000>;
compatible = "brcm,trx";
};
asus@7ec0000 {
label = "asus";
reg = <0x07ec0000 0x00140000>;
read-only;
};
};
};

28
arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
View file

@ -103,6 +103,34 @@ &usb3 {
&spi_nor {
status = "okay";
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
boot@0 {
label = "boot";
reg = <0x000000 0x040000>;
read-only;
};
os-image@100000 {
label = "os-image";
reg = <0x040000 0x200000>;
compatible = "brcm,trx";
};
rootfs@240000 {
label = "rootfs";
reg = <0x240000 0xc00000>;
};
nvram@ff0000 {
label = "nvram";
reg = <0xff0000 0x010000>;
};
};
};
&usb3_phy {

4
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
View file

@ -12,6 +12,10 @@ nandcs: nandcs@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
partitions {
compatible = "brcm,bcm947xx-cfe-partitions";
};
};
};
};

5
arch/arm/boot/dts/bcm5301x.dtsi
View file

@ -475,8 +475,11 @@ spi_nor: spi-nor@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <20000000>;
linux,part-probe = "ofpart", "bcm47xxpart";
status = "disabled";
partitions {
compatible = "brcm,bcm947xx-cfe-partitions";
};
};
};

26
arch/arm/boot/dts/bcm958625hr.dts
View file

@ -58,6 +58,24 @@ gpio-restart {
open-source;
priority = <200>;
};
/* Hardware I2C block cannot do more than 63 bytes per transfer,
* which would prevent reading from a SFP's EEPROM (256 byte).
*/
i2c1: i2c {
compatible = "i2c-gpio";
sda-gpios = <&gpioa 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
};
sfp: sfp {
compatible = "sff,sfp";
i2c-bus = <&i2c1>;
mod-def0-gpios = <&gpioa 28 GPIO_ACTIVE_LOW>;
los-gpios = <&gpioa 24 GPIO_ACTIVE_HIGH>;
tx-fault-gpios = <&gpioa 30 GPIO_ACTIVE_HIGH>;
tx-disable-gpios = <&gpioa 26 GPIO_ACTIVE_HIGH>;
};
};
&amac0 {
@ -210,6 +228,14 @@ port@4 {
reg = <4>;
};
port@5 {
label = "sfp";
phy-mode = "sgmii";
reg = <5>;
sfp = <&sfp>;
managed = "in-band-status";
};
port@8 {
ethernet = <&amac2>;
label = "cpu";