hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

brcm63xx: spi flash on legacy spi controller needs the workaround 

Fixes generic SPI flash accesses on BCM6358/BCM6368. BCM6338 still needs
additional fixes for M25P80, so it remains broken for now.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39266 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Jonas Gorski 2014-01-13 12:12:50 +00:00
parent 02c8d6aa27
commit d9d3c10863
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/brcm63xx/patches-3.10/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
View File

@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
case STRAPBUS_6368_BOOT_SEL_NAND: case STRAPBUS_6368_BOOT_SEL_NAND:
return BCM63XX_FLASH_TYPE_NAND; return BCM63XX_FLASH_TYPE_NAND;
@@ -117,8 +143,11 @@ int __init bcm63xx_flash_register(void) @@ -117,8 +143,14 @@ int __init bcm63xx_flash_register(void)
return platform_device_register(&mtd_dev); return platform_device_register(&mtd_dev);
case BCM63XX_FLASH_TYPE_SERIAL: case BCM63XX_FLASH_TYPE_SERIAL:
@ -77,6 +77,9 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+ if (BCMCPU_IS_6328() || BCMCPU_IS_6362()) + if (BCMCPU_IS_6328() || BCMCPU_IS_6362())
+ bcm63xx_spi_flash_info[0].bus_num = 1; + bcm63xx_spi_flash_info[0].bus_num = 1;
+ +
+ if (BCMCPU_IS_6358() || BCMCPU_IS_6368())
+ bcm63xx_flash_data.max_transfer_len = SPI_6358_MSG_DATA_SIZE;
+
+ return spi_register_board_info(bcm63xx_spi_flash_info, + return spi_register_board_info(bcm63xx_spi_flash_info,
+ ARRAY_SIZE(bcm63xx_spi_flash_info)); + ARRAY_SIZE(bcm63xx_spi_flash_info));
case BCM63XX_FLASH_TYPE_NAND: case BCM63XX_FLASH_TYPE_NAND:

2
target/linux/brcm63xx/patches-3.10/415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
View File

@ -97,7 +97,7 @@ Subject: [PATCH 38/59] MIPS: BCM63XX: store the flash type in global variable
case BCM63XX_FLASH_TYPE_PARALLEL: case BCM63XX_FLASH_TYPE_PARALLEL:
/* read base address of boot chip select (0) */ /* read base address of boot chip select (0) */
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val = bcm_mpi_readl(MPI_CSBASE_REG(0));
@@ -153,7 +166,7 @@ int __init bcm63xx_flash_register(void) @@ -156,7 +169,7 @@ int __init bcm63xx_flash_register(void)
return -ENODEV; return -ENODEV;
default: default:
pr_err("flash detection failed for BCM%x: %d\n", pr_err("flash detection failed for BCM%x: %d\n",