Support Orange Pi 4A

orangepi-xunlong · Aug 11, 2024 · 168a348 · 168a348
1 parent 19c7bf4
commit 168a348
Show file tree

Hide file tree

Showing 4 changed files with 187 additions and 14 deletions.
diff --git a/examples/blink.c b/examples/blink.c
@@ -49,6 +49,7 @@ unsigned char getGpioNum(void)
 		case PI_MODEL_ZERO_2_W:
 		case PI_MODEL_3_PLUS:
 		case PI_MODEL_RV:
+		case PI_MODEL_4A:
 			return 28;
 			break;
 		case PI_MODEL_R1_PLUS:

diff --git a/gpio/readall.c b/gpio/readall.c
@@ -79,6 +79,11 @@ static char * alts_common [] =
   "IN", "OUT", "ALT2", "ALT3", "ALT4", "ALT5", "ALT6", "OFF"
 };
 
+static char * alts_a527 [] =
+{
+  "IN", "OUT", "ALT2", "ALT3", "ALT4", "ALT5", "ALT6",  "ALT7", "ALT8", "ALT9", "ALT10", "ALT11", "ALT12", "ALT13", "ALT14", "OFF",
+};
+
 static char * alts_rk3588 [] =
 {
   "IN", "OUT", "ALT1", "ALT2", "ALT3", "ALT4", "ALT5", "ALT6", "ALT7", "ALT8", "ALT9", "ALT10", "ALT11", "ALT12", "ALT13", "ALT14",
@@ -603,6 +608,34 @@ static char * physNames_ZERO_2[64] =
 	"    PH10", "        ",
 };
 
+static int physToWpi_4A[64] =
+{
+        -1,     // 0
+        -1, -1, // 1, 2
+         0, -1, // 3, 4
+         1, -1, // 5, 6
+         2,  3, // 7, 8
+        -1,  4, // 9, 10
+         5,  6, //11, 12
+         7, -1, //13, 14
+         8,  9, //15, 16
+        -1, 10, //17, 18
+        11, -1, //19, 20
+        12, 13, //21, 22
+        14, 15, //23, 24
+        -1, 16, //25, 26
+        17, 18, //27, 28
+        19, -1, //29, 30
+        20, 21, //31, 32
+        22, -1, //33, 34
+        23, 24, //35, 36
+        25, 26, //37, 38
+        -1, 27, //39, 40
+
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //41-> 55
+        -1, -1, -1, -1, -1, -1, -1, -1                              // 56-> 63
+};
+
 static int physToWpi_ZERO_2_W[64] =
 {
         -1,     // 0
@@ -631,6 +664,31 @@ static int physToWpi_ZERO_2_W[64] =
         -1, -1, -1, -1, -1, -1, -1, -1                              // 56-> 63
 };
 
+static char * physNames_4A[64] =
+{
+	      NULL,
+	"    3.3V", "5V      ",
+	"   SDA.4", "5V      ",
+	"   SCL.4", "GND     ",
+	"    PWM8", "TXD.7   ",
+	"     GND", "RXD.7   ",
+	"   TXD.2", "PB05    ",
+	"   RXD.2", "GND     ",
+	"    PB02", "PI13    ",
+	"    3.3V", "PI14    ",
+	"  MOSI.1", "GND     ",
+	"  MISO.1", "TXD.6   ",
+	"  SCLK.1", "CE.1    ",
+	"     GND", "RXD.6   ",
+	"   SDA.5", "SCL.5   ",
+	"    PB03", "GND     ",
+	"    PB11", "PWM12   ",
+	"   PWM13", "GND     ",
+	"    PB06", "PI10    ",
+	"    PB12", "PB07    ",
+	"     GND", "PB08    ",
+};
+
 static char * physNames_ZERO_2_W[64] =
 {
 	      NULL,
@@ -1933,6 +1991,12 @@ void OrangePiReadAll(int model)
 			physNames =  physNames_ZERO_2_W;
 			alts = alts_common;
 			break;
+		case PI_MODEL_4A:
+			printf (" +------+-----+----------+--------+---+  OPI 4A  +---+--------+----------+-----+------+\n");
+			physToWpi =  physToWpi_4A;
+			physNames =  physNames_4A;
+			alts = alts_a527;
+			break;
 		case PI_MODEL_RK3399:
 			printf (" +------+-----+----------+--------+---+OPi RK3399+---+--------+----------+-----+------+\n");
 			physToWpi =  physToWpi_RK3399;
@@ -2090,6 +2154,7 @@ void OrangePiReadAll(int model)
 		case PI_MODEL_3_PLUS:
 		case PI_MODEL_AI_PRO:
 		case PI_MODEL_RV:
+		case PI_MODEL_4A:
 			for (pin = 1 ; pin <= 40; pin += 2)
 				readallPhys(pin);
 			break;
@@ -2161,6 +2226,9 @@ void OrangePiReadAll(int model)
 		case PI_MODEL_ZERO_2_W:
 			printf (" +------+-----+----------+--------+---+  ZERO2W  +---+--------+----------+-----+------+\n");
 			break;
+		case PI_MODEL_4A:
+			printf (" +------+-----+----------+--------+---+  OPI 4A  +---+--------+----------+-----+------+\n");
+			break;
 		case PI_MODEL_RK3399:
 			printf (" +------+-----+----------+--------+---+OPi RK3399+---+--------+----------+-----+------+\n");
 			break;

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
@@ -252,6 +252,22 @@ static int ORANGEPI_PIN_MASK_ZERO_2_W[12][32] =  //[BANK]  [INDEX]
 	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PE
 };
 
