diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-05-02 15:28:10 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-05-02 15:28:10 +0000 |
| commit | a80a4f3ec26e475d11fa108311ff2668e3aaa7c4 (patch) | |
| tree | a0fc8dc2a3535cfa94615d325cfca0ad6dba0c7f | |
| parent | 999a956f4cd97154946cad35735d353a04a734da (diff) | |
| download | upstream-a80a4f3ec26e475d11fa108311ff2668e3aaa7c4.tar.gz upstream-a80a4f3ec26e475d11fa108311ff2668e3aaa7c4.tar.bz2 upstream-a80a4f3ec26e475d11fa108311ff2668e3aaa7c4.zip | |
bcm63xx: fix hsspi flash registration for BCM6362
Use busnum 1 for HSSPI so it won't conflict on chips having both SPI
controllers.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36524
2 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/409-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch b/target/linux/brcm63xx/patches-3.8/409-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch index d659d7af73..48774a3b05 100644 --- a/target/linux/brcm63xx/patches-3.8/409-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch +++ b/target/linux/brcm63xx/patches-3.8/409-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch @@ -77,7 +77,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> +}; + +static struct bcm63xx_hsspi_pdata spi_pdata = { -+ .bus_num = 0, ++ .bus_num = 1, +}; + +static struct platform_device bcm63xx_hsspi_device = { diff --git a/target/linux/brcm63xx/patches-3.8/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/brcm63xx/patches-3.8/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch index b06213403d..c82c409435 100644 --- a/target/linux/brcm63xx/patches-3.8/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch +++ b/target/linux/brcm63xx/patches-3.8/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch @@ -68,14 +68,16 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { case STRAPBUS_6368_BOOT_SEL_NAND: return BCM63XX_FLASH_TYPE_NAND; -@@ -116,8 +142,11 @@ int __init bcm63xx_flash_register(void) +@@ -116,8 +142,13 @@ int __init bcm63xx_flash_register(void) return platform_device_register(&mtd_dev); case BCM63XX_FLASH_TYPE_SERIAL: - pr_warn("unsupported serial flash detected\n"); - return -ENODEV; -+ if (BCMCPU_IS_6328()) ++ if (BCMCPU_IS_6328() || BCMCPU_IS_6362()) { ++ bcm63xx_spi_flash_info[0].bus_num = 1; + bcm63xx_flash_data.max_transfer_len = HSSPI_BUFFER_LEN; ++ } + + return spi_register_board_info(bcm63xx_spi_flash_info, + ARRAY_SIZE(bcm63xx_spi_flash_info)); |