brcm47xx: refresh patches

SVN-Revision: 20996

diff --git a/target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch b/target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch
index 26ba3b75571355505b445ed1829f9ab40f2ead52..f254b203bd5d31e1811302714138855d21cf3397 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/ide.h
 +++ b/include/linux/ide.h
-@@ -195,7 +195,11 @@
+@@ -195,7 +195,11 @@ static inline void ide_std_init_ports(st
        hw->io_ports.ctl_addr = ctl_addr;
  }
  

diff --git a/target/linux/brcm47xx/patches-2.6.33/610-pci_ide_fix.patch b/target/linux/brcm47xx/patches-2.6.33/610-pci_ide_fix.patch
index 26ba3b75571355505b445ed1829f9ab40f2ead52..f254b203bd5d31e1811302714138855d21cf3397 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.33/610-pci_ide_fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.33/610-pci_ide_fix.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/ide.h
 +++ b/include/linux/ide.h
-@@ -195,7 +195,11 @@
+@@ -195,7 +195,11 @@ static inline void ide_std_init_ports(st
        hw->io_ports.ctl_addr = ctl_addr;
  }
  

diff --git a/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch b/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch
index 1ceccb5c604104830ae92cf9630c3031ebbf61e1..4f47a3c52ddcd5793ce53c616c5e55da40004b99 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch
+++ b/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.33/drivers/ssb/driver_pcicore.c
-===================================================================
---- linux-2.6.33.orig/drivers/ssb/driver_pcicore.c     2010-03-15 14:52:55.000000000 +0100
-+++ linux-2.6.33/drivers/ssb/driver_pcicore.c  2010-03-15 15:57:38.000000000 +0100
-@@ -246,20 +246,12 @@
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -246,20 +246,12 @@ static struct pci_controller ssb_pcicore
        .pci_ops        = &ssb_pcicore_pciops,
        .io_resource    = &ssb_pcicore_io_resource,
        .mem_resource   = &ssb_pcicore_mem_resource,
