[PATCH] ARM: rpi: add CM4S device id

Sebastien Bourdelin sebastien.bourdelin at gmail.com
Thu Dec 14 08:35:20 PST 2023


Introduce the device id for the raspberry CM4S accordingly to [1].

 [1]: https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-revision-codes

Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin at rtone.fr>
---
 arch/arm/boards/raspberry-pi/rpi-common.c | 4 ++++
 include/mach/bcm283x/mbox.h               | 1 +
 2 files changed, 5 insertions(+)

diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index c2b273c5c3..597e2d2d0e 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -650,6 +650,9 @@ static const struct rpi_machine_data rpi_4_ids[] = {
 	}, {
 		.hw_id = BCM2711_BOARD_REV_CM4,
 		.init = rpi_eth_init,
+	}, {
+		.hw_id = BCM2711_BOARD_REV_CM4_S,
+		.init = rpi_eth_init,
 	}, {
 		.hw_id = U8_MAX
 	},
@@ -682,6 +685,7 @@ static const struct of_device_id rpi_of_match[] = {
 	/* BCM2711 based Boards */
 	{ .compatible = "raspberrypi,4-model-b", .data = rpi_4_ids },
 	{ .compatible = "raspberrypi,4-compute-module", .data = rpi_4_ids },
+	{ .compatible = "raspberrypi,4-compute-module-s", .data = rpi_4_ids },
 	{ .compatible = "raspberrypi,400", .data = rpi_4_ids },
 
 	{ /* sentinel */ },
diff --git a/include/mach/bcm283x/mbox.h b/include/mach/bcm283x/mbox.h
index 908ba17dba..cf5143673a 100644
--- a/include/mach/bcm283x/mbox.h
+++ b/include/mach/bcm283x/mbox.h
@@ -175,6 +175,7 @@ struct bcm2835_mbox_tag_hdr {
 #define BCM2837B0_BOARD_REV_ZERO_2	0x12
 #define BCM2711_BOARD_REV_400		0x13
 #define BCM2711_BOARD_REV_CM4		0x14
+#define BCM2711_BOARD_REV_CM4_S		0x15
 
 struct bcm2835_mbox_tag_get_board_rev {
 	struct bcm2835_mbox_tag_hdr tag_hdr;
-- 
2.42.0




More information about the barebox mailing list