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
This commit is contained in:
parent
999a956f4c
commit
a80a4f3ec2
2 changed files with 5 additions and 3 deletions
|
@ -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 = {
|
||||
|
|
|
@ -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));
|
||||
|
|
Loading…
Reference in a new issue