The patch titled
Add buswidth to SSB MIPS core flash driver
has been removed from the -mm tree. Its filename was
add-buswidth-to-ssb-mips-core-flash-driver.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: Add buswidth to SSB MIPS core flash driver
From: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Fix the size of the flash window and detect the width of the flash bus (8 or
16 bits).
Cc: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Signed-off-by: Michael Buesch <mb@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ssb/driver_mipscore.c | 8 ++++++--
include/linux/ssb/ssb_driver_mips.h | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff -puN drivers/ssb/driver_mipscore.c~add-buswidth-to-ssb-mips-core-flash-driver drivers/ssb/driver_mipscore.c
--- a/drivers/ssb/driver_mipscore.c~add-buswidth-to-ssb-mips-core-flash-driver
+++ a/drivers/ssb/driver_mipscore.c
@@ -133,12 +133,16 @@ static void ssb_mips_flash_detect(struct
{
struct ssb_bus *bus = mcore->dev->bus;
+ mcore->flash_buswidth = 2;
if (bus->chipco.dev) {
mcore->flash_window = 0x1c000000;
- mcore->flash_window_size = 0x800000;
+ mcore->flash_window_size = 0x02000000;
+ if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG)
+ & SSB_CHIPCO_CFG_DS16) == 0)
+ mcore->flash_buswidth = 1;
} else {
mcore->flash_window = 0x1fc00000;
- mcore->flash_window_size = 0x400000;
+ mcore->flash_window_size = 0x00400000;
}
}
diff -puN include/linux/ssb/ssb_driver_mips.h~add-buswidth-to-ssb-mips-core-flash-driver include/linux/ssb/ssb_driver_mips.h
--- a/include/linux/ssb/ssb_driver_mips.h~add-buswidth-to-ssb-mips-core-flash-driver
+++ a/include/linux/ssb/ssb_driver_mips.h
@@ -20,6 +20,7 @@ struct ssb_mipscore {
int nr_serial_ports;
struct ssb_serial_port serial_ports[4];
+ u8 flash_buswidth;
u32 flash_window;
u32 flash_window_size;
};
_
Patches currently in -mm which might be from aurelien@xxxxxxxxxxx are
git-kvm.patch
git-wireless.patch
add-buswidth-to-ssb-mips-core-flash-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
