diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-07-01 08:07:09 +0200 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 13:00:35 +0200 |
| commit | 47e4253d173ecd41bcfedcfe5e03b3193b42540a (patch) | |
| tree | 2e23b7ffa4ab5afb9971e843333d3302a7d20399 /arch/arm/mach-omap2 | |
| parent | b315c820b8373cc503f06a71bfb252551398eb1b (diff) | |
| download | kernel_samsung_tuna-47e4253d173ecd41bcfedcfe5e03b3193b42540a.zip kernel_samsung_tuna-47e4253d173ecd41bcfedcfe5e03b3193b42540a.tar.gz kernel_samsung_tuna-47e4253d173ecd41bcfedcfe5e03b3193b42540a.tar.bz2 | |
tuna: use twl6030 gpadc methods
Diffstat (limited to 'arch/arm/mach-omap2')
| -rwxr-xr-x[-rw-r--r--] | arch/arm/mach-omap2/board-tuna-jack.c | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | arch/arm/mach-omap2/board-tuna-power.c | 6 | ||||
| -rwxr-xr-x | arch/arm/mach-omap2/board-tuna-sensors.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-tuna-jack.c b/arch/arm/mach-omap2/board-tuna-jack.c index d3dc6ac..4445cf6 100644..100755 --- a/arch/arm/mach-omap2/board-tuna-jack.c +++ b/arch/arm/mach-omap2/board-tuna-jack.c @@ -20,7 +20,7 @@ #include <linux/platform_device.h> #include <linux/gpio.h> #include <linux/input.h> -#include <linux/i2c/twl6030-madc.h> +#include <linux/i2c/twl6030-gpadc.h> #include <linux/sec_jack.h> #include "mux.h" @@ -111,7 +111,7 @@ static int sec_jack_get_adc_value(void) { int value; - value = twl6030_get_madc_conversion(ADC_CHANNEL_JACK); + value = twl6030_get_gpadc_conversion(ADC_CHANNEL_JACK); return (int)(1800*value) / 1024; } diff --git a/arch/arm/mach-omap2/board-tuna-power.c b/arch/arm/mach-omap2/board-tuna-power.c index 53a6338..9a5a743 100644..100755 --- a/arch/arm/mach-omap2/board-tuna-power.c +++ b/arch/arm/mach-omap2/board-tuna-power.c @@ -22,7 +22,7 @@ #include <linux/moduleparam.h> #include <linux/pda_power.h> #include <linux/platform_device.h> -#include <linux/i2c/twl6030-madc.h> +#include <linux/i2c/twl6030-gpadc.h> #include <linux/delay.h> #include <plat/cpu.h> @@ -263,11 +263,11 @@ static int twl6030_get_adc_data(int ch) int i, j; for (i = 0; i < ADC_NUM_SAMPLES; i++) { - adc_data = twl6030_get_madc_conversion(ch); + adc_data = twl6030_get_gpadc_conversion(ch); if (adc_data == -EAGAIN) { for (j = 0; j < ADC_LIMIT_ERR_COUNT; j++) { msleep(20); - adc_data = twl6030_get_madc_conversion(ch); + adc_data = twl6030_get_gpadc_conversion(ch); if (adc_data > 0) break; } diff --git a/arch/arm/mach-omap2/board-tuna-sensors.c b/arch/arm/mach-omap2/board-tuna-sensors.c index f818aad..dcb8374 100755 --- a/arch/arm/mach-omap2/board-tuna-sensors.c +++ b/arch/arm/mach-omap2/board-tuna-sensors.c @@ -17,7 +17,7 @@ #include <linux/i2c.h> #include <linux/mpu.h> #include <linux/gp2a.h> -#include <linux/i2c/twl6030-madc.h> +#include <linux/i2c/twl6030-gpadc.h> #include "mux.h" #include "board-tuna.h" @@ -33,7 +33,7 @@ static int gp2a_light_adc_value(void) { - return twl6030_get_madc_conversion(GP2A_LIGHT_ADC_CHANNEL); + return twl6030_get_gpadc_conversion(GP2A_LIGHT_ADC_CHANNEL); } static void gp2a_power(bool on) |