Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits) omap: zoom: host should not pull up wl1271's irq line arm: plat-omap: iommu: fix request_mem_region() error path OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430 omap4: mux: Remove duplicate mux modes omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected omap4: board-omap4panda: Initialise the serial pads omap3: board-3430sdp: Initialise the serial pads omap4: board-4430sdp: Initialise the serial pads omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init omap2+: mux: Remove the use of IDLE flag omap2+: Add separate list for dynamic pads to mux perf: add OMAP support for the new power events OMAP4: Add IVA OPP enteries. OMAP4: Update Voltage Rail Values for MPU, IVA and CORE OMAP4: Enable 800 MHz and 1 GHz MPU-OPP OMAP3+: OPP: Replace voltage values with Macros OMAP3: wdtimer: Fix CORE idle transition Watchdog: omap_wdt: add fine grain runtime-pm ... Fix up various conflicts in - arch/arm/mach-omap2/board-omap3evm.c - arch/arm/mach-omap2/clock3xxx_data.c - arch/arm/mach-omap2/usb-musb.c - arch/arm/plat-omap/include/plat/usb.h - drivers/usb/musb/musb_core.h
This commit is contained in:
Linus Torvalds
292
include/linux/hwspinlock.h
Normal file
292
include/linux/hwspinlock.h
Normal file
@@ -0,0 +1,292 @@
|
||||
/*
|
||||
* Hardware spinlock public header
|
||||
*
|
||||
* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com
|
||||
*
|
||||
* Contact: Ohad Ben-Cohen <ohad@wizery.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published
|
||||
* by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_HWSPINLOCK_H
|
||||
#define __LINUX_HWSPINLOCK_H
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/sched.h>
|
||||
|
||||
/* hwspinlock mode argument */
|
||||
#define HWLOCK_IRQSTATE 0x01 /* Disable interrupts, save state */
|
||||
#define HWLOCK_IRQ 0x02 /* Disable interrupts, don't save state */
|
||||
|
||||
struct hwspinlock;
|
||||
|
||||
#if defined(CONFIG_HWSPINLOCK) || defined(CONFIG_HWSPINLOCK_MODULE)
|
||||
|
||||
int hwspin_lock_register(struct hwspinlock *lock);
|
||||
struct hwspinlock *hwspin_lock_unregister(unsigned int id);
|
||||
struct hwspinlock *hwspin_lock_request(void);
|
||||
struct hwspinlock *hwspin_lock_request_specific(unsigned int id);
|
||||
int hwspin_lock_free(struct hwspinlock *hwlock);
|
||||
int hwspin_lock_get_id(struct hwspinlock *hwlock);
|
||||
int __hwspin_lock_timeout(struct hwspinlock *, unsigned int, int,
|
||||
unsigned long *);
|
||||
int __hwspin_trylock(struct hwspinlock *, int, unsigned long *);
|
||||
void __hwspin_unlock(struct hwspinlock *, int, unsigned long *);
|
||||
|
||||
#else /* !CONFIG_HWSPINLOCK */
|
||||
|
||||
/*
|
||||
* We don't want these functions to fail if CONFIG_HWSPINLOCK is not
|
||||
* enabled. We prefer to silently succeed in this case, and let the
|
||||
* code path get compiled away. This way, if CONFIG_HWSPINLOCK is not
|
||||
* required on a given setup, users will still work.
|
||||
*
|
||||
* The only exception is hwspin_lock_register/hwspin_lock_unregister, with which
|
||||
* we _do_ want users to fail (no point in registering hwspinlock instances if
|
||||
* the framework is not available).
|
||||
*
|
||||
* Note: ERR_PTR(-ENODEV) will still be considered a success for NULL-checking
|
||||
* users. Others, which care, can still check this with IS_ERR.
|
||||
*/
|
||||
static inline struct hwspinlock *hwspin_lock_request(void)
|
||||
{
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
static inline struct hwspinlock *hwspin_lock_request_specific(unsigned int id)
|
||||
{
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
static inline int hwspin_lock_free(struct hwspinlock *hwlock)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline
|
||||
int __hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int to,
|
||||
int mode, unsigned long *flags)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline
|
||||
int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline
|
||||
void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int hwspin_lock_get_id(struct hwspinlock *hwlock)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int hwspin_lock_register(struct hwspinlock *hwlock)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static inline struct hwspinlock *hwspin_lock_unregister(unsigned int id)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /* !CONFIG_HWSPINLOCK */
|
||||
|
||||
/**
|
||||
* hwspin_trylock_irqsave() - try to lock an hwspinlock, disable interrupts
|
||||
* @hwlock: an hwspinlock which we want to trylock
|
||||
* @flags: a pointer to where the caller's interrupt state will be saved at
|
||||
*
|
||||
* This function attempts to lock the underlying hwspinlock, and will
|
||||
* immediately fail if the hwspinlock is already locked.
|
||||
*
|
||||
* Upon a successful return from this function, preemption and local
|
||||
* interrupts are disabled (previous interrupts state is saved at @flags),
|
||||
* so the caller must not sleep, and is advised to release the hwspinlock
|
||||
* as soon as possible.
|
||||
*
|
||||
* Returns 0 if we successfully locked the hwspinlock, -EBUSY if
|
||||
* the hwspinlock was already taken, and -EINVAL if @hwlock is invalid.
|
||||
*/
|
||||
static inline
|
||||
int hwspin_trylock_irqsave(struct hwspinlock *hwlock, unsigned long *flags)
|
||||
{
|
||||
return __hwspin_trylock(hwlock, HWLOCK_IRQSTATE, flags);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_trylock_irq() - try to lock an hwspinlock, disable interrupts
|
||||
* @hwlock: an hwspinlock which we want to trylock
|
||||
*
|
||||
* This function attempts to lock the underlying hwspinlock, and will
|
||||
* immediately fail if the hwspinlock is already locked.
|
||||
*
|
||||
* Upon a successful return from this function, preemption and local
|
||||
* interrupts are disabled, so the caller must not sleep, and is advised
|
||||
* to release the hwspinlock as soon as possible.
|
||||
*
|
||||
* Returns 0 if we successfully locked the hwspinlock, -EBUSY if
|
||||
* the hwspinlock was already taken, and -EINVAL if @hwlock is invalid.
|
||||
*/
|
||||
static inline int hwspin_trylock_irq(struct hwspinlock *hwlock)
|
||||
{
|
||||
return __hwspin_trylock(hwlock, HWLOCK_IRQ, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_trylock() - attempt to lock a specific hwspinlock
|
||||
* @hwlock: an hwspinlock which we want to trylock
|
||||
*
|
||||
* This function attempts to lock an hwspinlock, and will immediately fail
|
||||
* if the hwspinlock is already taken.
|
||||
*
|
||||
* Upon a successful return from this function, preemption is disabled,
|
||||
* so the caller must not sleep, and is advised to release the hwspinlock
|
||||
* as soon as possible. This is required in order to minimize remote cores
|
||||
* polling on the hardware interconnect.
|
||||
*
|
||||
* Returns 0 if we successfully locked the hwspinlock, -EBUSY if
|
||||
* the hwspinlock was already taken, and -EINVAL if @hwlock is invalid.
|
||||
*/
|
||||
static inline int hwspin_trylock(struct hwspinlock *hwlock)
|
||||
{
|
||||
return __hwspin_trylock(hwlock, 0, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_lock_timeout_irqsave() - lock hwspinlock, with timeout, disable irqs
|
||||
* @hwlock: the hwspinlock to be locked
|
||||
* @to: timeout value in msecs
|
||||
* @flags: a pointer to where the caller's interrupt state will be saved at
|
||||
*
|
||||
* This function locks the underlying @hwlock. If the @hwlock
|
||||
* is already taken, the function will busy loop waiting for it to
|
||||
* be released, but give up when @timeout msecs have elapsed.
|
||||
*
|
||||
* Upon a successful return from this function, preemption and local interrupts
|
||||
* are disabled (plus previous interrupt state is saved), so the caller must
|
||||
* not sleep, and is advised to release the hwspinlock as soon as possible.
|
||||
*
|
||||
* Returns 0 when the @hwlock was successfully taken, and an appropriate
|
||||
* error code otherwise (most notably an -ETIMEDOUT if the @hwlock is still
|
||||
* busy after @timeout msecs). The function will never sleep.
|
||||
*/
|
||||
static inline int hwspin_lock_timeout_irqsave(struct hwspinlock *hwlock,
|
||||
unsigned int to, unsigned long *flags)
|
||||
{
|
||||
return __hwspin_lock_timeout(hwlock, to, HWLOCK_IRQSTATE, flags);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_lock_timeout_irq() - lock hwspinlock, with timeout, disable irqs
|
||||
* @hwlock: the hwspinlock to be locked
|
||||
* @to: timeout value in msecs
|
||||
*
|
||||
* This function locks the underlying @hwlock. If the @hwlock
|
||||
* is already taken, the function will busy loop waiting for it to
|
||||
* be released, but give up when @timeout msecs have elapsed.
|
||||
*
|
||||
* Upon a successful return from this function, preemption and local interrupts
|
||||
* are disabled so the caller must not sleep, and is advised to release the
|
||||
* hwspinlock as soon as possible.
|
||||
*
|
||||
* Returns 0 when the @hwlock was successfully taken, and an appropriate
|
||||
* error code otherwise (most notably an -ETIMEDOUT if the @hwlock is still
|
||||
* busy after @timeout msecs). The function will never sleep.
|
||||
*/
|
||||
static inline
|
||||
int hwspin_lock_timeout_irq(struct hwspinlock *hwlock, unsigned int to)
|
||||
{
|
||||
return __hwspin_lock_timeout(hwlock, to, HWLOCK_IRQ, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_lock_timeout() - lock an hwspinlock with timeout limit
|
||||
* @hwlock: the hwspinlock to be locked
|
||||
* @to: timeout value in msecs
|
||||
*
|
||||
* This function locks the underlying @hwlock. If the @hwlock
|
||||
* is already taken, the function will busy loop waiting for it to
|
||||
* be released, but give up when @timeout msecs have elapsed.
|
||||
*
|
||||
* Upon a successful return from this function, preemption is disabled
|
||||
* so the caller must not sleep, and is advised to release the hwspinlock
|
||||
* as soon as possible.
|
||||
* This is required in order to minimize remote cores polling on the
|
||||
* hardware interconnect.
|
||||
*
|
||||
* Returns 0 when the @hwlock was successfully taken, and an appropriate
|
||||
* error code otherwise (most notably an -ETIMEDOUT if the @hwlock is still
|
||||
* busy after @timeout msecs). The function will never sleep.
|
||||
*/
|
||||
static inline
|
||||
int hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int to)
|
||||
{
|
||||
return __hwspin_lock_timeout(hwlock, to, 0, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_unlock_irqrestore() - unlock hwspinlock, restore irq state
|
||||
* @hwlock: a previously-acquired hwspinlock which we want to unlock
|
||||
* @flags: previous caller's interrupt state to restore
|
||||
*
|
||||
* This function will unlock a specific hwspinlock, enable preemption and
|
||||
* restore the previous state of the local interrupts. It should be used
|
||||
* to undo, e.g., hwspin_trylock_irqsave().
|
||||
*
|
||||
* @hwlock must be already locked before calling this function: it is a bug
|
||||
* to call unlock on a @hwlock that is already unlocked.
|
||||
*/
|
||||
static inline void hwspin_unlock_irqrestore(struct hwspinlock *hwlock,
|
||||
unsigned long *flags)
|
||||
{
|
||||
__hwspin_unlock(hwlock, HWLOCK_IRQSTATE, flags);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_unlock_irq() - unlock hwspinlock, enable interrupts
|
||||
* @hwlock: a previously-acquired hwspinlock which we want to unlock
|
||||
*
|
||||
* This function will unlock a specific hwspinlock, enable preemption and
|
||||
* enable local interrupts. Should be used to undo hwspin_lock_irq().
|
||||
*
|
||||
* @hwlock must be already locked (e.g. by hwspin_trylock_irq()) before
|
||||
* calling this function: it is a bug to call unlock on a @hwlock that is
|
||||
* already unlocked.
|
||||
*/
|
||||
static inline void hwspin_unlock_irq(struct hwspinlock *hwlock)
|
||||
{
|
||||
__hwspin_unlock(hwlock, HWLOCK_IRQ, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* hwspin_unlock() - unlock hwspinlock
|
||||
* @hwlock: a previously-acquired hwspinlock which we want to unlock
|
||||
*
|
||||
* This function will unlock a specific hwspinlock and enable preemption
|
||||
* back.
|
||||
*
|
||||
* @hwlock must be already locked (e.g. by hwspin_trylock()) before calling
|
||||
* this function: it is a bug to call unlock on a @hwlock that is already
|
||||
* unlocked.
|
||||
*/
|
||||
static inline void hwspin_unlock(struct hwspinlock *hwlock)
|
||||
{
|
||||
__hwspin_unlock(hwlock, 0, NULL);
|
||||
}
|
||||
|
||||
#endif /* __LINUX_HWSPINLOCK_H */
|
||||
@@ -639,7 +639,6 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
|
||||
extern int twl4030_remove_script(u8 flags);
|
||||
|
||||
struct twl4030_codec_audio_data {
|
||||
unsigned int audio_mclk; /* not used, will be removed */
|
||||
unsigned int digimic_delay; /* in ms */
|
||||
unsigned int ramp_delay_value;
|
||||
unsigned int offset_cncl_path;
|
||||
@@ -650,7 +649,6 @@ struct twl4030_codec_audio_data {
|
||||
};
|
||||
|
||||
struct twl4030_codec_vibra_data {
|
||||
unsigned int audio_mclk;
|
||||
unsigned int coexist;
|
||||
};
|
||||
|
||||
|
||||
@@ -168,6 +168,7 @@
|
||||
#define ONENAND_SYS_CFG1_INT (1 << 6)
|
||||
#define ONENAND_SYS_CFG1_IOBE (1 << 5)
|
||||
#define ONENAND_SYS_CFG1_RDY_CONF (1 << 4)
|
||||
#define ONENAND_SYS_CFG1_VHF (1 << 3)
|
||||
#define ONENAND_SYS_CFG1_HF (1 << 2)
|
||||
#define ONENAND_SYS_CFG1_SYNC_WRITE (1 << 1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user