Merge tag 'gpio-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-mxc.c

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index e4f42c95c32058129d7814c9a4640abc14ec8fd5..ec1eb1b7250ff145f5459f50b4c874154f1e23dc 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -131,7 +131,7 @@ static struct mxc_gpio_hwdata *mxc_gpio_hwdata;
 #define GPIO_INT_FALL_EDGE     (mxc_gpio_hwdata->fall_edge)
 #define GPIO_INT_BOTH_EDGES    0x4
 
-static struct platform_device_id mxc_gpio_devtype[] = {
+static const struct platform_device_id mxc_gpio_devtype[] = {
        {
                .name = "imx1-gpio",
                .driver_data = IMX1_GPIO,
@@ -449,7 +449,8 @@ static int mxc_gpio_probe(struct platform_device *pdev)
        err = bgpio_init(&port->bgc, &pdev->dev, 4,
                         port->base + GPIO_PSR,
                         port->base + GPIO_DR, NULL,
-                        port->base + GPIO_GDIR, NULL, 0);
+                        port->base + GPIO_GDIR, NULL,
+                        BGPIOF_READ_OUTPUT_REG_SET);
        if (err)
                goto out_bgio;