aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-10-09 18:24:25 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-10-09 18:24:25 +0000
commitf57d27da8c106ac4ba2da9c9353b23adeac0379b (patch)
treebd77dba18eea5c2230b6ec4865ded01124bce627 /target/linux/ixp4xx
parent5396ed06394d83eef95601e893251869ddf1a591 (diff)
downloadupstream-f57d27da8c106ac4ba2da9c9353b23adeac0379b.tar.gz
upstream-f57d27da8c106ac4ba2da9c9353b23adeac0379b.tar.bz2
upstream-f57d27da8c106ac4ba2da9c9353b23adeac0379b.zip
fixup GPS on the cambria - thanks Chris
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12935 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch26
-rw-r--r--target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch4
-rw-r--r--target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch26
-rw-r--r--target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch4
4 files changed, 36 insertions, 24 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
index 78e4a9e561..237c6b3e0a 100644
--- a/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
@@ -57,33 +57,39 @@
static void __init cambria_gw2350_setup(void)
{
+ *IXP4XX_EXP_CS2 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO3, IRQT_BOTHEDGE);
-+ cambria_optional_uart_data[0].mapbase = IXP4XX_EXP_BUS_BASE(2);
-+ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(2), 0x0fff);
++ set_irq_type(IRQ_IXP4XX_GPIO3, IRQT_RISING);
++ cambria_optional_uart_data[0].mapbase = 0x52FF0000;
++ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52FF0000, 0x0fff);
+ cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3;
+
+ *IXP4XX_EXP_CS3 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO4, IRQT_BOTHEDGE);
-+ cambria_optional_uart_data[1].mapbase = IXP4XX_EXP_BUS_BASE(3);
-+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(3), 0x0fff);
++ set_irq_type(IRQ_IXP4XX_GPIO4, IRQT_RISING);
++ cambria_optional_uart_data[1].mapbase = 0x53FF0000;
++ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
+ cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
+
+ platform_device_register(&cambria_optional_uart);
platform_device_register(&cambria_npec_device);
platform_device_register(&cambria_npea_device);
-@@ -298,6 +349,20 @@
+@@ -294,10 +345,26 @@
+ platform_device_register(&cambria_usb1_device);
+
+ platform_device_register(&cambria_gpio_leds_device);
++
++ *IXP4XX_EXP_CS2 = 0xBFFF3C43;
++ *IXP4XX_EXP_CS3 = 0xBFFF3C43;
+ }
static void __init cambria_gw2358_setup(void)
{
+ *IXP4XX_EXP_CS3 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO3, IRQT_BOTHEDGE);
++ set_irq_type(IRQ_IXP4XX_GPIO3, IRQT_RISING);
+ cambria_optional_uart_data[0].mapbase = 0x53FC0000;
+ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x53FC0000, 0x0fff);
+ cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3;
+
-+ *IXP4XX_EXP_CS3 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO4, IRQT_BOTHEDGE);
++ set_irq_type(IRQ_IXP4XX_GPIO4, IRQT_RISING);
+ cambria_optional_uart_data[1].mapbase = 0x53F80000;
+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53F80000, 0x0fff);
+ cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
diff --git a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
index 0fe2eb0526..157e1f1698 100644
--- a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
@@ -23,7 +23,7 @@
static struct latch_led cambria_latch_leds[] = {
{
@@ -337,6 +352,11 @@
- cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(3), 0x0fff);
+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
+ cambria_gpio_resources[0].start = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) |\
@@ -34,7 +34,7 @@
platform_device_register(&cambria_optional_uart);
platform_device_register(&cambria_npec_device);
platform_device_register(&cambria_npea_device);
-@@ -361,6 +381,10 @@
+@@ -363,6 +383,10 @@
cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53F80000, 0x0fff);
cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
diff --git a/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch
index 3a034f02b8..9688767c86 100644
--- a/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch
@@ -57,33 +57,39 @@
static void __init cambria_gw2350_setup(void)
{
+ *IXP4XX_EXP_CS2 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_BOTH);
-+ cambria_optional_uart_data[0].mapbase = IXP4XX_EXP_BUS_BASE(2);
-+ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(2), 0x0fff);
++ set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
++ cambria_optional_uart_data[0].mapbase = 0x52FF0000;
++ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52FF0000, 0x0fff);
+ cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3;
+
+ *IXP4XX_EXP_CS3 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_BOTH);
-+ cambria_optional_uart_data[1].mapbase = IXP4XX_EXP_BUS_BASE(3);
-+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(3), 0x0fff);
++ set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING);
++ cambria_optional_uart_data[1].mapbase = 0x53FF0000;
++ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
+ cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
+
+ platform_device_register(&cambria_optional_uart);
platform_device_register(&cambria_npec_device);
platform_device_register(&cambria_npea_device);
-@@ -298,6 +349,20 @@
+@@ -294,10 +345,26 @@
+ platform_device_register(&cambria_usb1_device);
+
+ platform_device_register(&cambria_gpio_leds_device);
++
++ *IXP4XX_EXP_CS2 = 0xBFFF3C43;
++ *IXP4XX_EXP_CS3 = 0xBFFF3C43;
+ }
static void __init cambria_gw2358_setup(void)
{
+ *IXP4XX_EXP_CS3 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_BOTH);
++ set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
+ cambria_optional_uart_data[0].mapbase = 0x53FC0000;
+ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x53FC0000, 0x0fff);
+ cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3;
+
-+ *IXP4XX_EXP_CS3 = 0xbfff0003;
-+ set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_BOTH);
++ set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING);
+ cambria_optional_uart_data[1].mapbase = 0x53F80000;
+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53F80000, 0x0fff);
+ cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
diff --git a/target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch
index 0fe2eb0526..157e1f1698 100644
--- a/target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch
@@ -23,7 +23,7 @@
static struct latch_led cambria_latch_leds[] = {
{
@@ -337,6 +352,11 @@
- cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(3), 0x0fff);
+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
+ cambria_gpio_resources[0].start = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) |\
@@ -34,7 +34,7 @@
platform_device_register(&cambria_optional_uart);
platform_device_register(&cambria_npec_device);
platform_device_register(&cambria_npea_device);
-@@ -361,6 +381,10 @@
+@@ -363,6 +383,10 @@
cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53F80000, 0x0fff);
cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 06:44:33 +0000