Skip to contentSkip to conversation

Broadcom bcmbca dts updates

PATCH In review david regan 2 participants 5 messages Jan 14, 2025 – Jan 21, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover Broadcom bcmbca dts updates

Updates for Broadcom bcmbca devices,
make use of OF_UPSTREAM which uses Linux dts, update bcmbca dts to current nand node naming convention, enable basic nand functionality for bcmbca devices.

Changes in v2:
- Removed addition of nand-on-flash-bbt parameter
- Moved enabling of nand functionality to a new patch added to the series

david regan (3):
arm: dts: Use upstream dts for additional bcmbca devices
arm: dts: Update nand node for bcmbca board dts
arm: dts: Enable basic nand functionality for bcmbca devices

 arch/arm/dts/bcm4908.dtsi             | 127 ----------------------
 arch/arm/dts/bcm63138.dtsi            | 149 --------------------------
 arch/arm/dts/bcm63148.dtsi            | 103 ------------------
 arch/arm/dts/bcm94908.dts             |  30 ------
 arch/arm/dts/bcm963138.dts            |  30 ------
 arch/arm/dts/bcm963148.dts            |  30 ------
 arch/arm/dts/bcm96753ref.dts          |  18 ++--
 arch/arm/dts/bcm968360bg.dts          |  18 ++--
 arch/arm/dts/bcm968580xref.dts        |  18 ++--
 arch/arm/mach-bcmbca/bcm4908/Kconfig  |   1 +
 arch/arm/mach-bcmbca/bcm63138/Kconfig |   1 +
 arch/arm/mach-bcmbca/bcm63148/Kconfig |   1 +
 configs/bcm94908_defconfig            |  11 +-
 configs/bcm963138_defconfig           |  11 +-
 configs/bcm963148_defconfig           |  11 +-
 15 files changed, 54 insertions(+), 505 deletions(-)
 delete mode 100644 arch/arm/dts/bcm4908.dtsi
 delete mode 100644 arch/arm/dts/bcm63138.dtsi
 delete mode 100644 arch/arm/dts/bcm63148.dtsi
 delete mode 100644 arch/arm/dts/bcm94908.dts
 delete mode 100644 arch/arm/dts/bcm963138.dts
 delete mode 100644 arch/arm/dts/bcm963148.dts
Signature · 1 line
2.37.3
#1 lore raw

PATCH v2 1/3 arm: dts: Use upstream dts for additional bcmbca devices

Make use of OF_UPSTREAM which uses Linux dts.

Changes in v2:
- Removed enabling of nand functionality

---
 arch/arm/dts/bcm4908.dtsi             | 127 ----------------------
 arch/arm/dts/bcm63138.dtsi            | 149 --------------------------
 arch/arm/dts/bcm63148.dtsi            | 103 ------------------
 arch/arm/dts/bcm94908.dts             |  30 ------
 arch/arm/dts/bcm963138.dts            |  30 ------
 arch/arm/dts/bcm963148.dts            |  30 ------
 arch/arm/mach-bcmbca/bcm4908/Kconfig  |   1 +
 arch/arm/mach-bcmbca/bcm63138/Kconfig |   1 +
 arch/arm/mach-bcmbca/bcm63148/Kconfig |   1 +
 configs/bcm94908_defconfig            |   3 +-
 configs/bcm963138_defconfig           |   3 +-
 configs/bcm963148_defconfig           |   3 +-
 12 files changed, 9 insertions(+), 472 deletions(-)
 delete mode 100644 arch/arm/dts/bcm4908.dtsi
 delete mode 100644 arch/arm/dts/bcm63138.dtsi
 delete mode 100644 arch/arm/dts/bcm63148.dtsi
 delete mode 100644 arch/arm/dts/bcm94908.dts
 delete mode 100644 arch/arm/dts/bcm963138.dts
 delete mode 100644 arch/arm/dts/bcm963148.dts
