From 706a2c6f2626b05255a744601d5ffac110ffd2c7 Mon Sep 17 00:00:00 2001 From: hjc Date: Fri, 9 Aug 2013 10:25:03 +0800 Subject: [PATCH] rk3028a_86v: defconfig add usb charge and gsensor ic gs_lsm303d --- arch/arm/configs/rk3028a_86v_defconfig | 3 +++ arch/arm/mach-rk3026/board-rk3028a-86v.c | 30 +++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/rk3028a_86v_defconfig b/arch/arm/configs/rk3028a_86v_defconfig index 401b7a60d05d..5fd5f9cae0fc 100644 --- a/arch/arm/configs/rk3028a_86v_defconfig +++ b/arch/arm/configs/rk3028a_86v_defconfig @@ -24,6 +24,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_ARCH_RK3026=y CONFIG_DDR_FREQ=y # CONFIG_DDR_TEST is not set +CONFIG_RK_CLOCK_PROC=y CONFIG_RK_USB_UART=y CONFIG_MACH_RK3028A_86V=y CONFIG_ARM_ERRATA_761320=y @@ -251,6 +252,7 @@ CONFIG_GS_LIS3DH=y CONFIG_SENSOR_DEVICE=y CONFIG_GSENSOR_DEVICE=y CONFIG_GS_MXC6225=y +CONFIG_GS_LSM303D=y # CONFIG_SERIO is not set # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set @@ -274,6 +276,7 @@ CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0 CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_RK30_ADC_FAC=y CONFIG_BATTERY_RK30_AC_CHARGE=y +CONFIG_BATTERY_RK30_USB_CHARGE=y CONFIG_BATTERY_RK30_VOL3V8=y # CONFIG_HWMON is not set CONFIG_MFD_TPS65910=y diff --git a/arch/arm/mach-rk3026/board-rk3028a-86v.c b/arch/arm/mach-rk3026/board-rk3028a-86v.c index 5185366fb972..1b02dbacf796 100755 --- a/arch/arm/mach-rk3026/board-rk3028a-86v.c +++ b/arch/arm/mach-rk3026/board-rk3028a-86v.c @@ -456,6 +456,7 @@ static int rk_platform_add_display_devices(void) /*********************************************************** * gsensor ************************************************************/ +// mma 8452 gsensor #if defined (CONFIG_GS_MMA8452) #define MMA8452_INT_PIN GS_INT_PIN static int mma8452_init_platform_hw(void) @@ -472,6 +473,24 @@ static struct sensor_platform_data mma8452_info = { }; #endif +// lsm303d gsensor +#if defined (CONFIG_GS_LSM303D) +#define LSM303D_INT_PIN GS_INT_PIN +static int lms303d_init_platform_hw(void) +{ + return 0; +} + +static struct sensor_platform_data lms303d_info = { + .type = SENSOR_TYPE_ACCEL, + .irq_enable = 1, + .poll_delay_ms = 30, + .init_platform_hw = lms303d_init_platform_hw, + .orientation = {-1, 0, 0, 0, -1, 0, 0, 0, 1}, +}; +#endif + + /*MMA7660 gsensor*/ #if defined (CONFIG_GS_MMA7660) #define MMA7660_INT_PIN GS_INT_PIN @@ -907,7 +926,7 @@ static struct rk30_adc_battery_platform_data rk30_adc_battery_platdata = { .dc_det_level = GPIO_LOW, .charge_ok_level = GPIO_HIGH, - .reference_voltage = 1800, // the rK2928 is 3300;RK3066 and rk29 are 2500;rk3066B is 1800; + .reference_voltage = 3300, // the rK2928 is 3300;RK3066 and rk29 are 2500;rk3066B is 1800; .pull_up_res = 200, //divider resistance , pull-up resistor .pull_down_res = 120, //divider resistance , pull-down resistor @@ -1407,6 +1426,15 @@ static struct i2c_board_info __initdata i2c1_info[] = { .platform_data = &lis3dh_info, }, #endif +#if defined (CONFIG_GS_LSM303D) + { + .type = "gs_lsm303d", + .addr = 0x1d, //0x19(SA0-->VCC), 0x18(SA0-->GND) + .flags = 0, + .irq = LSM303D_INT_PIN, + .platform_data = &lms303d_info, + }, +#endif #if defined (CONFIG_COMPASS_AK8975) { .type = "ak8975", -- 2.34.1