@@ -23,7 +21,7 @@ Index: linux-2.6.33/drivers/ssb/driver_pcicore.c
        if (d->bus->ops != &ssb_pcicore_pciops) {
                /* This is not a device on the PCI-core bridge. */
                return -ENODEV;
-@@ -268,27 +260,6 @@
+@@ -268,27 +260,6 @@ int ssb_pcicore_plat_dev_init(struct pci
        ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
                   pci_name(d));
  

diff --git a/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch
index aaff523390ea3ca7328c79236fa07ff7e60ed5f6..b92e085235770c17c234e7868c0d9672074a0ef9 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch
+++ b/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
-===================================================================
---- linux-2.6.32.9.orig/drivers/pcmcia/yenta_socket.c  2010-03-12 09:43:45.000000000 +0100
-+++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c       2010-03-12 10:05:33.000000000 +0100
-@@ -866,6 +866,8 @@
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -911,6 +911,8 @@ static unsigned int yenta_probe_irq(stru
         * Probe for usable interrupts using the force
         * register to generate bogus card status events.
         */
@@ -11,7 +9,7 @@ Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
        cb_writel(socket, CB_SOCKET_EVENT, -1);
        cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
        exca_writeb(socket, I365_CSCINT, 0);
-@@ -880,6 +882,7 @@
+@@ -925,6 +927,7 @@ static unsigned int yenta_probe_irq(stru
        }
        cb_writel(socket, CB_SOCKET_MASK, 0);
        exca_writeb(socket, I365_CSCINT, 0);
@@ -19,7 +17,7 @@ Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
  
        mask = probe_irq_mask(val) & 0xffff;
  
-@@ -960,6 +963,10 @@
+@@ -1005,6 +1008,10 @@ static void yenta_get_socket_capabilitie
        else
                socket->socket.irq_mask = 0;
  
@@ -30,7 +28,7 @@ Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
        dev_printk(KERN_INFO, &socket->dev->dev,
                   "ISA IRQ mask 0x%04x, PCI irq %d\n",
                   socket->socket.irq_mask, socket->cb_irq);
-@@ -1198,6 +1205,15 @@
+@@ -1243,6 +1250,15 @@ static int __devinit yenta_probe(struct 
        dev_printk(KERN_INFO, &dev->dev,
                   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
  

diff --git a/target/linux/brcm47xx/patches-2.6.34/110-flash_map.patch b/target/linux/brcm47xx/patches-2.6.34/110-flash_map.patch
index 307bc7b78530e17a04760b41e7ab4893e970657b..a481125e2ce214b2feb764bcf4ddc67585f4e179 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/110-flash_map.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/110-flash_map.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/maps/Kconfig
 +++ b/drivers/mtd/maps/Kconfig
-@@ -325,6 +325,12 @@ config MTD_CFI_FLAGADM
+@@ -319,6 +319,12 @@ config MTD_CFI_FLAGADM
          Mapping for the Flaga digital module. If you don't have one, ignore
          this setting.
  

diff --git a/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch
index fc750eb30c4437b28c60cbcf1be504a8d14f74d6..f667a26308c4e5cc250ec5e4727596c962cd69c6 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch
@@ -8,7 +8,7 @@
        select PCI_GT64XXX_PCI0
        select MIPS_MSC
        select SWAP_IO_SPACE
-@@ -1561,13 +1560,6 @@ config IP22_CPU_SCACHE
+@@ -1560,13 +1559,6 @@ config IP22_CPU_SCACHE
        bool
        select BOARD_SCACHE
  
@@ -24,7 +24,7 @@
        select BOARD_SCACHE
 --- a/arch/mips/kernel/cpu-probe.c
 +++ b/arch/mips/kernel/cpu-probe.c
-@@ -759,6 +759,8 @@ static inline void cpu_probe_mips(struct
+@@ -772,6 +772,8 @@ static inline void cpu_probe_mips(struct
        case PRID_IMP_25KF:
                c->cputype = CPU_25KF;
                __cpu_name[cpu] = "MIPS 25Kc";

diff --git a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
index 41986144413dfe1299ac09da79b3bc00d090be29..56fdbbc62bc62aeea7fde3ab997b9798394c57ec 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
@@ -220,7 +220,7 @@
  #endif /* _ASM_R4KCACHE_H */
 --- a/arch/mips/include/asm/stackframe.h
 +++ b/arch/mips/include/asm/stackframe.h
-@@ -430,6 +430,10 @@
+@@ -449,6 +449,10 @@
                .macro  RESTORE_SP_AND_RET
                LONG_L  sp, PT_R29(sp)
                .set    mips3
@@ -345,7 +345,7 @@
  }
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
-@@ -749,6 +749,9 @@ static void __cpuinit build_r4000_tlb_re
+@@ -801,6 +801,9 @@ static void __cpuinit build_r4000_tlb_re
                /* No need for uasm_i_nop */
        }
  
@@ -355,7 +355,7 @@
  #ifdef CONFIG_64BIT
        build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
  #else
-@@ -1203,6 +1206,9 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1260,6 +1263,9 @@ build_r4000_tlbchange_handler_head(u32 *
                                   struct uasm_reloc **r, unsigned int pte,
                                   unsigned int ptr)
  {

diff --git a/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch
index 9cba353da3cd80c747960316b2b0e2a3a9d9cb1b..4a71a6fc6d925535652aab4b58b8e1457da1ace6 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/cpu-features.h
 +++ b/arch/mips/include/asm/cpu-features.h
-@@ -107,6 +107,9 @@
+@@ -110,6 +110,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache       (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
  #endif
@@ -48,7 +48,7 @@
                        kunmap_atomic(vaddr, KM_USER0);
 --- a/arch/mips/mm/init.c
 +++ b/arch/mips/mm/init.c
-@@ -209,7 +209,7 @@ void copy_user_highpage(struct page *to,
+@@ -210,7 +210,7 @@ void copy_user_highpage(struct page *to,
        void *vfrom, *vto;
  
        vto = kmap_atomic(to, KM_USER1);
@@ -57,7 +57,7 @@
            page_mapped(from) && !Page_dcache_dirty(from)) {
                vfrom = kmap_coherent(from, vaddr);
                copy_page(vto, vfrom);
-@@ -231,7 +231,7 @@ void copy_to_user_page(struct vm_area_st
+@@ -232,7 +232,7 @@ void copy_to_user_page(struct vm_area_st
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {
@@ -66,7 +66,7 @@
            page_mapped(page) && !Page_dcache_dirty(page)) {
                void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(vto, src, len);
-@@ -249,7 +249,7 @@ void copy_from_user_page(struct vm_area_
+@@ -250,7 +250,7 @@ void copy_from_user_page(struct vm_area_
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {

diff --git a/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch
index f396ca745a27f59d3769d6c4497bd0a24383ef66..a2691b008d391debbe18a41f379d9fd5f3672e84 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch
@@ -31,7 +31,7 @@
        }
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -1069,6 +1069,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1070,6 +1070,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
  
        if (bus->chip_id == 0x5365) {
                rate = 100000000;

diff --git a/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch
index cde3cbf7275d62d2528fb04fb6e02c4eea24b1a2..af2289b0800974aca77e5918deaf5a9714aa152e 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch
@@ -33,7 +33,7 @@
   * These are used to make use of C type-checking..
 --- a/arch/mips/mm/init.c
 +++ b/arch/mips/mm/init.c
-@@ -203,30 +203,6 @@ void kunmap_coherent(void)
+@@ -204,30 +204,6 @@ void kunmap_coherent(void)
        preempt_check_resched();
  }
  

diff --git a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch
index 53cee12066347e588923850b35468a8821c244ee..0a1796c73bc5d8bd15fed235e1d27e4d5e192013 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch
@@ -110,7 +110,7 @@
  static void bcm47xx_machine_restart(char *command)
  {
        printk(KERN_ALERT "Please stand by while rebooting the system...\n");
-@@ -56,7 +66,7 @@
+@@ -56,7 +66,7 @@ static void bcm47xx_machine_halt(void)
                cpu_relax();
  }
  
@@ -119,7 +119,7 @@
  {
        int i = 0;
  
-@@ -73,51 +83,143 @@
+@@ -73,51 +83,143 @@ static void str2eaddr(char *str, char *d
        }
  }
  

diff --git a/target/linux/brcm47xx/patches-2.6.34/610-pci_ide_fix.patch b/target/linux/brcm47xx/patches-2.6.34/610-pci_ide_fix.patch
index 26ba3b75571355505b445ed1829f9ab40f2ead52..f254b203bd5d31e1811302714138855d21cf3397 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/610-pci_ide_fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/610-pci_ide_fix.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/ide.h
 +++ b/include/linux/ide.h
-@@ -195,7 +195,11 @@
+@@ -195,7 +195,11 @@ static inline void ide_std_init_ports(st
        hw->io_ports.ctl_addr = ctl_addr;
  }
  

diff --git a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch
index 3edf04bf05df498a7b6f7fe9f26640ccf8a63a17..a308335b54b8fb4a81de90f65981e66437503d11 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch
@@ -31,7 +31,7 @@
  
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
-@@ -611,6 +611,9 @@ build_get_pgde32(u32 **p, unsigned int t
+@@ -640,6 +640,9 @@ build_get_pgde32(u32 **p, unsigned int t
  #endif
        uasm_i_addu(p, ptr, tmp, ptr);
  #else
@@ -41,7 +41,7 @@
        UASM_i_LA_mostly(p, ptr, pgdc);
  #endif
        uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
-@@ -749,12 +752,12 @@ static void __cpuinit build_r4000_tlb_re
+@@ -801,12 +804,12 @@ static void __cpuinit build_r4000_tlb_re
                /* No need for uasm_i_nop */
        }
  
@@ -57,7 +57,7 @@
        build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
  #endif
  
-@@ -766,6 +769,9 @@ static void __cpuinit build_r4000_tlb_re
+@@ -818,6 +821,9 @@ static void __cpuinit build_r4000_tlb_re
        build_update_entries(&p, K0, K1);
        build_tlb_write_entry(&p, &l, &r, tlb_random);
        uasm_l_leave(&l, p);
@@ -67,7 +67,7 @@
        uasm_i_eret(&p); /* return from trap */
  
  #ifdef CONFIG_HUGETLB_PAGE
-@@ -1206,12 +1212,12 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1263,12 +1269,12 @@ build_r4000_tlbchange_handler_head(u32 *
                                   struct uasm_reloc **r, unsigned int pte,
                                   unsigned int ptr)
  {
@@ -83,7 +83,7 @@
        build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
  #endif
  
-@@ -1248,6 +1254,9 @@ build_r4000_tlbchange_handler_tail(u32 *
+@@ -1305,6 +1311,9 @@ build_r4000_tlbchange_handler_tail(u32 *
        build_update_entries(p, tmp, ptr);
        build_tlb_write_entry(p, l, r, tlb_indexed);
        uasm_l_leave(l, *p);

diff --git a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
index ee63e30b3be9914e481e7799f6927f748e23bf12..be266e206f0a36db5b80c85d405062010afd44e0 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
@@ -1,6 +1,6 @@
---- a/drivers/pcmcia/yenta_socket.c    
-+++ b/drivers/pcmcia/yenta_socket.c    
-@@ -924,6 +924,8 @@
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -924,6 +924,8 @@ static unsigned int yenta_probe_irq(stru
         * Probe for usable interrupts using the force
         * register to generate bogus card status events.
         */
@@ -9,7 +9,7 @@
        cb_writel(socket, CB_SOCKET_EVENT, -1);
        cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
        reg = exca_readb(socket, I365_CSCINT);
-@@ -939,6 +941,7 @@
+@@ -939,6 +941,7 @@ static unsigned int yenta_probe_irq(stru
        }
        cb_writel(socket, CB_SOCKET_MASK, 0);
        exca_writeb(socket, I365_CSCINT, reg);
@@ -17,7 +17,7 @@
  
        mask = probe_irq_mask(val) & 0xffff;
  
-@@ -1022,6 +1025,10 @@
+@@ -1022,6 +1025,10 @@ static void yenta_get_socket_capabilitie
        else
                socket->socket.irq_mask = 0;
  
@@ -28,7 +28,7 @@
        dev_printk(KERN_INFO, &socket->dev->dev,
                   "ISA IRQ mask 0x%04x, PCI irq %d\n",
                   socket->socket.irq_mask, socket->cb_irq);
-@@ -1260,6 +1267,15 @@
+@@ -1260,6 +1267,15 @@ static int __devinit yenta_probe(struct 
        dev_printk(KERN_INFO, &dev->dev,
                   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));