x1000: GPIO refactor

The GPIO API was pretty clunky and pin settings were decentralized,
making it hard to see what was happening and making GPIO stuff look
like a mess, frankly.

Instead of passing clunky (port, pin) pairs everywhere, GPIOs are now
identified with a single int. The extra overhead should be minimal as
GPIO configuration is generally not on a performance-critical path.

Pin assignments are now mostly consolidated in gpio-target.h and put
in various tables so gpio_init() can assign most pins at boot time.

Most drivers no longer need to touch GPIOs and basic pin I/O stuff
can happen without config since pins are put into the right state.
IRQ pins still need to be configured manually before use.

Change-Id: Ic5326284b0b2a2f613e9e76a41cb50e24af3aa47

6 files changed, 50 insertions, 25 deletions

diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c
index 542d1745dc..8528b803f7 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c
@@ -87,5 +87,5 @@ void audiohw_set_power_mode(int mode)
 
 void ak4376_set_pdn_pin(int level)
 {
-    gpio_config(GPIO_A, 1 << 16, GPIO_OUTPUT(level ? 1 : 0));
+    gpio_set_level(GPIO_AK4376_POWER, level ? 1 : 0);
 }
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c
index efc652c84f..47b5e3d6dc 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c
@@ -35,8 +35,6 @@
 # include "font.h"
 #endif
 
-#define FT_RST_PIN      (1 << 15)
-#define FT_INT_PIN      (1 << 12)
 #define ft_interrupt    GPIOB12
 
 /* Touch event types */
@@ -389,11 +387,13 @@ static void ft_init(void)
     i2c_x1000_set_freq(FT6x06_BUS, I2C_FREQ_400K);
 
     /* Reset chip */
-    gpio_config(GPIO_B, FT_RST_PIN|FT_INT_PIN, GPIO_OUTPUT(0));
+    gpio_set_level(GPIO_FT6x06_RESET, 0);
     mdelay(5);
-    gpio_out_level(GPIO_B, FT_RST_PIN, 1);
-    gpio_config(GPIO_B, FT_INT_PIN, GPIO_IRQ_EDGE(0));
-    gpio_enable_irq(GPIO_B, FT_INT_PIN);
+    gpio_set_level(GPIO_FT6x06_RESET, 1);
+
+    /* Configure the interrupt pin */
+    gpio_set_function(GPIO_FT6x06_INTERRUPT, GPIOF_IRQ_EDGE(0));
+    gpio_enable_irq(GPIO_FT6x06_INTERRUPT);
 }
 
 void touchpad_set_sensitivity(int level)
@@ -454,10 +454,6 @@ static void hp_detect_init(void)
 /* Rockbox interface */
 void button_init_device(void)
 {
-    /* Configure physical button GPIOs */
-    gpio_config(GPIO_A, (1 << 17) | (1 << 19), GPIO_INPUT);
-    gpio_config(GPIO_B, (1 << 28) | (1 << 31), GPIO_INPUT);
-
     /* Initialize touchpad */
     ft_init();
 
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/gpio-target.h b/firmware/target/mips/ingenic_x1000/fiiom3k/gpio-target.h
new file mode 100644
index 0000000000..f580cd9167
--- /dev/null
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/gpio-target.h
@@ -0,0 +1,26 @@
+/*              Name            Port    Pins            Function */
+DEFINE_PINGROUP(LCD_DATA,       GPIO_A, 0xffff <<  0,   GPIOF_DEVICE(1))
+DEFINE_PINGROUP(LCD_CONTROL,    GPIO_B,   0x1a << 16,   GPIOF_DEVICE(1))
+DEFINE_PINGROUP(MSC0,           GPIO_A,   0x3f << 20,   GPIOF_DEVICE(1))
+DEFINE_PINGROUP(SFC,            GPIO_A,   0x3f << 26,   GPIOF_DEVICE(1))
+DEFINE_PINGROUP(I2S,            GPIO_B,   0x1f <<  0,   GPIOF_DEVICE(1))
+DEFINE_PINGROUP(DMIC,           GPIO_B,      3 << 21,   GPIOF_DEVICE(0))
+DEFINE_PINGROUP(I2C0,           GPIO_B,      3 << 23,   GPIOF_DEVICE(0))
+DEFINE_PINGROUP(I2C1,           GPIO_C,      3 << 26,   GPIOF_DEVICE(0))
+DEFINE_PINGROUP(I2C2,           GPIO_D,      3 <<  0,   GPIOF_DEVICE(1))
+
+/*          Name                Pin             Function */
+DEFINE_GPIO(AK4376_POWER,       GPIO_PA(16),    GPIOF_OUTPUT(0))
+DEFINE_GPIO(BTN_PLAY,           GPIO_PA(17),    GPIOF_INPUT)
+DEFINE_GPIO(BTN_VOL_UP,         GPIO_PA(19),    GPIOF_INPUT)
+DEFINE_GPIO(MSC0_CD,            GPIO_PB(6),     GPIOF_INPUT)
+DEFINE_GPIO(USB_ID,             GPIO_PB(7),     GPIOF_INPUT)
+DEFINE_GPIO(AXP_IRQ,            GPIO_PB(10),    GPIOF_INPUT)
+DEFINE_GPIO(USB_DETECT,         GPIO_PB(11),    GPIOF_INPUT)
+DEFINE_GPIO(FT6x06_INTERRUPT,   GPIO_PB(12),    GPIOF_INPUT)
+DEFINE_GPIO(FT6x06_RESET,       GPIO_PB(15),    GPIOF_OUTPUT(0))
+DEFINE_GPIO(LCD_RD,             GPIO_PB(16),    GPIOF_OUTPUT(1))
+DEFINE_GPIO(LCD_CE,             GPIO_PB(18),    GPIOF_OUTPUT(1))
+DEFINE_GPIO(USB_DRVVBUS,        GPIO_PB(25),    GPIOF_OUTPUT(0))
+DEFINE_GPIO(BTN_VOL_DOWN,       GPIO_PB(28),    GPIOF_INPUT)
+DEFINE_GPIO(BTN_POWER,          GPIO_PB(31),    GPIOF_INPUT)
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c
index 96f794d7df..29e72286ff 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c
@@ -25,9 +25,6 @@
 #include "gpio-x1000.h"
 #include "system.h"
 
-#define CS_PIN (1 << 18)
-#define RD_PIN (1 << 16)
-
 static const uint32_t fiio_lcd_cmd_enable[] = {
     /* Software reset */
     LCD_INSTR_CMD,      0x01,
@@ -169,17 +166,27 @@ const struct lcd_tgt_config lcd_tgt_config = {
 void lcd_tgt_enable(bool enable)
 {
     if(enable) {
-        gpio_config(GPIO_A, 0xffff, GPIO_DEVICE(1));
-        gpio_config(GPIO_B, 0x1f << 16, GPIO_DEVICE(1));
-        gpio_config(GPIO_B, CS_PIN|RD_PIN, GPIO_OUTPUT(1));
+        /* reset controller, probably */
+        gpio_set_level(GPIO_LCD_CE, 1);
+        gpio_set_level(GPIO_LCD_RD, 1);
         mdelay(5);
-        gpio_out_level(GPIO_B, CS_PIN, 0);
+        gpio_set_level(GPIO_LCD_CE, 0);
+
+        /* set the clock whatever it is... */
         lcd_set_clock(X1000_CLK_SCLK_A, 30000000);
+
+        /* program the initial configuration */
         lcd_exec_commands(&fiio_lcd_cmd_enable[0]);
     } else {
+        /* go to sleep mode first */
         lcd_exec_commands(&fiio_lcd_cmd_sleep[0]);
-        mdelay(115); /* ensure we wait a total of 120ms before power off */
-        gpio_config(GPIO_B, CS_PIN|RD_PIN, 0);
+
+        /* ensure we wait a total of 120ms before power off */
+        mdelay(115);
+
+        /* this is intended to power off the panel but I'm not sure it does */
+        gpio_set_level(GPIO_LCD_CE, 0);
+        gpio_set_level(GPIO_LCD_RD, 0);
     }
 }
 
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
index a7f6165980..6b1ad2dbb5 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
@@ -28,7 +28,6 @@
 #endif
 #include "axp-pmu.h"
 #include "i2c-x1000.h"
-#include "gpio-x1000.h"
 
 const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
 {
@@ -53,9 +52,6 @@ const unsigned short percent_to_volt_charge[11] =
       3485, 3780, 3836, 3857, 3890, 3930, 3986, 4062, 4158, 4185, 4196
 };
 
-#define AXP_IRQ_PORT GPIO_B
-#define AXP_IRQ_PIN  (1 << 10)
-
 void power_init(void)
 {
     /* Initialize driver */
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/spl-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/spl-fiiom3k.c
index efea5aa323..85ce4da8f6 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/spl-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/spl-fiiom3k.c
@@ -116,7 +116,7 @@ int spl_get_boot_option(void)
     const int max_iter_count = 30;
 
     /* Configure the button GPIOs as inputs */
-    gpio_config(GPIO_A, pinmask, GPIO_INPUT);
+    gpioz_configure(GPIO_A, pinmask, GPIOF_INPUT);
 
     /* Poll the pins for a short duration to detect a keypress */
     do {