diff options
Diffstat (limited to 'target/linux/ar71xx/files/arch/mips/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c | 12 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c index ea7ae143bd..a13c928125 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c @@ -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); diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c index c88f68a41f..8564b01a62 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c @@ -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); } |