diff options
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/imx50.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/generic.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/nand.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/usb-imx6.c | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx50.c b/arch/arm/mach-imx/imx50.c index 4fd5481670..b76e3794e3 100644 --- a/arch/arm/mach-imx/imx50.c +++ b/arch/arm/mach-imx/imx50.c @@ -86,7 +86,7 @@ int imx50_devices_init(void) return 0; } -void imx50_init_lowlevel_early(unsigned int cpufreq_mhz) +static void imx50_init_lowlevel_early(unsigned int cpufreq_mhz) { void __iomem *ccm = IOMEM(MX50_CCM_BASE_ADDR); u32 r; diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index dc537941a7..be58da4da2 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -19,6 +19,7 @@ void vf610_boot_save_loc(void); void imx8_boot_save_loc(void); void imx25_get_boot_source(enum bootsource *src, int *instance); +void imx27_get_boot_source(enum bootsource *src, int *instance); void imx35_get_boot_source(enum bootsource *src, int *instance); void imx51_get_boot_source(enum bootsource *src, int *instance); void imx53_get_boot_source(enum bootsource *src, int *instance); diff --git a/arch/arm/mach-imx/nand.c b/arch/arm/mach-imx/nand.c index f298a36046..7574fe80b2 100644 --- a/arch/arm/mach-imx/nand.c +++ b/arch/arm/mach-imx/nand.c @@ -17,6 +17,7 @@ #include <mach/imx25-regs.h> #include <mach/imx27-regs.h> #include <mach/imx35-regs.h> +#include <mach/imx-nand.h> #include <io.h> #define RCSR_NFC_FMS (1 << 8) diff --git a/arch/arm/mach-imx/usb-imx6.c b/arch/arm/mach-imx/usb-imx6.c index 5e3df10e44..4236bcb772 100644 --- a/arch/arm/mach-imx/usb-imx6.c +++ b/arch/arm/mach-imx/usb-imx6.c @@ -20,6 +20,7 @@ #include <common.h> #include <io.h> #include <mach/imx6-regs.h> +#include <mach/usb.h> #define SET 0x4 #define CLR 0x8 @@ -33,7 +34,6 @@ #define USB_UH1_USBCMD 0x340 #define USB_CMD_RUNSTOP (1 << 0) -#define USB_CMD_RESET (1 << 1) #define USB_OVER_CUR_DIS (1 << 7) #define USBPHY_CTRL_SFTRST (1 << 31) |