rk: gpio.h: make gpio irq num same as gpio num

diff --git a/arch/arm/plat-rk/include/plat/gpio.h b/arch/arm/plat-rk/include/plat/gpio.h
index 76cfb23f158459e605e59db06b602240cb60c348..d6aa56d8d7d5f2897875fead1e36dafd4c4aad5f 100644 (file)
--- a/arch/arm/plat-rk/include/plat/gpio.h
+++ b/arch/arm/plat-rk/include/plat/gpio.h
@@ -21,7 +21,7 @@
 
 #define PIN_BASE                       NR_GIC_IRQS
 
-#define CPU_TOTOL_GPIO_NUM             (NUM_GROUP * GPIO_BANKS)
+#define CPU_TOTOL_GPIO_NUM             NR_GPIO_IRQS
 
 #define SPI_FPGA_EXPANDER_BASE         (PIN_BASE + CPU_TOTOL_GPIO_NUM)
 
@@ -59,158 +59,158 @@
 #define INVALID_GPIO           -1
 
 #if defined(CONFIG_SPI_FPGA_GPIO)
-#define FPGA_PIO0_00 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 0)
-#define FPGA_PIO0_01 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 1)
-#define FPGA_PIO0_02 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 2)
-#define FPGA_PIO0_03 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 3)
-#define FPGA_PIO0_04 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 4)
-#define FPGA_PIO0_05 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 5)
-#define FPGA_PIO0_06 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 6)
-#define FPGA_PIO0_07 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 7)
-
-#define FPGA_PIO0_08 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 0)
-#define FPGA_PIO0_09 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 1)
-#define FPGA_PIO0_10 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 2)
-#define FPGA_PIO0_11 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 3)
-#define FPGA_PIO0_12 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 4)
-#define FPGA_PIO0_13 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 5)
-#define FPGA_PIO0_14 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 6)
-#define FPGA_PIO0_15 (SPI_FPGA_EXPANDER_BASE + 1*NUM_GROUP + 7)
-
-#define FPGA_PIO1_00 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 0)
-#define FPGA_PIO1_01 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 1)
-#define FPGA_PIO1_02 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 2)
-#define FPGA_PIO1_03 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 3)
-#define FPGA_PIO1_04 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 4)
-#define FPGA_PIO1_05 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 5)
-#define FPGA_PIO1_06 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 6)
-#define FPGA_PIO1_07 (SPI_FPGA_EXPANDER_BASE + 2*NUM_GROUP + 7)
-
-#define FPGA_PIO1_08 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 0)
-#define FPGA_PIO1_09 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 1)
-#define FPGA_PIO1_10 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 2)
-#define FPGA_PIO1_11 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 3)
-#define FPGA_PIO1_12 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 4)
-#define FPGA_PIO1_13 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 5)
-#define FPGA_PIO1_14 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 6)
-#define FPGA_PIO1_15 (SPI_FPGA_EXPANDER_BASE + 3*NUM_GROUP + 7)
-
-#define FPGA_PIO2_00 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 0)
-#define FPGA_PIO2_01 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 1)
-#define FPGA_PIO2_02 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 2)
-#define FPGA_PIO2_03 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 3)
-#define FPGA_PIO2_04 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 4)
-#define FPGA_PIO2_05 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 5)
-#define FPGA_PIO2_06 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 6)
-#define FPGA_PIO2_07 (SPI_FPGA_EXPANDER_BASE + 4*NUM_GROUP + 7)
-
-#define FPGA_PIO2_08 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 0)
-#define FPGA_PIO2_09 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 1)
-#define FPGA_PIO2_10 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 2)
-#define FPGA_PIO2_11 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 3)
-#define FPGA_PIO2_12 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 4)
-#define FPGA_PIO2_13 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 5)
-#define FPGA_PIO2_14 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 6)
-#define FPGA_PIO2_15 (SPI_FPGA_EXPANDER_BASE + 5*NUM_GROUP + 7)
-
-#define FPGA_PIO3_00 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 0)
-#define FPGA_PIO3_01 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 1)
-#define FPGA_PIO3_02 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 2)
-#define FPGA_PIO3_03 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 3)
-#define FPGA_PIO3_04 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 4)
-#define FPGA_PIO3_05 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 5)
-#define FPGA_PIO3_06 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 6)
-#define FPGA_PIO3_07 (SPI_FPGA_EXPANDER_BASE + 6*NUM_GROUP + 7)
-
-#define FPGA_PIO3_08 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 0)
-#define FPGA_PIO3_09 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 1)
-#define FPGA_PIO3_10 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 2)
-#define FPGA_PIO3_11 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 3)
-#define FPGA_PIO3_12 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 4)
-#define FPGA_PIO3_13 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 5)
-#define FPGA_PIO3_14 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 6)
-#define FPGA_PIO3_15 (SPI_FPGA_EXPANDER_BASE + 7*NUM_GROUP + 7)
-
-#define FPGA_PIO4_00 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 0)
-#define FPGA_PIO4_01 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 1)
-#define FPGA_PIO4_02 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 2)
-#define FPGA_PIO4_03 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 3)
-#define FPGA_PIO4_04 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 4)
-#define FPGA_PIO4_05 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 5)
-#define FPGA_PIO4_06 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 6)
-#define FPGA_PIO4_07 (SPI_FPGA_EXPANDER_BASE + 8*NUM_GROUP + 7)
-
-#define FPGA_PIO4_08 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 0)
-#define FPGA_PIO4_09 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 1)
-#define FPGA_PIO4_10 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 2)
-#define FPGA_PIO4_11 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 3)
-#define FPGA_PIO4_12 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 4)
-#define FPGA_PIO4_13 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 5)
-#define FPGA_PIO4_14 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 6)
-#define FPGA_PIO4_15 (SPI_FPGA_EXPANDER_BASE + 9*NUM_GROUP + 7)
-
-#define FPGA_PIO5_00 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 0)
-#define FPGA_PIO5_01 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 1)
-#define FPGA_PIO5_02 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 2)
-#define FPGA_PIO5_03 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 3)
-#define FPGA_PIO5_04 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 4)
-#define FPGA_PIO5_05 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 5)
-#define FPGA_PIO5_06 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 6)
-#define FPGA_PIO5_07 (SPI_FPGA_EXPANDER_BASE + 10*NUM_GROUP + 7)
-
-#define FPGA_PIO5_08 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 0)
-#define FPGA_PIO5_09 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 1)
-#define FPGA_PIO5_10 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 2)
-#define FPGA_PIO5_11 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 3)
-#define FPGA_PIO5_12 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 4)
-#define FPGA_PIO5_13 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 5)
-#define FPGA_PIO5_14 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 6)
-#define FPGA_PIO5_15 (SPI_FPGA_EXPANDER_BASE + 11*NUM_GROUP + 7)
+#define FPGA_PIO0_00 (SPI_FPGA_EXPANDER_BASE + 0*8 + 0)
+#define FPGA_PIO0_01 (SPI_FPGA_EXPANDER_BASE + 0*8 + 1)
+#define FPGA_PIO0_02 (SPI_FPGA_EXPANDER_BASE + 0*8 + 2)
+#define FPGA_PIO0_03 (SPI_FPGA_EXPANDER_BASE + 0*8 + 3)
+#define FPGA_PIO0_04 (SPI_FPGA_EXPANDER_BASE + 0*8 + 4)
+#define FPGA_PIO0_05 (SPI_FPGA_EXPANDER_BASE + 0*8 + 5)
+#define FPGA_PIO0_06 (SPI_FPGA_EXPANDER_BASE + 0*8 + 6)
+#define FPGA_PIO0_07 (SPI_FPGA_EXPANDER_BASE + 0*8 + 7)
+
+#define FPGA_PIO0_08 (SPI_FPGA_EXPANDER_BASE + 1*8 + 0)
+#define FPGA_PIO0_09 (SPI_FPGA_EXPANDER_BASE + 1*8 + 1)
+#define FPGA_PIO0_10 (SPI_FPGA_EXPANDER_BASE + 1*8 + 2)
+#define FPGA_PIO0_11 (SPI_FPGA_EXPANDER_BASE + 1*8 + 3)
+#define FPGA_PIO0_12 (SPI_FPGA_EXPANDER_BASE + 1*8 + 4)
+#define FPGA_PIO0_13 (SPI_FPGA_EXPANDER_BASE + 1*8 + 5)
+#define FPGA_PIO0_14 (SPI_FPGA_EXPANDER_BASE + 1*8 + 6)
+#define FPGA_PIO0_15 (SPI_FPGA_EXPANDER_BASE + 1*8 + 7)
+
+#define FPGA_PIO1_00 (SPI_FPGA_EXPANDER_BASE + 2*8 + 0)
+#define FPGA_PIO1_01 (SPI_FPGA_EXPANDER_BASE + 2*8 + 1)
+#define FPGA_PIO1_02 (SPI_FPGA_EXPANDER_BASE + 2*8 + 2)
+#define FPGA_PIO1_03 (SPI_FPGA_EXPANDER_BASE + 2*8 + 3)
+#define FPGA_PIO1_04 (SPI_FPGA_EXPANDER_BASE + 2*8 + 4)
+#define FPGA_PIO1_05 (SPI_FPGA_EXPANDER_BASE + 2*8 + 5)
+#define FPGA_PIO1_06 (SPI_FPGA_EXPANDER_BASE + 2*8 + 6)
+#define FPGA_PIO1_07 (SPI_FPGA_EXPANDER_BASE + 2*8 + 7)
+
+#define FPGA_PIO1_08 (SPI_FPGA_EXPANDER_BASE + 3*8 + 0)
+#define FPGA_PIO1_09 (SPI_FPGA_EXPANDER_BASE + 3*8 + 1)
+#define FPGA_PIO1_10 (SPI_FPGA_EXPANDER_BASE + 3*8 + 2)
+#define FPGA_PIO1_11 (SPI_FPGA_EXPANDER_BASE + 3*8 + 3)
+#define FPGA_PIO1_12 (SPI_FPGA_EXPANDER_BASE + 3*8 + 4)
+#define FPGA_PIO1_13 (SPI_FPGA_EXPANDER_BASE + 3*8 + 5)
+#define FPGA_PIO1_14 (SPI_FPGA_EXPANDER_BASE + 3*8 + 6)
+#define FPGA_PIO1_15 (SPI_FPGA_EXPANDER_BASE + 3*8 + 7)
+
+#define FPGA_PIO2_00 (SPI_FPGA_EXPANDER_BASE + 4*8 + 0)
+#define FPGA_PIO2_01 (SPI_FPGA_EXPANDER_BASE + 4*8 + 1)
+#define FPGA_PIO2_02 (SPI_FPGA_EXPANDER_BASE + 4*8 + 2)
+#define FPGA_PIO2_03 (SPI_FPGA_EXPANDER_BASE + 4*8 + 3)
+#define FPGA_PIO2_04 (SPI_FPGA_EXPANDER_BASE + 4*8 + 4)
+#define FPGA_PIO2_05 (SPI_FPGA_EXPANDER_BASE + 4*8 + 5)
+#define FPGA_PIO2_06 (SPI_FPGA_EXPANDER_BASE + 4*8 + 6)
+#define FPGA_PIO2_07 (SPI_FPGA_EXPANDER_BASE + 4*8 + 7)
+
+#define FPGA_PIO2_08 (SPI_FPGA_EXPANDER_BASE + 5*8 + 0)
+#define FPGA_PIO2_09 (SPI_FPGA_EXPANDER_BASE + 5*8 + 1)
+#define FPGA_PIO2_10 (SPI_FPGA_EXPANDER_BASE + 5*8 + 2)
+#define FPGA_PIO2_11 (SPI_FPGA_EXPANDER_BASE + 5*8 + 3)
+#define FPGA_PIO2_12 (SPI_FPGA_EXPANDER_BASE + 5*8 + 4)
+#define FPGA_PIO2_13 (SPI_FPGA_EXPANDER_BASE + 5*8 + 5)
+#define FPGA_PIO2_14 (SPI_FPGA_EXPANDER_BASE + 5*8 + 6)
+#define FPGA_PIO2_15 (SPI_FPGA_EXPANDER_BASE + 5*8 + 7)
+
+#define FPGA_PIO3_00 (SPI_FPGA_EXPANDER_BASE + 6*8 + 0)
+#define FPGA_PIO3_01 (SPI_FPGA_EXPANDER_BASE + 6*8 + 1)
+#define FPGA_PIO3_02 (SPI_FPGA_EXPANDER_BASE + 6*8 + 2)
+#define FPGA_PIO3_03 (SPI_FPGA_EXPANDER_BASE + 6*8 + 3)
+#define FPGA_PIO3_04 (SPI_FPGA_EXPANDER_BASE + 6*8 + 4)
+#define FPGA_PIO3_05 (SPI_FPGA_EXPANDER_BASE + 6*8 + 5)
+#define FPGA_PIO3_06 (SPI_FPGA_EXPANDER_BASE + 6*8 + 6)
+#define FPGA_PIO3_07 (SPI_FPGA_EXPANDER_BASE + 6*8 + 7)
+
+#define FPGA_PIO3_08 (SPI_FPGA_EXPANDER_BASE + 7*8 + 0)
+#define FPGA_PIO3_09 (SPI_FPGA_EXPANDER_BASE + 7*8 + 1)
+#define FPGA_PIO3_10 (SPI_FPGA_EXPANDER_BASE + 7*8 + 2)
+#define FPGA_PIO3_11 (SPI_FPGA_EXPANDER_BASE + 7*8 + 3)
+#define FPGA_PIO3_12 (SPI_FPGA_EXPANDER_BASE + 7*8 + 4)
+#define FPGA_PIO3_13 (SPI_FPGA_EXPANDER_BASE + 7*8 + 5)
+#define FPGA_PIO3_14 (SPI_FPGA_EXPANDER_BASE + 7*8 + 6)
+#define FPGA_PIO3_15 (SPI_FPGA_EXPANDER_BASE + 7*8 + 7)
+
+#define FPGA_PIO4_00 (SPI_FPGA_EXPANDER_BASE + 8*8 + 0)
+#define FPGA_PIO4_01 (SPI_FPGA_EXPANDER_BASE + 8*8 + 1)
+#define FPGA_PIO4_02 (SPI_FPGA_EXPANDER_BASE + 8*8 + 2)
+#define FPGA_PIO4_03 (SPI_FPGA_EXPANDER_BASE + 8*8 + 3)
+#define FPGA_PIO4_04 (SPI_FPGA_EXPANDER_BASE + 8*8 + 4)
+#define FPGA_PIO4_05 (SPI_FPGA_EXPANDER_BASE + 8*8 + 5)
+#define FPGA_PIO4_06 (SPI_FPGA_EXPANDER_BASE + 8*8 + 6)
+#define FPGA_PIO4_07 (SPI_FPGA_EXPANDER_BASE + 8*8 + 7)
+
+#define FPGA_PIO4_08 (SPI_FPGA_EXPANDER_BASE + 9*8 + 0)
+#define FPGA_PIO4_09 (SPI_FPGA_EXPANDER_BASE + 9*8 + 1)
+#define FPGA_PIO4_10 (SPI_FPGA_EXPANDER_BASE + 9*8 + 2)
+#define FPGA_PIO4_11 (SPI_FPGA_EXPANDER_BASE + 9*8 + 3)
+#define FPGA_PIO4_12 (SPI_FPGA_EXPANDER_BASE + 9*8 + 4)
+#define FPGA_PIO4_13 (SPI_FPGA_EXPANDER_BASE + 9*8 + 5)
+#define FPGA_PIO4_14 (SPI_FPGA_EXPANDER_BASE + 9*8 + 6)
+#define FPGA_PIO4_15 (SPI_FPGA_EXPANDER_BASE + 9*8 + 7)
+
+#define FPGA_PIO5_00 (SPI_FPGA_EXPANDER_BASE + 10*8 + 0)
+#define FPGA_PIO5_01 (SPI_FPGA_EXPANDER_BASE + 10*8 + 1)
+#define FPGA_PIO5_02 (SPI_FPGA_EXPANDER_BASE + 10*8 + 2)
+#define FPGA_PIO5_03 (SPI_FPGA_EXPANDER_BASE + 10*8 + 3)
+#define FPGA_PIO5_04 (SPI_FPGA_EXPANDER_BASE + 10*8 + 4)
+#define FPGA_PIO5_05 (SPI_FPGA_EXPANDER_BASE + 10*8 + 5)
+#define FPGA_PIO5_06 (SPI_FPGA_EXPANDER_BASE + 10*8 + 6)
+#define FPGA_PIO5_07 (SPI_FPGA_EXPANDER_BASE + 10*8 + 7)
+
+#define FPGA_PIO5_08 (SPI_FPGA_EXPANDER_BASE + 11*8 + 0)
+#define FPGA_PIO5_09 (SPI_FPGA_EXPANDER_BASE + 11*8 + 1)
+#define FPGA_PIO5_10 (SPI_FPGA_EXPANDER_BASE + 11*8 + 2)
+#define FPGA_PIO5_11 (SPI_FPGA_EXPANDER_BASE + 11*8 + 3)
+#define FPGA_PIO5_12 (SPI_FPGA_EXPANDER_BASE + 11*8 + 4)
+#define FPGA_PIO5_13 (SPI_FPGA_EXPANDER_BASE + 11*8 + 5)
+#define FPGA_PIO5_14 (SPI_FPGA_EXPANDER_BASE + 11*8 + 6)
+#define FPGA_PIO5_15 (SPI_FPGA_EXPANDER_BASE + 11*8 + 7)
 #endif
 
 #if defined(CONFIG_IOEXTEND_TCA6424)