arch/arm/dts/bcm4908.dtsi deleted +0 -127
deleted file mode 100644
index 0be5cfeeffa9..000000000000
@@ -1,127 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-
-/dts-v1/;
-
-/ {
-	compatible = "brcm,bcm4908", "brcm,bcmbca";
-
-	interrupt-parent = <&gic>;
-
-	#address-cells = <2>;
-	#size-cells = <2>;
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu0: cpu@0 {
-			device_type = "cpu";
-			compatible = "brcm,brahma-b53";
-			reg = <0x0>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0xfff8>;
-			next-level-cache = <&l2>;
-		};
-
-		cpu1: cpu@1 {
-			device_type = "cpu";
-			compatible = "brcm,brahma-b53";
-			reg = <0x1>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0xfff8>;
-			next-level-cache = <&l2>;
-		};
-
-		cpu2: cpu@2 {
-			device_type = "cpu";
-			compatible = "brcm,brahma-b53";
-			reg = <0x2>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0xfff8>;
-			next-level-cache = <&l2>;
-		};
-
-		cpu3: cpu@3 {
-			device_type = "cpu";
-			compatible = "brcm,brahma-b53";
-			reg = <0x3>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0xfff8>;
-			next-level-cache = <&l2>;
-		};
-
-		l2: l2-cache0 {
-			compatible = "cache";
-		};
-	};
-
-	axi@81000000 {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0x00 0x00 0x81000000 0x4000>;
-
-		gic: interrupt-controller@1000 {
-			compatible = "arm,gic-400";
-			#interrupt-cells = <3>;
-			#address-cells = <0>;
-			interrupt-controller;
-			reg = <0x1000 0x1000>,
-			      <0x2000 0x2000>;
-		};
-	};
-
-	timer {
-		compatible = "arm,armv8-timer";
-		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
-	};
-
-	pmu {
-		compatible = "arm,cortex-a53-pmu";
-		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
-	};
-
-	clocks {
-		periph_clk: periph_clk {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <50000000>;
-			clock-output-names = "periph";
-		};
-	};
-
-	bus@ff800000 {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0x00 0x00 0xff800000 0x3000>;
-
-		uart0: serial@640 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0x640 0x18>;
-			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&periph_clk>;
-			clock-names = "refclk";
-			status = "disabled";
-		};
-
-	};
-};
arch/arm/dts/bcm63138.dtsi deleted +0 -149

149 lines not on this page · raw message

arch/arm/dts/bcm63148.dtsi deleted +0 -103

103 lines not on this page · raw message

