From 524e26f6ff8438cba0f9da6b811d948a851c4972 Mon Sep 17 00:00:00 2001 From: cwz Date: Wed, 13 Apr 2011 19:20:19 -0700 Subject: [PATCH] update fih board from sdk, add uart 3, pll and so on --- arch/arm/mach-rk29/board-rk29-fih.c | 5 ++++- drivers/mfd/tps65910-core.c | 35 ++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c index f796e1dd7b3f..988235071609 100755 --- a/arch/arm/mach-rk29/board-rk29-fih.c +++ b/arch/arm/mach-rk29/board-rk29-fih.c @@ -1907,6 +1907,9 @@ static struct platform_device *devices[] __initdata = { #ifdef CONFIG_UART2_RK29 &rk29_device_uart2, #endif +#ifdef CONFIG_UART3_RK29 + &rk29_device_uart3, +#endif #ifdef CONFIG_RK29_PWM_REGULATOR &rk29_device_pwm_regulator, @@ -2309,7 +2312,7 @@ static void __init machine_rk29_mapio(void) rk29_map_common_io(); rk29_setup_early_printk(); rk29_sram_init(); - rk29_clock_init(periph_pll_288mhz); + rk29_clock_init(periph_pll_300mhz); rk29_iomux_init(); } diff --git a/drivers/mfd/tps65910-core.c b/drivers/mfd/tps65910-core.c index 493e1b4fef78..4b26df95e8e5 100644 --- a/drivers/mfd/tps65910-core.c +++ b/drivers/mfd/tps65910-core.c @@ -728,14 +728,43 @@ static int proc_tps65910_show(struct seq_file *s, void *v) { struct regulator *vldo; - vldo = regulator_get(NULL, "vmmc"); - if (vldo > NULL) + vldo = regulator_get(NULL, "vaux1"); + if (!IS_ERR(vldo)) { - seq_printf(s, "Disable VMMC.\n"); + seq_printf(s, "Disable VAUX1.\n"); + regulator_disable(vldo); + } + + vldo = regulator_get(NULL, "vdig1"); + if (!IS_ERR(vldo)) + { + seq_printf(s, "Disable VDIG1.\n"); + regulator_disable(vldo); + } + + vldo = regulator_get(NULL, "vdig2"); + if (!IS_ERR(vldo)) + { + seq_printf(s, "Disable VDIG2.\n"); + regulator_disable(vldo); + } + + vldo = regulator_get(NULL, "vdac"); + if (!IS_ERR(vldo)) + { + seq_printf(s, "Disable VDAC.\n"); + regulator_disable(vldo); + } + + vldo = regulator_get(NULL, "vaux2"); + if (!IS_ERR(vldo)) + { + seq_printf(s, "Disable VAUX2.\n"); regulator_disable(vldo); } } #endif + return 0; } -- 2.34.1