[xburst] Add per board struct describing the external clock setup.

[openwrt/svn-archive/archive.git] / target / linux / xburst / files-2.6.32 / arch / mips / jz4740 / board-qi_lb60.c

diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c
index 249d4c5fd5d2eed6f0bb582304967fb44a1a1f4d..bf0863626bf0edd44e5d479546d6ec3bdf31b545 100644 (file)
--- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c
+++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c
@@ -31,6 +31,7 @@
 #include <linux/power/gpio-charger.h>
 #include <linux/mmc/jz4740_mmc.h>
 
+#include "clock.h"
 
 /* NAND */
 static struct nand_ecclayout qi_lb60_ecclayout_1gb = {
@@ -118,7 +119,6 @@ static struct jz_nand_platform_data qi_lb60_nand_pdata = {
        .busy_gpio = 94,
 };
 
-
 /* Keyboard*/
 
 /* #define KEEP_UART_ALIVE
@@ -387,12 +387,18 @@ static int __init qi_lb60_init_platform_devices(void)
                                        ARRAY_SIZE(jz_platform_devices));
 
 }
+
+struct jz4740_clock_board_data jz4740_clock_bdata = {
+       .ext_rate = 12000000,
+       .rtc_rate = 32768,
+};
+
 extern int jz_gpiolib_init(void);
-extern int jz_init_clocks(unsigned long extal);
 
 static __init int board_avt2(char *str)
 {
        qi_lb60_mmc_pdata.card_detect_active_low = 1;
+       qi_lb60_mmc_pdata.power_active_low      = 1;
 
        return 1;
 }
@@ -404,8 +410,8 @@ static int __init qi_lb60_board_setup(void)
        printk("Qi Hardware JZ4740 QI_LB60 setup\n");
        if (jz_gpiolib_init())
                panic("Failed to initalize jz gpio\n");
-       jz_init_clocks(12000000);
 
+       jz_init_clocks();
        board_gpio_setup();
 
        if (qi_lb60_init_platform_devices())