diff options
| -rw-r--r-- | target/linux/au1000/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/au1000/patches-2.6.32/005-mtx1_fix_pci.patch | 38 | ||||
| -rw-r--r-- | target/linux/au1000/patches-2.6.32/005-revert_mtx1_board_gpiolib.patch | 69 |
3 files changed, 39 insertions, 70 deletions
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index e9351c7f2..6f1a9791c 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=RMI/AMD AU1x00 FEATURES:=jffs2 usb pci SUBTARGETS=au1500 au1550 -LINUX_VERSION:=2.6.30.10 +LINUX_VERSION:=2.6.32.14 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/au1000/patches-2.6.32/005-mtx1_fix_pci.patch b/target/linux/au1000/patches-2.6.32/005-mtx1_fix_pci.patch new file mode 100644 index 000000000..c2d747348 --- /dev/null +++ b/target/linux/au1000/patches-2.6.32/005-mtx1_fix_pci.patch @@ -0,0 +1,38 @@ + + +diff --git a/arch/mips/alchemy/mtx-1/board_setup.c +b/arch/mips/alchemy/mtx-1/board_setup.c +index 45b61c9..17140ac 100644 +--- a/arch/mips/alchemy/mtx-1/board_setup.c ++++ b/arch/mips/alchemy/mtx-1/board_setup.c +@@ -56,8 +56,6 @@ void __init board_setup(void) + } + #endif + +- alchemy_gpio2_enable(); +- + #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) + /* Enable USB power switch */ + alchemy_gpio_direction_output(204, 0); +@@ -92,20 +90,12 @@ void __init board_setup(void) + int + mtx1_pci_idsel(unsigned int devsel, int assert) + { +-#define MTX_IDSEL_ONLY_0_AND_3 0 +-#if MTX_IDSEL_ONLY_0_AND_3 +- if (devsel != 0 && devsel != 3) { +- printk(KERN_ERR "*** not 0 or 3\n"); +- return 0; +- } +-#endif +- + if (assert && devsel != 0) + /* Suppress signal to Cardbus */ + gpio_set_value(1, 0); /* set EXT_IO3 OFF */ + else + gpio_set_value(1, 1); /* set EXT_IO3 ON */ + +- au_sync_udelay(1); ++ udelay(1); + return 1; + } diff --git a/target/linux/au1000/patches-2.6.32/005-revert_mtx1_board_gpiolib.patch b/target/linux/au1000/patches-2.6.32/005-revert_mtx1_board_gpiolib.patch deleted file mode 100644 index 2cd7f9592..000000000 --- a/target/linux/au1000/patches-2.6.32/005-revert_mtx1_board_gpiolib.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit 1cd692621e6d4b1f707039ea0b4e5ad3143312fb -Author: Florian Fainelli <ffainelli@freebox.fr> -Date: Thu Jul 1 10:02:53 2010 +0200 - - Revert "MIPS: Alchemy: MTX-1: Use linux gpio api." - - This reverts commit b312ab3b5a86c8be5753cdf32ea429ba80651298. - -diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c -index cc32c69..8ed1ae1 100644 ---- a/arch/mips/alchemy/mtx-1/board_setup.c -+++ b/arch/mips/alchemy/mtx-1/board_setup.c -@@ -28,7 +28,6 @@ - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include <linux/gpio.h> - #include <linux/init.h> - - #include <asm/mach-au1x00/au1000.h> -@@ -56,11 +55,10 @@ void __init board_setup(void) - } - #endif - -- alchemy_gpio2_enable(); -- - #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) - /* Enable USB power switch */ -- alchemy_gpio_direction_output(204, 0); -+ au_writel(au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR); -+ au_writel(0x100000, GPIO2_OUTPUT); - #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */ - - #ifdef CONFIG_PCI -@@ -76,14 +74,14 @@ void __init board_setup(void) - - /* Initialize GPIO */ - au_writel(0xFFFFFFFF, SYS_TRIOUTCLR); -- alchemy_gpio_direction_output(0, 0); /* Disable M66EN (PCI 66MHz) */ -- alchemy_gpio_direction_output(3, 1); /* Disable PCI CLKRUN# */ -- alchemy_gpio_direction_output(1, 1); /* Enable EXT_IO3 */ -- alchemy_gpio_direction_output(5, 0); /* Disable eth PHY TX_ER */ -+ au_writel(0x00000001, SYS_OUTPUTCLR); /* set M66EN (PCI 66MHz) to OFF */ -+ au_writel(0x00000008, SYS_OUTPUTSET); /* set PCI CLKRUN# to OFF */ -+ au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */ -+ au_writel(0x00000020, SYS_OUTPUTCLR); /* set eth PHY TX_ER to OFF */ - - /* Enable LED and set it to green */ -- alchemy_gpio_direction_output(211, 1); /* green on */ -- alchemy_gpio_direction_output(212, 0); /* red off */ -+ au_writel(au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR); -+ au_writel(0x18000800, GPIO2_OUTPUT); - - board_pci_idsel = mtx1_pci_idsel; - -@@ -103,10 +101,10 @@ mtx1_pci_idsel(unsigned int devsel, int assert) - - if (assert && devsel != 0) - /* Suppress signal to Cardbus */ -- gpio_set_value(1, 0); /* set EXT_IO3 OFF */ -+ au_writel(0x00000002, SYS_OUTPUTCLR); /* set EXT_IO3 OFF */ - else -- gpio_set_value(1, 1); /* set EXT_IO3 ON */ -- -+ au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */ - au_sync_udelay(1); - return 1; - } -+ |