Changeset 41295


Ignore:
Timestamp:
2014-06-21T21:23:28+02:00 (4 years ago)
Author:
jogo
Message:

brcm63xx: update variant detection patches and fix VARID shift

The variant id field shift was wrong, causing the variant detection
to fail.

Signed-off-by: Jonas Gorski <jogo@…>

Location:
trunk/target/linux/brcm63xx
Files:
14 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch

    r39220 r41295  
    1212--- a/drivers/mtd/devices/m25p80.c 
    1313+++ b/drivers/mtd/devices/m25p80.c 
    14 @@ -1092,7 +1092,8 @@ static int m25p_probe(struct spi_device 
     14@@ -1093,7 +1093,8 @@ static int m25p_probe(struct spi_device 
    1515        /* partitions should match sector boundaries; and it may be good to 
    1616         * use readonly partitions for writeprotected sectors (BP2..BP0). 
  • trunk/target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch

    r39220 r41295  
    6161  * Write an address range to the flash chip.  Data must be written in 
    6262  * FLASH_PAGESIZE chunks.  The address range may be any size provided 
    63 @@ -987,6 +1009,9 @@ static int m25p_probe(struct spi_device 
     63@@ -988,6 +1010,9 @@ static int m25p_probe(struct spi_device 
    6464                return -ENOMEM; 
    6565        } 
  • trunk/target/linux/brcm63xx/patches-3.10/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch

    r39269 r41295  
    1 From c50acd37b425a8a907a6f7f93aa2e658256e79ce Mon Sep 17 00:00:00 2001 
     1From 994ed2c168ce27483724cd0c387f752d1ccd30e7 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:08:36 +0100 
    4 Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu variant helper 
     4Subject: [PATCH 20/45] MIPS: BCM63XX: add a new cpu variant helper 
    55 
    66--- 
  • trunk/target/linux/brcm63xx/patches-3.10/331-MIPS-BCM63XX-define-variant-id-field.patch

    r39269 r41295  
    1 From 9cd8b4a2ee9d0e6a5b91845bdd6f4b7e114fc8c4 Mon Sep 17 00:00:00 2001 
     1From 3bd8e2535265f06f79ed9c0ad788405441e091dc Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:22:41 +0100 
    4 Subject: [PATCH 41/53] MIPS: BCM63XX: define variant id field 
     4Subject: [PATCH 21/45] MIPS: BCM63XX: define variant id field 
    55 
     6Some SoC have a variant id field in the chip id register. 
     7 
     8Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
    69--- 
    710 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 ++ 
     
    1417 #define REV_CHIPID_SHIFT               16 
    1518 #define REV_CHIPID_MASK                        (0xffff << REV_CHIPID_SHIFT) 
    16 +#define REV_VARID_SHIFT                        8 
     19+#define REV_VARID_SHIFT                        12 
    1720+#define REV_VARID_MASK                 (0xf << REV_VARID_SHIFT) 
    1821 #define REV_REVID_SHIFT                        0 
  • trunk/target/linux/brcm63xx/patches-3.10/332-MIPS-BCM63XX-detect-BCM6328-variants.patch

    r41294 r41295  
    1 From 6c8d94aaf5e2f0a3327e4f69ccd980bd5617f925 Mon Sep 17 00:00:00 2001 
     1From d59120f23279ef62a48d9f94847254b061d0a8b6 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:30:59 +0100 
    4 Subject: [PATCH 42/53] MIPS: BCM63XX: detect bcm6328 variants 
     4Subject: [PATCH 22/45] MIPS: BCM63XX: detect BCM6328 variants 
    55 
     6Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
    67--- 
    78 arch/mips/bcm63xx/cpu.c                          | 10 ++++++++++ 
  • trunk/target/linux/brcm63xx/patches-3.10/333-MIPS-BCM63XX-detect-BCM6362-variants.patch

    r39269 r41295  
    1 From dc48adb13a99086d1f484d3379a918626c5b1658 Mon Sep 17 00:00:00 2001 
     1From 04458c3db8eb79da21ecde40ab36a1dde52bef06 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:33:28 +0100 
    4 Subject: [PATCH 43/53] MIPS: BCM63XX: detect BCM6362 variants 
     4Subject: [PATCH 23/45] MIPS: BCM63XX: detect BCM6362 variants 
    55 
    66--- 
  • trunk/target/linux/brcm63xx/patches-3.10/334-MIPS-BCM63XX-detect-BCM6368-variants.patch

    r41294 r41295  
    1 From 311b0246d51e09d13464e76abb0e231c855dd333 Mon Sep 17 00:00:00 2001 
     1From 825cc67e56b5e624a05f6850a86d91508b786848 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:36:56 +0100 
    4 Subject: [PATCH 44/53] MIPS: BCM63XX: add support for BCM6368 variants 
     4Subject: [PATCH 24/44] MIPS: BCM63XX: detect BCM6368 variants 
    55 
     6The DSL-less BCM6368 variant BCM6367 uses a different chip id. Apart 
     7from missing DSL, there is no difference to BCM6368, so treat it such. 
     8 
     9Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
    610--- 
    711 arch/mips/bcm63xx/cpu.c                          | 4 ++++ 
  • trunk/target/linux/brcm63xx/patches-3.10/339-MIPS-BCM63XX-add-support-for-BCM63268.patch

    r39677 r41295  
    573573+#define REV_LONG_CHIPID_SHIFT          12 
    574574+#define REV_LONG_CHIPID_MASK           (0xfffff << REV_LONG_CHIPID_SHIFT) 
    575  #define REV_VARID_SHIFT                        8 
     575 #define REV_VARID_SHIFT                        12 
    576576 #define REV_VARID_MASK                 (0xf << REV_VARID_SHIFT) 
    577577 #define REV_REVID_SHIFT                        0 
  • trunk/target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch

    r39220 r41295  
    1111--- a/drivers/mtd/devices/m25p80.c 
    1212+++ b/drivers/mtd/devices/m25p80.c 
    13 @@ -976,6 +976,9 @@ static int m25p_probe(struct spi_device 
     13@@ -977,6 +977,9 @@ static int m25p_probe(struct spi_device 
    1414                        dev_warn(&spi->dev, "unrecognized id %s\n", data->type); 
    1515        } 
  • trunk/target/linux/brcm63xx/patches-3.14/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch

    r40380 r41295  
    1212--- a/drivers/mtd/devices/m25p80.c 
    1313+++ b/drivers/mtd/devices/m25p80.c 
    14 @@ -1313,7 +1313,8 @@ static int m25p_probe(struct spi_device 
     14@@ -1314,7 +1314,8 @@ static int m25p_probe(struct spi_device 
    1515        /* partitions should match sector boundaries; and it may be good to 
    1616         * use readonly partitions for writeprotected sectors (BP2..BP0). 
  • trunk/target/linux/brcm63xx/patches-3.14/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch

    r40380 r41295  
    6161  * Write an address range to the flash chip.  Data must be written in 
    6262  * FLASH_PAGESIZE chunks.  The address range may be any size provided 
    63 @@ -1158,6 +1180,9 @@ static int m25p_probe(struct spi_device 
     63@@ -1159,6 +1181,9 @@ static int m25p_probe(struct spi_device 
    6464        if (!flash->command) 
    6565                return -ENOMEM; 
  • trunk/target/linux/brcm63xx/patches-3.14/204-USB-OHCI-allow-other-arches-to-use-the-BE-frame-numb.patch

    r40380 r41295  
    2121--- a/drivers/usb/host/ohci.h 
    2222+++ b/drivers/usb/host/ohci.h 
    23 @@ -639,7 +639,7 @@ static inline u32 hc32_to_cpup (const st 
     23@@ -641,7 +641,7 @@ static inline u32 hc32_to_cpup (const st 
    2424  * some big-endian SOC implementations.  Same thing happens with PSW access. 
    2525  */ 
  • trunk/target/linux/brcm63xx/patches-3.14/331-MIPS-BCM63XX-define-variant-id-field.patch

    r40380 r41295  
    1 From 9cd8b4a2ee9d0e6a5b91845bdd6f4b7e114fc8c4 Mon Sep 17 00:00:00 2001 
     1From 3bd8e2535265f06f79ed9c0ad788405441e091dc Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:22:41 +0100 
    4 Subject: [PATCH 41/53] MIPS: BCM63XX: define variant id field 
     4Subject: [PATCH 21/45] MIPS: BCM63XX: define variant id field 
    55 
     6Some SoC have a variant id field in the chip id register. 
     7 
     8Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
    69--- 
    710 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 ++ 
     
    1417 #define REV_CHIPID_SHIFT               16 
    1518 #define REV_CHIPID_MASK                        (0xffff << REV_CHIPID_SHIFT) 
    16 +#define REV_VARID_SHIFT                        8 
     19+#define REV_VARID_SHIFT                        12 
    1720+#define REV_VARID_MASK                 (0xf << REV_VARID_SHIFT) 
    1821 #define REV_REVID_SHIFT                        0 
  • trunk/target/linux/brcm63xx/patches-3.14/332-MIPS-BCM63XX-detect-BCM6328-variants.patch

    r41294 r41295  
    1 From 6c8d94aaf5e2f0a3327e4f69ccd980bd5617f925 Mon Sep 17 00:00:00 2001 
     1From d59120f23279ef62a48d9f94847254b061d0a8b6 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:30:59 +0100 
    4 Subject: [PATCH 42/53] MIPS: BCM63XX: detect bcm6328 variants 
     4Subject: [PATCH 22/45] MIPS: BCM63XX: detect BCM6328 variants 
    55 
     6Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
    67--- 
    78 arch/mips/bcm63xx/cpu.c                          | 10 ++++++++++ 
  • trunk/target/linux/brcm63xx/patches-3.14/333-MIPS-BCM63XX-detect-BCM6362-variants.patch

    r40380 r41295  
    1 From dc48adb13a99086d1f484d3379a918626c5b1658 Mon Sep 17 00:00:00 2001 
     1From 04458c3db8eb79da21ecde40ab36a1dde52bef06 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:33:28 +0100 
    4 Subject: [PATCH 43/53] MIPS: BCM63XX: detect BCM6362 variants 
     4Subject: [PATCH 23/45] MIPS: BCM63XX: detect BCM6362 variants 
    55 
    66--- 
  • trunk/target/linux/brcm63xx/patches-3.14/334-MIPS-BCM63XX-detect-BCM6368-variants.patch

    r41294 r41295  
    1 From 311b0246d51e09d13464e76abb0e231c855dd333 Mon Sep 17 00:00:00 2001 
     1From 825cc67e56b5e624a05f6850a86d91508b786848 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Sat, 7 Dec 2013 14:36:56 +0100 
    4 Subject: [PATCH 44/53] MIPS: BCM63XX: add support for BCM6368 variants 
     4Subject: [PATCH 24/44] MIPS: BCM63XX: detect BCM6368 variants 
    55 
     6The DSL-less BCM6368 variant BCM6367 uses a different chip id. Apart 
     7from missing DSL, there is no difference to BCM6368, so treat it such. 
     8 
     9Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
    610--- 
    711 arch/mips/bcm63xx/cpu.c                          | 4 ++++ 
  • trunk/target/linux/brcm63xx/patches-3.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch

    r40380 r41295  
    573573+#define REV_LONG_CHIPID_SHIFT          12 
    574574+#define REV_LONG_CHIPID_MASK           (0xfffff << REV_LONG_CHIPID_SHIFT) 
    575  #define REV_VARID_SHIFT                        8 
     575 #define REV_VARID_SHIFT                        12 
    576576 #define REV_VARID_MASK                 (0xf << REV_VARID_SHIFT) 
    577577 #define REV_REVID_SHIFT                        0 
  • trunk/target/linux/brcm63xx/patches-3.14/414-MTD-m25p80-allow-passing-pp_data.patch

    r40380 r41295  
    1111--- a/drivers/mtd/devices/m25p80.c 
    1212+++ b/drivers/mtd/devices/m25p80.c 
    13 @@ -1149,6 +1149,9 @@ static int m25p_probe(struct spi_device 
     13@@ -1150,6 +1150,9 @@ static int m25p_probe(struct spi_device 
    1414                        dev_warn(&spi->dev, "unrecognized id %s\n", data->type); 
    1515        } 
Note: See TracChangeset for help on using the changeset viewer.