diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-04-30 10:03:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-04-30 10:03:28 +0200 |
| commit | 7ecef37ec5eac299c738833f10bf4a06bdbfdfaf (patch) | |
| tree | 704d7f348a68c5c1139a36b323d34679d8b971a6 | |
| parent | 07b8c4bbff46f1553c7b002bec6bcd24fb6a1cb5 (diff) | |
| parent | 328ad44c5290cc4575be5f0dc457c75bb71015d4 (diff) | |
| download | linux-7ecef37ec5eac299c738833f10bf4a06bdbfdfaf.tar.gz | |
Merge tag 'arm-soc/for-6.10/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM64-based SoCs Device Tree updates
for 6.10, please pull the following:
- Rafal moves the "brcm,wp-not-connected" property from the individual
board DTSes to the SoC' DTSI since all boards a designed the same way
* tag 'arm-soc/for-6.10/devicetree-arm64' of https://github.com/Broadcom/stblinux:
arm64: dts: broadcom: bcmbca: bcm4908: set brcm,wp-not-connected
Link: https://lore.kernel.org/r/20240429213703.2327834-3-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi index e01cf4f540770c..8b924812322cde 100644 --- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi @@ -594,6 +594,7 @@ reg-names = "nand", "nand-int-base"; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "nand_ctlrdy"; + brcm,wp-not-connected; status = "disabled"; nandcs: nand@0 { diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts index 030ffa5364fbc1..e5b37643296bf4 100644 --- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts +++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts @@ -34,7 +34,6 @@ }; &nand_controller { - brcm,wp-not-connected; status = "okay"; }; |