Merge branch 'omap-fixes-for-linus' of... (9d82d5ef) · Commits · 戴 / test

arch/arm/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -702,6 +702,7 @@ config ARCH_OMAP
	select ARCH_HAS_CPUFREQ		select ARCH_HAS_CPUFREQ
	select GENERIC_TIME		select GENERIC_TIME
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
			select ARCH_HAS_HOLES_MEMORYMODEL
	help		help
	Support for TI's OMAP platform (OMAP1 and OMAP2).		Support for TI's OMAP platform (OMAP1 and OMAP2).

arch/arm/mach-omap2/gpmc.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -505,7 +505,7 @@ static void __init gpmc_mem_init(void)
	void __init gpmc_init(void)		void __init gpmc_init(void)
	{		{
	u32 l;		u32 l;
	char *ck;		char *ck = NULL;

	if (cpu_is_omap24xx()) {		if (cpu_is_omap24xx()) {
	ck = "core_l3_ck";		ck = "core_l3_ck";
	@@ -521,6 +521,9 @@ void __init gpmc_init(void)
	l = OMAP44XX_GPMC_BASE;		l = OMAP44XX_GPMC_BASE;
	}		}

			if (WARN_ON(!ck))
			return;

	gpmc_l3_clk = clk_get(NULL, ck);		gpmc_l3_clk = clk_get(NULL, ck);
	if (IS_ERR(gpmc_l3_clk)) {		if (IS_ERR(gpmc_l3_clk)) {
	printk(KERN_ERR "Could not get GPMC clock %s\n", ck);		printk(KERN_ERR "Could not get GPMC clock %s\n", ck);

arch/arm/mach-omap2/irq.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -194,7 +194,7 @@ void __init omap_init_irq(void)
	int i;		int i;

	for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {		for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
	unsigned long base;		unsigned long base = 0;
	struct omap_irq_bank *bank = irq_banks + i;		struct omap_irq_bank *bank = irq_banks + i;

	if (cpu_is_omap24xx())		if (cpu_is_omap24xx())
	@@ -202,6 +202,8 @@ void __init omap_init_irq(void)
	else if (cpu_is_omap34xx())		else if (cpu_is_omap34xx())
	base = OMAP34XX_IC_BASE;		base = OMAP34XX_IC_BASE;

			BUG_ON(!base);

	/* Static mapping, never released */		/* Static mapping, never released */
	bank->base_reg = ioremap(base, SZ_4K);		bank->base_reg = ioremap(base, SZ_4K);
	if (!bank->base_reg) {		if (!bank->base_reg) {

arch/arm/mach-omap2/mux.c

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -486,7 +486,7 @@ int __init omap_mux_init_signal(char *muxname, int val)
	static inline void omap_mux_decode(struct seq_file *s, u16 val)		static inline void omap_mux_decode(struct seq_file *s, u16 val)
	{		{
	char *flags[OMAP_MUX_MAX_NR_FLAGS];		char *flags[OMAP_MUX_MAX_NR_FLAGS];
	char mode[14];		char mode[sizeof("OMAP_MUX_MODE") + 1];
	int i = -1;		int i = -1;

	sprintf(mode, "OMAP_MUX_MODE%d", val & 0x7);		sprintf(mode, "OMAP_MUX_MODE%d", val & 0x7);
	@@ -553,6 +553,7 @@ static int omap_mux_dbg_board_show(struct seq_file s, void unused)
	if (!m0_name)		if (!m0_name)
	continue;		continue;

			/* REVISIT: Needs to be updated if mode0 names get longer */
	for (i = 0; i < OMAP_MUX_DEFNAME_LEN; i++) {		for (i = 0; i < OMAP_MUX_DEFNAME_LEN; i++) {
	if (m0_name[i] == '\0') {		if (m0_name[i] == '\0') {
	m0_def[i] = m0_name[i];		m0_def[i] = m0_name[i];
	@@ -968,6 +969,13 @@ static void __init omap_mux_init_list(struct omap_mux *superset)
	}		}
	#endif		#endif

			#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS)
			if (!superset->muxnames \|\| !superset->muxnames[0]) {
			superset++;
			continue;
			}
			#endif

	entry = omap_mux_list_add(superset);		entry = omap_mux_list_add(superset);
	if (!entry) {		if (!entry) {
	printk(KERN_ERR "mux: Could not add entry\n");		printk(KERN_ERR "mux: Could not add entry\n");

arch/arm/mach-omap2/mux34xx.c

+47 −0

Original line number	Original line	Diff line number	Diff line
	@@ -649,6 +649,53 @@ static struct omap_mux __initdata omap3_muxmodes[] = {
	_OMAP3_MUXENTRY(UART3_TX_IRTX, 166,		_OMAP3_MUXENTRY(UART3_TX_IRTX, 166,
	"uart3_tx_irtx", NULL, NULL, NULL,		"uart3_tx_irtx", NULL, NULL, NULL,
	"gpio_166", NULL, NULL, "safe_mode"),		"gpio_166", NULL, NULL, "safe_mode"),

			/* Only on 3630, see omap36xx_cbp_subset for the signals */
			_OMAP3_MUXENTRY(GPMC_A11, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MBUSFLAG, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MREAD, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MWRITE, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_SBUSFLAG, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_SREAD, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_SWRITE, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(GPMC_A11, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MCAD28, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MCAD29, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MCAD32, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MCAD33, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MCAD34, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MCAD35, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
			_OMAP3_MUXENTRY(SAD2D_MCAD36, 0,
			NULL, NULL, NULL, NULL,
			NULL, NULL, NULL, NULL),
	{ .reg_offset = OMAP_MUX_TERMINATOR },		{ .reg_offset = OMAP_MUX_TERMINATOR },
	};		};

Admin message