gpio: ixp4xx: Detect special machines by compatible

There are some special clock amendments for two machines
formerly detected by their machine_is() boardfile macro.

They are now migrated to device tree so use
of_machine_is_compatible() instead.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 45764ec3b2ebe433064cdd28221dac99ff61616e..075a5d0feef72a8a2552cbc9a28484bfb66b05fc 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -353,7 +353,6 @@ config GPIO_IOP
 
 config GPIO_IXP4XX
        bool "Intel IXP4xx GPIO"
-       depends on ARM # For <asm/mach-types.h>
        depends on ARCH_IXP4XX
        select GPIO_GENERIC
        select GPIOLIB_IRQCHIP

diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c
index b3b050604e0be02ab165fc2a7ce6a15a66e14ad8..1acda980d11985277167992b7e7151e5ed617205 100644 (file)
--- a/drivers/gpio/gpio-ixp4xx.c
+++ b/drivers/gpio/gpio-ixp4xx.c
@@ -17,8 +17,6 @@
 /* Include that go away with DT transition */
 #include <linux/irqchip/irq-ixp4xx.h>
 
-#include <asm/mach-types.h>
-
 #define IXP4XX_REG_GPOUT       0x00
 #define IXP4XX_REG_GPOE                0x04
 #define IXP4XX_REG_GPIN                0x08
@@ -240,7 +238,8 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev)
         * Make sure GPIO 14 and 15 are NOT used as clocks but GPIO on
         * specific machines.
         */
-       if (machine_is_dsmg600() || machine_is_nas100d())
+       if (of_machine_is_compatible("dlink,dsm-g600-a") ||
+           of_machine_is_compatible("iom,nas-100d"))
                __raw_writel(0x0, g->base + IXP4XX_REG_GPCLK);
 
        /*