diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2013-01-04 13:41:54 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2013-01-04 13:41:54 +0800 |
| commit | ccce7dc63f494aaed6bd3ea55b9e14c76da0931e (patch) | |
| tree | 6892e44aff8fda5dac08bb0aefa6a0d9b3b92af2 /arch | |
| parent | 60daab290bbab00c73cc057ff868f658ec73d304 (diff) | |
| parent | c27cb3851bb6f822f8a92e4a1e10fba19284bdd4 (diff) | |
Merge tag 'rel_imx_3.0.35_1.1.0' into imx_3.0.35_android
Conflicts:
drivers/mxc/vpu/mxc_vpu.c
drivers/usb/gadget/arcotg_udc.c
sound/soc/imx/imx-wm8962.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/system.c | 10 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx6.h | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/mach-mx6/Makefile b/arch/arm/mach-mx6/Makefile index d39aa2945319..0430f982d6b2 100644 --- a/arch/arm/mach-mx6/Makefile +++ b/arch/arm/mach-mx6/Makefile @@ -18,5 +18,5 @@ obj-$(CONFIG_MACH_MX6Q_HDMIDONGLE) += board-mx6q_hdmidongle.o mx6q_hdmidongle_pm obj-$(CONFIG_SMP) += plat_hotplug.o platsmp.o headsmp.o obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o obj-$(CONFIG_IMX_PCIE) += pcie.o +obj-$(CONFIG_USB_FSL_ARC_OTG) += usb_dr.o obj-$(CONFIG_USB_EHCI_ARC_H1) += usb_h1.o -obj-$(CONFIG_USB_FSL_ARC_OTG) += usb_dr.o
\ No newline at end of file diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 9a5103bed73e..fd99bcdc9442 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -417,7 +417,7 @@ static struct mtd_partition m25p32_partitions[] = { .mask_flags = MTD_WRITEABLE, }, { .name = "kernel", - .offset = MTDPART_OFS_APPEND, + .offset = MTDPART_OFS_NXTBLK, .size = MTDPART_SIZ_FULL, }, }; diff --git a/arch/arm/mach-mx6/system.c b/arch/arm/mach-mx6/system.c index 6d24f22d156c..61649c5ed5d8 100644 --- a/arch/arm/mach-mx6/system.c +++ b/arch/arm/mach-mx6/system.c @@ -563,7 +563,7 @@ void mxc_clear_mfgmode(void) #endif #ifdef CONFIG_MXC_REBOOT_ANDROID_CMD -/* This function will set a bit on SRC_GPR10[7-8] bits to enter +/* This function will set a bit on SNVS_LPGPR[7-8] bits to enter * special boot mode. These bits will not clear by watchdog reset, so * it can be checked by bootloader to choose enter different mode.*/ @@ -574,18 +574,18 @@ void do_switch_recovery(void) { u32 reg; - reg = __raw_readl(SRC_BASE_ADDR + SRC_GPR10); + reg = __raw_readl(MX6Q_SNVS_BASE_ADDR + SNVS_LPGPR); reg |= ANDROID_RECOVERY_BOOT; - __raw_writel(reg, SRC_BASE_ADDR + SRC_GPR10); + __raw_writel(reg, MX6Q_SNVS_BASE_ADDR + SNVS_LPGPR); } void do_switch_fastboot(void) { u32 reg; - reg = __raw_readl(SRC_BASE_ADDR + SRC_GPR10); + reg = __raw_readl(MX6Q_SNVS_BASE_ADDR + SNVS_LPGPR); reg |= ANDROID_FASTBOOT_BOOT; - __raw_writel(reg, SRC_BASE_ADDR + SRC_GPR10); + __raw_writel(reg, MX6Q_SNVS_BASE_ADDR + SNVS_LPGPR); } #endif diff --git a/arch/arm/plat-mxc/include/mach/mx6.h b/arch/arm/plat-mxc/include/mach/mx6.h index 48b04b104560..bb22de06a45a 100644 --- a/arch/arm/plat-mxc/include/mach/mx6.h +++ b/arch/arm/plat-mxc/include/mach/mx6.h @@ -302,6 +302,8 @@ #define SRC_GPR9 0x40 #define SRC_GPR10 0x44 +#define SNVS_LPGPR 0x68 + /* GPC offsets */ #define MXC_GPC_CNTR_OFFSET 0x0 |