arch/arm/dts/bcm94908.dts deleted +0 -30
deleted file mode 100644
index fcbd3c430ace..000000000000
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright 2022 Broadcom Ltd.
- */
-
-/dts-v1/;
-
-#include "bcm4908.dtsi"
-
-/ {
-	model = "Broadcom BCM94908 Reference Board";
-	compatible = "brcm,bcm94908", "brcm,bcm4908", "brcm,bcmbca";
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x0 0x0 0x08000000>;
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
arch/arm/dts/bcm963138.dts deleted +0 -30
deleted file mode 100644
index 6158a8733554..000000000000
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright 2022 Broadcom Ltd.
- */
-
-/dts-v1/;
-
-#include "bcm63138.dtsi"
-
-/ {
-	model = "Broadcom BCM963138 Reference Board";
-	compatible = "brcm,bcm963138", "brcm,bcm63138", "brcm,bcmbca";
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x08000000>;
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
arch/arm/dts/bcm963148.dts deleted +0 -30
deleted file mode 100644
index 98f6a6d09f50..000000000000
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright 2019 Broadcom Ltd.
- */
-
-/dts-v1/;
-
-#include "bcm63148.dtsi"
-
-/ {
-	model = "Broadcom BCM963148 Reference Board";
-	compatible = "brcm,bcm963148", "brcm,bcm63148", "brcm,bcmbca";
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x08000000>;
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
arch/arm/mach-bcmbca/bcm4908/Kconfig +1 -0
index 564bc8d2d664..9131505fa7c8 100644
@@ -8,6 +8,7 @@ if BCM4908
 config TARGET_BCM94908
 	bool "Broadcom 4908 Reference Board"
 	depends on ARCH_BCMBCA
+	imply OF_UPSTREAM
 
 config SYS_SOC
 	default "bcm4908"
arch/arm/mach-bcmbca/bcm63138/Kconfig +1 -0
index a34888d231d3..9b7db352f84d 100644
@@ -8,6 +8,7 @@ if BCM63138
 config TARGET_BCM963138
 	bool "Broadcom 63138 Reference Board"
 	depends on ARCH_BCMBCA
+	imply OF_UPSTREAM
 
 config SYS_SOC
 	default "bcm63138"
arch/arm/mach-bcmbca/bcm63148/Kconfig +1 -0
index f81504c25cbb..a3c7b5bf8e45 100644
@@ -8,6 +8,7 @@ if BCM63148
 config TARGET_BCM963148
 	bool "Broadcom 63148 Reference Board"
 	depends on ARCH_BCMBCA
+	imply OF_UPSTREAM
 
 config SYS_SOC
 	default "bcm63148"
configs/bcm94908_defconfig +2 -1
index 3979c29e9323..0b6db9aa52e9 100644
@@ -9,7 +9,7 @@ CONFIG_TARGET_BCM94908=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000
-CONFIG_DEFAULT_DEVICE_TREE="bcm94908"
+CONFIG_DEFAULT_DEVICE_TREE="broadcom/bcmbca/bcm94908"
 CONFIG_SYS_LOAD_ADDR=0x01000000
 CONFIG_IDENT_STRING=" Broadcom BCM4908"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -17,5 +17,6 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CACHE=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
 CONFIG_CLK=y
configs/bcm963138_defconfig +2 -1
index cc2ffe5fcd29..9459a232560d 100644
@@ -8,7 +8,7 @@ CONFIG_TARGET_BCM963138=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000
-CONFIG_DEFAULT_DEVICE_TREE="bcm963138"
+CONFIG_DEFAULT_DEVICE_TREE="broadcom/bcm963138"
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SYS_LOAD_ADDR=0x01000000
 CONFIG_IDENT_STRING=" Broadcom BCM63138"
@@ -17,5 +17,6 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CACHE=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
 CONFIG_CLK=y
configs/bcm963148_defconfig +2 -1
index a0dd06ba505a..d6fbc34927cb 100644
@@ -9,7 +9,7 @@ CONFIG_TARGET_BCM963148=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000
-CONFIG_DEFAULT_DEVICE_TREE="bcm963148"
+CONFIG_DEFAULT_DEVICE_TREE="broadcom/bcm963148"
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SYS_LOAD_ADDR=0x01000000
 CONFIG_IDENT_STRING=" Broadcom BCM63148"
@@ -18,5 +18,6 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CACHE=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
 CONFIG_CLK=y
Signature · 1 line
2.37.3
#2 lore raw

PATCH v2 2/3 arm: dts: Update nand node for bcmbca board dts

In reply to david regan

Update bcmbca dts to current nand node naming convention.

Changes in v2:
- Removed addition of nand-on-flash-bbt parameter

---
 arch/arm/dts/bcm96753ref.dts   | 18 +++++++-----------
 arch/arm/dts/bcm968360bg.dts   | 18 +++++++-----------
 arch/arm/dts/bcm968580xref.dts | 18 +++++++-----------
 3 files changed, 21 insertions(+), 33 deletions(-)
arch/arm/dts/bcm96753ref.dts +7 -11
index ebc8c8e4ce77..c763358514fc 100644
@@ -64,19 +64,15 @@
 	status = "okay";
 };
 
-&nand {
+&nand_controller {
+	brcm,wp-not-connected;
 	status = "okay";
-	write-protect = <0>;
-	#address-cells = <1>;
-	#size-cells = <0>;
+};
 
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		reg = <0>;
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		brcm,nand-oob-sector-size = <16>;
-	};
+&nandcs {
+	nand-ecc-strength = <4>;
+	nand-ecc-step-size = <512>;
+	brcm,nand-oob-sector-size = <16>;
 };
 
 &leds {
arch/arm/dts/bcm968360bg.dts +7 -11
index 1335f484ee6c..a5b30f4e4a6b 100644
@@ -62,19 +62,15 @@
 	status = "okay";
 };
 
-&nand {
+&nand_controller {
+	brcm,wp-not-connected;
 	status = "okay";
-	write-protect = <0>;
-	#address-cells = <1>;
-	#size-cells = <0>;
+};
 
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		reg = <0>;
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		brcm,nand-oob-sector-size = <16>;
-	};
+&nandcs {
+	nand-ecc-strength = <4>;
+	nand-ecc-step-size = <512>;
+	brcm,nand-oob-sector-size = <16>;
 };
 
 &leds {
arch/arm/dts/bcm968580xref.dts +7 -11
index 9aa45877b543..77616023010e 100644
@@ -62,19 +62,15 @@
 	status = "okay";
 };
 
-&nand {
+&nand_controller {
+	brcm,wp-not-connected;
 	status = "okay";
-	write-protect = <0>;
-	#address-cells = <1>;
-	#size-cells = <0>;
+};
 
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		reg = <0>;
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		brcm,nand-oob-sector-size = <16>;
-	};
+&nandcs {
+	nand-ecc-strength = <4>;
+	nand-ecc-step-size = <512>;
+	brcm,nand-oob-sector-size = <16>;
 };
 
 &leds {
Signature · 1 line
2.37.3
#3 lore raw

PATCH v2 3/3 arm: dts: Enable basic nand functionality for bcmbca devices

In reply to david regan

Enable rudimentary nand read/write capability.

Changes in v2:
- New patch in series added enabling of nand functionality

---
 configs/bcm94908_defconfig  | 8 ++++++++
 configs/bcm963138_defconfig | 8 ++++++++
 configs/bcm963148_defconfig | 8 ++++++++
 3 files changed, 24 insertions(+)
configs/bcm94908_defconfig +8 -0
index 0b6db9aa52e9..e651212d6853 100644
@@ -16,7 +16,15 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
+CONFIG_OF_CONTROL=y
 CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
+CONFIG_DM=y
 CONFIG_CLK=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_NAND_BRCMNAND=y
+CONFIG_NAND_BRCMNAND_BCMBCA=y
configs/bcm963138_defconfig +8 -0
index 9459a232560d..f1f83dc2f1be 100644
@@ -16,7 +16,15 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
+CONFIG_OF_CONTROL=y
 CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
+CONFIG_DM=y
 CONFIG_CLK=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_NAND_BRCMNAND=y
+CONFIG_NAND_BRCMNAND_BCMBCA=y
configs/bcm963148_defconfig +8 -0
index d6fbc34927cb..579fdd5d22c3 100644
@@ -17,7 +17,15 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
+CONFIG_OF_CONTROL=y
 CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
+CONFIG_DM=y
 CONFIG_CLK=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_NAND_BRCMNAND=y
+CONFIG_NAND_BRCMNAND_BCMBCA=y
Signature · 1 line
2.37.3
#4 lore raw
In reply to david regan
Quoted 11 lines · david regan

Updates for Broadcom bcmbca devices,
make use of OF_UPSTREAM which uses Linux dts, update bcmbca dts to current nand node naming convention, enable basic nand functionality for bcmbca devices.

Changes in v2:
- Removed addition of nand-on-flash-bbt parameter
- Moved enabling of nand functionality to a new patch added to the series

[...]

Applied to u-boot/master, thanks!

Signature · 1 line
Tom