From d421a8e57451ef0c6b0a22d3fe9256f75a8c3db1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 6 Mar 2011 23:10:58 +0000 Subject: [PATCH] atheros: add gpio_set_debounce(), refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25914 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/atheros/patches-2.6.37/100-board.patch | 11 ++++++++--- .../patches-2.6.37/101-early-printk-support.patch | 2 +- .../linux/atheros/patches-2.6.37/130-watchdog.patch | 2 +- .../patches-2.6.37/200-ar2313_enable_mvswitch.patch | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/target/linux/atheros/patches-2.6.37/100-board.patch b/target/linux/atheros/patches-2.6.37/100-board.patch index 1cf355fb0b..a30f5fe858 100644 --- a/target/linux/atheros/patches-2.6.37/100-board.patch +++ b/target/linux/atheros/patches-2.6.37/100-board.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -100,6 +100,19 @@ config BCM63XX +@@ -102,6 +102,19 @@ config BCM63XX help Support for BCM63XX based boards @@ -20,7 +20,7 @@ config MIPS_COBALT bool "Cobalt Server" select CEVT_R4K -@@ -714,6 +727,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD +@@ -716,6 +729,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD endchoice @@ -619,7 +619,7 @@ +#endif /* __ASM_MACH_GENERIC_DMA_COHERENCE_H */ --- /dev/null +++ b/arch/mips/include/asm/mach-ar231x/gpio.h -@@ -0,0 +1,79 @@ +@@ -0,0 +1,84 @@ +#ifndef _ATHEROS_GPIO_H_ +#define _ATHEROS_GPIO_H_ + @@ -696,6 +696,11 @@ + return (irq - (AR531X_GPIO_IRQ(0))); +} + ++static inline int gpio_set_debounce(unsigned gpio, unsigned debounce) ++{ ++ return -ENOSYS; ++} ++ +#include /* cansleep wrappers */ + +#endif diff --git a/target/linux/atheros/patches-2.6.37/101-early-printk-support.patch b/target/linux/atheros/patches-2.6.37/101-early-printk-support.patch index 22d41744a4..44f08c6f8b 100644 --- a/target/linux/atheros/patches-2.6.37/101-early-printk-support.patch +++ b/target/linux/atheros/patches-2.6.37/101-early-printk-support.patch @@ -58,7 +58,7 @@ obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -110,6 +110,7 @@ config ATHEROS_AR231X +@@ -112,6 +112,7 @@ config ATHEROS_AR231X select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_32BIT_KERNEL select GENERIC_GPIO diff --git a/target/linux/atheros/patches-2.6.37/130-watchdog.patch b/target/linux/atheros/patches-2.6.37/130-watchdog.patch index aaa162e820..c2c9c23398 100644 --- a/target/linux/atheros/patches-2.6.37/130-watchdog.patch +++ b/target/linux/atheros/patches-2.6.37/130-watchdog.patch @@ -203,7 +203,7 @@ +module_exit(exit_ar2315_wdt); --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -927,6 +927,12 @@ config BCM63XX_WDT +@@ -930,6 +930,12 @@ config BCM63XX_WDT To compile this driver as a loadable module, choose M here. The module will be called bcm63xx_wdt. diff --git a/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch index c652d7ba6d..bb4af76a61 100644 --- a/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch +++ b/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch @@ -48,7 +48,7 @@ /* reset descriptor's curr_addr */ rxdesc->addr = virt_to_phys(skb_new->data); -@@ -1254,6 +1260,8 @@ static int ar231x_mdiobus_probe (struct +@@ -1254,6 +1260,8 @@ static int ar231x_mdiobus_probe (struct return PTR_ERR(phydev); }