Commit 4f3e79b3 authored by Linus Walleij's avatar Linus Walleij Committed by Bartosz Golaszewski

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent d3bf3dc4
...@@ -353,7 +353,6 @@ config GPIO_IOP ...@@ -353,7 +353,6 @@ config GPIO_IOP
config GPIO_IXP4XX config GPIO_IXP4XX
bool "Intel IXP4xx GPIO" bool "Intel IXP4xx GPIO"
depends on ARM # For <asm/mach-types.h>
depends on ARCH_IXP4XX depends on ARCH_IXP4XX
select GPIO_GENERIC select GPIO_GENERIC
select GPIOLIB_IRQCHIP select GPIOLIB_IRQCHIP
......
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
/* Include that go away with DT transition */ /* Include that go away with DT transition */
#include <linux/irqchip/irq-ixp4xx.h> #include <linux/irqchip/irq-ixp4xx.h>
#include <asm/mach-types.h>
#define IXP4XX_REG_GPOUT 0x00 #define IXP4XX_REG_GPOUT 0x00
#define IXP4XX_REG_GPOE 0x04 #define IXP4XX_REG_GPOE 0x04
#define IXP4XX_REG_GPIN 0x08 #define IXP4XX_REG_GPIN 0x08
...@@ -240,7 +238,8 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev) ...@@ -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 * Make sure GPIO 14 and 15 are NOT used as clocks but GPIO on
* specific machines. * 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); __raw_writel(0x0, g->base + IXP4XX_REG_GPCLK);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment