Skip to content

L
linux
Commit 010bf734 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

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

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

- Rafal updates the BCM5301x, HR2, BCM63xx, BCM5301x, NSP and Cygnus DTS
  files to resolve a number of DT binding check warnings pertaining to
  NAND, pinmux, clocks, SPI

- Stefan provides a fix for an increase in the DWC2 controller's RX FIFO
  causing regressions on the Raspberry Pi 4B

- Mateusz adds a BCM2711 specific VEC compatible string to allow keying
  off that variant properly

- Stefan adds support for the Raspberry Pi 400 by doing some DTS/DTSI
  re-organization work and finally adding the DTS file proper

* tag 'arm-soc/for-5.14/devicetree' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: Add reference to RPi 400
  ARM: dts: Add Raspberry Pi 400 support
  ARM: dts: bcm283x: Fix up GPIO LED node names
  dt-bindings: arm: bcm2835: Add Raspberry Pi 400 to DT schema
  ARM: dts: Move BCM2711 RPi specific into separate dtsi
  ARM: dts: bcm283x: Fix up MMC node names
  ARM: boot: dts: bcm2711: Add BCM2711 VEC compatible
  Revert "ARM: dts: bcm283x: increase dwc2's RX FIFO size"
  ARM: dts: BCM5301X: Fixup SPI binding
  dt-bindings: clock: brcm, iproc-clocks: convert to the json-schema
  ARM: dts: BCM5301X: Fix pinmux subnodes names
  ARM: dts: Hurricane 2: Fix NAND nodes names
  ARM: dts: BCM63xx: Fix NAND nodes names
  ARM: NSP: dts: fix NAND nodes names
  ARM: Cygnus: dts: fix NAND nodes names
  ARM: brcmstb: dts: fix NAND nodes names
  ARM: dts: BCM5301X: Fix NAND nodes names

