![Linus Torvalds](/assets/img/avatar_default.png)
Here's a small collection of fixes accrued during the last release that weren't considered severe enough to merge during the -rc series. A few of these are around resurrecting TI81xx support that's been broken for quite a while, the rest are smaller fixes -- most for PXA but a few across the board. There are also some updates to MAINTAINERS here, in particular for Broadcom platforms. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJU4uShAAoJEIwa5zzehBx3SW0P/1T19Tnx2D18/c2rFvyNl3N3 09emcSZZ2xPKlmt0y6kpbyvV5X8zM/0JjH61DVJGYHeMMHTuhk8evy9ptfXTXkGp GskrIla2jozSaei45lsx7uy9Cz/FtxQSQ9SqBTfOBlvL8yekEJ9/ZPsL7tqRvTQa OllOR7RztcjkO/A9FjrSqlEwY6Ckduv6lKjfuXaGmx88sMMQt7hmgM+x5sgzJnss 5BHYOhXXYODh6KHJRQqG0fi5j2vOrWSw18dro6HwZPN3TlsmeFYkkOV9bOgJiBQz TYXoFTnIwYLaBaVVzIrQO1fmyVmxlFjSRvs3BY++a142VPjxkXmh7KNWYwLKEtXH cVET4jtKHVQVOEo9pbx3E5Fjlcj/VKJDPqdnTvCXV9OjpCDLP9bT0EfXRmjmWiab oUQDW3o+VEY4INBnsRJ6yL3iXelU26U/XMTZxWuZRo3m1ArF4yTUdzMUjQGYyRW6 rGnLYZU6wO8cc61IG3It8bq58MZx1DDtP3knjf3lDfcFv62AA2dNcN75vkdeKar3 ndFqtKwr3OZ+NuSgGASxfMOGEi2uMZborI+hzaXy/aTefSN0gUSFR1Kpy05Q4aKA D0mZ+JF8gArZMqXfAqGbYD/mgT293UWKS2kIlyfAviJS9oMxT5oFE/TpTIpCT1gv pi5ydJMFmD7X5A0w6wik =YCX1 -----END PGP SIGNATURE----- Merge tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC non-critical fixes from Olof Johansson: "Here's a small collection of fixes accrued during the last release that weren't considered severe enough to merge during the -rc series. A few of these are around resurrecting TI81xx support that's been broken for quite a while, the rest are smaller fixes -- most for PXA but a few across the board. There are also some updates to MAINTAINERS here, in particular for Broadcom platforms" * tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits) MAINTAINERS: fix git repositories for Broadcom SoCs ARM: pxa: fix broken isa interrupts for zeus and viper ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3 ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken ARM: AM43xx: hwmod: set DSS submodule parent hwmods ARM: OMAP2+: hwmod: print error if wait_target_ready() failed MAINTAINERS: add maintainer for OMAP hwmod data ARM: OMAP2+: Disable omap3 PM init for ti81xx ARM: OMAP2+: Fix reboot for 81xx ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init ARM: OMAP2+: Fix ti81xx class type ARM: OMAP2+: Fix ti81xx devtype ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs MAINTAINERS: update Broadcom Cygnus SoC git tree MAINTAINERS: move BCM63xx ARM-based SoCs git tree hx4700: regulator: declare full constraints ARM: pxa: add regulator_has_full_constraints to spitz board file ARM: pxa: add regulator_has_full_constraints to poodle board file ...
329 lines
8.7 KiB
C
329 lines
8.7 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 <linux/reboot.h>
|
|
#include <linux/irqchip/irq-omap-intc.h>
|
|
|
|
#include <asm/proc-fns.h>
|
|
#include <asm/hardware/cache-l2x0.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) || defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX))
|
|
int omap4_pm_init(void);
|
|
int omap4_pm_init_early(void);
|
|
#else
|
|
static inline int omap4_pm_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int omap4_pm_init_early(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_gptimer_timer_init(void);
|
|
extern void omap4_local_timer_init(void);
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
int omap_l2_cache_init(void);
|
|
#define OMAP_L2C_AUX_CTRL (L2C_AUX_CTRL_SHARED_OVERRIDE | \
|
|
L310_AUX_CTRL_DATA_PREFETCH | \
|
|
L310_AUX_CTRL_INSTR_PREFETCH)
|
|
void omap4_l2c310_write_sec(unsigned long val, unsigned reg);
|
|
#else
|
|
static inline int omap_l2_cache_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#define OMAP_L2C_AUX_CTRL 0
|
|
#define omap4_l2c310_write_sec NULL
|
|
#endif
|
|
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 ti814x_init_early(void);
|
|
void ti816x_init_early(void);
|
|
void am33xx_init_early(void);
|
|
void am43xx_init_early(void);
|
|
void am43xx_init_late(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 am33xx_init_late(void);
|
|
void omap5_init_late(void);
|
|
int omap2_common_pm_late_init(void);
|
|
void dra7xx_init_early(void);
|
|
void dra7xx_init_late(void);
|
|
|
|
#ifdef CONFIG_SOC_BUS
|
|
void omap_soc_device_init(void);
|
|
#else
|
|
static inline void omap_soc_device_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SOC_OMAP2420) || defined(CONFIG_SOC_OMAP2430)
|
|
void omap2xxx_restart(enum reboot_mode mode, const char *cmd);
|
|
#else
|
|
static inline void omap2xxx_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_AM33XX
|
|
void am33xx_restart(enum reboot_mode mode, const char *cmd);
|
|
#else
|
|
static inline void am33xx_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP3
|
|
void omap3xxx_restart(enum reboot_mode mode, const char *cmd);
|
|
#else
|
|
static inline void omap3xxx_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_TI81XX
|
|
void ti81xx_restart(enum reboot_mode mode, const char *cmd);
|
|
#else
|
|
static inline void ti81xx_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
|
|
defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
|
|
void omap44xx_restart(enum reboot_mode mode, const char *cmd);
|
|
#else
|
|
static inline void omap44xx_restart(enum reboot_mode 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);
|
|
|
|
unsigned int omap4_xlate_irq(unsigned int hwirq);
|
|
void omap_gic_of_init(void);
|
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
extern void __iomem *omap4_get_l2cache_base(void);
|
|
#endif
|
|
|
|
struct device_node;
|
|
|
|
#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 gic_dist_disable(void);
|
|
extern void gic_dist_enable(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 omap4_secondary_startup(void);
|
|
extern void omap4460_secondary_startup(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);
|
|
extern void omap5_secondary_hyp_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);
|
|
#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)
|
|
{}
|
|
|
|
#endif
|
|
|
|
void pdata_quirks_init(const struct of_device_id *);
|
|
void omap_auxdata_legacy_init(struct device *dev);
|
|
void omap_pcs_legacy_init(int irq, void (*rearm)(void));
|
|
|
|
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 void omap_reserve(void);
|
|
|
|
struct omap_hwmod;
|
|
extern int omap_dss_reset(struct omap_hwmod *);
|
|
|
|
/* SoC specific clock initializer */
|
|
int omap_clk_init(void);
|
|
|
|
int __init omapdss_init_of(void);
|
|
void __init omapdss_early_init_of(void);
|
|
|
|
#endif /* __ASSEMBLER__ */
|
|
#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
|