diff --git a/docs/radxa_cm3.md b/docs/radxa_cm3.md
index 6b4af9651..41e54ceef 100644
--- a/docs/radxa_cm3.md
+++ b/docs/radxa_cm3.md
@@ -15,28 +15,28 @@ Pin Mapping
 
 Radxa CM3 IO Board and Raspberry Pi CM4 IO Baseboard's 40-pin expansion header are compatible. The following pinout applies to both products:
 
-|    Function3|   Function3|    Function2| Function1|  PIN  |  PIN  |  Function1|    Function2| Function3|
-|-------------|------------|-------------|----------|:------|------:|-----------|-------------|----------|
-|             |            |             |       3V3|   1   |   2   |      +5.0V|             |          |
-|      PWM2_M1|SPI0_MOSI_M0|  I2C2_SDA_M0|  GPIO0_B6|   3   |   4   |      +5.0V|             |          |
-|      PWM1_M1| SPI0_CLK_M0|  I2C2_SCL_M0|  GPIO0_B5|   5   |   6   |        GND|             |          |
-|             |            |             |  GPIO3_D5|   7   |   8   |   GPIO0_D1|  UART2_TX_M0|          |
-|             |            |             |       GND|   9   |   10  |   GPIO0_D0|  UART2_RX_M0|          |
-|             |            |      PWM0_M1|  GPIO0_C7|   11  |   12  |   GPIO3_C7|             |          |
-|             |            |      PWM0_M0|  GPIO0_B7|   13  |   14  |        GND|             |          |
-|             |            |         PWM4|  GPIO0_C3|   15  |   16  |   GPIO3_D4|             |          |
-|             |            |             |     +3.3V|   17  |   18  |   GPIO3_D3|             |          |
-|             | I2C4_SDA_M0| SPI3_MOSI_M0|  GPIO4_B2|   19  |   20  |        GND|             |          |
-|             |            | SPI3_MISO_M0|  GPIO4_B0|   21  |   22  |   GPIO3_C6|             |          |
-|             | I2C4_SCL_M0|  SPI3_CLK_M0|  GPIO4_B3|   23  |   24  |   GPIO4_A6|  SPI3_CS0_M0|          |
-|             |            |             |       GND|   25  |   26  |SARADC_VIN3|             |          |
-|             |            |  I2C2_SDA_M1|  GPIO4_B4|   27  |   28  |   GPIO4_B5|  I2C2_SCL_M1|          |
-|             |            |             |  GPIO4_B1|   29  |   30  |        GND|             |          |
-|             |        PWM6| SPI0_MISO_M0|  GPIO0_C5|   31  |   32  |   GPIO4_C0|  UART5_TX_M1|          |
-|             |     PWM7_IR|  SPI0_CS0_M0|  GPIO0_C6|   33  |   34  |        GND|             |          |
-|             |            |             |  GPIO3_D0|   35  |   36  |   GPIO4_A7|  SPI3_CS1_M0|          |
-|             |            |      PWM3_IR|  GPIO0_C2|   37  |   38  |   GPIO3_D2|             |          |
-|             |            |             |       GND|   39  |   40  |   GPIO3_D1|             |          |
+|    Function3|   Function3|    Function2| Function1|  PIN  |  PIN  |  Function1|    Function2|   Function3|
+|-------------|------------|-------------|----------|:------|------:|-----------|-------------|------------|
+|             |            |             |       3V3|   1   |   2   |      +5.0V|             |            |
+|      PWM2_M1|SPI0_MOSI_M0|  I2C2_SDA_M0|  GPIO0_B6|   3   |   4   |      +5.0V|             |            |
+|      PWM1_M1| SPI0_CLK_M0|  I2C2_SCL_M0|  GPIO0_B5|   5   |   6   |        GND|             |            |
+|             |            |             |  GPIO3_D5|   7   |   8   |   GPIO0_D1|  UART2_TX_M0|            |
+|             |            |             |       GND|   9   |   10  |   GPIO0_D0|  UART2_RX_M0|            |
+|             |            |      PWM0_M1|  GPIO0_C7|   11  |   12  |   GPIO3_C7|             |            |
+|             |            |      PWM0_M0|  GPIO0_B7|   13  |   14  |        GND|             |            |
+|             |            |         PWM4|  GPIO0_C3|   15  |   16  |   GPIO3_D4|             |            |
+|             |            |             |     +3.3V|   17  |   18  |   GPIO3_D3|             |            |
+|             | I2C4_SDA_M0| SPI3_MOSI_M0|  GPIO4_B2|   19  |   20  |        GND|             |            |
+|             |            | SPI3_MISO_M0|  GPIO4_B0|   21  |   22  |   GPIO3_C6|             |            |
+|             | I2C4_SCL_M0|  SPI3_CLK_M0|  GPIO4_B3|   23  |   24  |   GPIO4_A6|  SPI3_CS0_M0|            |
+|             |            |             |       GND|   25  |   26  |   GPIO4_C5|  UART9_TX_M1|SPI3_MISO_M1|
+|             |            |  I2C2_SDA_M1|  GPIO4_B4|   27  |   28  |   GPIO4_B5|  I2C2_SCL_M1|            |
+|             |            |             |  GPIO4_B1|   29  |   30  |        GND|             |            |
+|             |        PWM6| SPI0_MISO_M0|  GPIO0_C5|   31  |   32  |   GPIO4_C0|  UART5_TX_M1|            |
+|             |     PWM7_IR|  SPI0_CS0_M0|  GPIO0_C6|   33  |   34  |        GND|             |            |
+|             |            |             |  GPIO3_D0|   35  |   36  |   GPIO4_A7|  SPI3_CS1_M0|            |
+|             |            |      PWM3_IR|  GPIO0_C2|   37  |   38  |   GPIO3_D2|             |            |
+|             |            |             |       GND|   39  |   40  |   GPIO3_D1|             |            |
 
 Supports
 --------