Link: https://lore.kernel.org/r/20210610194836.309869-1-f.fainelli@gmail.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 52b54b06 3a3907c4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 610 additions and 464 deletions
Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml
View file @ 010bf734
......@@ -18,6 +18,7 @@ properties:
- description: BCM2711 based Boards
items:
- enum:
- raspberrypi,400
- raspberrypi,4-model-b
- const: brcm,bcm2711
......
Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml 0 → 100644
View file @ 010bf734
This diff is collapsed.
arch/arm/boot/dts/Makefile
View file @ 010bf734
......@@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
bcm2837-rpi-3-b.dtb \
bcm2837-rpi-3-b-plus.dtb \
bcm2837-rpi-cm3-io3.dtb \
bcm2711-rpi-400.dtb \
bcm2711-rpi-4-b.dtb \
bcm2835-rpi-zero.dtb \
bcm2835-rpi-zero-w.dtb
......
arch/arm/boot/dts/bcm-cygnus.dtsi
View file @ 010bf734
......@@ -460,7 +460,7 @@ sdhci1: sdhci@18043000 {
status = "disabled";
};
nand: nand@18046000 {
nand_controller: nand-controller@18046000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x18046000 0x600>, <0xf8105408 0x600>,
<0x18046f00 0x20>;
......
arch/arm/boot/dts/bcm-hr2.dtsi
View file @ 010bf734
......@@ -179,7 +179,7 @@ amac0: ethernet@22000 {
status = "disabled";
};
nand: nand@26000 {
nand_controller: nand-controller@26000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x26000 0x600>,
<0x11b408 0x600>,
......
arch/arm/boot/dts/bcm-nsp.dtsi
View file @ 010bf734
......@@ -269,7 +269,7 @@ mailbox: mailbox@25c00 {
dma-coherent;
};
nand: nand@26000 {
nand_controller: nand-controller@26000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x026000 0x600>,
<0x11b408 0x600>,
......
arch/arm/boot/dts/bcm2711-rpi-4-b.dts
View file @ 010bf734
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2711.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2711-rpi.dtsi"
#include "bcm283x-rpi-usb-peripheral.dtsi"
#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
/ {
compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
model = "Raspberry Pi 4 Model B";
......@@ -15,25 +13,12 @@ chosen {
stdout-path = "serial1:115200n8";
};
/* Will be filled by the bootloader */
memory@0 {
device_type = "memory";
reg = <0 0 0>;
};
aliases {
emmc2bus = &emmc2bus;
ethernet0 = &genet;
pcie0 = &pcie0;
blconfig = &blconfig;
};
leds {
act {
led-act {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
pwr {
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
......@@ -79,31 +64,15 @@ &ddc1 {
status = "okay";
};
&firmware {
firmware_clocks: clocks {
compatible = "raspberrypi,firmware-clocks";
#clock-cells = <1>;
};
expgpio: gpio {
compatible = "raspberrypi,firmware-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio-line-names = "BT_ON",
"WL_ON",
"PWR_LED_OFF",
"GLOBAL_RESET",
"VDD_SD_IO_SEL",
"CAM_GPIO",
"SD_PWR_ON",
"";
status = "okay";
};
reset: reset {
compatible = "raspberrypi,firmware-reset";
#reset-cells = <1>;
};
&expgpio {
gpio-line-names = "BT_ON",
"WL_ON",
"PWR_LED_OFF",
"GLOBAL_RESET",
"VDD_SD_IO_SEL",
"CAM_GPIO",
"SD_PWR_ON",
"";
};
&gpio {
......@@ -180,23 +149,13 @@ &gpio {
};
&hdmi0 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
wifi-2.4ghz-coexistence;
status = "okay";
};
&hdmi1 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
wifi-2.4ghz-coexistence;
status = "okay";
};
&hvs {
clocks = <&firmware_clocks 4>;
};
&pixelvalve0 {
status = "okay";
};
......@@ -219,22 +178,6 @@ &pwm1 {
status = "okay";
};
&rmem {
/*
* RPi4's co-processor will copy the board's bootloader configuration
* into memory for the OS to consume. It'll also update this node with
* its placement information.
*/
blconfig: nvram@0 {
compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x0 0x0 0x0>;
no-map;
status = "disabled";
};
};
/* SDHCI is used to control the SDIO for wireless */
&sdhci {
#address-cells = <1>;
......@@ -309,10 +252,6 @@ &uart1 {
status = "okay";
};
&vchiq {
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
};
&vc4 {
status = "okay";
};
......
arch/arm/boot/dts/bcm2711-rpi-400.dts 0 → 100644
View file @ 010bf734
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2711-rpi-4-b.dts"
/ {
compatible = "raspberrypi,400", "brcm,bcm2711";
model = "Raspberry Pi 400";
chosen {
/* 8250 auxiliary UART instead of pl011 */
stdout-path = "serial1:115200n8";
};
leds {
/delete-node/ led-act;
led-pwr {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
};
gpio-poweroff {
compatible = "gpio-poweroff";
gpios = <&expgpio 5 GPIO_ACTIVE_HIGH>;
};
};
&expgpio {
gpio-line-names = "BT_ON",
"WL_ON",
"",
"GLOBAL_RESET",
"VDD_SD_IO_SEL",
"CAM_GPIO",
"SD_PWR_ON",
"SD_OC_N";
};
&genet_mdio {
clock-frequency = <1950000>;
};
&pm {
/delete-property/ system-power-controller;
};
arch/arm/boot/dts/bcm2711-rpi.dtsi 0 → 100644
View file @ 010bf734
// SPDX-License-Identifier: GPL-2.0
#include "bcm2835-rpi.dtsi"
#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
/ {
/* Will be filled by the bootloader */
memory@0 {
device_type = "memory";
reg = <0 0 0>;
};
aliases {
emmc2bus = &emmc2bus;
ethernet0 = &genet;
pcie0 = &pcie0;
blconfig = &blconfig;
};
};
&firmware {
firmware_clocks: clocks {
compatible = "raspberrypi,firmware-clocks";
#clock-cells = <1>;
};
expgpio: gpio {
compatible = "raspberrypi,firmware-gpio";
gpio-controller;
#gpio-cells = <2>;
status = "okay";
};
reset: reset {
compatible = "raspberrypi,firmware-reset";
#reset-cells = <1>;
};
};
&hdmi0 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
wifi-2.4ghz-coexistence;
};
&hdmi1 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
wifi-2.4ghz-coexistence;
};
&hvs {
clocks = <&firmware_clocks 4>;
};
&rmem {
/*
* RPi4's co-processor will copy the board's bootloader configuration
* into memory for the OS to consume. It'll also update this node with
* its placement information.
*/
blconfig: nvram@0 {
compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x0 0x0 0x0>;
no-map;
status = "disabled";
};
};
&vchiq {
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
};
arch/arm/boot/dts/bcm2711.dtsi
View file @ 010bf734
......@@ -413,7 +413,7 @@ emmc2bus: emmc2bus {
ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>;
dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>;
emmc2: emmc2@7e340000 {
emmc2: mmc@7e340000 {
compatible = "brcm,bcm2711-emmc2";
reg = <0x0 0x7e340000 0x100>;
interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
......@@ -1087,5 +1087,6 @@ &usb {
};
&vec {
compatible = "brcm,bcm2711-vec";
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
};
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
View file @ 010bf734
......@@ -14,11 +14,11 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
pwr {
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
......
arch/arm/boot/dts/bcm2835-rpi-a.dts
View file @ 010bf734
......@@ -14,7 +14,7 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
......
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View file @ 010bf734
......@@ -15,11 +15,11 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
pwr {
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
......
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
View file @ 010bf734
......@@ -15,7 +15,7 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
......
arch/arm/boot/dts/bcm2835-rpi-b.dts
View file @ 010bf734
......@@ -15,7 +15,7 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
......
arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
View file @ 010bf734
......@@ -5,7 +5,7 @@
/ {
leds {
act {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
};
};
......
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
View file @ 010bf734
......@@ -23,7 +23,7 @@ chosen {
};
leds {
act {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
};
};
......
arch/arm/boot/dts/bcm2835-rpi-zero.dts
View file @ 010bf734
......@@ -18,7 +18,7 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
};
......
arch/arm/boot/dts/bcm2835-rpi.dtsi
View file @ 010bf734
......@@ -4,7 +4,7 @@ / {
leds {
compatible = "gpio-leds";
act {
led-act {
label = "ACT";
default-state = "keep";
linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
View file @ 010bf734
......@@ -15,11 +15,11 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
pwr {
led-pwr {
label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
......
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
View file @ 010bf734
......@@ -19,11 +19,11 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
};
pwr {
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
......
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
View file @ 010bf734
......@@ -20,11 +20,11 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
};
pwr {
led-pwr {
label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
......
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
View file @ 010bf734
......@@ -20,7 +20,7 @@ memory@0 {
};
leds {
act {
led-act {
gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
};
};
......
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
View file @ 010bf734
......@@ -14,7 +14,7 @@ leds {
* Since there is no upstream GPIO driver yet,
* remove the incomplete node.
*/
/delete-node/ act;
/delete-node/ led-act;
};
reg_3v3: fixed-regulator {
......
arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
View file @ 010bf734
// SPDX-License-Identifier: GPL-2.0
&usb {
dr_mode = "otg";
g-rx-fifo-size = <558>;
g-rx-fifo-size = <256>;
g-np-tx-fifo-size = <32>;
/*
* According to dwc2 the sum of all device EP
......
arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
View file @ 010bf734
// SPDX-License-Identifier: GPL-2.0
&usb {
dr_mode = "peripheral";
g-rx-fifo-size = <558>;
g-rx-fifo-size = <256>;
g-np-tx-fifo-size = <32>;
g-tx-fifo-size = <256 256 512 512 512 768 768>;
};
arch/arm/boot/dts/bcm283x.dtsi
View file @ 010bf734
......@@ -420,7 +420,7 @@ pwm: pwm@7e20c000 {
status = "disabled";
};
sdhci: sdhci@7e300000 {
sdhci: mmc@7e300000 {
compatible = "brcm,bcm2835-sdhci";
reg = <0x7e300000 0x100>;
interrupts = <2 30>;
......
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
View file @ 010bf734
......@@ -24,8 +24,8 @@ memory@0 {
reg = <0x00000000 0x08000000>;
};
nand: nand@18028000 {
nandcs@0 {
nand_controller: nand-controller@18028000 {
nand@0 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
......
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
View file @ 010bf734
......@@ -25,8 +25,8 @@ memory@0 {
<0x88000000 0x08000000>;
};
nand: nand@18028000 {
nandcs@0 {
nand_controller: nand-controller@18028000 {
nand@0 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
......
arch/arm/boot/dts/bcm47094.dtsi
View file @ 010bf734
......@@ -11,7 +11,7 @@ / {
&pinctrl {
compatible = "brcm,bcm4709-pinmux";
pinmux_mdio: mdio {
pinmux_mdio: mdio-pins {
groups = "mdio_grp";
function = "mdio";
};
......
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
View file @ 010bf734
......@@ -6,8 +6,8 @@
*/
/ {
nand@18028000 {
nandcs: nandcs@0 {
nand-controller@18028000 {
nandcs: nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
#address-cells = <1>;
......
arch/arm/boot/dts/bcm5301x.dtsi
View file @ 010bf734
......@@ -458,18 +458,18 @@ spi-pins {
function = "spi";
};
pinmux_i2c: i2c {
pinmux_i2c: i2c-pins {
groups = "i2c_grp";
function = "i2c";
};
pinmux_pwm: pwm {
pinmux_pwm: pwm-pins {
groups = "pwm0_grp", "pwm1_grp",
"pwm2_grp", "pwm3_grp";
function = "pwm";
};
pinmux_uart1: uart1 {
pinmux_uart1: uart1-pins {
groups = "uart1_grp";
function = "uart1";
};
......@@ -501,7 +501,7 @@ rng: rng@18004000 {
reg = <0x18004000 0x14>;
};
nand: nand@18028000 {
nand_controller: nand-controller@18028000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
reg-names = "nand", "iproc-idm", "iproc-ext";
......@@ -520,27 +520,27 @@ spi@18029200 {
<0x1811b408 0x004>,
<0x180293a0 0x01c>;
reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "spi_lr_fullness_reached",
<GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "mspi_done",
"mspi_halted",
"spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
"spi_lr_overhead",
"mspi_done",
"mspi_halted";
"spi_lr_overread";
clocks = <&iprocmed>;
clock-names = "iprocmed";
num-cs = <2>;
#address-cells = <1>;
#size-cells = <0>;
spi_nor: spi-nor@0 {
spi_nor: flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <20000000>;
......
arch/arm/boot/dts/bcm63138.dtsi
View file @ 010bf734
......@@ -203,7 +203,7 @@ serial1: serial@620 {
status = "disabled";
};
nand: nand@2000 {
nand_controller: nand-controller@2000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
......
arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
View file @ 010bf734
......@@ -14,10 +14,10 @@ memory@0 {
};
};
&nand {
&nand_controller {
status = "okay";
nandcs@1 {
nand@1 {
compatible = "brcm,nandcs";
reg = <1>;
nand-ecc-step-size = <512>;
......
arch/arm/boot/dts/bcm7445.dtsi
View file @ 010bf734
......@@ -148,7 +148,7 @@ aon-ctrl@410000 {
reg-names = "aon-ctrl", "aon-sram";
};
nand: nand@3e2800 {
nand_controller: nand-controller@3e2800 {
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
......
arch/arm/boot/dts/bcm911360_entphn.dts
View file @ 010bf734
......@@ -82,8 +82,8 @@ &uart3 {
status = "okay";
};
&nand {
nandcs@1 {
&nand_controller {
nand@1 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm953012k.dts
View file @ 010bf734
......@@ -49,8 +49,8 @@ memory@80000000 {
};
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958300k.dts
View file @ 010bf734
......@@ -60,8 +60,8 @@ &uart3 {
status = "okay";
};
&nand {
nandcs@1 {
&nand_controller {
nand@1 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958305k.dts
View file @ 010bf734
......@@ -68,8 +68,8 @@ &uart3 {
status = "okay";
};
&nand {
nandcs@1 {
&nand_controller {
nand@1 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958522er.dts
View file @ 010bf734
......@@ -74,8 +74,8 @@ &ehci0 {
status = "okay";
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958525er.dts
View file @ 010bf734
......@@ -74,8 +74,8 @@ &ehci0 {
status = "okay";
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958525xmc.dts
View file @ 010bf734
......@@ -90,8 +90,8 @@ rtc@68 {
};
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958622hr.dts
View file @ 010bf734
......@@ -78,8 +78,8 @@ &ehci0 {
status = "okay";
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958623hr.dts
View file @ 010bf734
......@@ -78,8 +78,8 @@ &ehci0 {
status = "okay";
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958625hr.dts
View file @ 010bf734
......@@ -89,8 +89,8 @@ &ehci0 {
status = "okay";
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm958625k.dts
View file @ 010bf734
......@@ -68,8 +68,8 @@ &ehci0 {
status = "okay";
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm/boot/dts/bcm963138dvt.dts
View file @ 010bf734
......@@ -31,10 +31,10 @@ &serial1 {
status = "okay";
};
&nand {
&nand_controller {
status = "okay";
nandcs@0 {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-ecc-strength = <4>;
......
arch/arm/boot/dts/bcm988312hr.dts
View file @ 010bf734
......@@ -74,8 +74,8 @@ &ehci0 {
status = "okay";
};
&nand {
nandcs@0 {
&nand_controller {
nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
......
arch/arm64/boot/dts/broadcom/Makefile
View file @ 010bf734
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb \
dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
bcm2711-rpi-4-b.dtb \
bcm2837-rpi-3-a-plus.dtb \
bcm2837-rpi-3-b.dtb \
bcm2837-rpi-3-b-plus.dtb \
......
arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts 0 → 100644
View file @ 010bf734
// SPDX-License-Identifier: GPL-2.0
#include "arm/bcm2711-rpi-400.dts"
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
View file @ 010bf734
......@@ -306,7 +306,7 @@ nand@1800 {
interrupt-names = "nand";
status = "okay";
nandcs: nandcs@0 {
nandcs: nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7