mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[ar71xx] update flash locking code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16359 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
#include <asm/mach-ar71xx/ar71xx.h>
|
||||
|
||||
static DEFINE_MUTEX(ar71xx_flash_mutex);
|
||||
static int ar71xx_flash_lock_enabled;
|
||||
|
||||
void __iomem *ar71xx_ddr_base;
|
||||
EXPORT_SYMBOL_GPL(ar71xx_ddr_base);
|
||||
@@ -102,21 +101,14 @@ void ar71xx_ddr_flush(u32 reg)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ar71xx_ddr_flush);
|
||||
|
||||
void __init ar71xx_flash_lock_enable(void)
|
||||
{
|
||||
ar71xx_flash_lock_enabled = 1;
|
||||
}
|
||||
|
||||
void ar71xx_flash_acquire(void)
|
||||
{
|
||||
if (ar71xx_flash_lock_enabled)
|
||||
mutex_lock(&ar71xx_flash_mutex);
|
||||
mutex_lock(&ar71xx_flash_mutex);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ar71xx_flash_acquire);
|
||||
|
||||
void ar71xx_flash_release(void)
|
||||
{
|
||||
if (ar71xx_flash_lock_enabled)
|
||||
mutex_unlock(&ar71xx_flash_mutex);
|
||||
mutex_unlock(&ar71xx_flash_mutex);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ar71xx_flash_release);
|
||||
|
||||
@@ -221,7 +221,7 @@ static void __init ap83_generic_setup(void)
|
||||
|
||||
static void __init ap83_040_setup(void)
|
||||
{
|
||||
ar71xx_flash_lock_enable();
|
||||
ap83_flash_data.is_shared=1;
|
||||
ap83_generic_setup();
|
||||
platform_device_register(&ap83_040_spi_device);
|
||||
}
|
||||
|
||||
@@ -422,7 +422,6 @@ void ar71xx_device_start(u32 mask);
|
||||
#define SPI_IOC_CS2 SPI_IOC_CS(2)
|
||||
#define SPI_IOC_CS_ALL (SPI_IOC_CS0 | SPI_IOC_CS1 | SPI_IOC_CS2)
|
||||
|
||||
void ar71xx_flash_lock_enable(void) __init;
|
||||
void ar71xx_flash_acquire(void);
|
||||
void ar71xx_flash_release(void);
|
||||
|
||||
|
||||
@@ -55,6 +55,7 @@ struct ar71xx_spi_platform_data {
|
||||
|
||||
struct ar91xx_flash_platform_data {
|
||||
unsigned int width;
|
||||
u8 is_shared:1;
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
unsigned int nr_parts;
|
||||
struct mtd_partition *parts;
|
||||
|
||||
Reference in New Issue
Block a user