+static int ORANGEPI_PIN_MASK_4A[12][32] =  //[BANK]  [INDEX]
+{
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PA
+	{ 0, 1, 2, 3, 4, 5, 6, 7, 8,-1,-1,11,12,13,14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PB
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PC
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PD
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PE
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PF
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PG
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PH
+	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PI
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PJ
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PK
+	{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,},//PE
+};
+
 static int ORANGEPI_PIN_MASK_800[5][32] =  //[BANK]	[INDEX]
 {
 	{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,},
@@ -871,6 +887,30 @@ int pinToGpio_ZERO_2_W[64] =
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 63
 };
 
+int pinToGpio_4A[64] =
+{
+	257, 256,     // 0, 1
+	 36,  45,     // 2, 3
+	 46,  32,     // 4  5
+	 37,  33,     // 6, 7
+	 34, 269,     // 8, 9
+	270, 260,     //10,11
+	261, 262,     //12,13
+	259, 258,     //14,15
+	263, 265,     //16,17
+	264,  35,     //18,19
+	 43, 267,     //20,21
+	268,  38,     //22,23
+	266,  44,     //24,25
+	 39,  40,     //26,27
+
+	-1,  -1,      //28,29
+	-1,  -1,      //30,31
+
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 47
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 63
+};
+
 int pinToGpio_RK3399[64] =
 {
 	43,  44,      // 0, 1
@@ -1644,6 +1684,34 @@ int physToGpio_ZERO_2_W[64] =
 	-1, -1, -1, -1, -1, -1, -1, 			 		   // ... 63
 };
 
+int physToGpio_4A[64] =
+{
+	 -1,
+	 -1,  -1,
+	257,  -1,
+	256,  -1,
+	 36,  45,
+	 -1,  46,
+	 32,  37,
+	 33,  -1,
+	 34, 269,
+	 -1, 270,
+	260,  -1,
+	261, 262,
+	259, 258,
+	 -1, 263,
+	265, 264,
+	 35,  -1,
+	 43, 267,
+	268,  -1,
+	 38, 266,
+	 44,  39,
+	 -1,  40,
+
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,	   // ... 56
+	-1, -1, -1, -1, -1, -1, -1, 			 		   // ... 63
+};
+
 int physToGpio_RK3399[64] =//head num map to OrangePi
 {
 	-1,       // 0
@@ -2582,6 +2650,7 @@ void piBoardId (int * model)
 	else if (strncmp(revision, "orangepi-rk3399.",         16) == 0) { *model = PI_MODEL_RK3399; }
 	else if (strncmp(revision, "orangepi800.",             12) == 0) { *model = PI_MODEL_800; }
 	else if (strncmp(revision, "orangepi4.",               10) == 0) { *model = PI_MODEL_4; }
+	else if (strncmp(revision, "orangepi4a.",              11) == 0) { *model = PI_MODEL_4A; }
 	else if (strncmp(revision, "orangepi4-lts.",           14) == 0) { *model = PI_MODEL_4_LTS; }
 	else if (strncmp(revision, "orangepir1plus.",          15) == 0) { *model = PI_MODEL_R1_PLUS; }
 	else if (strncmp(revision, "orangepi-r1plus.",         16) == 0) { *model = PI_MODEL_R1_PLUS; }
@@ -4690,6 +4759,18 @@ void set_soc_info(void)
 			sunxi_gpio_info_t.gpio_base_offset = 0x0;
 			sunxi_gpio_info_t.r_gpio_base_offset = 0x0;
 			sunxi_gpio_info_t.pwm_base_addr = H6_PWM_BASE;
+			sunxi_gpio_info_t.gpio_bank_offset = 0x24;
+			sunxi_gpio_info_t.pull_offset = 0x1c;
+			sunxi_gpio_info_t.gpio_cfg_mask = 0x7;
+			break;
+		case PI_MODEL_4A:
+			sunxi_gpio_info_t.gpio_base_addr = A527_GPIO_BASE_ADDR;
+			sunxi_gpio_info_t.r_gpio_base_addr = H6_R_GPIO_BASE_ADDR;
+			sunxi_gpio_info_t.gpio_base_offset = 0x0;
+			sunxi_gpio_info_t.r_gpio_base_offset = 0x0;
+			sunxi_gpio_info_t.gpio_bank_offset = 0x30;
+			sunxi_gpio_info_t.pull_offset = 0x24;
+			sunxi_gpio_info_t.gpio_cfg_mask = 0xf;
 			break;
 		case PI_MODEL_ZERO:
 		case PI_MODEL_ZERO_PLUS_2:
@@ -4703,6 +4784,9 @@ void set_soc_info(void)
 			sunxi_gpio_info_t.gpio_base_offset = 0x800;
 			sunxi_gpio_info_t.r_gpio_base_offset = 0xc00;
 			sunxi_gpio_info_t.pwm_base_addr = H3_PWM_BASE;
+			sunxi_gpio_info_t.gpio_bank_offset = 0x24;
+			sunxi_gpio_info_t.pull_offset = 0x1c;
+			sunxi_gpio_info_t.gpio_cfg_mask = 0x7;
 			break;
 		default:
 			break;
@@ -4834,6 +4918,11 @@ int wiringPiSetup (void)
 			physToGpio = physToGpio_ZERO_2_W;
 			ORANGEPI_PIN_MASK = ORANGEPI_PIN_MASK_ZERO_2_W;
 			break;
+		case PI_MODEL_4A:
+			pinToGpio =  pinToGpio_4A;
+			physToGpio = physToGpio_4A;
+			ORANGEPI_PIN_MASK = ORANGEPI_PIN_MASK_4A;
+			break;
 		case PI_MODEL_800:
 			pinToGpio =  pinToGpio_800;
 			physToGpio = physToGpio_800;
@@ -4967,7 +5056,7 @@ int wiringPiSetup (void)
 		case PI_MODEL_3: case PI_MODEL_LTIE_2: case PI_MODEL_ZERO_2:
 		case PI_MODEL_ZERO: case PI_MODEL_ZERO_PLUS_2: case PI_MODEL_WIN:
 		case PI_MODEL_PRIME: case PI_MODEL_PC_2: case PI_MODEL_ZERO_PLUS:
-		case PI_MODEL_H3: case PI_MODEL_ZERO_2_W:
+		case PI_MODEL_H3: case PI_MODEL_ZERO_2_W: case PI_MODEL_4A:
 
 			sunxi_gpio_info_t.pwm = (uint32_t *)mmap(0, BLOCK_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, sunxi_gpio_info_t.pwm_base_addr);
 			if ((int32_t)(unsigned long)sunxi_gpio_info_t.pwm == -1)
@@ -5395,6 +5484,10 @@ int wiringPiSetupSys (void)
 			pinToGpio =  pinToGpio_ZERO_2_W;
 			physToGpio = physToGpio_ZERO_2_W;
 			break;
+		case PI_MODEL_4A:
+			pinToGpio =  pinToGpio_4A;
+			physToGpio = physToGpio_4A;
+			break;
 		case PI_MODEL_800:
 			pinToGpio =  pinToGpio_800;
 			physToGpio = physToGpio_800;
@@ -6246,13 +6339,13 @@ int orangepi_get_gpio_mode(int pin)
 			if (bank == 11)
 				phyaddr = sunxi_gpio_info_t.r_gpio_base_addr + sunxi_gpio_info_t.r_gpio_base_offset + ((index >> 3) << 2);
 			else
-				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * 36) + ((index >> 3) << 2);
+				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * sunxi_gpio_info_t.gpio_bank_offset) + ((index >> 3) << 2);
 
 			/* Ignore unused gpio */
 			if (ORANGEPI_PIN_MASK[bank][index] != -1)
 			{
 				regval = readR(phyaddr);
-				mode = (regval >> offset) & 7;
+				mode = (regval >> offset) & sunxi_gpio_info_t.gpio_cfg_mask;
 			}
 
 			return mode;
