From bb1c6df16beb801269d5e63db8be2cb1d22cca10 Mon Sep 17 00:00:00 2001 From: Chuckduey Date: Mon, 28 Dec 2020 14:49:09 -0700 Subject: [PATCH] Added Raspberry Pi 400 to platforms Signed-off-by: Chuckduey --- include/arm/raspberry_pi.h | 1 + src/arm/raspberry_pi.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/include/arm/raspberry_pi.h b/include/arm/raspberry_pi.h index 31b1f54..349857f 100644 --- a/include/arm/raspberry_pi.h +++ b/include/arm/raspberry_pi.h @@ -25,6 +25,7 @@ extern "C" { #define MRAA_RASPBERRY_PI3_B_PLUS_PINCOUNT 41 #define MRAA_RASPBERRY_PI3_A_PLUS_PINCOUNT 41 #define MRAA_RASPBERRY_PI4_B_PINCOUNT 41 +#define MRAA_RASPBERRY_PI_400_PINCOUNT 41 mraa_board_t * mraa_raspberry_pi(); diff --git a/src/arm/raspberry_pi.c b/src/arm/raspberry_pi.c index 172217d..bda8731 100644 --- a/src/arm/raspberry_pi.c +++ b/src/arm/raspberry_pi.c @@ -29,6 +29,7 @@ #define PLATFORM_NAME_RASPBERRY_PI3_B_PLUS "Raspberry Pi 3 Model B+" #define PLATFORM_NAME_RASPBERRY_PI3_A_PLUS "Raspberry Pi 3 Model A+" #define PLATFORM_NAME_RASPBERRY_PI4_B "Raspberry Pi 4 Model B" +#define PLATFORM_NAME_RASPBERRY_PI_400 "Raspberry Pi 400" #define PLATFORM_RASPBERRY_PI_B_REV_1 1 #define PLATFORM_RASPBERRY_PI_A_REV_2 2 #define PLATFORM_RASPBERRY_PI_B_REV_2 3 @@ -42,6 +43,7 @@ #define PLATFORM_RASPBERRY_PI3_B_PLUS 11 #define PLATFORM_RASPBERRY_PI3_A_PLUS 12 #define PLATFORM_RASPBERRY_PI4_B 13 +#define PLATFORM_RASPBERRY_PI_400 14 #define MMAP_PATH "/dev/mem" #define BCM2835_PERI_BASE 0x20000000 #define BCM2836_PERI_BASE 0x3f000000 @@ -513,6 +515,12 @@ mraa_raspberry_pi() b->phy_pin_count = MRAA_RASPBERRY_PI4_B_PINCOUNT; peripheral_base = BCM2837_PERI_BASE; block_size = BCM2837_BLOCK_SIZE; + } else if (strstr(line, "c03130")) { + b->platform_name = PLATFORM_NAME_RASPBERRY_PI_400; + platform_detected = PLATFORM_RASPBERRY_PI_400; + b->phy_pin_count = MRAA_RASPBERRY_PI_400_PINCOUNT; + peripheral_base = BCM2837_PERI_BASE; + block_size = BCM2837_BLOCK_SIZE; } else { b->platform_name = PLATFORM_NAME_RASPBERRY_PI_B_REV_1; platform_detected = PLATFORM_RASPBERRY_PI_B_REV_1; @@ -587,6 +595,10 @@ mraa_raspberry_pi() b->platform_name = PLATFORM_NAME_RASPBERRY_PI4_B; platform_detected = PLATFORM_RASPBERRY_PI4_B; b->phy_pin_count = MRAA_RASPBERRY_PI4_B_PINCOUNT; + } else if (mraa_file_contains(compatible_path, "raspberrypi,4-model-bbrcm")) { + b->platform_name = PLATFORM_NAME_RASPBERRY_PI_400; + platform_detected = PLATFORM_RASPBERRY_PI_400; + b->phy_pin_count = MRAA_RASPBERRY_PI_400_PINCOUNT; } } @@ -856,7 +868,8 @@ mraa_raspberry_pi() (platform_detected == PLATFORM_RASPBERRY_PI_ZERO_W) || (platform_detected == PLATFORM_RASPBERRY_PI3_B_PLUS) || (platform_detected == PLATFORM_RASPBERRY_PI3_A_PLUS) || - (platform_detected == PLATFORM_RASPBERRY_PI4_B)) { + (platform_detected == PLATFORM_RASPBERRY_PI4_B) || + (platform_detected == PLATFORM_RASPBERRY_PI_400)) { strncpy(b->pins[27].name, "ID_SD", MRAA_PIN_NAME_SIZE); b->pins[27].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 0, 0, 0 };