summaryrefslogtreecommitdiffstats
path: root/kernel/arch/mips/ar7
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/mips/ar7')
-rw-r--r--kernel/arch/mips/ar7/gpio.c5
-rw-r--r--kernel/arch/mips/ar7/platform.c6
-rw-r--r--kernel/arch/mips/ar7/setup.c1
3 files changed, 7 insertions, 5 deletions
diff --git a/kernel/arch/mips/ar7/gpio.c b/kernel/arch/mips/ar7/gpio.c
index d8dbd8f0c..f4930456e 100644
--- a/kernel/arch/mips/ar7/gpio.c
+++ b/kernel/arch/mips/ar7/gpio.c
@@ -21,7 +21,10 @@
#include <linux/module.h>
#include <linux/gpio.h>
-#include <asm/mach-ar7/gpio.h>
+#include <asm/mach-ar7/ar7.h>
+
+#define AR7_GPIO_MAX 32
+#define TITAN_GPIO_MAX 51
struct ar7_gpio_chip {
void __iomem *regs;
diff --git a/kernel/arch/mips/ar7/platform.c b/kernel/arch/mips/ar7/platform.c
index be9ff1673..58fca9ad5 100644
--- a/kernel/arch/mips/ar7/platform.c
+++ b/kernel/arch/mips/ar7/platform.c
@@ -39,7 +39,6 @@
#include <asm/addrspace.h>
#include <asm/mach-ar7/ar7.h>
-#include <asm/mach-ar7/gpio.h>
#include <asm/mach-ar7/prom.h>
/*****************************************************************************
@@ -679,7 +678,8 @@ static int __init ar7_register_devices(void)
}
if (ar7_has_high_cpmac()) {
- res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
+ res = fixed_phy_add(PHY_POLL, cpmac_high.id,
+ &fixed_phy_status, -1);
if (!res) {
cpmac_get_mac(1, cpmac_high_data.dev_addr);
@@ -692,7 +692,7 @@ static int __init ar7_register_devices(void)
} else
cpmac_low_data.phy_mask = 0xffffffff;
- res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
+ res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status, -1);
if (!res) {
cpmac_get_mac(0, cpmac_low_data.dev_addr);
res = platform_device_register(&cpmac_low);
diff --git a/kernel/arch/mips/ar7/setup.c b/kernel/arch/mips/ar7/setup.c
index 820b7a313..7bb9a670b 100644
--- a/kernel/arch/mips/ar7/setup.c
+++ b/kernel/arch/mips/ar7/setup.c
@@ -23,7 +23,6 @@
#include <asm/reboot.h>
#include <asm/mach-ar7/ar7.h>
#include <asm/mach-ar7/prom.h>
-#include <asm/mach-ar7/gpio.h>
static void ar7_machine_restart(char *command)
{