diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-08-14 18:05:37 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-08-14 18:05:37 +0000 |
| commit | 0e70096329b6e9770e66cc2749e56293ace466df (patch) | |
| tree | db5a82fd1f2a213e0ee8d7bbd15579b183c6ff78 /target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch | |
| parent | a61e780690a289ee3c8c4e1d50ca63a3dc0b20e8 (diff) | |
| download | upstream-0e70096329b6e9770e66cc2749e56293ace466df.tar.gz upstream-0e70096329b6e9770e66cc2749e56293ace466df.tar.bz2 upstream-0e70096329b6e9770e66cc2749e56293ace466df.zip | |
[brcm47xx] refresh 2.6.23 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12311 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch b/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch index bf16997c41..a2857fecbb 100644 --- a/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch +++ b/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c -=================================================================== ---- linux-2.6.23.17.orig/drivers/ssb/driver_chipcommon.c -+++ linux-2.6.23.17/drivers/ssb/driver_chipcommon.c -@@ -403,6 +403,7 @@ int ssb_chipco_serial_init(struct ssb_ch +--- a/drivers/ssb/driver_chipcommon.c ++++ b/drivers/ssb/driver_chipcommon.c +@@ -403,6 +403,7 @@ unsigned int irq; u32 baud_base, div; u32 i, n; @@ -10,7 +8,7 @@ Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT); irq = ssb_mips_irq(cc->dev); -@@ -414,14 +415,39 @@ int ssb_chipco_serial_init(struct ssb_ch +@@ -414,14 +415,39 @@ chipco_read32(cc, SSB_CHIPCO_CLOCK_M2)); div = 1; } else { @@ -53,7 +51,7 @@ Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c /* Internal backplane clock */ baud_base = ssb_clockspeed(bus); div = chipco_read32(cc, SSB_CHIPCO_CLKDIV) -@@ -433,7 +459,7 @@ int ssb_chipco_serial_init(struct ssb_ch +@@ -433,7 +459,7 @@ } /* Clock source depends on strapping if UartClkOverride is unset */ @@ -62,7 +60,7 @@ Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c !(chipco_read32(cc, SSB_CHIPCO_CORECTL) & SSB_CHIPCO_CORECTL_UARTCLK0)) { if ((cc->capabilities & SSB_CHIPCO_CAP_UARTCLK) == SSB_CHIPCO_CAP_UARTCLK_INT) { -@@ -455,7 +481,7 @@ int ssb_chipco_serial_init(struct ssb_ch +@@ -455,7 +481,7 @@ cc_mmio = cc->dev->bus->mmio + (cc->dev->core_index * SSB_CORE_SIZE); uart_regs = cc_mmio + SSB_CHIPCO_UART0_DATA; /* Offset changed at after rev 0 */ @@ -71,10 +69,8 @@ Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c uart_regs += (i * 8); else uart_regs += (i * 256); -Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h -=================================================================== ---- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_chipcommon.h -+++ linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h +--- a/include/linux/ssb/ssb_driver_chipcommon.h ++++ b/include/linux/ssb/ssb_driver_chipcommon.h @@ -51,9 +51,12 @@ #define SSB_CHIPCO_CAP_JTAGM 0x00400000 /* JTAG master present */ #define SSB_CHIPCO_CAP_BROM 0x00800000 /* Internal boot ROM active */ |