Merge remote-tracking branch 'gpio/for-next'

[deliverable/linux.git] / drivers / gpio / gpio-mmio.c

diff --git a/drivers/gpio/gpio-mmio.c b/drivers/gpio/gpio-mmio.c
index 6ec144baeb11f1d124586b53ba353db7da7adab9..d7d03ad052d007bd1d7531a015e4688e2f603754 100644 (file)
--- a/drivers/gpio/gpio-mmio.c
+++ b/drivers/gpio/gpio-mmio.c
@@ -573,6 +573,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev,
 
 #ifdef CONFIG_OF
 static const struct of_device_id bgpio_of_match[] = {
+       { .compatible = "brcm,bcm6345-gpio" },
        { .compatible = "wd,mbl-gpio" },
        { }
 };
@@ -593,6 +594,9 @@ static struct bgpio_pdata *bgpio_parse_dt(struct platform_device *pdev,
 
        pdata->base = -1;
 
+       if (of_device_is_big_endian(pdev->dev.of_node))
+               *flags |= BGPIOF_BIG_ENDIAN_BYTE_ORDER;
+
        if (of_property_read_bool(pdev->dev.of_node, "no-output"))
                *flags |= BGPIOF_NO_OUTPUT;