diff options
Diffstat (limited to 'arch/arm/boards')
-rw-r--r-- | arch/arm/boards/chumby_falconwing/falconwing.c | 8 | ||||
-rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 24 | ||||
-rw-r--r-- | arch/arm/boards/duckbill/lowlevel.c | 7 | ||||
-rw-r--r-- | arch/arm/boards/freescale-mx23-evk/mx23-evk.c | 8 | ||||
-rw-r--r-- | arch/arm/boards/freescale-mx28-evk/lowlevel.c | 8 | ||||
-rw-r--r-- | arch/arm/boards/freescale-mx28-evk/mx28-evk.c | 8 | ||||
-rw-r--r-- | arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c | 8 | ||||
-rw-r--r-- | arch/arm/boards/imx233-olinuxino/lowlevel.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/karo-tx28/lowlevel.c | 8 | ||||
-rw-r--r-- | arch/arm/boards/karo-tx28/tx28.c | 8 |
10 files changed, 20 insertions, 71 deletions
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index c866043e8b..5554b78d6d 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -258,14 +258,6 @@ static const uint32_t pad_setup[] = { GPMI_RDY3_GPIO | GPIO_IN | PULLUP(1), }; -static int falconwing_mem_init(void) -{ - arm_add_mem_device("ram0", IMX_MEMORY_BASE, 64 * 1024 * 1024); - - return 0; -} -mem_initcall(falconwing_mem_init); - #define GPIO_USB_HUB_RESET 29 #define GPIO_USB_HUB_POWER 26 diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index 947db7cff6..dcf560432d 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -89,30 +89,6 @@ static struct i2c_gpio_platform_data i2c_gpio_pdata = { .udelay = 5, /* ~100 kHz */ }; -void v5_mmu_cache_flush(void); -long cfa10036_get_ram_size(void) -{ - volatile u32 *base = (void *)IMX_MEMORY_BASE; - volatile u32 *ofs = base + SZ_128M / sizeof(u32); - - *base = *ofs = 0xdeadbeef; - *ofs = 0xbaadcafe; - - v5_mmu_cache_flush(); - if (*base == 0xbaadcafe) - return SZ_128M; - else - return SZ_256M; -} - -static int cfa10036_mem_init(void) -{ - arm_add_mem_device("ram0", IMX_MEMORY_BASE, cfa10036_get_ram_size()); - - return 0; -} -mem_initcall(cfa10036_mem_init); - static int cfa10036_devices_init(void) { int i; diff --git a/arch/arm/boards/duckbill/lowlevel.c b/arch/arm/boards/duckbill/lowlevel.c index 2922e40f2a..22987a6cdb 100644 --- a/arch/arm/boards/duckbill/lowlevel.c +++ b/arch/arm/boards/duckbill/lowlevel.c @@ -51,11 +51,14 @@ static noinline void duckbill_init(void) pr_debug("initializing power...\n"); - mx28_power_init(0, 0, 1); + mx28_power_init(POWER_USE_5V, &mx28_power_default); pr_debug("initializing SDRAM...\n"); - mx28_mem_init(mx28_dram_vals_default); + /* EMI_CLK of 480 / 2 * (18/21) = 205.7 MHz */ + mxs_mem_init_clock(2, 21); + mx28_mem_init(PINCTRL_EMI_DS_CTRL_DDR_MODE_DDR2, + mx28_dram_vals_default); pr_debug("DONE\n"); } diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c index dd8048851b..a3587db063 100644 --- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c +++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c @@ -53,14 +53,6 @@ static struct fsl_usb2_platform_data usb_pdata = { }; #endif -static int mx23_evk_mem_init(void) -{ - arm_add_mem_device("ram0", IMX_MEMORY_BASE, 32 * 1024 * 1024); - - return 0; -} -mem_initcall(mx23_evk_mem_init); - /** * Try to register an environment storage on the attached MCI card * @return 0 on success diff --git a/arch/arm/boards/freescale-mx28-evk/lowlevel.c b/arch/arm/boards/freescale-mx28-evk/lowlevel.c index 4d45a03ba2..22cae1374c 100644 --- a/arch/arm/boards/freescale-mx28-evk/lowlevel.c +++ b/arch/arm/boards/freescale-mx28-evk/lowlevel.c @@ -43,11 +43,15 @@ static noinline void freescale_mx28evk_init(void) pr_debug("initializing power...\n"); - mx28_power_init(0, 1, 0); + mx28_power_init(POWER_USE_BATTERY_INPUT | POWER_ENABLE_4P2, + &mx28_power_default); pr_debug("initializing SDRAM...\n"); - mx28_mem_init(mx28_dram_vals_default); + /* EMI_CLK of 480 / 2 * (18/21) = 205.7 MHz */ + mxs_mem_init_clock(2, 21); + mx28_mem_init(PINCTRL_EMI_DS_CTRL_DDR_MODE_DDR2, + mx28_dram_vals_default); pr_debug("DONE\n"); } diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index 9e5d612bda..06a2c21a47 100644 --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c +++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c @@ -232,14 +232,6 @@ static struct imx_fb_platformdata mx28_evk_fb_pdata = { .enable = mx28_evk_fb_enable, }; -static int mx28_evk_mem_init(void) -{ - arm_add_mem_device("ram0", IMX_MEMORY_BASE, 128 * 1024 * 1024); - - return 0; -} -mem_initcall(mx28_evk_mem_init); - static const struct spi_board_info mx28evk_spi_board_info[] = { { .name = "m25p80", diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c index b87a6764f3..c06779ddf6 100644 --- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c +++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c @@ -40,14 +40,6 @@ static struct mxs_mci_platform_data mci_pdata = { .f_min = 400000, }; -static int imx23_olinuxino_mem_init(void) -{ - arm_add_mem_device("ram0", IMX_MEMORY_BASE, 64 * 1024 * 1024); - - return 0; -} -mem_initcall(imx23_olinuxino_mem_init); - static void olinuxino_init_usb(void) { imx23_usb_phy_enable(); diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c index 63a65230b0..5f36c17e52 100644 --- a/arch/arm/boards/imx233-olinuxino/lowlevel.c +++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c @@ -154,11 +154,13 @@ static noinline void imx23_olinuxino_init(void) pr_debug("initializing power...\n"); - mx23_power_init(0, 0, 1); + mx23_power_init(POWER_USE_5V, &mx23_power_default); pr_debug("initializing SDRAM...\n"); imx23_olinuxino_adjust_memory_params(mx23_dram_vals); + /* EMI_CLK of 480 / 2 * (18/33) = 130.90 MHz */ + mxs_mem_init_clock(2, 33); mx23_mem_init(); pr_debug("DONE\n"); diff --git a/arch/arm/boards/karo-tx28/lowlevel.c b/arch/arm/boards/karo-tx28/lowlevel.c index d072637de7..1a93be747d 100644 --- a/arch/arm/boards/karo-tx28/lowlevel.c +++ b/arch/arm/boards/karo-tx28/lowlevel.c @@ -43,11 +43,15 @@ static noinline void karo_tx28_init(void) pr_debug("initializing power...\n"); - mx28_power_init(0, 1, 0); + mx28_power_init(POWER_USE_BATTERY_INPUT | POWER_ENABLE_4P2, + &mx28_power_default); pr_debug("initializing SDRAM...\n"); - mx28_mem_init(mx28_dram_vals_default); + /* EMI_CLK of 480 / 2 * (18/21) = 205.7 MHz */ + mxs_mem_init_clock(2, 21); + mx28_mem_init(PINCTRL_EMI_DS_CTRL_DDR_MODE_DDR2, + mx28_dram_vals_default); pr_debug("DONE\n"); } diff --git a/arch/arm/boards/karo-tx28/tx28.c b/arch/arm/boards/karo-tx28/tx28.c index 26dbc00790..47cac21307 100644 --- a/arch/arm/boards/karo-tx28/tx28.c +++ b/arch/arm/boards/karo-tx28/tx28.c @@ -73,14 +73,6 @@ static const uint32_t tx28_pad_setup[] = { extern void base_board_init(void); -static int tx28_mem_init(void) -{ - arm_add_mem_device("ram0", IMX_MEMORY_BASE, 128 * 1024 * 1024); - - return 0; -} -mem_initcall(tx28_mem_init); - static int tx28_devices_init(void) { int i; |