e9b7086b80
Commita66cb3454f
(ARM: OMAP: Map SRAM later on with ioremap_exec()) moved the SRAM init to happen later to remove a dependency to early SoC detection for map_io. This broke booting on some boards not using Kconfig option for OMAP_CLOCKS_SET_BY_BOOTLOADER as the dpll1 reprogramming would cause the following error: kernel BUG at arch/arm/plat-omap/sram.c:226! Internal error: Oops - undefined instruction: 0 [#1] PREEMPT Modules linked in: CPU: 0 Not tainted (3.2.0-rc1-e3 #9) PC is at omap_sram_reprogram_clock+0x28/0x30 LR is at omap1_select_table_rate+0x88/0xb4 pc : [<c001b0c4>] lr : [<c0019f54>] psr: 600000d3 sp : c035bf10 ip : c035bf20 fp : c035bf1c r10: c035bfd4 r9 : 54029252 r8 : c03f8120 r7 : c0362b50 r6 : 00b71b00 r5 : c03873cc r4 : c0362b40 r3 : 00000000 r2 : c0362b40 r1 : 0000010a r0 : 00002cb0 Flags: nZCv IRQs off FIQs off Mode SVC_32 ISA ARM Segment kernel Control: 0000317f Table: 10004000 DAC: 00000017 Process swapper (pid: 0, stack limit = 0xc035a270) Stack: (0xc035bf10 to 0xc035c000) bf00: c035bf3c c035bf20 c0019f54 c001b0ac bf20: 00001000 00002cb3 00000004 c035ed4c c035bf74 c035bf40 c033ea24 c0019edc bf40: c02f526c 00000002 00000015 bc058c9b 93111a16 c035335c 02000000 c035ed4c bf60: c035ed4c c03f8120 c035bf84 c035bf78 c00194c4 c033e8ec c035bfc4 c035bf88 bf80: c033bc24 c00194a0 c035bf90 c035bf98 00000000 00000000 00000000 00000000 bfa0: 00000001 00000000 c0354678 c035ece4 10004000 103532f4 c035bff4 c035bfc8 bfc0: c0338574 c033b598 00000000 00000000 00000000 c035467c 0000317d c035c03c bfe0: c0354678 c035ece4 00000000 c035bff8 10008040c0338508
00000000 00000000 Backtrace: [<c001b09c>] (omap_sram_reprogram_clock+0x0/0x30) from [<c0019f54>] (omap1_select_table_rate+0x88/0xb4) [<c0019ecc>] (omap1_select_table_rate+0x0/0xb4) from [<c033ea24>] (omap1_clk_init+0x148/0x334) r7:c035ed4c r6:00000004 r5:00002cb3 r4:00001000 [<c033e8dc>] (omap1_clk_init+0x0/0x334) from [<c00194c4>] (omap1_init_early+0x34/0x48) r8:c03f8120 r7:c035ed4c r6:c035ed4c r5:02000000 r4:c035335c [<c0019490>] (omap1_init_early+0x0/0x48) from [<c033bc24>] (setup_arch+0x69c/0x79c) [<c033b588>] (setup_arch+0x0/0x79c) from [<c0338574>] (start_kernel+0x7c/0x2f4) [<c03384f8>] (start_kernel+0x0/0x2f4) from [<10008040>] (0x10008040) r7:c035ece4 r6:c0354678 r5:c035c03c r4:0000317d Code: 0a000002 e1a0e00f e12fff13 e89da800 (e7f001f2) Fix this by adding omap1_clk_late_init() that only reprograms dpll1 if the bootloader rate is less than 60MHz. This also allows removing of the OMAP_CLOCKS_SET_BY_BOOTLOADER option. Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Tony Lindgren <tony@atomide.com>
340 lines
8.1 KiB
C
340 lines
8.1 KiB
C
/*
|
|
* linux/arch/arm/mach-omap1/devices.c
|
|
*
|
|
* OMAP1 platform device setup/initialization
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/spi/spi.h>
|
|
|
|
#include <mach/camera.h>
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <plat/common.h>
|
|
#include <plat/tc.h>
|
|
#include <plat/board.h>
|
|
#include <plat/mux.h>
|
|
#include <plat/mmc.h>
|
|
#include <plat/omap7xx.h>
|
|
#include <plat/mcbsp.h>
|
|
|
|
#include "clock.h"
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
#if defined(CONFIG_RTC_DRV_OMAP) || defined(CONFIG_RTC_DRV_OMAP_MODULE)
|
|
|
|
#define OMAP_RTC_BASE 0xfffb4800
|
|
|
|
static struct resource rtc_resources[] = {
|
|
{
|
|
.start = OMAP_RTC_BASE,
|
|
.end = OMAP_RTC_BASE + 0x5f,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = INT_RTC_TIMER,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.start = INT_RTC_ALARM,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device omap_rtc_device = {
|
|
.name = "omap_rtc",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(rtc_resources),
|
|
.resource = rtc_resources,
|
|
};
|
|
|
|
static void omap_init_rtc(void)
|
|
{
|
|
(void) platform_device_register(&omap_rtc_device);
|
|
}
|
|
#else
|
|
static inline void omap_init_rtc(void) {}
|
|
#endif
|
|
|
|
static inline void omap_init_mbox(void) { }
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
|
|
|
|
static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
|
|
int controller_nr)
|
|
{
|
|
if (controller_nr == 0) {
|
|
if (cpu_is_omap7xx()) {
|
|
omap_cfg_reg(MMC_7XX_CMD);
|
|
omap_cfg_reg(MMC_7XX_CLK);
|
|
omap_cfg_reg(MMC_7XX_DAT0);
|
|
} else {
|
|
omap_cfg_reg(MMC_CMD);
|
|
omap_cfg_reg(MMC_CLK);
|
|
omap_cfg_reg(MMC_DAT0);
|
|
}
|
|
|
|
if (cpu_is_omap1710()) {
|
|
omap_cfg_reg(M15_1710_MMC_CLKI);
|
|
omap_cfg_reg(P19_1710_MMC_CMDDIR);
|
|
omap_cfg_reg(P20_1710_MMC_DATDIR0);
|
|
}
|
|
if (mmc_controller->slots[0].wires == 4 && !cpu_is_omap7xx()) {
|
|
omap_cfg_reg(MMC_DAT1);
|
|
/* NOTE: DAT2 can be on W10 (here) or M15 */
|
|
if (!mmc_controller->slots[0].nomux)
|
|
omap_cfg_reg(MMC_DAT2);
|
|
omap_cfg_reg(MMC_DAT3);
|
|
}
|
|
}
|
|
|
|
/* Block 2 is on newer chips, and has many pinout options */
|
|
if (cpu_is_omap16xx() && controller_nr == 1) {
|
|
if (!mmc_controller->slots[1].nomux) {
|
|
omap_cfg_reg(Y8_1610_MMC2_CMD);
|
|
omap_cfg_reg(Y10_1610_MMC2_CLK);
|
|
omap_cfg_reg(R18_1610_MMC2_CLKIN);
|
|
omap_cfg_reg(W8_1610_MMC2_DAT0);
|
|
if (mmc_controller->slots[1].wires == 4) {
|
|
omap_cfg_reg(V8_1610_MMC2_DAT1);
|
|
omap_cfg_reg(W15_1610_MMC2_DAT2);
|
|
omap_cfg_reg(R10_1610_MMC2_DAT3);
|
|
}
|
|
|
|
/* These are needed for the level shifter */
|
|
omap_cfg_reg(V9_1610_MMC2_CMDDIR);
|
|
omap_cfg_reg(V5_1610_MMC2_DATDIR0);
|
|
omap_cfg_reg(W19_1610_MMC2_DATDIR1);
|
|
}
|
|
|
|
/* Feedback clock must be set on OMAP-1710 MMC2 */
|
|
if (cpu_is_omap1710())
|
|
omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 << 24),
|
|
MOD_CONF_CTRL_1);
|
|
}
|
|
}
|
|
|
|
void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
|
|
int nr_controllers)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < nr_controllers; i++) {
|
|
unsigned long base, size;
|
|
unsigned int irq = 0;
|
|
|
|
if (!mmc_data[i])
|
|
continue;
|
|
|
|
omap1_mmc_mux(mmc_data[i], i);
|
|
|
|
switch (i) {
|
|
case 0:
|
|
base = OMAP1_MMC1_BASE;
|
|
irq = INT_MMC;
|
|
break;
|
|
case 1:
|
|
if (!cpu_is_omap16xx())
|
|
return;
|
|
base = OMAP1_MMC2_BASE;
|
|
irq = INT_1610_MMC2;
|
|
break;
|
|
default:
|
|
continue;
|
|
}
|
|
size = OMAP1_MMC_SIZE;
|
|
|
|
omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]);
|
|
};
|
|
}
|
|
|
|
#endif
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* OMAP7xx SPI support */
|
|
#if defined(CONFIG_SPI_OMAP_100K) || defined(CONFIG_SPI_OMAP_100K_MODULE)
|
|
|
|
struct platform_device omap_spi1 = {
|
|
.name = "omap1_spi100k",
|
|
.id = 1,
|
|
};
|
|
|
|
struct platform_device omap_spi2 = {
|
|
.name = "omap1_spi100k",
|
|
.id = 2,
|
|
};
|
|
|
|
static void omap_init_spi100k(void)
|
|
{
|
|
omap_spi1.dev.platform_data = ioremap(OMAP7XX_SPI1_BASE, 0x7ff);
|
|
if (omap_spi1.dev.platform_data)
|
|
platform_device_register(&omap_spi1);
|
|
|
|
omap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff);
|
|
if (omap_spi2.dev.platform_data)
|
|
platform_device_register(&omap_spi2);
|
|
}
|
|
|
|
#else
|
|
static inline void omap_init_spi100k(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
|
|
#define OMAP1_CAMERA_BASE 0xfffb6800
|
|
#define OMAP1_CAMERA_IOSIZE 0x1c
|
|
|
|
static struct resource omap1_camera_resources[] = {
|
|
[0] = {
|
|
.start = OMAP1_CAMERA_BASE,
|
|
.end = OMAP1_CAMERA_BASE + OMAP1_CAMERA_IOSIZE - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = INT_CAMERA,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static u64 omap1_camera_dma_mask = DMA_BIT_MASK(32);
|
|
|
|
static struct platform_device omap1_camera_device = {
|
|
.name = "omap1-camera",
|
|
.id = 0, /* This is used to put cameras on this interface */
|
|
.dev = {
|
|
.dma_mask = &omap1_camera_dma_mask,
|
|
.coherent_dma_mask = DMA_BIT_MASK(32),
|
|
},
|
|
.num_resources = ARRAY_SIZE(omap1_camera_resources),
|
|
.resource = omap1_camera_resources,
|
|
};
|
|
|
|
void __init omap1_camera_init(void *info)
|
|
{
|
|
struct platform_device *dev = &omap1_camera_device;
|
|
int ret;
|
|
|
|
dev->dev.platform_data = info;
|
|
|
|
ret = platform_device_register(dev);
|
|
if (ret)
|
|
dev_err(&dev->dev, "unable to register device: %d\n", ret);
|
|
}
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
static inline void omap_init_sti(void) {}
|
|
|
|
#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
|
|
|
|
static struct platform_device omap_pcm = {
|
|
.name = "omap-pcm-audio",
|
|
.id = -1,
|
|
};
|
|
|
|
OMAP_MCBSP_PLATFORM_DEVICE(1);
|
|
OMAP_MCBSP_PLATFORM_DEVICE(2);
|
|
OMAP_MCBSP_PLATFORM_DEVICE(3);
|
|
|
|
static void omap_init_audio(void)
|
|
{
|
|
platform_device_register(&omap_mcbsp1);
|
|
platform_device_register(&omap_mcbsp2);
|
|
if (!cpu_is_omap7xx())
|
|
platform_device_register(&omap_mcbsp3);
|
|
platform_device_register(&omap_pcm);
|
|
}
|
|
|
|
#else
|
|
static inline void omap_init_audio(void) {}
|
|
#endif
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/*
|
|
* This gets called after board-specific INIT_MACHINE, and initializes most
|
|
* on-chip peripherals accessible on this board (except for few like USB):
|
|
*
|
|
* (a) Does any "standard config" pin muxing needed. Board-specific
|
|
* code will have muxed GPIO pins and done "nonstandard" setup;
|
|
* that code could live in the boot loader.
|
|
* (b) Populating board-specific platform_data with the data drivers
|
|
* rely on to handle wiring variations.
|
|
* (c) Creating platform devices as meaningful on this board and
|
|
* with this kernel configuration.
|
|
*
|
|
* Claiming GPIOs, and setting their direction and initial values, is the
|
|
* responsibility of the device drivers. So is responding to probe().
|
|
*
|
|
* Board-specific knowledge like creating devices or pin setup is to be
|
|
* kept out of drivers as much as possible. In particular, pin setup
|
|
* may be handled by the boot loader, and drivers should expect it will
|
|
* normally have been done by the time they're probed.
|
|
*/
|
|
static int __init omap1_init_devices(void)
|
|
{
|
|
if (!cpu_class_is_omap1())
|
|
return -ENODEV;
|
|
|
|
omap_sram_init();
|
|
omap1_clk_late_init();
|
|
|
|
/* please keep these calls, and their implementations above,
|
|
* in alphabetical order so they're easier to sort through.
|
|
*/
|
|
|
|
omap_init_mbox();
|
|
omap_init_rtc();
|
|
omap_init_spi100k();
|
|
omap_init_sti();
|
|
omap_init_audio();
|
|
|
|
return 0;
|
|
}
|
|
arch_initcall(omap1_init_devices);
|
|
|
|
#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
|
|
|
|
static struct resource wdt_resources[] = {
|
|
{
|
|
.start = 0xfffeb000,
|
|
.end = 0xfffeb07F,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device omap_wdt_device = {
|
|
.name = "omap_wdt",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(wdt_resources),
|
|
.resource = wdt_resources,
|
|
};
|
|
|
|
static int __init omap_init_wdt(void)
|
|
{
|
|
if (!cpu_is_omap16xx())
|
|
return -ENODEV;
|
|
|
|
return platform_device_register(&omap_wdt_device);
|
|
}
|
|
subsys_initcall(omap_init_wdt);
|
|
#endif
|