-#define TCA6424_P00 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 0)
-#define TCA6424_P01 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 1)
-#define TCA6424_P02 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 2)
-#define TCA6424_P03 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 3)
-#define TCA6424_P04 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 4)
-#define TCA6424_P05 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 5)
-#define TCA6424_P06 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 6)
-#define TCA6424_P07 (TCA6424_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 7)
-
-#define TCA6424_P10 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 0)
-#define TCA6424_P11 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 1)
-#define TCA6424_P12 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 2)
-#define TCA6424_P13 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 3)
-#define TCA6424_P14 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 4)
-#define TCA6424_P15 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 5)
-#define TCA6424_P16 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 6)
-#define TCA6424_P17 (TCA6424_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 7)
-
-#define TCA6424_P20 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 0)
-#define TCA6424_P21 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 1)
-#define TCA6424_P22 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 2)
-#define TCA6424_P23 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 3)
-#define TCA6424_P24 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 4)
-#define TCA6424_P25 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 5)
-#define TCA6424_P26 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 6)
-#define TCA6424_P27 (TCA6424_GPIO_EXPANDER_BASE + 2*NUM_GROUP + 7)
+#define TCA6424_P00 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 0)
+#define TCA6424_P01 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 1)
+#define TCA6424_P02 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 2)
+#define TCA6424_P03 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 3)
+#define TCA6424_P04 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 4)
+#define TCA6424_P05 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 5)
+#define TCA6424_P06 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 6)
+#define TCA6424_P07 (TCA6424_GPIO_EXPANDER_BASE + 0*8 + 7)
+
+#define TCA6424_P10 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 0)
+#define TCA6424_P11 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 1)
+#define TCA6424_P12 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 2)
+#define TCA6424_P13 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 3)
+#define TCA6424_P14 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 4)
+#define TCA6424_P15 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 5)
+#define TCA6424_P16 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 6)
+#define TCA6424_P17 (TCA6424_GPIO_EXPANDER_BASE + 1*8 + 7)
+
+#define TCA6424_P20 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 0)
+#define TCA6424_P21 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 1)
+#define TCA6424_P22 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 2)
+#define TCA6424_P23 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 3)
+#define TCA6424_P24 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 4)
+#define TCA6424_P25 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 5)
+#define TCA6424_P26 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 6)
+#define TCA6424_P27 (TCA6424_GPIO_EXPANDER_BASE + 2*8 + 7)
 #endif
 
 #if defined(CONFIG_GPIO_WM831X)
