Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-pxa / stargate2.c

diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 80d7f23ad0fde822c2f4a9b7e1262f24d2ea2645..b0656e158d90409f249cc4a6965483bb68e1dc52 100644 (file)
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -376,7 +376,7 @@ static struct spi_board_info spi_board_info[] __initdata = {
                .bus_num = 1,
                .chip_select = 0,
                .controller_data = &staccel_chip_info,
-               .irq = IRQ_GPIO(96),
+               .irq = PXA_GPIO_TO_IRQ(96),
        }, {
                .modalias = "cc2420",
                .max_speed_hz = 6500000,
@@ -546,7 +546,7 @@ static struct i2c_board_info __initdata imote2_pwr_i2c_board_info[] = {
                .type = "da9030",
                .addr = 0x49,
                .platform_data = &imote2_da9030_pdata,
-               .irq = gpio_to_irq(1),
+               .irq = PXA_GPIO_TO_IRQ(1),
        },
 };
 
@@ -560,18 +560,18 @@ static struct i2c_board_info __initdata imote2_i2c_board_info[] = {
                /* Through a nand gate - Also beware, on V2 sensor board the
                 * pull up resistors are missing.
                 */
-               .irq = IRQ_GPIO(99),
+               .irq = PXA_GPIO_TO_IRQ(99),
        }, { /* ITS400 Sensor board only */
                .type = "tsl2561",
                .addr = 0x49,
                /* Through a nand gate - Also beware, on V2 sensor board the
                 * pull up resistors are missing.
                 */
-               .irq = IRQ_GPIO(99),
+               .irq = PXA_GPIO_TO_IRQ(99),
        }, { /* ITS400 Sensor board only */
                .type = "tmp175",
                .addr = 0x4A,
-               .irq = IRQ_GPIO(96),
+               .irq = PXA_GPIO_TO_IRQ(96),
        }, { /* IMB400 Multimedia board */
                .type = "wm8940",
                .addr = 0x1A,
@@ -593,10 +593,16 @@ static struct pxa2xx_udc_mach_info imote2_udc_info __initdata = {
        .udc_command            = sg2_udc_command,
 };
 
+static struct platform_device imote2_audio_device = {
+       .name = "imote2-audio",
+       .id   = -1,
+};
+
 static struct platform_device *imote2_devices[] = {
        &stargate2_flash_device,
        &imote2_leds,
        &sht15,
+       &imote2_audio_device,
 };
 
 static void __init imote2_init(void)
@@ -661,8 +667,8 @@ static struct resource smc91x_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        [1] = {
-               .start = IRQ_GPIO(40),
-               .end = IRQ_GPIO(40),
+               .start = PXA_GPIO_TO_IRQ(40),
+               .end = PXA_GPIO_TO_IRQ(40),
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
        }
 };
@@ -707,7 +713,7 @@ static int stargate2_mci_init(struct device *dev,
        }
        gpio_direction_input(SG2_GPIO_nSD_DETECT);
 
-       err = request_irq(IRQ_GPIO(SG2_GPIO_nSD_DETECT),
+       err = request_irq(PXA_GPIO_TO_IRQ(SG2_GPIO_nSD_DETECT),
                          stargate2_detect_int,
                          IRQ_TYPE_EDGE_BOTH,
                          "MMC card detect",
@@ -738,7 +744,7 @@ static void stargate2_mci_setpower(struct device *dev, unsigned int vdd)
 
 static void stargate2_mci_exit(struct device *dev, void *data)
 {
-       free_irq(IRQ_GPIO(SG2_GPIO_nSD_DETECT), data);
+       free_irq(PXA_GPIO_TO_IRQ(SG2_GPIO_nSD_DETECT), data);
        gpio_free(SG2_SD_POWER_ENABLE);
        gpio_free(SG2_GPIO_nSD_DETECT);
 }
@@ -913,7 +919,7 @@ static struct i2c_board_info __initdata stargate2_pwr_i2c_board_info[] = {
                .type = "da9030",
                .addr = 0x49,
                .platform_data = &stargate2_da9030_pdata,
-               .irq = gpio_to_irq(1),
+               .irq = PXA_GPIO_TO_IRQ(1),
        },
 };
 
@@ -938,18 +944,18 @@ static struct i2c_board_info __initdata stargate2_i2c_board_info[] = {
                /* Through a nand gate - Also beware, on V2 sensor board the
                 * pull up resistors are missing.
                 */
-               .irq = IRQ_GPIO(99),
+               .irq = PXA_GPIO_TO_IRQ(99),
        }, { /* ITS400 Sensor board only */
                .type = "tsl2561",
                .addr = 0x49,
                /* Through a nand gate - Also beware, on V2 sensor board the
                 * pull up resistors are missing.
                 */
-               .irq = IRQ_GPIO(99),
+               .irq = PXA_GPIO_TO_IRQ(99),
        }, { /* ITS400 Sensor board only */
                .type = "tmp175",
                .addr = 0x4A,
-               .irq = IRQ_GPIO(96),
+               .irq = PXA_GPIO_TO_IRQ(96),
        },
 };