MIPS: TXx9: Add mtd support

[linux-2.6-omap-h63xx.git] / arch / mips / txx9 / jmr3927 / setup.c

diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index 87db41be8a565b9f3b0fc53632162cb534fed6c3..0f3843c92cf72981affa0c26450ba8f693d17c49 100644 (file)
--- a/arch/mips/txx9/jmr3927/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -62,7 +62,6 @@ static void __init jmr3927_time_init(void)
 }
 
 #define DO_WRITE_THROUGH
-#define DO_ENABLE_CACHE
 
 static void jmr3927_board_init(void);
 
@@ -77,11 +76,6 @@ static void __init jmr3927_mem_setup(void)
        /* cache setup */
        {
                unsigned int conf;
-#ifdef DO_ENABLE_CACHE
-               int mips_ic_disable = 0, mips_dc_disable = 0;
-#else
-               int mips_ic_disable = 1, mips_dc_disable = 1;
-#endif
 #ifdef DO_WRITE_THROUGH
                int mips_config_cwfon = 0;
                int mips_config_wbon = 0;
@@ -91,10 +85,7 @@ static void __init jmr3927_mem_setup(void)
 #endif
 
                conf = read_c0_conf();
-               conf &= ~(TX39_CONF_ICE | TX39_CONF_DCE |
-                         TX39_CONF_WBON | TX39_CONF_CWFON);
-               conf |= mips_ic_disable ? 0 : TX39_CONF_ICE;
-               conf |= mips_dc_disable ? 0 : TX39_CONF_DCE;
+               conf &= ~(TX39_CONF_WBON | TX39_CONF_CWFON);
                conf |= mips_config_wbon ? TX39_CONF_WBON : 0;
                conf |= mips_config_cwfon ? TX39_CONF_CWFON : 0;
 
@@ -199,11 +190,20 @@ static void __init jmr3927_rtc_init(void)
        platform_device_register_simple("rtc-ds1742", -1, &res, 1);
 }
 
+static void __init jmr3927_mtd_init(void)
+{
+       int i;
+
+       for (i = 0; i < 2; i++)
+               tx3927_mtd_init(i);
+}
+
 static void __init jmr3927_device_init(void)
 {
        __swizzle_addr_b = jmr3927_swizzle_addr_b;
        jmr3927_rtc_init();
        tx3927_wdt_init();
+       jmr3927_mtd_init();
 }
 
 struct txx9_board_vec jmr3927_vec __initdata = {