mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
7307c00f33
This branch contains changes for OMAP that came in late during the release staging, close to when the merge window opened. It contains, among other things: - OMAP PM fixes and some patches for audio device integration - OMAP clock fixes related to common clock conversion - A set of patches cleaning up WFI entry and blocking. - A set of fixes and IP block support for PM on TI AM33xx SoCs (Beaglebone, etc) - A set of smaller fixes and cleanups around AM33xx restart and revision detection, as well as removal of some dead code (CONFIG_32K_TIMER_HZ) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJRL9AUAAoJEIwa5zzehBx3BiIQAIwJOAZQhbIsDAmqVAGfj39i Y6DneECJ3BvrMsC3nk6IUOC/aW5uUi2GAmhYI6YuDDKzLfeTSGW2VQcMa98cvWig dLo2CPqKuuB7YZAwHkg4i3BwHVJcaPntaKOajNmhwJQIiNEiXCauP/f9kG2NKvHu XxlWuNyeEB1uQlnB0nXL+HHqcHKxproK6eIvILWYJMdVYnMn+57O3yWBmXkCr07b 9oOa1NdR+4xN7cSbS5YGUfxqwDWnXSZSKggXEPLglHObmSqj7R7NDBNgRR7ui8+t c3UYljPsiRprY8TYVTbator9wyYocZ6pMja+vrPwATHUMsxGZTurURzpYsyAXaMc VKWLWItCOOee8CKn1+pGpelon69//EJEFIsg1hChJJZKMRLHYVg48tM64/uN1VOo Mu/6XDLx4DearMxZv5pZ7Qe0IkIDGtlpyIwo1Yy6T5xEC6pcwRG0XeTuQtOxndFc XUcXrE+Nlg3eW/6xtB7XhftnKVoBsCrIQ5Z+PxMw1QNUTXWxQwZffeBLxGenuoD6 IofLCdjVyRMcPnVj+s29ZO5k7yMllQ0dO8bySxoU2Y2QvD7wUdZxGDY5Nu7cwfAt jL0sEpT32g4ZSD8R75qt+qTDWv/IjB4EE/uNw3y2AUSTT5A+cN7H3MXw5s7hm8nI fw5cYz37iH0zUZhoIU/w =/vBT -----END PGP SIGNATURE----- Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC late OMAP changes from Olof Johansson: "This branch contains changes for OMAP that came in late during the release staging, close to when the merge window opened. It contains, among other things: - OMAP PM fixes and some patches for audio device integration - OMAP clock fixes related to common clock conversion - A set of patches cleaning up WFI entry and blocking. - A set of fixes and IP block support for PM on TI AM33xx SoCs (Beaglebone, etc) - A set of smaller fixes and cleanups around AM33xx restart and revision detection, as well as removal of some dead code (CONFIG_32K_TIMER_HZ)" * tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits) ARM: omap2: include linux/errno.h in hwmod_reset ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default ARM: OMAP4: hwmod data: Enable AESS hwmod device ARM: OMAP4: hwmod data: Update AESS data with memory bank area ARM: OMAP4+: AESS: enable internal auto-gating during initial setup ASoC: TI AESS: add autogating-enable function, callable from architecture code ARM: OMAP2+: hwmod: add enable_preprogram hook ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init() ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3 ARM: OMAP2+: AM33XX: Update the hardreset API ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files ...
299 lines
8.0 KiB
C
299 lines
8.0 KiB
C
/*
|
|
* Header for code common to all OMAP2+ machines.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
|
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#ifndef __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
|
|
#define __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
|
|
#ifndef __ASSEMBLER__
|
|
|
|
#include <linux/irq.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/i2c/twl.h>
|
|
#include <linux/i2c-omap.h>
|
|
|
|
#include <asm/proc-fns.h>
|
|
|
|
#include "i2c.h"
|
|
#include "serial.h"
|
|
|
|
#include "usb.h"
|
|
|
|
#define OMAP_INTC_START NR_IRQS
|
|
|
|
#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP2)
|
|
int omap2_pm_init(void);
|
|
#else
|
|
static inline int omap2_pm_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3)
|
|
int omap3_pm_init(void);
|
|
#else
|
|
static inline int omap3_pm_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4)
|
|
int omap4_pm_init(void);
|
|
#else
|
|
static inline int omap4_pm_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_OMAP_MUX
|
|
int omap_mux_late_init(void);
|
|
#else
|
|
static inline int omap_mux_late_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
extern void omap2_init_common_infrastructure(void);
|
|
|
|
extern void omap2_sync32k_timer_init(void);
|
|
extern void omap3_sync32k_timer_init(void);
|
|
extern void omap3_secure_sync32k_timer_init(void);
|
|
extern void omap3_gp_gptimer_timer_init(void);
|
|
extern void omap3_am33xx_gptimer_timer_init(void);
|
|
extern void omap4_local_timer_init(void);
|
|
extern void omap5_realtime_timer_init(void);
|
|
|
|
void omap2420_init_early(void);
|
|
void omap2430_init_early(void);
|
|
void omap3430_init_early(void);
|
|
void omap35xx_init_early(void);
|
|
void omap3630_init_early(void);
|
|
void omap3_init_early(void); /* Do not use this one */
|
|
void am33xx_init_early(void);
|
|
void am35xx_init_early(void);
|
|
void ti81xx_init_early(void);
|
|
void am33xx_init_early(void);
|
|
void omap4430_init_early(void);
|
|
void omap5_init_early(void);
|
|
void omap3_init_late(void); /* Do not use this one */
|
|
void omap4430_init_late(void);
|
|
void omap2420_init_late(void);
|
|
void omap2430_init_late(void);
|
|
void omap3430_init_late(void);
|
|
void omap35xx_init_late(void);
|
|
void omap3630_init_late(void);
|
|
void am35xx_init_late(void);
|
|
void ti81xx_init_late(void);
|
|
void omap4430_init_late(void);
|
|
int omap2_common_pm_late_init(void);
|
|
|
|
#if defined(CONFIG_SOC_OMAP2420) || defined(CONFIG_SOC_OMAP2430)
|
|
void omap2xxx_restart(char mode, const char *cmd);
|
|
#else
|
|
static inline void omap2xxx_restart(char mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_AM33XX
|
|
void am33xx_restart(char mode, const char *cmd);
|
|
#else
|
|
static inline void am33xx_restart(char mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP3
|
|
void omap3xxx_restart(char mode, const char *cmd);
|
|
#else
|
|
static inline void omap3xxx_restart(char mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
|
|
void omap44xx_restart(char mode, const char *cmd);
|
|
#else
|
|
static inline void omap44xx_restart(char mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/* This gets called from mach-omap2/io.c, do not call this */
|
|
void __init omap2_set_globals_tap(u32 class, void __iomem *tap);
|
|
|
|
void __init omap242x_map_io(void);
|
|
void __init omap243x_map_io(void);
|
|
void __init omap3_map_io(void);
|
|
void __init am33xx_map_io(void);
|
|
void __init omap4_map_io(void);
|
|
void __init omap5_map_io(void);
|
|
void __init ti81xx_map_io(void);
|
|
|
|
/* omap_barriers_init() is OMAP4 only */
|
|
void omap_barriers_init(void);
|
|
|
|
/**
|
|
* omap_test_timeout - busy-loop, testing a condition
|
|
* @cond: condition to test until it evaluates to true
|
|
* @timeout: maximum number of microseconds in the timeout
|
|
* @index: loop index (integer)
|
|
*
|
|
* Loop waiting for @cond to become true or until at least @timeout
|
|
* microseconds have passed. To use, define some integer @index in the
|
|
* calling code. After running, if @index == @timeout, then the loop has
|
|
* timed out.
|
|
*/
|
|
#define omap_test_timeout(cond, timeout, index) \
|
|
({ \
|
|
for (index = 0; index < timeout; index++) { \
|
|
if (cond) \
|
|
break; \
|
|
udelay(1); \
|
|
} \
|
|
})
|
|
|
|
extern struct device *omap2_get_mpuss_device(void);
|
|
extern struct device *omap2_get_iva_device(void);
|
|
extern struct device *omap2_get_l3_device(void);
|
|
extern struct device *omap4_get_dsp_device(void);
|
|
|
|
void omap2_init_irq(void);
|
|
void omap3_init_irq(void);
|
|
void ti81xx_init_irq(void);
|
|
extern int omap_irq_pending(void);
|
|
void omap_intc_save_context(void);
|
|
void omap_intc_restore_context(void);
|
|
void omap3_intc_suspend(void);
|
|
void omap3_intc_prepare_idle(void);
|
|
void omap3_intc_resume_idle(void);
|
|
void omap2_intc_handle_irq(struct pt_regs *regs);
|
|
void omap3_intc_handle_irq(struct pt_regs *regs);
|
|
void omap_intc_of_init(void);
|
|
void omap_gic_of_init(void);
|
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
extern void __iomem *omap4_get_l2cache_base(void);
|
|
#endif
|
|
|
|
struct device_node;
|
|
#ifdef CONFIG_OF
|
|
int __init intc_of_init(struct device_node *node,
|
|
struct device_node *parent);
|
|
#else
|
|
int __init intc_of_init(struct device_node *node,
|
|
struct device_node *parent)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_SMP
|
|
extern void __iomem *omap4_get_scu_base(void);
|
|
#else
|
|
static inline void __iomem *omap4_get_scu_base(void)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
extern void __init gic_init_irq(void);
|
|
extern void gic_dist_disable(void);
|
|
extern bool gic_dist_disabled(void);
|
|
extern void gic_timer_retrigger(void);
|
|
extern void omap_smc1(u32 fn, u32 arg);
|
|
extern void __iomem *omap4_get_sar_ram_base(void);
|
|
extern void omap_do_wfi(void);
|
|
|
|
#ifdef CONFIG_SMP
|
|
/* Needed for secondary core boot */
|
|
extern void omap_secondary_startup(void);
|
|
extern void omap_secondary_startup_4460(void);
|
|
extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
|
|
extern void omap_auxcoreboot_addr(u32 cpu_addr);
|
|
extern u32 omap_read_auxcoreboot0(void);
|
|
|
|
extern void omap4_cpu_die(unsigned int cpu);
|
|
|
|
extern struct smp_operations omap4_smp_ops;
|
|
|
|
extern void omap5_secondary_startup(void);
|
|
#endif
|
|
|
|
#if defined(CONFIG_SMP) && defined(CONFIG_PM)
|
|
extern int omap4_mpuss_init(void);
|
|
extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);
|
|
extern int omap4_finish_suspend(unsigned long cpu_state);
|
|
extern void omap4_cpu_resume(void);
|
|
extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);
|
|
extern u32 omap4_mpuss_read_prev_context_state(void);
|
|
#else
|
|
static inline int omap4_enter_lowpower(unsigned int cpu,
|
|
unsigned int power_state)
|
|
{
|
|
cpu_do_idle();
|
|
return 0;
|
|
}
|
|
|
|
static inline int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
|
|
{
|
|
cpu_do_idle();
|
|
return 0;
|
|
}
|
|
|
|
static inline int omap4_mpuss_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int omap4_finish_suspend(unsigned long cpu_state)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void omap4_cpu_resume(void)
|
|
{}
|
|
|
|
static inline u32 omap4_mpuss_read_prev_context_state(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
struct omap_sdrc_params;
|
|
extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
|
|
struct omap_sdrc_params *sdrc_cs1);
|
|
struct omap2_hsmmc_info;
|
|
extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers);
|
|
extern void omap_reserve(void);
|
|
|
|
struct omap_hwmod;
|
|
extern int omap_dss_reset(struct omap_hwmod *);
|
|
|
|
#endif /* __ASSEMBLER__ */
|
|
#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
|