V1.17

Author: TheRemote

OrangePiRDA/kernel/arch/arm/mach-rda/devices.c

@@ -278,21 +278,19 @@ static struct platform_device rda_comreg0 = {
 	.num_resources = ARRAY_SIZE(rda_comreg0_resource),
 };
 
-static struct spi_gpio_platform_data spi_gpio_data = {
-	.sck = 2, // spi pins on the comb
-	.mosi = 4,
-	.miso = 3,
+static struct spi_gpio_platform_data spi2_gpio_data = {
+		.sck = 2, // spi pins on the comb
+		.mosi = 3,
+		.miso = 4,
 
-	.num_chipselect = 1, // this is the number of devices (we will only connect the screen, but can be extended for spidev)
+		.num_chipselect = 2, // this is the number of devices (we will only connect the screen, but can be extended for spidev)
 };
-
-struct platform_device rda_spi_gpio = {
-	.name = "spi_gpio", // spi driver name
-	.id = 3,			// bus number, because spi0 spi1 spi2 is already described in this file, then this one will be 3
-	.dev = {
-		.platform_data = &spi_gpio_data,
-	}};
-
+struct platform_device rda_spi2_gpio = {
+		.name = "spi_gpio", // spi driver name
+		.id = 2,			// bus number spi2 available on GPIO header
+		.dev = {
+				.platform_data = &spi2_gpio_data,
+		}};
 static struct resource rda_md_resource[] = {
 	[0] = {
 		.start = RDA_COMREGS_PHYS,
@@ -1580,14 +1578,25 @@ static struct spi_board_info rda_spi_board_info[] = {
 		.bus_num = 0,
 		.chip_select = 1,
 		.controller_data = (void *)&tlv320aic23_spi,
+		.platform_data = (void *) NULL,
 	},
 	{
 		.modalias = "spidev", // driver name
-		.max_speed_hz = 32000000,
+		.max_speed_hz = 1000000,
 		.mode = SPI_MODE_0,
-		.bus_num = 3, // our spi number is 3
+		.bus_num = 2, // /dev/spidev2.0 using gpio_spi driver
 		.chip_select = 0,
-		.controller_data = (void *) 5, // CS pin 
+		.controller_data = (void *) 10, // SPI2_CS_0 is not available on gpio HEADER, use any other GPIO CS pin
+		.platform_data = (void *) &spi2_gpio_data,
+	},
+	{
+		.modalias = "spidev", // driver name
+		.max_speed_hz = 1000000,
+		.mode = SPI_MODE_0,
+		.bus_num = 2, // /dev/spidev2.1 using gpio_spi driver
+		.chip_select = 1,
+		.controller_data = (void *) 6, // CS pin
+		.platform_data = (void *) &spi2_gpio_data,
 	},
 };
 
@@ -1657,8 +1666,7 @@ static struct platform_device *devices[] __initdata = {
 #endif
 	&rda_spi0,
 	&rda_spi1,
-	&rda_spi2,
-	&rda_spi_gpio,
+	&rda_spi2_gpio,
 	&rda_vibrator,
 	&rda_power_supply,
 #ifdef CONFIG_LEDS_RDA
@@ -1703,4 +1711,4 @@ void __init rda_init_devices(void)
 	bl_device_init();
 #endif
 	platform_add_devices(devices, ARRAY_SIZE(devices));
-}
+}

OrangePiRDA/scripts/lib/build_image.sh

@@ -5,7 +5,7 @@ build_rk_image() {
 }
 
 build_rda_image() {
-	VER="v1.16"
+	VER="v1.17"
 	IMAGENAME="Legendary_OrangePi_${BOARD}_${OS}_${DISTRO}_${IMAGETYPE}_${VER}"
 	IMAGE="${BUILD}/images/$IMAGENAME.img"
 

OrangePiRDA/scripts/lib/distributions.sh

@@ -604,7 +604,7 @@ EOF
 		rm -f "$DEST/type-phase"
 
 		# GPIO fixup
-		curl -k -L -o "$DEST/usr/local/sbin/gpio_fixup.sh" https://wiki.pbeirne.com/patb/i96/raw/master/gpio_fixup.sh
+		curl -k -L -o "$DEST/usr/local/sbin/gpio_fixup.sh" https://raw.githubusercontent.com/MehdiZAABAR/OrangePi-I96-Work/master/OrangePiRDA/output/rootfs/usr/local/sbin/gpio_fixup.sh
 		chmod +x "$DEST/usr/local/sbin/gpio_fixup.sh"
 		curl -k -L -o "$DEST/usr/local/bin/opio" https://wiki.pbeirne.com/patb/opio/raw/master/opio
 		chmod +x "$DEST/usr/local/bin/opio"

README.md

@@ -50,6 +50,7 @@ Ubuntu is not building correctly yet.<br>
 <br>
 <h2>Version History</h2>
 <ol>
+  <li>September 20th 2022 - V1.17 - Add further spidev fixes (thanks MZA, <a href="https://github.com/MehdiZAABAR/OrangePi-I96-Work/">OrangePi-I96-Work</a>)</li>
   <li>September 19th 2022 - V1.16 - Add cpufrequtils package (thanks Marco, <a href="https://github.com/TheRemote/Legendary-OrangePi-i96/pull/5">PR #5</a>)</li>
   <li>September 18th 2022 - V1.15 - Fix Bluetooth to have fixed MAC address stored in /data/misc/bluetooth (thanks Marco, <a href="https://github.com/TheRemote/Legendary-OrangePi-i96/pull/4">PR #4</a>)</li>
   <li>September 16th 2022 - V1.14 - Add bluez-tools package</li>
@@ -83,5 +84,5 @@ Is it enough?  You'll have to judge for yourself if it's enough but it is enough
 <a href="https://4pda.to/forum/index.php?showtopic=813602&st=280">Credit to Yoshie</a> for enough hints to enable the spidev interface<br>
 <a href="https://github.com/TheRemote/Legendary-OrangePi-i96/pull/1">Credit to jakeau</a> for adding the ability to use the i96 as a HID device (PR #1)<br>
 <a href="https://github.com/TheRemote/Legendary-OrangePi-i96/pull/2">Credit to SteveGotthardt</a> for adding the USB serial connection and fixing ACL entries to eliminate warnings (PR #2)<br>
-<a href="https://github.com/MehdiZAABAR/WiringPi">Credit to MZA</a> for fixing the WiringPi library to work with the i96<br>
+<a href="https://github.com/MehdiZAABAR/WiringPi">Credit to MZA</a> for fixing the WiringPi library to work with the i96 as well as fixes to the spidev interface<br>
 <a href="https://github.com/well0nez/RDA5991g_patchram">Credit to Marco</a> for fixing the Bluetooth patchram utility to work with the i96 as well as fixing the Bluetooth MAC address (PR #4)<br>