202 lines
6 KiB
Diff
202 lines
6 KiB
Diff
|
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
|
||
|
|
index 5ff3a4f..36171fd 100644
|
||
|
|
--- a/drivers/ssb/Kconfig
|
||
|
|
+++ b/drivers/ssb/Kconfig
|
||
|
|
@@ -144,7 +144,7 @@ config SSB_SFLASH
|
||
|
|
# Assumption: We are on embedded, if we compile the MIPS core.
|
||
|
|
config SSB_EMBEDDED
|
||
|
|
bool
|
||
|
|
- depends on SSB_DRIVER_MIPS
|
||
|
|
+ depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
|
||
|
|
default y
|
||
|
|
|
||
|
|
config SSB_DRIVER_EXTIF
|
||
|
|
diff --git a/drivers/ssb/driver_chipcommon_sflash.c b/drivers/ssb/driver_chipcommon_sflash.c
|
||
|
|
index 720665c..e84cf04 100644
|
||
|
|
--- a/drivers/ssb/driver_chipcommon_sflash.c
|
||
|
|
+++ b/drivers/ssb/driver_chipcommon_sflash.c
|
||
|
|
@@ -9,6 +9,19 @@
|
||
|
|
|
||
|
|
#include "ssb_private.h"
|
||
|
|
|
||
|
|
+static struct resource ssb_sflash_resource = {
|
||
|
|
+ .name = "ssb_sflash",
|
||
|
|
+ .start = SSB_FLASH2,
|
||
|
|
+ .end = 0,
|
||
|
|
+ .flags = IORESOURCE_MEM | IORESOURCE_READONLY,
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+struct platform_device ssb_sflash_dev = {
|
||
|
|
+ .name = "ssb_sflash",
|
||
|
|
+ .resource = &ssb_sflash_resource,
|
||
|
|
+ .num_resources = 1,
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
struct ssb_sflash_tbl_e {
|
||
|
|
char *name;
|
||
|
|
u32 id;
|
||
|
|
@@ -16,7 +29,7 @@ struct ssb_sflash_tbl_e {
|
||
|
|
u16 numblocks;
|
||
|
|
};
|
||
|
|
|
||
|
|
-static struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
|
||
|
|
+static const struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
|
||
|
|
{ "M25P20", 0x11, 0x10000, 4, },
|
||
|
|
{ "M25P40", 0x12, 0x10000, 8, },
|
||
|
|
|
||
|
|
@@ -27,7 +40,7 @@ static struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
|
||
|
|
{ 0 },
|
||
|
|
};
|
||
|
|
|
||
|
|
-static struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
|
||
|
|
+static const struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
|
||
|
|
{ "SST25WF512", 1, 0x1000, 16, },
|
||
|
|
{ "SST25VF512", 0x48, 0x1000, 16, },
|
||
|
|
{ "SST25WF010", 2, 0x1000, 32, },
|
||
|
|
@@ -45,7 +58,7 @@ static struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
|
||
|
|
{ 0 },
|
||
|
|
};
|
||
|
|
|
||
|
|
-static struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
|
||
|
|
+static const struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
|
||
|
|
{ "AT45DB011", 0xc, 256, 512, },
|
||
|
|
{ "AT45DB021", 0x14, 256, 1024, },
|
||
|
|
{ "AT45DB041", 0x1c, 256, 2048, },
|
||
|
|
@@ -73,7 +86,8 @@ static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode)
|
||
|
|
/* Initialize serial flash access */
|
||
|
|
int ssb_sflash_init(struct ssb_chipcommon *cc)
|
||
|
|
{
|
||
|
|
- struct ssb_sflash_tbl_e *e;
|
||
|
|
+ struct ssb_sflash *sflash = &cc->dev->bus->mipscore.sflash;
|
||
|
|
+ const struct ssb_sflash_tbl_e *e;
|
||
|
|
u32 id, id2;
|
||
|
|
|
||
|
|
switch (cc->capabilities & SSB_CHIPCO_CAP_FLASHT) {
|
||
|
|
@@ -131,9 +145,21 @@ int ssb_sflash_init(struct ssb_chipcommon *cc)
|
||
|
|
return -ENOTSUPP;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ sflash->window = SSB_FLASH2;
|
||
|
|
+ sflash->blocksize = e->blocksize;
|
||
|
|
+ sflash->numblocks = e->numblocks;
|
||
|
|
+ sflash->size = sflash->blocksize * sflash->numblocks;
|
||
|
|
+ sflash->present = true;
|
||
|
|
+
|
||
|
|
pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n",
|
||
|
|
e->name, e->blocksize, e->numblocks);
|
||
|
|
|
||
|
|
+ /* Prepare platform device, but don't register it yet. It's too early,
|
||
|
|
+ * malloc (required by device_private_init) is not available yet. */
|
||
|
|
+ ssb_sflash_dev.resource[0].end = ssb_sflash_dev.resource[0].start +
|
||
|
|
+ sflash->size;
|
||
|
|
+ ssb_sflash_dev.dev.platform_data = sflash;
|
||
|
|
+
|
||
|
|
pr_err("Serial flash support is not implemented yet!\n");
|
||
|
|
|
||
|
|
return -ENOTSUPP;
|
||
|
|
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
|
||
|
|
index 812775a..e55ddf7 100644
|
||
|
|
--- a/drivers/ssb/main.c
|
||
|
|
+++ b/drivers/ssb/main.c
|
||
|
|
@@ -553,6 +553,14 @@ static int ssb_devices_register(struct ssb_bus *bus)
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#ifdef CONFIG_SSB_SFLASH
|
||
|
|
+ if (bus->mipscore.sflash.present) {
|
||
|
|
+ err = platform_device_register(&ssb_sflash_dev);
|
||
|
|
+ if (err)
|
||
|
|
+ pr_err("Error registering serial flash\n");
|
||
|
|
+ }
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
return 0;
|
||
|
|
error:
|
||
|
|
/* Unwind the already registered devices. */
|
||
|
|
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
|
||
|
|
index 32ed1fa..69161bb 100644
|
||
|
|
--- a/drivers/ssb/pcihost_wrapper.c
|
||
|
|
+++ b/drivers/ssb/pcihost_wrapper.c
|
||
|
|
@@ -38,7 +38,7 @@ static int ssb_pcihost_resume(struct pci_dev *dev)
|
||
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
||
|
|
int err;
|
||
|
|
|
||
|
|
- pci_set_power_state(dev, 0);
|
||
|
|
+ pci_set_power_state(dev, PCI_D0);
|
||
|
|
err = pci_enable_device(dev);
|
||
|
|
if (err)
|
||
|
|
return err;
|
||
|
|
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
|
||
|
|
index a3b2364..e753fbe 100644
|
||
|
|
--- a/drivers/ssb/sprom.c
|
||
|
|
+++ b/drivers/ssb/sprom.c
|
||
|
|
@@ -54,7 +54,7 @@ static int hex2sprom(u16 *sprom, const char *dump, size_t len,
|
||
|
|
while (cnt < sprom_size_words) {
|
||
|
|
memcpy(tmp, dump, 4);
|
||
|
|
dump += 4;
|
||
|
|
- err = strict_strtoul(tmp, 16, &parsed);
|
||
|
|
+ err = kstrtoul(tmp, 16, &parsed);
|
||
|
|
if (err)
|
||
|
|
return err;
|
||
|
|
sprom[cnt++] = swab16((u16)parsed);
|
||
|
|
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
|
||
|
|
index 4671f17..eb507a5 100644
|
||
|
|
--- a/drivers/ssb/ssb_private.h
|
||
|
|
+++ b/drivers/ssb/ssb_private.h
|
||
|
|
@@ -243,6 +243,10 @@ static inline int ssb_sflash_init(struct ssb_chipcommon *cc)
|
||
|
|
extern struct platform_device ssb_pflash_dev;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#ifdef CONFIG_SSB_SFLASH
|
||
|
|
+extern struct platform_device ssb_sflash_dev;
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#ifdef CONFIG_SSB_DRIVER_EXTIF
|
||
|
|
extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);
|
||
|
|
extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
|
||
|
|
diff --git a/include/linux/ssb/ssb_driver_mips.h b/include/linux/ssb/ssb_driver_mips.h
|
||
|
|
index afe79d4..6535e47 100644
|
||
|
|
--- a/include/linux/ssb/ssb_driver_mips.h
|
||
|
|
+++ b/include/linux/ssb/ssb_driver_mips.h
|
||
|
|
@@ -20,6 +20,18 @@ struct ssb_pflash {
|
||
|
|
u32 window_size;
|
||
|
|
};
|
||
|
|
|
||
|
|
+#ifdef CONFIG_SSB_SFLASH
|
||
|
|
+struct ssb_sflash {
|
||
|
|
+ bool present;
|
||
|
|
+ u32 window;
|
||
|
|
+ u32 blocksize;
|
||
|
|
+ u16 numblocks;
|
||
|
|
+ u32 size;
|
||
|
|
+
|
||
|
|
+ void *priv;
|
||
|
|
+};
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
struct ssb_mipscore {
|
||
|
|
struct ssb_device *dev;
|
||
|
|
|
||
|
|
@@ -27,6 +39,9 @@ struct ssb_mipscore {
|
||
|
|
struct ssb_serial_port serial_ports[4];
|
||
|
|
|
||
|
|
struct ssb_pflash pflash;
|
||
|
|
+#ifdef CONFIG_SSB_SFLASH
|
||
|
|
+ struct ssb_sflash sflash;
|
||
|
|
+#endif
|
||
|
|
};
|
||
|
|
|
||
|
|
extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
|
||
|
|
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
|
||
|
|
index 3a72569..f9f931c 100644
|
||
|
|
--- a/include/linux/ssb/ssb_regs.h
|
||
|
|
+++ b/include/linux/ssb/ssb_regs.h
|
||
|
|
@@ -172,6 +172,7 @@
|
||
|
|
#define SSB_SPROMSIZE_WORDS_R4 220
|
||
|
|
#define SSB_SPROMSIZE_BYTES_R123 (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
|
||
|
|
#define SSB_SPROMSIZE_BYTES_R4 (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
|
||
|
|
+#define SSB_SPROMSIZE_WORDS_R10 230
|
||
|
|
#define SSB_SPROM_BASE1 0x1000
|
||
|
|
#define SSB_SPROM_BASE31 0x0800
|
||
|
|
#define SSB_SPROM_REVISION 0x007E
|