@@ -7452,7 +7545,7 @@ int orangepi_set_gpio_mode(int pin, int mode)
 			if (bank == 11)
 				phyaddr = sunxi_gpio_info_t.r_gpio_base_addr + sunxi_gpio_info_t.r_gpio_base_offset + ((index >> 3) << 2);
 			else
-				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * 36) + ((index >> 3) << 2);
+				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * sunxi_gpio_info_t.gpio_bank_offset) + ((index >> 3) << 2);
 
 			/* Ignore unused gpio */
 			if (ORANGEPI_PIN_MASK[bank][index] != -1)
@@ -7467,7 +7560,7 @@ int orangepi_set_gpio_mode(int pin, int mode)
 				/* Set Input */
 				if(INPUT == mode)
 				{
-					regval &= ~(7 << offset);
+					regval &= ~(sunxi_gpio_info_t.gpio_cfg_mask << offset);
 					writeR(regval, phyaddr);
 					regval = readR(phyaddr);
 
@@ -7477,13 +7570,14 @@ int orangepi_set_gpio_mode(int pin, int mode)
 				else if(OUTPUT == mode)
 				{
 					/* Set Output */
-					regval &= ~(7 << offset);
+					regval &= ~(sunxi_gpio_info_t.gpio_cfg_mask << offset);
 					regval |=  (1 << offset);
 
 					if (wiringPiDebug)
 						printf("Out mode ready set val: 0x%x\n",regval);
 
 					writeR(regval, phyaddr);
+					//printf("write regval = %#x\n", regval);
 					regval = readR(phyaddr);
 
 					if (wiringPiDebug)
@@ -7509,7 +7603,7 @@ int orangepi_set_gpio_mode(int pin, int mode)
 					H618_set_pwm_reg(pin,&sunxi_gpio_info_t);
 
 					// set pin PWMx to pwm mode
-					regval &= ~(7 << offset);
+					regval &= ~(sunxi_gpio_info_t.gpio_cfg_mask << offset);
 					if (OrangePiModel == PI_MODEL_ZERO_2)
 						regval |= (0x4 << offset); // ALT4 PWM
 					else if (OrangePiModel == PI_MODEL_ZERO_2_W)
@@ -7568,7 +7662,7 @@ int orangepi_set_gpio_alt(int pin, int mode)
 	if (bank == 11)
 		phyaddr = sunxi_gpio_info_t.r_gpio_base_addr + ((index >> 3) << 2);
 	else
-		phyaddr = sunxi_gpio_info_t.gpio_base_addr + (bank * 36) + ((index >> 3) << 2);
+		phyaddr = sunxi_gpio_info_t.gpio_base_addr + (bank * sunxi_gpio_info_t.gpio_bank_offset) + ((index >> 3) << 2);
 
 	/* Ignore unused gpio */
 	if (ORANGEPI_PIN_MASK[bank][index] != -1)
@@ -7577,7 +7671,7 @@ int orangepi_set_gpio_alt(int pin, int mode)
 			printf("Register[%#x]: %#x index:%d\n", phyaddr, regval, index);
 
 		regval = readR(phyaddr);
-		regval &= ~(7 << offset);
+		regval &= ~(sunxi_gpio_info_t.gpio_cfg_mask << offset);
 		regval |=  (mode << offset);
 		writeR(regval, phyaddr);
 	}
@@ -7943,9 +8037,9 @@ int orangepi_digitalWrite(int pin, int value)
 			}
 			else
 			{
-				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * 36) + 0x10;
+				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * sunxi_gpio_info_t.gpio_bank_offset) + 0x10;
 			}
