sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM i.MX bootsource: add separate function for mx25 and mx35 

This patch creates a seperate function for mx25 and mx35 to save it's
bootsource.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2013-03-14 18:38:44 +01:00 committed by Sascha Hauer
parent 39c350aa50
commit c74fb45f64
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-imx/boot.c
View File

@ -18,6 +18,8 @@
#include <io.h>
#include <mach/generic.h>
#include <mach/imx25-regs.h>
#include <mach/imx35-regs.h>
static const char *bootsource_str[] = {
[BOOTSOURCE_UNKNOWN] = "unknown",
@ -94,7 +96,7 @@ static const enum imx_bootsource locations[4][4] = {
* Note also that I suspect that the boot source pins are only sampled at
* power up.
*/
void imx_25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
{
enum imx_bootsource src;
@ -103,6 +105,24 @@ void imx_25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
imx_set_bootsource(src);
}
void imx25_boot_save_loc(void __iomem *ccm_base)
{
uint32_t val;
val = readl(ccm_base + MX25_CCM_RCSR);
imx25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
(val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
}
void imx35_boot_save_loc(void __iomem *ccm_base)
{
uint32_t val;
val = readl(ccm_base + MX35_CCM_RCSR);
imx25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
(val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
}
#define IMX27_SYSCTRL_GPCR 0x18
#define IMX27_GPCR_BOOT_SHIFT 16
#define IMX27_GPCR_BOOT_MASK (0xf << IMX27_GPCR_BOOT_SHIFT)

6
arch/arm/mach-imx/imx25.c
View File

@ -59,11 +59,7 @@ static struct imx_iim_platform_data imx25_iim_pdata = {
static int imx25_init(void)
{
uint32_t val;
val = readl(MX25_CCM_BASE_ADDR + MX25_CCM_RCSR);
imx_25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
(val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
imx25_boot_save_loc((void *)MX25_CCM_BASE_ADDR);
add_generic_device("imx_iim", 0, NULL, MX25_IIM_BASE_ADDR, SZ_4K,
IORESOURCE_MEM, &imx25_iim_pdata);

6
arch/arm/mach-imx/imx35.c
View File

@ -59,13 +59,9 @@ core_initcall(imx35_l2_fix);
static int imx35_init(void)
{
uint32_t val;
imx35_silicon_revision();
val = readl(MX35_CCM_BASE_ADDR + MX35_CCM_RCSR);
imx_25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
(val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
imx35_boot_save_loc((void *)MX35_CCM_BASE_ADDR);
add_generic_device("imx_iim", 0, NULL, MX35_IIM_BASE_ADDR, SZ_4K,
IORESOURCE_MEM, NULL);

3
arch/arm/mach-imx/include/mach/generic.h
View File

@ -16,7 +16,8 @@ enum imx_bootsource {
enum imx_bootsource imx_bootsource(void);
void imx_set_bootsource(enum imx_bootsource src);
void imx_25_35_boot_save_loc(unsigned int ctrl, unsigned int type);
void imx25_boot_save_loc(void __iomem *ccm_base);
void imx35_boot_save_loc(void __iomem *ccm_base);
void imx27_boot_save_loc(void __iomem *sysctrl_base);
void imx51_boot_save_loc(void __iomem *src_base);
void imx53_boot_save_loc(void __iomem *src_base);