-#define WM831X_P01 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 0)
-#define WM831X_P02 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 1)
-#define WM831X_P03 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 2)
-#define WM831X_P04 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 3)
-#define WM831X_P05 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 4)
-#define WM831X_P06 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 5)
-#define WM831X_P07 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 6)
-#define WM831X_P08 (WM831X_GPIO_EXPANDER_BASE + 0*NUM_GROUP + 7)
-
-#define WM831X_P09 (WM831X_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 0)
-#define WM831X_P10 (WM831X_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 1)
-#define WM831X_P11 (WM831X_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 2)
-#define WM831X_P12 (WM831X_GPIO_EXPANDER_BASE + 1*NUM_GROUP + 3)
+#define WM831X_P01 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 0)
+#define WM831X_P02 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 1)
+#define WM831X_P03 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 2)
+#define WM831X_P04 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 3)
+#define WM831X_P05 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 4)
+#define WM831X_P06 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 5)
+#define WM831X_P07 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 6)
+#define WM831X_P08 (WM831X_GPIO_EXPANDER_BASE + 0*8 + 7)
+
+#define WM831X_P09 (WM831X_GPIO_EXPANDER_BASE + 1*8 + 0)
+#define WM831X_P10 (WM831X_GPIO_EXPANDER_BASE + 1*8 + 1)
+#define WM831X_P11 (WM831X_GPIO_EXPANDER_BASE + 1*8 + 2)
+#define WM831X_P12 (WM831X_GPIO_EXPANDER_BASE + 1*8 + 3)
 #endif
 
 /*