diff --git a/include/arm/radxa_cm3.h b/include/arm/radxa_cm3.h
index bc03c5a58..2094cdbe9 100644
--- a/include/arm/radxa_cm3.h
+++ b/include/arm/radxa_cm3.h
@@ -18,7 +18,7 @@ extern "C" {
 #define MRAA_RADXA_CM3_SPI_COUNT  2
 #define MRAA_RADXA_CM3_UART_COUNT 1
 #define MRAA_RADXA_CM3_PWM_COUNT  9
-#define MRAA_RADXA_CM3_AIO_COUNT  1
+#define MRAA_RADXA_CM3_AIO_COUNT  0
 #define MRAA_RADXA_CM3_PIN_COUNT  40
 #define PLATFORM_NAME_RADXA_CM3_IO   "Radxa Compute Module 3(CM3) IO Board"
 #define PLATFORM_NAME_RADXA_CM3_IO_2   "Radxa CM3 IO Board"
diff --git a/src/arm/radxa_cm3.c b/src/arm/radxa_cm3.c
index a1364d252..14a16b448 100644
--- a/src/arm/radxa_cm3.c
+++ b/src/arm/radxa_cm3.c
@@ -141,7 +141,7 @@ mraa_radxa_cm3()
     mraa_radxa_cm3_pininfo(b, 23, 4, 11, (mraa_pincapabilities_t){1,1,0,0,1,1,0,0}, "GPIO4_B3");
     mraa_radxa_cm3_pininfo(b, 24, 4, 6, (mraa_pincapabilities_t){1,1,0,0,1,0,0,0}, "GPIO4_A6");
     mraa_radxa_cm3_pininfo(b, 25, -1, -1, (mraa_pincapabilities_t){1,0,0,0,0,0,0,0}, "GND");
-    mraa_radxa_cm3_pininfo(b, 26, -1, -1, (mraa_pincapabilities_t){1,0,0,0,0,0,1,0}, "SARADC_VIN3");
+    mraa_radxa_cm3_pininfo(b, 26, 4, 21, (mraa_pincapabilities_t){1,1,0,0,1,0,0,1}, "GPIO4_C5");
     mraa_radxa_cm3_pininfo(b, 27, 4, 12, (mraa_pincapabilities_t){1,1,0,0,0,1,0,0}, "GPIO4_B4");
     mraa_radxa_cm3_pininfo(b, 28, 4, 13, (mraa_pincapabilities_t){1,1,0,0,0,1,0,0}, "GPIO4_B5");
     mraa_radxa_cm3_pininfo(b, 29, 4, 9, (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, "GPIO4_B1");