Fix wrong pin definition and ADC support for RK3588

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
index 0b00e76ca99e6f82eb2332b60ba7de63cdc3b63b..933e15f0584871d633c96db9f7b03d0afa55b4c3 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
@@ -232,8 +232,8 @@ SPI1_MOSI_M1 = GPIO3_B7
 SPI1_MISO_M1 = GPIO3_C0
 SPI1_CLK_M1 = GPIO3_C1
 SPI1_SCLK_M1 = SPI1_CLK_M1
 SPI1_MISO_M1 = GPIO3_C0
 SPI1_CLK_M1 = GPIO3_C1
 SPI1_SCLK_M1 = SPI1_CLK_M1

-SPI1_CS0_M1 = SPI1_CS0_M1
-SPI1_CS1_M1 = SPI1_CS1_M1
+SPI1_CS0_M1 = GPIO3_C2
+SPI1_CS1_M1 = GPIO3_C3

 
 SPI3_MISO_M0 = GPIO4_C4
 SPI3_MOSI_M0 = GPIO4_C5
 
 SPI3_MISO_M0 = GPIO4_C4
 SPI3_MOSI_M0 = GPIO4_C5

diff --git a/src/analogio.py b/src/analogio.py
index 4b7f9b06615dc33176557f4c024ac1cbb14ae025..8e07c9c84ffbfcb394df97f6c60bb18c1bfd3964 100644 (file)
--- a/src/analogio.py
+++ b/src/analogio.py
@@ -29,6 +29,8 @@ elif detector.chip.RK3308:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.RK3399:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.RK3399:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn

+elif detector.chip.RK3588:
+    from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn

 elif detector.chip.IMX6ULL:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.STM32MP157:
 elif detector.chip.IMX6ULL:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.STM32MP157: