ARM: shmobile: sh73a0: Support sparse GPIO numbers

The SH73A0 SoC has sparse GPIO numbers. Declare the pin numbers ranges
in the PFC SoC data and use the pin numbers in the GPIO API.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 7f3a6b7e7b7c..65a5e0b80f06 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -433,7 +433,7 @@ static struct sh_mobile_sdhi_info sdhi2_info = {
                           TMIO_MMC_WRPROTECT_DISABLE,
         .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
         .tmio_ocr_mask  = MMC_VDD_27_28 | MMC_VDD_28_29,
-        .cd_gpio        = GPIO_PORT13,
+        .cd_gpio        = 13,
 };
 
 static struct resource sdhi2_resources[] = {
@@ -672,7 +672,7 @@ static void __init kzm_init(void)
         gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */
 
         /* SMSC */
-        gpio_request_one(GPIO_PORT224, GPIOF_IN, NULL); /* IRQ3 */
+        gpio_request_one(224, GPIOF_IN, NULL); /* IRQ3 */
 
         /* LCDC */
         gpio_request(GPIO_FN_LCDD23,    NULL);
@@ -702,11 +702,11 @@ static void __init kzm_init(void)
         gpio_request(GPIO_FN_LCDDISP,   NULL);
         gpio_request(GPIO_FN_LCDDCK,    NULL);
 
-        gpio_request_one(GPIO_PORT222, GPIOF_OUT_INIT_HIGH, NULL); /* LCDCDON */
-        gpio_request_one(GPIO_PORT226, GPIOF_OUT_INIT_HIGH, NULL); /* SC */
+        gpio_request_one(222, GPIOF_OUT_INIT_HIGH, NULL); /* LCDCDON */
+        gpio_request_one(226, GPIOF_OUT_INIT_HIGH, NULL); /* SC */
 
         /* Touchscreen */
-        gpio_request_one(GPIO_PORT223, GPIOF_IN, NULL); /* IRQ8 */
+        gpio_request_one(223, GPIOF_IN, NULL); /* IRQ8 */
 
         /* enable MMCIF */
         gpio_request(GPIO_FN_MMCCLK0,           NULL);
@@ -730,7 +730,7 @@ static void __init kzm_init(void)
         gpio_request(GPIO_FN_SDHID0_1,          NULL);
         gpio_request(GPIO_FN_SDHID0_0,          NULL);
         gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON, NULL);
-        gpio_request_one(GPIO_PORT15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
+        gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
 
         /* enable Micro SD */
         gpio_request(GPIO_FN_SDHID2_0,          NULL);
@@ -739,7 +739,7 @@ static void __init kzm_init(void)
         gpio_request(GPIO_FN_SDHID2_3,          NULL);
         gpio_request(GPIO_FN_SDHICMD2,          NULL);
         gpio_request(GPIO_FN_SDHICLK2,          NULL);
-        gpio_request_one(GPIO_PORT14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
+        gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
 
         /* I2C 3 */
         gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL);