projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kernel] add NP25G and WP543 board id
[openwrt.git]
/
target
/
linux
/
ixp4xx
/
patches-2.6.26
/
191-cambria_optional_uart.patch
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
5747aa7
..
c93e446
100644
(file)
--- 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
@@
-8,7
+8,7
@@
struct cambria_board_info {
unsigned char *model;
struct cambria_board_info {
unsigned char *model;
-@@ -105,6 +106,43 @@
+@@ -105,6 +106,43 @@
static struct platform_device cambria_ua
.resource = &cambria_uart_resource,
};
.resource = &cambria_uart_resource,
};
@@
-27,13
+27,13
@@
+
+static struct plat_serial8250_port cambria_optional_uart_data[] = {
+ {
+
+static struct plat_serial8250_port cambria_optional_uart_data[] = {
+ {
-+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
++ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST
| UPF_BUGGY_UART
,
+ .iotype = UPIO_MEM,
+ .regshift = 0,
+ .uartclk = 1843200,
+ },
+ {
+ .iotype = UPIO_MEM,
+ .regshift = 0,
+ .uartclk = 1843200,
+ },
+ {
-+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
++ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST
| UPF_BUGGY_UART
,
+ .iotype = UPIO_MEM,
+ .regshift = 0,
+ .uartclk = 1843200,
+ .iotype = UPIO_MEM,
+ .regshift = 0,
+ .uartclk = 1843200,
@@
-52,46
+52,50
@@
static struct resource cambria_pata_resources[] = {
{
.flags = IORESOURCE_MEM
static struct resource cambria_pata_resources[] = {
{
.flags = IORESOURCE_MEM
-@@ -287,6 +325,19 @@
+@@ -287,6 +325,19 @@
static void __init cambria_gw23xx_setup(
#ifdef CONFIG_SENSORS_EEPROM
static void __init cambria_gw2350_setup(void)
{
+ *IXP4XX_EXP_CS2 = 0xbfff0003;
#ifdef CONFIG_SENSORS_EEPROM
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;
+ 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);
+ 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,22 @@
+@@ -294,10 +345,26 @@ static void __init cambria_gw2350_setup(
+ 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;
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;
+
+ 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;
+
+ platform_device_register(&cambria_optional_uart);
+
+ 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;
+
+ platform_device_register(&cambria_optional_uart);
+
-+ cambria_npec_data.phy = 2;
-+ cambria_npea_data.phy = 1;
platform_device_register(&cambria_npec_device);
platform_device_register(&cambria_npea_device);
platform_device_register(&cambria_npec_device);
platform_device_register(&cambria_npea_device);
This page took
0.029075 seconds
and
4
git commands to generate.