diff options
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/mem-init.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/power.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/usb-imx23.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/usb-imx28.c | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/mach-mxs/mem-init.c b/arch/arm/mach-mxs/mem-init.c index 568db81302..44785c2bfc 100644 --- a/arch/arm/mach-mxs/mem-init.c +++ b/arch/arm/mach-mxs/mem-init.c @@ -30,8 +30,8 @@ #define MXS_BLOCK_SFTRST (1 << 31) #define MXS_BLOCK_CLKGATE (1 << 30) -int mxs_early_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned - int timeout) +static int mxs_early_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, + unsigned int timeout) { while (--timeout) { if ((readl(®->reg) & mask) == mask) @@ -42,8 +42,8 @@ int mxs_early_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned return !timeout; } -int mxs_early_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned - int timeout) +static int mxs_early_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, + unsigned int timeout) { while (--timeout) { if ((readl(®->reg) & mask) == 0) @@ -54,7 +54,7 @@ int mxs_early_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned return !timeout; } -int mxs_early_reset_block(struct mxs_register_32 *reg) +static int mxs_early_reset_block(struct mxs_register_32 *reg) { /* Clear SFTRST */ writel(MXS_BLOCK_SFTRST, ®->reg_clr); diff --git a/arch/arm/mach-mxs/power.c b/arch/arm/mach-mxs/power.c index 74c5479f3e..6febf5dbaa 100644 --- a/arch/arm/mach-mxs/power.c +++ b/arch/arm/mach-mxs/power.c @@ -14,6 +14,7 @@ #include <stmp-device.h> #include <errno.h> #include <mach/imx-regs.h> +#include <mach/power.h> #define POWER_CTRL (IMX_POWER_BASE + 0x0) #define POWER_CTRL_CLKGATE 0x40000000 diff --git a/arch/arm/mach-mxs/usb-imx23.c b/arch/arm/mach-mxs/usb-imx23.c index e626396f9d..d9a54b66f8 100644 --- a/arch/arm/mach-mxs/usb-imx23.c +++ b/arch/arm/mach-mxs/usb-imx23.c @@ -17,6 +17,7 @@ #include <io.h> #include <mach/imx23-regs.h> #include <mach/power.h> +#include <mach/usb.h> #define USBPHY_PWD (IMX_USBPHY_BASE + 0x0) diff --git a/arch/arm/mach-mxs/usb-imx28.c b/arch/arm/mach-mxs/usb-imx28.c index a87d4f6cbc..a4e1bdb280 100644 --- a/arch/arm/mach-mxs/usb-imx28.c +++ b/arch/arm/mach-mxs/usb-imx28.c @@ -18,6 +18,7 @@ #include <io.h> #include <errno.h> #include <mach/imx28-regs.h> +#include <mach/usb.h> #define POWER_CTRL (IMX_POWER_BASE + 0x0) #define POWER_CTRL_CLKGATE 0x40000000 |