summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-qong.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:28 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:28 +0200
commitd6bb0f27709b91e674ce1441e2dd5e68620edf14 (patch)
tree1b79f4894618a8849b06d0f12152e9c35053d94a /arch/arm/mach-imx/mach-qong.c
parent2f540738f8d228016c6cd0d3b303896c174ecee3 (diff)
parent91056a63a7d8dbc817747a22d9a9490463323575 (diff)
downloadop-kernel-dev-d6bb0f27709b91e674ce1441e2dd5e68620edf14.zip
op-kernel-dev-d6bb0f27709b91e674ce1441e2dd5e68620edf14.tar.gz
Merge branch 'imx/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-imx/mach-qong.c')
-rw-r--r--arch/arm/mach-imx/mach-qong.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 9e11359..c33ab00 100644
--- a/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -190,7 +190,10 @@ static struct platform_device qong_nand_device = {
static void __init qong_init_nand_mtd(void)
{
/* init CS */
- mx31_setup_weimcs(3, 0x00004f00, 0x20013b31, 0x00020800);
+ __raw_writel(0x00004f00, MX31_IO_ADDRESS(MX31_WEIM_CSCRxU(3)));
+ __raw_writel(0x20013b31, MX31_IO_ADDRESS(MX31_WEIM_CSCRxL(3)));
+ __raw_writel(0x00020800, MX31_IO_ADDRESS(MX31_WEIM_CSCRxA(3)));
+
mxc_iomux_set_gpr(MUX_SDCTL_CSD1_SEL, true);
/* enable pin */
OpenPOWER on IntegriCloud