Imre Kaloz
15 years ago
parent
3d3d75a248
commit
6b2a7b73ca
@ -1,229 +0,0 @@ |
||||
--- a/arch/avr32/boards/atngw100/setup.c
|
||||
+++ b/arch/avr32/boards/atngw100/setup.c
|
||||
@@ -118,7 +118,7 @@ static void __init set_hw_addr(struct pl
|
||||
|
||||
void __init setup_board(void)
|
||||
{
|
||||
- at32_map_usart(1, 0, 0); /* USART 1: /dev/ttyS0, DB9 */
|
||||
+ at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */
|
||||
at32_setup_serial_console(0);
|
||||
}
|
||||
|
||||
--- a/arch/avr32/boards/atstk1000/atstk1002.c
|
||||
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
|
||||
@@ -252,12 +252,12 @@ static void __init atstk1002_setup_extda
|
||||
void __init setup_board(void)
|
||||
{
|
||||
#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
|
||||
- at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */
|
||||
+ at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */
|
||||
#else
|
||||
- at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */
|
||||
+ at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */
|
||||
#endif
|
||||
/* USART 2/unused: expansion connector */
|
||||
- at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */
|
||||
+ at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */
|
||||
|
||||
at32_setup_serial_console(0);
|
||||
}
|
||||
--- a/arch/avr32/boards/atstk1000/atstk1003.c
|
||||
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
|
||||
@@ -115,12 +115,12 @@ static void __init atstk1003_setup_extda
|
||||
void __init setup_board(void)
|
||||
{
|
||||
#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
|
||||
- at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */
|
||||
+ at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */
|
||||
#else
|
||||
- at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */
|
||||
+ at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */
|
||||
#endif
|
||||
/* USART 2/unused: expansion connector */
|
||||
- at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */
|
||||
+ at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */
|
||||
|
||||
at32_setup_serial_console(0);
|
||||
}
|
||||
--- a/arch/avr32/boards/atstk1000/atstk1004.c
|
||||
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
|
||||
@@ -120,12 +120,12 @@ static void __init atstk1004_setup_extda
|
||||
void __init setup_board(void)
|
||||
{
|
||||
#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
|
||||
- at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */
|
||||
+ at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */
|
||||
#else
|
||||
- at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */
|
||||
+ at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */
|
||||
#endif
|
||||
/* USART 2/unused: expansion connector */
|
||||
- at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */
|
||||
+ at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */
|
||||
|
||||
at32_setup_serial_console(0);
|
||||
}
|
||||
--- a/arch/avr32/boards/favr-32/setup.c
|
||||
+++ b/arch/avr32/boards/favr-32/setup.c
|
||||
@@ -250,7 +250,7 @@ static void __init favr32_setup_atmel_pw
|
||||
|
||||
void __init setup_board(void)
|
||||
{
|
||||
- at32_map_usart(3, 0, 0); /* USART 3 => /dev/ttyS0 */
|
||||
+ at32_map_usart(3, 0); /* USART 3 => /dev/ttyS0 */
|
||||
at32_setup_serial_console(0);
|
||||
}
|
||||
|
||||
--- a/arch/avr32/boards/hammerhead/setup.c
|
||||
+++ b/arch/avr32/boards/hammerhead/setup.c
|
||||
@@ -165,7 +165,7 @@ static void __init set_hw_addr(struct pl
|
||||
|
||||
void __init setup_board(void)
|
||||
{
|
||||
- at32_map_usart(1, 0, 0); /* USART 1: /dev/ttyS0, DB9 */
|
||||
+ at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */
|
||||
at32_setup_serial_console(0);
|
||||
}
|
||||
|
||||
--- a/arch/avr32/boards/merisc/setup.c
|
||||
+++ b/arch/avr32/boards/merisc/setup.c
|
||||
@@ -231,9 +231,9 @@ static void detect_merisc_board_id(void)
|
||||
|
||||
void __init setup_board(void)
|
||||
{
|
||||
- at32_map_usart(0, 0, 0);
|
||||
- at32_map_usart(1, 1, 0);
|
||||
- at32_map_usart(3, 3, 0);
|
||||
+ at32_map_usart(0, 0);
|
||||
+ at32_map_usart(1, 1);
|
||||
+ at32_map_usart(3, 3);
|
||||
at32_setup_serial_console(1);
|
||||
}
|
||||
|
||||
@@ -248,7 +248,7 @@ static int __init merisc_init(void)
|
||||
at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26));
|
||||
|
||||
if (merisc_board_id >= 1)
|
||||
- at32_map_usart(2, 2, 0);
|
||||
+ at32_map_usart(2, 2);
|
||||
|
||||
at32_add_device_usart(0);
|
||||
at32_add_device_usart(1);
|
||||
--- a/arch/avr32/boards/mimc200/setup.c
|
||||
+++ b/arch/avr32/boards/mimc200/setup.c
|
||||
@@ -175,10 +175,10 @@ static void __init set_hw_addr(struct pl
|
||||
|
||||
void __init setup_board(void)
|
||||
{
|
||||
- at32_map_usart(0, 0, 0); /* USART 0: /dev/ttyS0 (TTL --> Altera) */
|
||||
- at32_map_usart(1, 1, 0); /* USART 1: /dev/ttyS1 (RS232) */
|
||||
- at32_map_usart(2, 2, 0); /* USART 2: /dev/ttyS2 (RS485) */
|
||||
- at32_map_usart(3, 3, 0); /* USART 3: /dev/ttyS3 (RS422 Multidrop) */
|
||||
+ at32_map_usart(0, 0); /* USART 0: /dev/ttyS0 (TTL --> Altera) */
|
||||
+ at32_map_usart(1, 1); /* USART 1: /dev/ttyS1 (RS232) */
|
||||
+ at32_map_usart(2, 2); /* USART 2: /dev/ttyS2 (RS485) */
|
||||
+ at32_map_usart(3, 3); /* USART 3: /dev/ttyS3 (RS422 Multidrop) */
|
||||
}
|
||||
|
||||
static struct i2c_gpio_platform_data i2c_gpio_data = {
|
||||
--- a/arch/avr32/mach-at32ap/at32ap700x.c
|
||||
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
|
||||
@@ -966,68 +966,56 @@ static struct resource atmel_usart3_reso
|
||||
DEFINE_DEV_DATA(atmel_usart, 3);
|
||||
DEV_CLK(usart, atmel_usart3, pba, 6);
|
||||
|
||||
-static inline void configure_usart0_pins(int flags)
|
||||
+static inline void configure_usart0_pins(void)
|
||||
{
|
||||
u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */
|
||||
- if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 6);
|
||||
- if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 7);
|
||||
- if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 10);
|
||||
|
||||
select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
|
||||
}
|
||||
|
||||
-static inline void configure_usart1_pins(int flags)
|
||||
+static inline void configure_usart1_pins(void)
|
||||
{
|
||||
u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */
|
||||
- if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 19);
|
||||
- if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 20);
|
||||
- if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 16);
|
||||
|
||||
select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP);
|
||||
}
|
||||
|
||||
-static inline void configure_usart2_pins(int flags)
|
||||
+static inline void configure_usart2_pins(void)
|
||||
{
|
||||
u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */
|
||||
- if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 30);
|
||||
- if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 29);
|
||||
- if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 28);
|
||||
|
||||
select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
|
||||
}
|
||||
|
||||
-static inline void configure_usart3_pins(int flags)
|
||||
+static inline void configure_usart3_pins(void)
|
||||
{
|
||||
u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */
|
||||
- if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 16);
|
||||
- if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 15);
|
||||
- if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 19);
|
||||
|
||||
select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
|
||||
}
|
||||
|
||||
static struct platform_device *__initdata at32_usarts[4];
|
||||
|
||||
-void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags)
|
||||
+void __init at32_map_usart(unsigned int hw_id, unsigned int line)
|
||||
{
|
||||
struct platform_device *pdev;
|
||||
|
||||
switch (hw_id) {
|
||||
case 0:
|
||||
pdev = &atmel_usart0_device;
|
||||
- configure_usart0_pins(flags);
|
||||
+ configure_usart0_pins();
|
||||
break;
|
||||
case 1:
|
||||
pdev = &atmel_usart1_device;
|
||||
- configure_usart1_pins(flags);
|
||||
+ configure_usart1_pins();
|
||||
break;
|
||||
case 2:
|
||||
pdev = &atmel_usart2_device;
|
||||
- configure_usart2_pins(flags);
|
||||
+ configure_usart2_pins();
|
||||
break;
|
||||
case 3:
|
||||
pdev = &atmel_usart3_device;
|
||||
- configure_usart3_pins(flags);
|
||||
+ configure_usart3_pins();
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
--- a/arch/avr32/mach-at32ap/include/mach/board.h
|
||||
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
|
||||
@@ -26,17 +26,12 @@ static inline void __deprecated at32_add
|
||||
#define ATMEL_MAX_UART 4
|
||||
extern struct platform_device *atmel_default_console_device;
|
||||
|
||||
-/* Flags for selecting USART extra pins */
|
||||
-#define ATMEL_USART_RTS 0x01
|
||||
-#define ATMEL_USART_CTS 0x02
|
||||
-#define ATMEL_USART_CLK 0x03
|
||||
-
|
||||
struct atmel_uart_data {
|
||||
short use_dma_tx; /* use transmit DMA? */
|
||||
short use_dma_rx; /* use receive DMA? */
|
||||
void __iomem *regs; /* virtual base address, if any */
|
||||
};
|
||||
-void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
|
||||
+void at32_map_usart(unsigned int hw_id, unsigned int line);
|
||||
struct platform_device *at32_add_device_usart(unsigned int id);
|
||||
|
||||
struct eth_platform_data {
|
||||
@ -0,0 +1,22 @@ |
||||
Fix clash in ATMEL_USART_ flags
|
||||
|
||||
At the moment ATMEL_USART_{RTS,CTS,CLK} have the values
|
||||
1, 2 and 3 respectively. Given these are used in bitmasks,
|
||||
trying to turn on the CLK line will in fact turn on the
|
||||
RTS and CTS lines as well.
|
||||
|
||||
Change the value of ATMEL_USART_CLK to 4.
|
||||
|
||||
Signed-off-by: Ben Nizette <bn@niasdigital.com>
|
||||
---
|
||||
--- a/arch/avr32/mach-at32ap/include/mach/board.h
|
||||
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
|
||||
@@ -29,7 +29,7 @@ extern struct platform_device *atmel_def
|
||||
/* Flags for selecting USART extra pins */
|
||||
#define ATMEL_USART_RTS 0x01
|
||||
#define ATMEL_USART_CTS 0x02
|
||||
-#define ATMEL_USART_CLK 0x03
|
||||
+#define ATMEL_USART_CLK 0x04
|
||||
|
||||
struct atmel_uart_data {
|
||||
short use_dma_tx; /* use transmit DMA? */
|
||||
@ -1,42 +0,0 @@ |
||||
--- a/drivers/net/r8169.c
|
||||
+++ b/drivers/net/r8169.c
|
||||
@@ -1890,7 +1890,7 @@ static const struct rtl_cfg_info {
|
||||
.hw_start = rtl_hw_start_8169,
|
||||
.region = 1,
|
||||
.align = 0,
|
||||
- .intr_event = SYSErr | LinkChg | RxOverflow |
|
||||
+ .intr_event = LinkChg | RxOverflow |
|
||||
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
||||
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
||||
.features = RTL_FEATURE_GMII
|
||||
@@ -1899,7 +1899,7 @@ static const struct rtl_cfg_info {
|
||||
.hw_start = rtl_hw_start_8168,
|
||||
.region = 2,
|
||||
.align = 8,
|
||||
- .intr_event = SYSErr | LinkChg | RxOverflow |
|
||||
+ .intr_event = LinkChg | RxOverflow |
|
||||
TxErr | TxOK | RxOK | RxErr,
|
||||
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
|
||||
.features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
|
||||
@@ -1908,7 +1908,7 @@ static const struct rtl_cfg_info {
|
||||
.hw_start = rtl_hw_start_8101,
|
||||
.region = 2,
|
||||
.align = 8,
|
||||
- .intr_event = SYSErr | LinkChg | RxOverflow | PCSTimeout |
|
||||
+ .intr_event = LinkChg | RxOverflow | PCSTimeout |
|
||||
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
||||
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
||||
.features = RTL_FEATURE_MSI
|
||||
@@ -3582,10 +3582,12 @@ static irqreturn_t rtl8169_interrupt(int
|
||||
goto out;
|
||||
}
|
||||
|
||||
+#if 0
|
||||
if (unlikely(status & SYSErr)) {
|
||||
rtl8169_pcierr_interrupt(dev);
|
||||
goto out;
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (status & LinkChg)
|
||||
rtl8169_check_link_status(dev, tp, ioaddr);
|
||||
@ -1,112 +0,0 @@ |
||||
From: Nicolas Pitre <nico@cam.org>
|
||||
Date: Fri, 22 May 2009 20:53:40 +0000 (-0400)
|
||||
Subject: [ARM] add coherent DMA mask for mv643xx_eth
|
||||
X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=a49a018a6ea6d73742a81d673fe5ec4a7d2137b3
|
||||
|
||||
[ARM] add coherent DMA mask for mv643xx_eth
|
||||
|
||||
Since commit eb0519b5a1cf, mv643xx_eth is non functional on ARM because
|
||||
the platform device declaration does not include any coherent DMA mask
|
||||
and coherent memory allocations fail.
|
||||
|
||||
Signed-off-by: Nicolas Pitre <nico@marvell.com>
|
||||
---
|
||||
|
||||
--- a/arch/arm/mach-kirkwood/common.c
|
||||
+++ b/arch/arm/mach-kirkwood/common.c
|
||||
@@ -144,6 +144,9 @@ static struct platform_device kirkwood_g
|
||||
.id = 0,
|
||||
.num_resources = 1,
|
||||
.resource = kirkwood_ge00_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
@@ -202,6 +205,9 @@ static struct platform_device kirkwood_g
|
||||
.id = 1,
|
||||
.num_resources = 1,
|
||||
.resource = kirkwood_ge01_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
--- a/arch/arm/mach-loki/common.c
|
||||
+++ b/arch/arm/mach-loki/common.c
|
||||
@@ -82,6 +82,9 @@ static struct platform_device loki_ge0 =
|
||||
.id = 0,
|
||||
.num_resources = 1,
|
||||
.resource = loki_ge0_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
@@ -136,6 +139,9 @@ static struct platform_device loki_ge1 =
|
||||
.id = 1,
|
||||
.num_resources = 1,
|
||||
.resource = loki_ge1_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
--- a/arch/arm/mach-mv78xx0/common.c
|
||||
+++ b/arch/arm/mach-mv78xx0/common.c
|
||||
@@ -321,6 +321,9 @@ static struct platform_device mv78xx0_ge
|
||||
.id = 0,
|
||||
.num_resources = 1,
|
||||
.resource = mv78xx0_ge00_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
@@ -375,6 +378,9 @@ static struct platform_device mv78xx0_ge
|
||||
.id = 1,
|
||||
.num_resources = 1,
|
||||
.resource = mv78xx0_ge01_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
@@ -429,6 +435,9 @@ static struct platform_device mv78xx0_ge
|
||||
.id = 2,
|
||||
.num_resources = 1,
|
||||
.resource = mv78xx0_ge10_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
@@ -496,6 +505,9 @@ static struct platform_device mv78xx0_ge
|
||||
.id = 3,
|
||||
.num_resources = 1,
|
||||
.resource = mv78xx0_ge11_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
--- a/arch/arm/mach-orion5x/common.c
|
||||
+++ b/arch/arm/mach-orion5x/common.c
|
||||
@@ -188,6 +188,9 @@ static struct platform_device orion5x_et
|
||||
.id = 0,
|
||||
.num_resources = 1,
|
||||
.resource = orion5x_eth_resources,
|
||||
+ .dev = {
|
||||
+ .coherent_dma_mask = 0xffffffff,
|
||||
+ },
|
||||
};
|
||||
|
||||
void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
|
||||
Loading…
Reference in new issue