Skip to content

Commit 7ecef37

Browse files
committed
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>
2 parents 07b8c4b + 328ad44 commit 7ecef37

2 files changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@
594594
reg-names = "nand", "nand-int-base";
595595
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
596596
interrupt-names = "nand_ctlrdy";
597+
brcm,wp-not-connected;
597598
status = "disabled";
598599

599600
nandcs: nand@0 {

arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
};
3535

3636
&nand_controller {
37-
brcm,wp-not-connected;
3837
status = "okay";
3938
};
4039

0 commit comments

Comments
 (0)