From: kfx Date: Tue, 23 Oct 2012 10:45:47 +0000 (+0800) Subject: rk2928 tb: fixed power_on gpio X-Git-Tag: firefly_0821_release~8333 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5e639842ab42ba2f4ed236b21ce31ecf8539c383;p=firefly-linux-kernel-4.4.55.git rk2928 tb: fixed power_on gpio --- diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk-tps65910.c b/arch/arm/mach-rk2928/board-rk2928-sdk-tps65910.c index 7980ac0fa979..514a08475c88 100755 --- a/arch/arm/mach-rk2928/board-rk2928-sdk-tps65910.c +++ b/arch/arm/mach-rk2928/board-rk2928-sdk-tps65910.c @@ -72,7 +72,7 @@ int tps65910_pre_init(struct tps65910 *tps65910){ printk(KERN_ERR "sram_gpio_init failed\n"); return -EINVAL; } - if(port_output_init(pmic_slp, 1, "pmic_slp") < 0){ + if(port_output_init(pmic_slp, 0, "pmic_slp") < 0){ printk(KERN_ERR "port_output_init failed\n"); return -EINVAL; } diff --git a/arch/arm/mach-rk2928/board-rk2928-tb.c b/arch/arm/mach-rk2928/board-rk2928-tb.c index 4a006bcce05c..4ae4a99785fb 100755 --- a/arch/arm/mach-rk2928/board-rk2928-tb.c +++ b/arch/arm/mach-rk2928/board-rk2928-tb.c @@ -916,7 +916,7 @@ static void __init rk30_i2c_register_board_info(void) } //end of i2c #if defined (CONFIG_MACH_RK2928_TB) -#define POWER_ON_PIN RK2928_PIN3_PC5 //power_hold +#define POWER_ON_PIN RK2928_PIN1_PB4 //power_hold #elif defined (CONFIG_MACH_RK2926_TB) #define POWER_ON_PIN RK2928_PIN1_PA2 //power_hold #endif diff --git a/arch/arm/mach-rk2928/include/mach/config.h b/arch/arm/mach-rk2928/include/mach/config.h index 4bc3eb244905..9b7aa3b29dd3 100644 --- a/arch/arm/mach-rk2928/include/mach/config.h +++ b/arch/arm/mach-rk2928/include/mach/config.h @@ -3,8 +3,8 @@ #include //#define RK2926_TB_DEFAULT_CONFIG -//#define RK2928_TB_DEFAULT_CONFIG -#define RK2926_SDK_DEFAULT_CONFIG +#define RK2928_TB_DEFAULT_CONFIG +//#define RK2926_SDK_DEFAULT_CONFIG //#define RK2928_SDK_DEFAULT_CONFIG enum { @@ -216,7 +216,7 @@ enum { /* global */ enum { - DEF_PWR_ON = 0x000003c5, + DEF_PWR_ON = 0x000001b4, }; /**************************** rk2926 sdk(m713) ******************************/