-			
+
 			/* Ignore unused gpio */
 			if (ORANGEPI_PIN_MASK[bank][index] != -1)
 			{
@@ -8094,7 +8188,7 @@ int orangepi_digitalRead(int pin)
 			if (bank == 11) 
 				phyaddr = sunxi_gpio_info_t.r_gpio_base_addr + sunxi_gpio_info_t.r_gpio_base_offset + 0x10;
 			else
-				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * 36) + 0x10;
+				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * sunxi_gpio_info_t.gpio_bank_offset) + 0x10;
 
 			break;
 
@@ -8283,9 +8377,9 @@ void OrangePi_set_gpio_pullUpDnControl (int pin, int pud)
 			offset = ((index % 16) << 1);
 
 			if (bank == 11)
-				phyaddr = sunxi_gpio_info_t.r_gpio_base_addr + sunxi_gpio_info_t.r_gpio_base_offset + ((index >> 4) << 2) + 0x1c;
+				phyaddr = sunxi_gpio_info_t.r_gpio_base_addr + sunxi_gpio_info_t.r_gpio_base_offset + ((index >> 4) << 2) + sunxi_gpio_info_t.pull_offset;
 			else
-				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * 36) + ((index >> 4) << 2) + 0x1c;
+				phyaddr = sunxi_gpio_info_t.gpio_base_addr + sunxi_gpio_info_t.gpio_base_offset + (bank * sunxi_gpio_info_t.gpio_bank_offset) + ((index >> 4) << 2) + sunxi_gpio_info_t.pull_offset;
 
 			bit_enable = 0;