diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/au1000/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/au1000/config-2.6.23 (renamed from target/linux/au1000/config-2.6.22) | 54 | ||||
| -rw-r--r-- | target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c | 44 | ||||
| -rw-r--r-- | target/linux/au1000/files/drivers/leds/leds-mtx1.c | 101 | ||||
| -rw-r--r-- | target/linux/au1000/patches/001-au1000_gpio_kconfig.patch | 24 | ||||
| -rw-r--r-- | target/linux/au1000/patches/001-au1x00_gpio.patch | 294 | ||||
| -rw-r--r-- | target/linux/au1000/patches/002-platform_devices.patch | 10 | ||||
| -rw-r--r-- | target/linux/au1000/patches/006-mtx1_system_button.patch | 2 | ||||
| -rw-r--r-- | target/linux/au1000/patches/011-mtx1_leds.patch | 28 | ||||
| -rw-r--r-- | target/linux/au1000/patches/016-pci-io_map.patch | 10 | ||||
| -rw-r--r-- | target/linux/au1000/patches/017-usb-power.patch | 11 |
11 files changed, 91 insertions, 489 deletions
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 278e617b1..3bfb64ab2 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -11,7 +11,7 @@ BOARD:=au1000 BOARDNAME:=AMD Alchemy AU1x00 FEATURES:=jffs2 usb pci -LINUX_VERSION:=2.6.22.4 +LINUX_VERSION:=2.6.23 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += yamonenv diff --git a/target/linux/au1000/config-2.6.22 b/target/linux/au1000/config-2.6.23 index 3ae9450de..bc2904553 100644 --- a/target/linux/au1000/config-2.6.22 +++ b/target/linux/au1000/config-2.6.23 @@ -4,8 +4,8 @@ CONFIG_64BIT_PHYS_ADDR=y # CONFIG_8139TOO is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_ATM is not set -# CONFIG_B44 is not set CONFIG_BASE_SMALL=0 CONFIG_BITREVERSE=y # CONFIG_BROADCOM_PHY is not set @@ -16,6 +16,7 @@ CONFIG_CPU_HAS_LLSC=y CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_LITTLE_ENDIAN=y +# CONFIG_CPU_LOONGSON2 is not set CONFIG_CPU_MIPS32=y CONFIG_CPU_MIPS32_R1=y # CONFIG_CPU_MIPS32_R2 is not set @@ -41,41 +42,40 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_VR41XX is not set CONFIG_CRAMFS=m CONFIG_CRC16=y -# CONFIG_DDB5477 is not set +# CONFIG_CRYPTO_HW is not set +CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y +# CONFIG_DS1682 is not set CONFIG_DUMMY=m CONFIG_ELF_CORE=y -# CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_FIXED_PHY is not set CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set -# CONFIG_GEN_RTC is not set # CONFIG_HAMRADIO is not set +CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=y CONFIG_HZ=250 # CONFIG_HZ_100 is not set -# CONFIG_HZ_1024 is not set -# CONFIG_HZ_128 is not set CONFIG_HZ_250=y -# CONFIG_HZ_256 is not set -# CONFIG_HZ_48 is not set CONFIG_I2C=m CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m -CONFIG_I2C_AU1X00GPIO=m +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_TAOS_EVM is not set # CONFIG_IDE is not set CONFIG_INITRAMFS_SOURCE="" -CONFIG_LEDS_MTX1=y +CONFIG_LEDS_GPIO=y # CONFIG_LEDS_TRIGGERS is not set +# CONFIG_LEMOTE_FULONG is not set CONFIG_MACH_ALCHEMY=y # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set @@ -91,7 +91,6 @@ CONFIG_MIPS_AU1X00_ENET=y # CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set -# CONFIG_MIPS_EV64120 is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MALTA is not set # CONFIG_MIPS_MIRAGE is not set @@ -106,14 +105,8 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_SEAD is not set # CONFIG_MIPS_SIM is not set -# CONFIG_MIPS_VPE_LOADER is not set # CONFIG_MIPS_XXS1500 is not set CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MOMENCO_JAGUAR_ATX is not set -# CONFIG_MOMENCO_OCELOT is not set -# CONFIG_MOMENCO_OCELOT_3 is not set -# CONFIG_MOMENCO_OCELOT_C is not set -# CONFIG_MOMENCO_OCELOT_G is not set CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_ALCHEMY is not set @@ -148,7 +141,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set # CONFIG_MTD_MTDRAM is not set CONFIG_MTD_MTX1=y -# CONFIG_MTD_OBSOLETE_CHIPS is not set # CONFIG_MTD_ONENAND is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_PHRAM is not set @@ -159,20 +151,23 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_SLRAM is not set -CONFIG_MTX1_WATCHDOG=y # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set +# CONFIG_NETDEV_1000 is not set +CONFIG_NET_ACT_POLICE=y CONFIG_NET_SCH_FIFO=y # CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NETDEV_1000 is not set +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_GRE=m +# CONFIG_NO_IOPORT is not set # CONFIG_PAGE_SIZE_16KB is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PCIPCWATCHDOG is not set CONFIG_PHYLIB=y +# CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set -# CONFIG_PNPACPI is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set # CONFIG_PPP_MPPE is not set @@ -180,10 +175,13 @@ CONFIG_PHYLIB=y # CONFIG_QSEMI_PHY is not set CONFIG_RESOURCES_64BIT=y # CONFIG_RTC is not set +# CONFIG_RTL8187 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_PROC_FS is not set +CONFIG_SCSI_WAIT_SCAN=m +# CONFIG_SENSORS_TSL2550 is not set CONFIG_SERIAL_8250_AU1X00=y # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_NR_UARTS=4 @@ -209,7 +207,6 @@ CONFIG_SOC_AU1X00=y CONFIG_SOFT_WATCHDOG=m # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_STANDALONE is not set -CONFIG_STRIP=m CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y @@ -217,24 +214,23 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_KGDB=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y -# CONFIG_TMD_HERMES is not set # CONFIG_TC35815 is not set +# CONFIG_TMD_HERMES is not set # CONFIG_TOSHIBA_JMR3927 is not set # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_USBPCWATCHDOG is not set -# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set -# CONFIG_USB_EHCI_SPLIT_ISO is not set -# CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_SERIAL_OTI6858 is not set CONFIG_USB_UHCI_HCD=m +# CONFIG_USER_NS is not set +# CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set CONFIG_WDT_MTX1=y -CONFIG_ZONE_DMA=y -CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c b/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c index e5116f08e..529595fcd 100644 --- a/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c +++ b/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c @@ -26,13 +26,31 @@ #include <asm/gpio.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) +static struct resource mtx1_wdt_res[] = { + [0] = { + .start = 15, + .end = 15, + .name = "mtx1-wdt-gpio", + .flags = IORESOURCE_IRQ, + } +}; + +static struct platform_device mtx1_wdt = { + .name = "mtx1-wdt", + .id = 0, + .num_resources = ARRAY_SIZE(mtx1_wdt_res), + .resource = mtx1_wdt_res, +}; + static struct gpio_led default_leds[] = { - { .name = "mtx1:green", .gpio = 211, .active_low = 1, }, - { .name = "mtx1:red", gpio = 212, .active_low = 1, }, -} + { .name = "mtx1:green", .gpio = 211, }, + { .name = "mtx1:red", .gpio = 212, }, +}; -static struct gpio_led_platform_data mtx1_led_data; +static struct gpio_led_platform_data mtx1_led_data = { + .num_leds = ARRAY_SIZE(default_leds), + .leds = default_leds, +}; static struct platform_device mtx1_gpio_leds = { .name = "leds-gpio", @@ -41,18 +59,16 @@ static struct platform_device mtx1_gpio_leds = { .platform_data = &mtx1_led_data, } }; -#endif + +static struct platform_device *mtx1_devs[] = { + &mtx1_gpio_leds, + &mtx1_wdt +}; static int __init mtx1_register_devices(void) { - int res; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) - mtx1_led_data.num_leds = ARRAY_SIZE(default_leds); - mtx1_led_data.leds = default_leds; - res = platform_device_register(&mtx1_gpio_leds); -#endif - return res; + return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs)); } -arch_initall(mtx1_register_devices); +arch_initcall(mtx1_register_devices); diff --git a/target/linux/au1000/files/drivers/leds/leds-mtx1.c b/target/linux/au1000/files/drivers/leds/leds-mtx1.c deleted file mode 100644 index 4c2ab55fc..000000000 --- a/target/linux/au1000/files/drivers/leds/leds-mtx1.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * LED driver for MTX-1 boards - * - * Copyright 2007 Florian Fainelli <florian@openwrt.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - */ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/platform_device.h> -#include <linux/leds.h> -#include <linux/err.h> -#include <asm/gpio.h> - -static struct platform_device *pdev; - -static void mtx1_led_set(struct led_classdev *led_cdev, enum led_brightness brightness) -{ - if (!strcmp("mtx1:green", led_cdev->name)) - gpio_set_value(211, brightness ? 1 : 0); - else - gpio_set_value(212, brightness ? 1 : 0); -} - -static struct led_classdev mtx1_green_led = { - .name = "mtx1:green", - .brightness_set = mtx1_led_set, -}; - -static struct led_classdev mtx1_red_led = { - .name = "mtx1:red", - .brightness_set = mtx1_led_set, -}; - -static int mtx1_leds_probe(struct platform_device *pdev) -{ - int ret; - - ret = led_classdev_register(&pdev->dev, &mtx1_green_led); - if (ret < 0) - goto out; - - ret = led_classdev_register(&pdev->dev, &mtx1_red_led); - if (ret < 0) - led_classdev_unregister(&mtx1_green_led); - -out: - return ret; -} - -static int mtx1_leds_remove(struct platform_device *pdev) -{ - led_classdev_unregister(&mtx1_green_led); - led_classdev_unregister(&mtx1_red_led); - return 0; -} - -static struct platform_driver mtx1_leds_driver = { - .probe = mtx1_leds_probe, - .remove = mtx1_leds_remove, - .driver = { - .name = "mtx1-leds", - } -}; - -static int __init mtx1_leds_init(void) -{ - int ret; - - ret = platform_driver_register(&mtx1_leds_driver); - if (ret < 0) - goto out; - - pdev = platform_device_register_simple("mtx1-leds", -1, NULL, 0); - if (IS_ERR(pdev)) { - ret = PTR_ERR(pdev); - platform_driver_unregister(&mtx1_leds_driver); - goto out; - } - -out: - return ret; - -} - -static void __exit mtx1_leds_exit(void) -{ - platform_device_unregister(pdev); - platform_driver_unregister(&mtx1_leds_driver); -} - -module_init(mtx1_leds_init); -module_exit(mtx1_leds_exit); - -MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); -MODULE_DESCRIPTION("MTX-1 LED driver"); -MODULE_LICENSE("GPL"); diff --git a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch new file mode 100644 index 000000000..1e0ddef06 --- /dev/null +++ b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch @@ -0,0 +1,24 @@ +From 8dea23a2b6dae52267b3a969e715d3f0753acf47 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli <florian.fainelli@telecomint.eu> +Date: Wed, 10 Oct 2007 14:54:11 +0200 +Subject: [PATCH] [PATCH] Add missing generic GPIO support for au1000 +With the generic GPIO support for au1000, we do not +select it in the kernel configuration. + +Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu> +--- + arch/mips/au1000/Kconfig | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig +index 29c95d9..f03b2eb 100644 +--- a/arch/mips/au1000/Kconfig ++++ b/arch/mips/au1000/Kconfig +@@ -141,3 +141,4 @@ config SOC_AU1X00 + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_SUPPORTS_APM_EMULATION + select SYS_SUPPORTS_KGDB ++ select GENERIC_GPIO +-- +1.5.2.4 + diff --git a/target/linux/au1000/patches/001-au1x00_gpio.patch b/target/linux/au1000/patches/001-au1x00_gpio.patch deleted file mode 100644 index d4339aec4..000000000 --- a/target/linux/au1000/patches/001-au1x00_gpio.patch +++ /dev/null @@ -1,294 +0,0 @@ -diff -urN linux-2.6.21.1/arch/mips/au1000/common/gpio.c linux-2.6.21.1.new/arch/mips/au1000/common/gpio.c ---- linux-2.6.21.1/arch/mips/au1000/common/gpio.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.new/arch/mips/au1000/common/gpio.c 2007-05-22 21:41:55.000000000 +0200 -@@ -1,4 +1,7 @@ - /* -+ * Copyright (C) 2007, OpenWrt.org, Florian Fainelli <florian@openwrt.org> -+ * Architecture specific GPIO support -+ * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your -@@ -18,101 +21,133 @@ - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * Notes : -+ * au1000 SoC have only one GPIO line : GPIO1 -+ * others have a second one : GPIO2 - */ -+ -+#include <linux/autoconf.h> -+#include <linux/init.h> -+#include <linux/types.h> - #include <linux/module.h> --#include <au1000.h> --#include <au1xxx_gpio.h> -+ -+#include <asm/addrspace.h> -+#include <asm/io.h> -+ -+#include <asm/mach-au1x00/au1000.h> -+#include <asm/gpio.h> - - #define gpio1 sys - #if !defined(CONFIG_SOC_AU1000) - static AU1X00_GPIO2 * const gpio2 = (AU1X00_GPIO2 *)GPIO2_BASE; -+#define GPIO2_OUTPUT_ENABLE_MASK 0x00010000 - --#define GPIO2_OUTPUT_ENABLE_MASK 0x00010000 -- --int au1xxx_gpio2_read(int signal) -+static int au1xxx_gpio2_read(unsigned gpio) - { -- signal -= 200; --/* gpio2->dir &= ~(0x01 << signal); //Set GPIO to input */ -- return ((gpio2->pinstate >> signal) & 0x01); -+ gpio -= AU1XXX_GPIO_BASE; -+ return ((gpio2->pinstate >> gpio) & 0x01); - } - --void au1xxx_gpio2_write(int signal, int value) -+static void au1xxx_gpio2_write(unsigned gpio, int value) - { -- signal -= 200; -+ gpio -= AU1XXX_GPIO_BASE; - -- gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << signal) | -- (value << signal); -+ gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | -+ (value << gpio); - } - --void au1xxx_gpio2_tristate(int signal) -+static int au1xxx_gpio2_direction_input(unsigned gpio) - { -- signal -= 200; -- gpio2->dir &= ~(0x01 << signal); /* Set GPIO to input */ -+ gpio -= AU1XXX_GPIO_BASE; -+ gpio2->dir &= ~(0x01 << gpio); -+ return 0; - } --#endif - --int au1xxx_gpio1_read(int signal) -+static int au1xxx_gpio2_direction_output(unsigned gpio, int value) -+{ -+ gpio -= AU1XXX_GPIO_BASE; -+ gpio2->dir = (0x01 << gpio) | (value << gpio); -+ return 0; -+} -+ -+#endif /* !defined(CONFIG_SOC_AU1000) */ -+ -+static int au1xxx_gpio1_read(unsigned gpio) - { --/* gpio1->trioutclr |= (0x01 << signal); */ -- return ((gpio1->pinstaterd >> signal) & 0x01); -+ return ((gpio1->pinstaterd >> gpio) & 0x01); - } - --void au1xxx_gpio1_write(int signal, int value) -+static void au1xxx_gpio1_write(unsigned gpio, int value) - { - if(value) -- gpio1->outputset = (0x01 << signal); -+ gpio1->outputset = (0x01 << gpio); - else -- gpio1->outputclr = (0x01 << signal); /* Output a Zero */ -+ /* Output a zero */ -+ gpio1->outputclr = (0x01 << gpio); - } - --void au1xxx_gpio1_tristate(int signal) -+static int au1xxx_gpio1_direction_input(unsigned gpio) - { -- gpio1->trioutclr = (0x01 << signal); /* Tristate signal */ -+ gpio1->pininputen = (0x01 << gpio); -+ return 0; - } - -+static int au1xxx_gpio1_direction_output(unsigned gpio, int value) -+{ -+ gpio1->trioutclr = (0x01 & gpio); -+ return 0; -+} - --int au1xxx_gpio_read(int signal) -+int au1xxx_gpio_get_value(unsigned gpio) - { -- if(signal >= 200) -+ if(gpio >= AU1XXX_GPIO_BASE) - #if defined(CONFIG_SOC_AU1000) - return 0; - #else -- return au1xxx_gpio2_read(signal); -+ return au1xxx_gpio2_read(gpio); - #endif - else -- return au1xxx_gpio1_read(signal); -+ return au1xxx_gpio1_read(gpio); - } - --void au1xxx_gpio_write(int signal, int value) -+void au1xxx_gpio_set_value(unsigned gpio, int value) - { -- if(signal >= 200) -+ if(gpio >= AU1XXX_GPIO_BASE) - #if defined(CONFIG_SOC_AU1000) - ; - #else -- au1xxx_gpio2_write(signal, value); -+ au1xxx_gpio2_write(gpio, value); - #endif - else -- au1xxx_gpio1_write(signal, value); -+ au1xxx_gpio1_write(gpio, value); - } - --void au1xxx_gpio_tristate(int signal) -+int au1xxx_gpio_direction_input(unsigned gpio) - { -- if(signal >= 200) -+ if (gpio >= AU1XXX_GPIO_BASE) - #if defined(CONFIG_SOC_AU1000) - ; - #else -- au1xxx_gpio2_tristate(signal); -+ return au1xxx_gpio2_direction_input(gpio); - #endif - else -- au1xxx_gpio1_tristate(signal); -+ return au1xxx_gpio1_direction_input(gpio); - } - --void au1xxx_gpio1_set_inputs(void) -+int au1xxx_gpio_direction_output(unsigned gpio, int value) - { -- gpio1->pininputen = 0; -+ if (gpio >= AU1XXX_GPIO_BASE) -+#if defined(CONFIG_SOC_AU1000) -+ ; -+#else -+ return au1xxx_gpio2_direction_output(gpio, value); -+#endif -+ else -+ return au1xxx_gpio1_direction_output(gpio, value); - } - --EXPORT_SYMBOL(au1xxx_gpio1_set_inputs); --EXPORT_SYMBOL(au1xxx_gpio_tristate); --EXPORT_SYMBOL(au1xxx_gpio_write); --EXPORT_SYMBOL(au1xxx_gpio_read); -+EXPORT_SYMBOL(au1xxx_gpio_direction_output); -+EXPORT_SYMBOL(au1xxx_gpio_direction_input); -+EXPORT_SYMBOL(au1xxx_gpio_get_value); -+EXPORT_SYMBOL(au1xxx_gpio_set_value); ---- linux-2.6.21.1/arch/mips/Kconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.new/arch/mips/Kconfig 2007-05-21 08:04:42.000000000 +0200 -@@ -1044,6 +1044,7 @@ - select SYS_SUPPORTS_32BIT_KERNEL - select SYS_SUPPORTS_APM_EMULATION - select SYS_SUPPORTS_KGDB -+ select GENERIC_GPIO - - config PNX8550 - bool -diff -urN linux-2.6.21.1/include/asm-mips/mach-au1x00/au1xxx_gpio.h linux-2.6.21.1.new/include/asm-mips/mach-au1x00/au1xxx_gpio.h ---- linux-2.6.21.1/include/asm-mips/mach-au1x00/au1xxx_gpio.h 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.new/include/asm-mips/mach-au1x00/au1xxx_gpio.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,20 +0,0 @@ --#ifndef __AU1XXX_GPIO_H --#define __AU1XXX_GPIO_H -- --void au1xxx_gpio1_set_inputs(void); --void au1xxx_gpio_tristate(int signal); --void au1xxx_gpio_write(int signal, int value); --int au1xxx_gpio_read(int signal); -- --typedef volatile struct --{ -- u32 dir; -- u32 reserved; -- u32 output; -- u32 pinstate; -- u32 inten; -- u32 enable; -- --} AU1X00_GPIO2; -- --#endif //__AU1XXX_GPIO_H -diff -urN linux-2.6.21.1/include/asm-mips/mach-au1x00/gpio.h linux-2.6.21.1.new/include/asm-mips/mach-au1x00/gpio.h ---- linux-2.6.21.1/include/asm-mips/mach-au1x00/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.new/include/asm-mips/mach-au1x00/gpio.h 2007-05-21 01:10:22.000000000 +0200 -@@ -0,0 +1,69 @@ -+#ifndef _AU1XXX_GPIO_H_ -+#define _AU1XXX_GPIO_H_ -+ -+#define AU1XXX_GPIO_BASE 200 -+ -+typedef volatile struct -+{ -+ u32 dir; -+ u32 reserved; -+ u32 output; -+ u32 pinstate; -+ u32 inten; -+ u32 enable; -+ -+} AU1X00_GPIO2; -+ -+extern int au1xxx_gpio_get_value(unsigned gpio); -+extern void au1xxx_gpio_set_value(unsigned gpio, int value); -+extern int au1xxx_gpio_direction_input(unsigned gpio); -+extern int au1xxx_gpio_direction_output(unsigned gpio, int value); -+ -+ -+/* Wrappers for the arch-neutral GPIO API */ -+ -+static inline int gpio_request(unsigned gpio, const char *label) -+{ -+ /* Not yet implemented */ -+ return 0; -+} -+ -+static inline void gpio_free(unsigned gpio) -+{ -+ /* Not yet implemented */ -+} -+ -+static inline int gpio_direction_input(unsigned gpio) -+{ -+ return au1xxx_gpio_direction_input(gpio); -+} -+ -+static inline int gpio_direction_output(unsigned gpio, int value) -+{ -+ return au1xxx_gpio_direction_output(gpio, value); -+} -+ -+static inline int gpio_get_value(unsigned gpio) -+{ -+ return au1xxx_gpio_get_value(gpio); -+} -+ -+static inline void gpio_set_value(unsigned gpio, int value) -+{ -+ au1xxx_gpio_set_value(gpio, value); -+} -+ -+static inline int gpio_to_irq(unsigned gpio) -+{ -+ return gpio; -+} -+ -+static inline int irq_to_gpio(unsigned irq) -+{ -+ return irq; -+} -+ -+/* For cansleep */ -+#include <asm-generic/gpio.h> -+ -+#endif /* _AU1XXX_GPIO_H_ */ diff --git a/target/linux/au1000/patches/002-platform_devices.patch b/target/linux/au1000/patches/002-platform_devices.patch new file mode 100644 index 000000000..193b5001d --- /dev/null +++ b/target/linux/au1000/patches/002-platform_devices.patch @@ -0,0 +1,10 @@ +diff --git a/arch/mips/au1000/mtx-1/Makefile b/arch/mips/au1000/mtx-1/Makefile +index 764bf9f..4d1b8d2 100644 +--- a/arch/mips/au1000/mtx-1/Makefile ++++ b/arch/mips/au1000/mtx-1/Makefile +@@ -7,4 +7,4 @@ + # Makefile for 4G Systems MTX-1 board. + # + +-lib-y := init.o board_setup.o irqmap.o ++lib-y := init.o board_setup.o irqmap.o platform.o diff --git a/target/linux/au1000/patches/006-mtx1_system_button.patch b/target/linux/au1000/patches/006-mtx1_system_button.patch index f4d380c72..4364a5432 100644 --- a/target/linux/au1000/patches/006-mtx1_system_button.patch +++ b/target/linux/au1000/patches/006-mtx1_system_button.patch @@ -15,7 +15,7 @@ diff -urN linux-2.6.16.7/arch/mips/au1000/mtx-1/Makefile linux-2.6.16.7.new/arch @@ -8,3 +8,4 @@ # - lib-y := init.o board_setup.o irqmap.o + lib-y := init.o board_setup.o irqmap.o platform.o +obj-y := mtx-1_sysbtn.o diff -urN linux-2.6.16.7/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c linux-2.6.16.7.new/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c --- linux-2.6.16.7/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c 1970-01-01 01:00:00.000000000 +0100 diff --git a/target/linux/au1000/patches/011-mtx1_leds.patch b/target/linux/au1000/patches/011-mtx1_leds.patch deleted file mode 100644 index 93c681e96..000000000 --- a/target/linux/au1000/patches/011-mtx1_leds.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urN linux-2.6.19.2/drivers/leds/Kconfig linux-2.6.19.2.new/drivers/leds/Kconfig ---- linux-2.6.19.2/drivers/leds/Kconfig 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2.new/drivers/leds/Kconfig 2007-03-02 13:50:28.000000000 +0100 -@@ -76,6 +76,13 @@ - This option enables support for the Soekris net4801 and net4826 error - LED. - -+config LEDS_MTX1 -+ tristate "LED Support for MTX-1 boards" -+ depends on LEDS_CLASS && MIPS_MTX1 -+ help -+ This option enables support for the MTX-1 power and status LED. -+ -+ - comment "LED Triggers" - - config LEDS_TRIGGERS -diff -urN linux-2.6.21.1/drivers/leds/Makefile linux-2.6.21.1.new/drivers/leds/Makefile ---- linux-2.6.21.1/drivers/leds/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.new/drivers/leds/Makefile 2007-05-24 23:39:18.000000000 +0200 -@@ -16,6 +16,7 @@ - obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o - obj-$(CONFIG_LEDS_H1940) += leds-h1940.o - obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o -+obj-$(CONFIG_LEDS_MTX1) += leds-mtx1.o - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o diff --git a/target/linux/au1000/patches/016-pci-io_map.patch b/target/linux/au1000/patches/016-pci-io_map.patch deleted file mode 100644 index 6a80f7cb4..000000000 --- a/target/linux/au1000/patches/016-pci-io_map.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-2.6.22.1.orig/arch/mips/au1000/common/pci.c 2007-07-24 18:42:21.031908123 +0200 -+++ linux-2.6.22.1/arch/mips/au1000/common/pci.c 2007-07-24 22:12:07.373162835 +0200 -@@ -74,6 +74,7 @@ - printk(KERN_ERR "Unable to ioremap pci space\n"); - return 1; - } -+ au1x_controller.io_map_base = virt_io_addr; - - #ifdef CONFIG_DMA_NONCOHERENT - { diff --git a/target/linux/au1000/patches/017-usb-power.patch b/target/linux/au1000/patches/017-usb-power.patch deleted file mode 100644 index 7f7fac85b..000000000 --- a/target/linux/au1000/patches/017-usb-power.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.22.1.orig/arch/mips/au1000/mtx-1/board_setup.c 2007-07-29 18:57:35.000000000 +0200 -+++ linux-2.6.22.1/arch/mips/au1000/mtx-1/board_setup.c 2007-07-29 18:59:48.000000000 +0200 -@@ -54,7 +54,7 @@ - - void __init board_setup(void) - { --#ifdef CONFIG_USB_OHCI -+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) - // enable USB power switch - au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR ); - au_writel( 0x100000, GPIO2_OUTPUT ); |