|
|
@@ -23,171 +23,45 @@
|
|
|
#include <linux/dma-mapping.h>
|
|
|
#include <linux/platform_device.h>
|
|
|
#include <linux/interrupt.h>
|
|
|
-#include <linux/irqdomain.h>
|
|
|
-#include <linux/of_address.h>
|
|
|
#include <linux/of_platform.h>
|
|
|
#include <linux/amba/bus.h>
|
|
|
#include <linux/amba/clcd.h>
|
|
|
#include <linux/platform_data/video-clcd-versatile.h>
|
|
|
-#include <linux/amba/pl061.h>
|
|
|
#include <linux/amba/mmci.h>
|
|
|
-#include <linux/amba/pl022.h>
|
|
|
#include <linux/io.h>
|
|
|
-#include <linux/irqchip/arm-vic.h>
|
|
|
-#include <linux/irqchip/versatile-fpga.h>
|
|
|
-#include <linux/gfp.h>
|
|
|
-#include <linux/clkdev.h>
|
|
|
#include <linux/mtd/physmap.h>
|
|
|
-#include <linux/bitops.h>
|
|
|
#include <linux/reboot.h>
|
|
|
|
|
|
-#include <clocksource/timer-sp804.h>
|
|
|
-
|
|
|
-#include <asm/irq.h>
|
|
|
-#include <asm/hardware/icst.h>
|
|
|
-#include <asm/mach-types.h>
|
|
|
-
|
|
|
#include <asm/mach/arch.h>
|
|
|
-#include <asm/mach/irq.h>
|
|
|
-#include <asm/mach/time.h>
|
|
|
#include <asm/mach/map.h>
|
|
|
#include <mach/hardware.h>
|
|
|
#include <mach/platform.h>
|
|
|
|
|
|
-#include <plat/sched_clock.h>
|
|
|
-
|
|
|
#include "core.h"
|
|
|
|
|
|
-/*
|
|
|
- * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
|
|
|
- * is the (PA >> 12).
|
|
|
- *
|
|
|
- * Setup a VA for the Versatile Vectored Interrupt Controller.
|
|
|
- */
|
|
|
-#define VA_VIC_BASE __io_address(VERSATILE_VIC_BASE)
|
|
|
-#define VA_SIC_BASE __io_address(VERSATILE_SIC_BASE)
|
|
|
-
|
|
|
-/* These PIC IRQs are valid in each configuration */
|
|
|
-#define PIC_VALID_ALL BIT(SIC_INT_KMI0) | BIT(SIC_INT_KMI1) | \
|
|
|
- BIT(SIC_INT_SCI3) | BIT(SIC_INT_UART3) | \
|
|
|
- BIT(SIC_INT_CLCD) | BIT(SIC_INT_TOUCH) | \
|
|
|
- BIT(SIC_INT_KEYPAD) | BIT(SIC_INT_DoC) | \
|
|
|
- BIT(SIC_INT_USB) | BIT(SIC_INT_PCI0) | \
|
|
|
- BIT(SIC_INT_PCI1) | BIT(SIC_INT_PCI2) | \
|
|
|
- BIT(SIC_INT_PCI3)
|
|
|
-#if 1
|
|
|
-#define IRQ_MMCI0A IRQ_VICSOURCE22
|
|
|
-#define IRQ_AACI IRQ_VICSOURCE24
|
|
|
-#define IRQ_ETH IRQ_VICSOURCE25
|
|
|
-#define PIC_MASK 0xFFD00000
|
|
|
-#define PIC_VALID PIC_VALID_ALL
|
|
|
-#else
|
|
|
-#define IRQ_MMCI0A IRQ_SIC_MMCI0A
|
|
|
-#define IRQ_AACI IRQ_SIC_AACI
|
|
|
-#define IRQ_ETH IRQ_SIC_ETH
|
|
|
-#define PIC_MASK 0
|
|
|
-#define PIC_VALID PIC_VALID_ALL | BIT(SIC_INT_MMCI0A) | \
|
|
|
- BIT(SIC_INT_MMCI1A) | BIT(SIC_INT_AACI) | \
|
|
|
- BIT(SIC_INT_ETH)
|
|
|
-#endif
|
|
|
-
|
|
|
-/* Lookup table for finding a DT node that represents the vic instance */
|
|
|
-static const struct of_device_id vic_of_match[] __initconst = {
|
|
|
- { .compatible = "arm,versatile-vic", },
|
|
|
- {}
|
|
|
-};
|
|
|
-
|
|
|
-static const struct of_device_id sic_of_match[] __initconst = {
|
|
|
- { .compatible = "arm,versatile-sic", },
|
|
|
- {}
|
|
|
-};
|
|
|
-
|
|
|
-void __init versatile_init_irq(void)
|
|
|
-{
|
|
|
- struct device_node *np;
|
|
|
-
|
|
|
- np = of_find_matching_node_by_address(NULL, vic_of_match,
|
|
|
- VERSATILE_VIC_BASE);
|
|
|
- __vic_init(VA_VIC_BASE, 0, IRQ_VIC_START, ~0, 0, np);
|
|
|
-
|
|
|
- writel(~0, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);
|
|
|
-
|
|
|
- np = of_find_matching_node_by_address(NULL, sic_of_match,
|
|
|
- VERSATILE_SIC_BASE);
|
|
|
-
|
|
|
- fpga_irq_init(VA_SIC_BASE, "SIC", IRQ_SIC_START,
|
|
|
- IRQ_VICSOURCE31, PIC_VALID, np);
|
|
|
-
|
|
|
- /*
|
|
|
- * Interrupts on secondary controller from 0 to 8 are routed to
|
|
|
- * source 31 on PIC.
|
|
|
- * Interrupts from 21 to 31 are routed directly to the VIC on
|
|
|
- * the corresponding number on primary controller. This is controlled
|
|
|
- * by setting PIC_ENABLEx.
|
|
|
- */
|
|
|
- writel(PIC_MASK, VA_SIC_BASE + SIC_INT_PIC_ENABLE);
|
|
|
-}
|
|
|
-
|
|
|
static struct map_desc versatile_io_desc[] __initdata __maybe_unused = {
|
|
|
{
|
|
|
.virtual = IO_ADDRESS(VERSATILE_SYS_BASE),
|
|
|
.pfn = __phys_to_pfn(VERSATILE_SYS_BASE),
|
|
|
.length = SZ_4K,
|
|
|
.type = MT_DEVICE
|
|
|
- }, {
|
|
|
- .virtual = IO_ADDRESS(VERSATILE_SIC_BASE),
|
|
|
- .pfn = __phys_to_pfn(VERSATILE_SIC_BASE),
|
|
|
- .length = SZ_4K,
|
|
|
- .type = MT_DEVICE
|
|
|
- }, {
|
|
|
- .virtual = IO_ADDRESS(VERSATILE_VIC_BASE),
|
|
|
- .pfn = __phys_to_pfn(VERSATILE_VIC_BASE),
|
|
|
- .length = SZ_4K,
|
|
|
- .type = MT_DEVICE
|
|
|
}, {
|
|
|
.virtual = IO_ADDRESS(VERSATILE_SCTL_BASE),
|
|
|
.pfn = __phys_to_pfn(VERSATILE_SCTL_BASE),
|
|
|
.length = SZ_4K * 9,
|
|
|
.type = MT_DEVICE
|
|
|
},
|
|
|
-#ifdef CONFIG_MACH_VERSATILE_AB
|
|
|
{
|
|
|
.virtual = IO_ADDRESS(VERSATILE_IB2_BASE),
|
|
|
.pfn = __phys_to_pfn(VERSATILE_IB2_BASE),
|
|
|
.length = SZ_64M,
|
|
|
.type = MT_DEVICE
|
|
|
},
|
|
|
-#endif
|
|
|
-#ifdef CONFIG_DEBUG_LL
|
|
|
- {
|
|
|
- .virtual = IO_ADDRESS(VERSATILE_UART0_BASE),
|
|
|
- .pfn = __phys_to_pfn(VERSATILE_UART0_BASE),
|
|
|
- .length = SZ_4K,
|
|
|
- .type = MT_DEVICE
|
|
|
- },
|
|
|
-#endif
|
|
|
-#ifdef CONFIG_PCI
|
|
|
- {
|
|
|
- .virtual = IO_ADDRESS(VERSATILE_PCI_CORE_BASE),
|
|
|
- .pfn = __phys_to_pfn(VERSATILE_PCI_CORE_BASE),
|
|
|
- .length = SZ_4K,
|
|
|
- .type = MT_DEVICE
|
|
|
- }, {
|
|
|
- .virtual = (unsigned long)VERSATILE_PCI_VIRT_BASE,
|
|
|
- .pfn = __phys_to_pfn(VERSATILE_PCI_BASE),
|
|
|
- .length = VERSATILE_PCI_BASE_SIZE,
|
|
|
- .type = MT_DEVICE
|
|
|
- }, {
|
|
|
- .virtual = (unsigned long)VERSATILE_PCI_CFG_VIRT_BASE,
|
|
|
- .pfn = __phys_to_pfn(VERSATILE_PCI_CFG_BASE),
|
|
|
- .length = VERSATILE_PCI_CFG_BASE_SIZE,
|
|
|
- .type = MT_DEVICE
|
|
|
- },
|
|
|
-#endif
|
|
|
};
|
|
|
|
|
|
void __init versatile_map_io(void)
|
|
|
{
|
|
|
+ debug_ll_io_init();
|
|
|
iotable_init(versatile_io_desc, ARRAY_SIZE(versatile_io_desc));
|
|
|
}
|
|
|
|
|
|
@@ -217,7 +91,7 @@ static struct resource versatile_flash_resource = {
|
|
|
.flags = IORESOURCE_MEM,
|
|
|
};
|
|
|
|
|
|
-static struct platform_device versatile_flash_device = {
|
|
|
+struct platform_device versatile_flash_device = {
|
|
|
.name = "physmap-flash",
|
|
|
.id = 0,
|
|
|
.dev = {
|
|
|
@@ -227,52 +101,6 @@ static struct platform_device versatile_flash_device = {
|
|
|
.resource = &versatile_flash_resource,
|
|
|
};
|
|
|
|
|
|
-static struct resource smc91x_resources[] = {
|
|
|
- [0] = {
|
|
|
- .start = VERSATILE_ETH_BASE,
|
|
|
- .end = VERSATILE_ETH_BASE + SZ_64K - 1,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
- [1] = {
|
|
|
- .start = IRQ_ETH,
|
|
|
- .end = IRQ_ETH,
|
|
|
- .flags = IORESOURCE_IRQ,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device smc91x_device = {
|
|
|
- .name = "smc91x",
|
|
|
- .id = 0,
|
|
|
- .num_resources = ARRAY_SIZE(smc91x_resources),
|
|
|
- .resource = smc91x_resources,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource versatile_i2c_resource = {
|
|
|
- .start = VERSATILE_I2C_BASE,
|
|
|
- .end = VERSATILE_I2C_BASE + SZ_4K - 1,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device versatile_i2c_device = {
|
|
|
- .name = "versatile-i2c",
|
|
|
- .id = 0,
|
|
|
- .num_resources = 1,
|
|
|
- .resource = &versatile_i2c_resource,
|
|
|
-};
|
|
|
-
|
|
|
-static struct i2c_board_info versatile_i2c_board_info[] = {
|
|
|
- {
|
|
|
- I2C_BOARD_INFO("ds1338", 0xd0 >> 1),
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static int __init versatile_i2c_init(void)
|
|
|
-{
|
|
|
- return i2c_register_board_info(0, versatile_i2c_board_info,
|
|
|
- ARRAY_SIZE(versatile_i2c_board_info));
|
|
|
-}
|
|
|
-arch_initcall(versatile_i2c_init);
|
|
|
-
|
|
|
#define VERSATILE_SYSMCI (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_MCI_OFFSET)
|
|
|
|
|
|
unsigned int mmc_status(struct device *dev)
|
|
|
@@ -295,126 +123,11 @@ static struct mmci_platform_data mmc0_plat_data = {
|
|
|
.gpio_cd = -1,
|
|
|
};
|
|
|
|
|
|
-static struct resource char_lcd_resources[] = {
|
|
|
- {
|
|
|
- .start = VERSATILE_CHAR_LCD_BASE,
|
|
|
- .end = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device char_lcd_device = {
|
|
|
- .name = "arm-charlcd",
|
|
|
- .id = -1,
|
|
|
- .num_resources = ARRAY_SIZE(char_lcd_resources),
|
|
|
- .resource = char_lcd_resources,
|
|
|
-};
|
|
|
-
|
|
|
-static struct resource leds_resources[] = {
|
|
|
- {
|
|
|
- .start = VERSATILE_SYS_BASE + VERSATILE_SYS_LED_OFFSET,
|
|
|
- .end = VERSATILE_SYS_BASE + VERSATILE_SYS_LED_OFFSET + 4,
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static struct platform_device leds_device = {
|
|
|
- .name = "versatile-leds",
|
|
|
- .id = -1,
|
|
|
- .num_resources = ARRAY_SIZE(leds_resources),
|
|
|
- .resource = leds_resources,
|
|
|
-};
|
|
|
-
|
|
|
-/*
|
|
|
- * Clock handling
|
|
|
- */
|
|
|
-static const struct icst_params versatile_oscvco_params = {
|
|
|
- .ref = 24000000,
|
|
|
- .vco_max = ICST307_VCO_MAX,
|
|
|
- .vco_min = ICST307_VCO_MIN,
|
|
|
- .vd_min = 4 + 8,
|
|
|
- .vd_max = 511 + 8,
|
|
|
- .rd_min = 1 + 2,
|
|
|
- .rd_max = 127 + 2,
|
|
|
- .s2div = icst307_s2div,
|
|
|
- .idx2s = icst307_idx2s,
|
|
|
-};
|
|
|
-
|
|
|
-static void versatile_oscvco_set(struct clk *clk, struct icst_vco vco)
|
|
|
-{
|
|
|
- void __iomem *sys_lock = __io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_LOCK_OFFSET;
|
|
|
- u32 val;
|
|
|
-
|
|
|
- val = readl(clk->vcoreg) & ~0x7ffff;
|
|
|
- val |= vco.v | (vco.r << 9) | (vco.s << 16);
|
|
|
-
|
|
|
- writel(0xa05f, sys_lock);
|
|
|
- writel(val, clk->vcoreg);
|
|
|
- writel(0, sys_lock);
|
|
|
-}
|
|
|
-
|
|
|
-static const struct clk_ops osc4_clk_ops = {
|
|
|
- .round = icst_clk_round,
|
|
|
- .set = icst_clk_set,
|
|
|
- .setvco = versatile_oscvco_set,
|
|
|
-};
|
|
|
-
|
|
|
-static struct clk osc4_clk = {
|
|
|
- .ops = &osc4_clk_ops,
|
|
|
- .params = &versatile_oscvco_params,
|
|
|
-};
|
|
|
-
|
|
|
-/*
|
|
|
- * These are fixed clocks.
|
|
|
- */
|
|
|
-static struct clk ref24_clk = {
|
|
|
- .rate = 24000000,
|
|
|
-};
|
|
|
-
|
|
|
-static struct clk sp804_clk = {
|
|
|
- .rate = 1000000,
|
|
|
-};
|
|
|
-
|
|
|
-static struct clk dummy_apb_pclk;
|
|
|
-
|
|
|
-static struct clk_lookup lookups[] = {
|
|
|
- { /* AMBA bus clock */
|
|
|
- .con_id = "apb_pclk",
|
|
|
- .clk = &dummy_apb_pclk,
|
|
|
- }, { /* UART0 */
|
|
|
- .dev_id = "dev:f1",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* UART1 */
|
|
|
- .dev_id = "dev:f2",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* UART2 */
|
|
|
- .dev_id = "dev:f3",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* UART3 */
|
|
|
- .dev_id = "fpga:09",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* KMI0 */
|
|
|
- .dev_id = "fpga:06",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* KMI1 */
|
|
|
- .dev_id = "fpga:07",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* MMC0 */
|
|
|
- .dev_id = "fpga:05",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* MMC1 */
|
|
|
- .dev_id = "fpga:0b",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* SSP */
|
|
|
- .dev_id = "dev:f4",
|
|
|
- .clk = &ref24_clk,
|
|
|
- }, { /* CLCD */
|
|
|
- .dev_id = "dev:20",
|
|
|
- .clk = &osc4_clk,
|
|
|
- }, { /* SP804 timers */
|
|
|
- .dev_id = "sp804",
|
|
|
- .clk = &sp804_clk,
|
|
|
- },
|
|
|
+static struct mmci_platform_data mmc1_plat_data = {
|
|
|
+ .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
|
|
|
+ .status = mmc_status,
|
|
|
+ .gpio_wp = -1,
|
|
|
+ .gpio_cd = -1,
|
|
|
};
|
|
|
|
|
|
/*
|
|
|
@@ -449,11 +162,10 @@ static void versatile_clcd_disable(struct clcd_fb *fb)
|
|
|
val &= ~SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH;
|
|
|
writel(val, sys_clcd);
|
|
|
|
|
|
-#ifdef CONFIG_MACH_VERSATILE_AB
|
|
|
/*
|
|
|
* If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light off
|
|
|
*/
|
|
|
- if (machine_is_versatile_ab() && is_sanyo_2_5_lcd) {
|
|
|
+ if (of_machine_is_compatible("arm,versatile-ab") && is_sanyo_2_5_lcd) {
|
|
|
void __iomem *versatile_ib2_ctrl = __io_address(VERSATILE_IB2_CTRL);
|
|
|
unsigned long ctrl;
|
|
|
|
|
|
@@ -461,7 +173,6 @@ static void versatile_clcd_disable(struct clcd_fb *fb)
|
|
|
ctrl &= ~0x01;
|
|
|
writel(ctrl, versatile_ib2_ctrl);
|
|
|
}
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
@@ -502,11 +213,10 @@ static void versatile_clcd_enable(struct clcd_fb *fb)
|
|
|
val |= SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH;
|
|
|
writel(val, sys_clcd);
|
|
|
|
|
|
-#ifdef CONFIG_MACH_VERSATILE_AB
|
|
|
/*
|
|
|
* If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light on
|
|
|
*/
|
|
|
- if (machine_is_versatile_ab() && is_sanyo_2_5_lcd) {
|
|
|
+ if (of_machine_is_compatible("arm,versatile-ab") && is_sanyo_2_5_lcd) {
|
|
|
void __iomem *versatile_ib2_ctrl = __io_address(VERSATILE_IB2_CTRL);
|
|
|
unsigned long ctrl;
|
|
|
|
|
|
@@ -514,7 +224,6 @@ static void versatile_clcd_enable(struct clcd_fb *fb)
|
|
|
ctrl |= 0x01;
|
|
|
writel(ctrl, versatile_ib2_ctrl);
|
|
|
}
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
@@ -575,113 +284,6 @@ static struct clcd_board clcd_plat_data = {
|
|
|
.remove = versatile_clcd_remove_dma,
|
|
|
};
|
|
|
|
|
|
-static struct pl061_platform_data gpio0_plat_data = {
|
|
|
- .gpio_base = 0,
|
|
|
- .irq_base = IRQ_GPIO0_START,
|
|
|
-};
|
|
|
-
|
|
|
-static struct pl061_platform_data gpio1_plat_data = {
|
|
|
- .gpio_base = 8,
|
|
|
- .irq_base = IRQ_GPIO1_START,
|
|
|
-};
|
|
|
-
|
|
|
-static struct pl061_platform_data gpio2_plat_data = {
|
|
|
- .gpio_base = 16,
|
|
|
- .irq_base = IRQ_GPIO2_START,
|
|
|
-};
|
|
|
-
|
|
|
-static struct pl061_platform_data gpio3_plat_data = {
|
|
|
- .gpio_base = 24,
|
|
|
- .irq_base = IRQ_GPIO3_START,
|
|
|
-};
|
|
|
-
|
|
|
-static struct pl022_ssp_controller ssp0_plat_data = {
|
|
|
- .bus_id = 0,
|
|
|
- .enable_dma = 0,
|
|
|
- .num_chipselect = 1,
|
|
|
-};
|
|
|
-
|
|
|
-#define AACI_IRQ { IRQ_AACI }
|
|
|
-#define MMCI0_IRQ { IRQ_MMCI0A,IRQ_SIC_MMCI0B }
|
|
|
-#define KMI0_IRQ { IRQ_SIC_KMI0 }
|
|
|
-#define KMI1_IRQ { IRQ_SIC_KMI1 }
|
|
|
-
|
|
|
-/*
|
|
|
- * These devices are connected directly to the multi-layer AHB switch
|
|
|
- */
|
|
|
-#define SMC_IRQ { }
|
|
|
-#define MPMC_IRQ { }
|
|
|
-#define CLCD_IRQ { IRQ_CLCDINT }
|
|
|
-#define DMAC_IRQ { IRQ_DMAINT }
|
|
|
-
|
|
|
-/*
|
|
|
- * These devices are connected via the core APB bridge
|
|
|
- */
|
|
|
-#define SCTL_IRQ { }
|
|
|
-#define WATCHDOG_IRQ { IRQ_WDOGINT }
|
|
|
-#define GPIO0_IRQ { IRQ_GPIOINT0 }
|
|
|
-#define GPIO1_IRQ { IRQ_GPIOINT1 }
|
|
|
-#define GPIO2_IRQ { IRQ_GPIOINT2 }
|
|
|
-#define GPIO3_IRQ { IRQ_GPIOINT3 }
|
|
|
-#define RTC_IRQ { IRQ_RTCINT }
|
|
|
-
|
|
|
-/*
|
|
|
- * These devices are connected via the DMA APB bridge
|
|
|
- */
|
|
|
-#define SCI_IRQ { IRQ_SCIINT }
|
|
|
-#define UART0_IRQ { IRQ_UARTINT0 }
|
|
|
-#define UART1_IRQ { IRQ_UARTINT1 }
|
|
|
-#define UART2_IRQ { IRQ_UARTINT2 }
|
|
|
-#define SSP_IRQ { IRQ_SSPINT }
|
|
|
-
|
|
|
-/* FPGA Primecells */
|
|
|
-APB_DEVICE(aaci, "fpga:04", AACI, NULL);
|
|
|
-APB_DEVICE(mmc0, "fpga:05", MMCI0, &mmc0_plat_data);
|
|
|
-APB_DEVICE(kmi0, "fpga:06", KMI0, NULL);
|
|
|
-APB_DEVICE(kmi1, "fpga:07", KMI1, NULL);
|
|
|
-
|
|
|
-/* DevChip Primecells */
|
|
|
-AHB_DEVICE(smc, "dev:00", SMC, NULL);
|
|
|
-AHB_DEVICE(mpmc, "dev:10", MPMC, NULL);
|
|
|
-AHB_DEVICE(clcd, "dev:20", CLCD, &clcd_plat_data);
|
|
|
-AHB_DEVICE(dmac, "dev:30", DMAC, NULL);
|
|
|
-APB_DEVICE(sctl, "dev:e0", SCTL, NULL);
|
|
|
-APB_DEVICE(wdog, "dev:e1", WATCHDOG, NULL);
|
|
|
-APB_DEVICE(gpio0, "dev:e4", GPIO0, &gpio0_plat_data);
|
|
|
-APB_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data);
|
|
|
-APB_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data);
|
|
|
-APB_DEVICE(gpio3, "dev:e7", GPIO3, &gpio3_plat_data);
|
|
|
-APB_DEVICE(rtc, "dev:e8", RTC, NULL);
|
|
|
-APB_DEVICE(sci0, "dev:f0", SCI, NULL);
|
|
|
-APB_DEVICE(uart0, "dev:f1", UART0, NULL);
|
|
|
-APB_DEVICE(uart1, "dev:f2", UART1, NULL);
|
|
|
-APB_DEVICE(uart2, "dev:f3", UART2, NULL);
|
|
|
-APB_DEVICE(ssp0, "dev:f4", SSP, &ssp0_plat_data);
|
|
|
-
|
|
|
-static struct amba_device *amba_devs[] __initdata = {
|
|
|
- &dmac_device,
|
|
|
- &uart0_device,
|
|
|
- &uart1_device,
|
|
|
- &uart2_device,
|
|
|
- &smc_device,
|
|
|
- &mpmc_device,
|
|
|
- &clcd_device,
|
|
|
- &sctl_device,
|
|
|
- &wdog_device,
|
|
|
- &gpio0_device,
|
|
|
- &gpio1_device,
|
|
|
- &gpio2_device,
|
|
|
- &gpio3_device,
|
|
|
- &rtc_device,
|
|
|
- &sci0_device,
|
|
|
- &ssp0_device,
|
|
|
- &aaci_device,
|
|
|
- &mmc0_device,
|
|
|
- &kmi0_device,
|
|
|
- &kmi1_device,
|
|
|
-};
|
|
|
-
|
|
|
-#ifdef CONFIG_OF
|
|
|
/*
|
|
|
* Lookup table for attaching a specific name and platform_data pointer to
|
|
|
* devices as they get created by of_platform_populate(). Ideally this table
|
|
|
@@ -690,43 +292,12 @@ static struct amba_device *amba_devs[] __initdata = {
|
|
|
*/
|
|
|
struct of_dev_auxdata versatile_auxdata_lookup[] __initdata = {
|
|
|
OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI0_BASE, "fpga:05", &mmc0_plat_data),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_KMI0_BASE, "fpga:06", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_KMI1_BASE, "fpga:07", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART3_BASE, "fpga:09", NULL),
|
|
|
- /* FIXME: this is buggy, the platform data is needed for this MMC instance too */
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI1_BASE, "fpga:0b", NULL),
|
|
|
+ OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI1_BASE, "fpga:0b", &mmc1_plat_data),
|
|
|
|
|
|
OF_DEV_AUXDATA("arm,primecell", VERSATILE_CLCD_BASE, "dev:20", &clcd_plat_data),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART0_BASE, "dev:f1", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART1_BASE, "dev:f2", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_UART2_BASE, "dev:f3", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_SSP_BASE, "dev:f4", &ssp0_plat_data),
|
|
|
|
|
|
-#if 0
|
|
|
- /*
|
|
|
- * These entries are unnecessary because no clocks referencing
|
|
|
- * them. I've left them in for now as place holders in case
|
|
|
- * any of them need to be added back, but they should be
|
|
|
- * removed before actually committing this patch. --gcl
|
|
|
- */
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_AACI_BASE, "fpga:04", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_SCI1_BASE, "fpga:0a", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_SMC_BASE, "dev:00", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_MPMC_BASE, "dev:10", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_DMAC_BASE, "dev:30", NULL),
|
|
|
-
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_SCTL_BASE, "dev:e0", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_WATCHDOG_BASE, "dev:e1", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_GPIO0_BASE, "dev:e4", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_GPIO1_BASE, "dev:e5", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_GPIO2_BASE, "dev:e6", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_GPIO3_BASE, "dev:e7", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_RTC_BASE, "dev:e8", NULL),
|
|
|
- OF_DEV_AUXDATA("arm,primecell", VERSATILE_SCI_BASE, "dev:f0", NULL),
|
|
|
-#endif
|
|
|
{}
|
|
|
};
|
|
|
-#endif
|
|
|
|
|
|
void versatile_restart(enum reboot_mode mode, const char *cmd)
|
|
|
{
|
|
|
@@ -745,12 +316,6 @@ void versatile_restart(enum reboot_mode mode, const char *cmd)
|
|
|
void __init versatile_init_early(void)
|
|
|
{
|
|
|
u32 val;
|
|
|
- void __iomem *sys = __io_address(VERSATILE_SYS_BASE);
|
|
|
-
|
|
|
- osc4_clk.vcoreg = sys + VERSATILE_SYS_OSCCLCD_OFFSET;
|
|
|
- clkdev_add_table(lookups, ARRAY_SIZE(lookups));
|
|
|
-
|
|
|
- versatile_sched_clock_init(sys + VERSATILE_SYS_24MHz_OFFSET, 24000000);
|
|
|
|
|
|
/*
|
|
|
* set clock frequency:
|
|
|
@@ -764,45 +329,3 @@ void __init versatile_init_early(void)
|
|
|
(VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel) | val,
|
|
|
__io_address(VERSATILE_SCTL_BASE));
|
|
|
}
|
|
|
-
|
|
|
-void __init versatile_init(void)
|
|
|
-{
|
|
|
- int i;
|
|
|
-
|
|
|
- platform_device_register(&versatile_flash_device);
|
|
|
- platform_device_register(&versatile_i2c_device);
|
|
|
- platform_device_register(&smc91x_device);
|
|
|
- platform_device_register(&char_lcd_device);
|
|
|
- platform_device_register(&leds_device);
|
|
|
-
|
|
|
- for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
|
|
|
- struct amba_device *d = amba_devs[i];
|
|
|
- amba_device_register(d, &iomem_resource);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-/*
|
|
|
- * Where is the timer (VA)?
|
|
|
- */
|
|
|
-#define TIMER0_VA_BASE __io_address(VERSATILE_TIMER0_1_BASE)
|
|
|
-#define TIMER1_VA_BASE (__io_address(VERSATILE_TIMER0_1_BASE) + 0x20)
|
|
|
-#define TIMER2_VA_BASE __io_address(VERSATILE_TIMER2_3_BASE)
|
|
|
-#define TIMER3_VA_BASE (__io_address(VERSATILE_TIMER2_3_BASE) + 0x20)
|
|
|
-
|
|
|
-/*
|
|
|
- * Set up timer interrupt, and return the current time in seconds.
|
|
|
- */
|
|
|
-void __init versatile_timer_init(void)
|
|
|
-{
|
|
|
-
|
|
|
- /*
|
|
|
- * Initialise to a known state (all timers off)
|
|
|
- */
|
|
|
- sp804_timer_disable(TIMER0_VA_BASE);
|
|
|
- sp804_timer_disable(TIMER1_VA_BASE);
|
|
|
- sp804_timer_disable(TIMER2_VA_BASE);
|
|
|
- sp804_timer_disable(TIMER3_VA_BASE);
|
|
|
-
|
|
|
- sp804_clocksource_init(TIMER3_VA_BASE, "timer3");
|
|
|
- sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1, "timer0");
|
|
|
-}
|
Rob Herring