Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b5d6043 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

ssb: register serial flash as platform device 



This allows writing MTD driver working as a platform driver. In
platform_data it will receive struct ssb_sflash, which contains all
important data about flash (window, size).

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e861ef52

drivers/ssb/driver_chipcommon_sflash.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,19 @@ 




#include "ssb_private.h"

#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 {

struct ssb_sflash_tbl_e {

	char *name;

	char *name;

	u32 id;

	u32 id;
@@ -141,6 +154,12 @@ int ssb_sflash_init(struct ssb_chipcommon *cc) 
	pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n",

	pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n",

		e->name, e->blocksize, e->numblocks);

		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");

	pr_err("Serial flash support is not implemented yet!\n");





	return -ENOTSUPP;

	return -ENOTSUPP;

drivers/ssb/main.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -553,6 +553,14 @@ static int ssb_devices_register(struct ssb_bus *bus) 
	}

	}

#endif

#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;

	return 0;

error:

error:

	/* Unwind the already registered devices. */

	/* Unwind the already registered devices. */

drivers/ssb/ssb_private.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -243,6 +243,10 @@ static inline int ssb_sflash_init(struct ssb_chipcommon *cc) 
extern struct platform_device ssb_pflash_dev;

extern struct platform_device ssb_pflash_dev;

#endif

#endif





#ifdef CONFIG_SSB_SFLASH

extern struct platform_device ssb_sflash_dev;

#endif



#ifdef CONFIG_SSB_DRIVER_EXTIF

#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_wdt(struct bcm47xx_wdt *wdt, u32 ticks);

extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);

extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);