mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[ixp4xx] update Avila patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10968 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -2,14 +2,14 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
@@ -192,6 +192,24 @@ static struct platform_device avila_leds
|
||||
@@ -192,10 +192,28 @@ static struct platform_device avila_leds
|
||||
.dev.platform_data = &avila_leds_data,
|
||||
};
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_GPIO_DEVICE
|
||||
+static struct resource avila_gpio_resources[] = {
|
||||
+ {
|
||||
+ .name = "gpio",
|
||||
+ /* FIXME: gpio mask should be model specific */
|
||||
+ .start = AVILA_GPIO_MASK,
|
||||
+ .end = AVILA_GPIO_MASK,
|
||||
+ .flags = 0,
|
||||
@@ -22,29 +22,24 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
+ .num_resources = ARRAY_SIZE(avila_gpio_resources),
|
||||
+ .resource = avila_gpio_resources,
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
static struct platform_device *avila_devices[] __initdata = {
|
||||
&avila_i2c_gpio,
|
||||
&avila_flash,
|
||||
@@ -199,6 +217,9 @@ static struct platform_device *avila_dev
|
||||
#ifdef CONFIG_LEDS_IXP4XX
|
||||
&avila_leds,
|
||||
#endif
|
||||
+#ifdef CONFIG_GPIO_DEVICE
|
||||
- &avila_uart
|
||||
+ &avila_uart,
|
||||
+ &avila_gpio,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static struct platform_device *avila_eth_devices[] = {
|
||||
static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 ";
|
||||
Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
|
||||
+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
|
||||
@@ -38,3 +38,6 @@
|
||||
|
||||
/* User LED */
|
||||
#define AVILA_LED_USER_GPIO 3
|
||||
@@ -39,3 +39,6 @@
|
||||
/* User LEDs */
|
||||
#define AVILA_GW23XX_LED_USER_GPIO 3
|
||||
#define AVILA_GW23X7_LED_USER_GPIO 4
|
||||
+
|
||||
+/* gpio mask used by platform device */
|
||||
+#define AVILA_GPIO_MASK (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)
|
||||
+#define AVILA_GPIO_MASK (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)
|
||||
|
||||
Reference in New Issue
Block a user