diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-17 16:36:52 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-17 16:36:52 +0000 |
| commit | 3859f87475f83e754b3e283def3f3b3781ba9cd2 (patch) | |
| tree | d1e66461793fbf43356de932b36af195e8383279 | |
| parent | 4294c6bb6cd0624e9e45b31e10c0a0ddd1bea5f9 (diff) | |
| download | master-187ad058-3859f87475f83e754b3e283def3f3b3781ba9cd2.tar.gz master-187ad058-3859f87475f83e754b3e283def3f3b3781ba9cd2.tar.bz2 master-187ad058-3859f87475f83e754b3e283def3f3b3781ba9cd2.zip | |
atheros[uart]: pass only physical I/O mem address to 8250 driver
Pass only physical address to 8250 serial port driver and set flag to
remap I/O memory inside the driver. Also fix AR5312 UART base address
definition, which seems specified already mapped.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41700 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/atheros/patches-3.10/100-board.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/atheros/patches-3.10/100-board.patch b/target/linux/atheros/patches-3.10/100-board.patch index b9d3719034..611d7ccf60 100644 --- a/target/linux/atheros/patches-3.10/100-board.patch +++ b/target/linux/atheros/patches-3.10/100-board.patch @@ -1384,8 +1384,8 @@ +#define AR531X_SDRAMCTL 0x18300000 +#define AR531X_FLASHCTL 0x18400000 +#define AR531X_APBBASE 0x1c000000 ++#define AR531X_UART0 0x1c000000 /* UART MMR */ +#define AR531X_FLASH 0x1e000000 -+#define AR531X_UART0 0xbc000000 /* UART MMR */ + +/* + * AR531X_NUM_ENET_MAC defines the number of ethernet MACs that @@ -2126,7 +2126,7 @@ + ar231x_write_reg(AR531X_WD_CTRL, AR531X_WD_CTRL_IGNORE_EXPIRATION); + + _machine_restart = ar5312_restart; -+ ar231x_serial_setup(KSEG1ADDR(AR531X_UART0), AR531X_MISC_IRQ_UART0, ++ ar231x_serial_setup(AR531X_UART0, AR531X_MISC_IRQ_UART0, + ar5312_sys_frequency()); +} + @@ -2686,7 +2686,7 @@ + ar231x_write_reg(AR2315_WDC, AR2315_WDC_IGNORE_EXPIRATION); + + _machine_restart = ar2315_restart; -+ ar231x_serial_setup(KSEG1ADDR(AR2315_UART0), AR2315_MISC_IRQ_UART0, ++ ar231x_serial_setup(AR2315_UART0, AR2315_MISC_IRQ_UART0, + ar2315_apb_frequency()); +} --- /dev/null @@ -2859,7 +2859,7 @@ +#endif --- /dev/null +++ b/arch/mips/ar231x/devices.c -@@ -0,0 +1,181 @@ +@@ -0,0 +1,180 @@ +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/serial.h> @@ -3006,13 +3006,12 @@ + + memset(&s, 0, sizeof(s)); + -+ s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; ++ s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP; + s.iotype = UPIO_MEM32; + s.irq = irq; + s.regshift = 2; + s.mapbase = mapbase; + s.uartclk = uartclk; -+ s.membase = (void __iomem *)s.mapbase; + + early_serial_setup(&s); +} |