diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2014-08-27 02:03:38 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:16:23 +0100 |
| commit | 3f308c4a4d4c1d3bbee8cd889ea32f7d98a287f9 (patch) | |
| tree | 101ea619cc9fa49863b91cb21975d3cc824f05fe | |
| parent | 3ee4b71fea62abd932b5ff35fd1faf1fa4244b7c (diff) | |
| download | kernel_samsung_tuna-3f308c4a4d4c1d3bbee8cd889ea32f7d98a287f9.tar.gz kernel_samsung_tuna-3f308c4a4d4c1d3bbee8cd889ea32f7d98a287f9.tar.bz2 kernel_samsung_tuna-3f308c4a4d4c1d3bbee8cd889ea32f7d98a287f9.zip | |
tuna: Add ability to switch between the different TWL GPADC/MADC stuff.
| -rw-r--r--[-rwxr-xr-x] | arch/arm/mach-omap2/board-tuna-jack.c | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | arch/arm/mach-omap2/board-tuna-power.c | 20 | ||||
| -rw-r--r--[-rwxr-xr-x] | arch/arm/mach-omap2/board-tuna-sensors.c | 13 |
3 files changed, 48 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-tuna-jack.c b/arch/arm/mach-omap2/board-tuna-jack.c index 4445cf6ba4f..dfd183b5c6f 100755..100644 --- a/arch/arm/mach-omap2/board-tuna-jack.c +++ b/arch/arm/mach-omap2/board-tuna-jack.c @@ -20,7 +20,15 @@ #include <linux/platform_device.h> #include <linux/gpio.h> #include <linux/input.h> + +#if defined(CONFIG_TWL6030_GPADC) #include <linux/i2c/twl6030-gpadc.h> +#elif defined(CONFIG_TWL4030_MADC) +#include <linux/i2c/twl4030-madc.h> +#else /* CONFIG_TWL6030_MADC */ +#include <linux/i2c/twl6030-madc.h> +#endif + #include <linux/sec_jack.h> #include "mux.h" @@ -111,7 +119,13 @@ static int sec_jack_get_adc_value(void) { int value; - value = twl6030_get_gpadc_conversion(ADC_CHANNEL_JACK); +#if defined(CONFIG_TWL6030_GPADC) + value = twl6030_get_gpadc_conversion(ADC_CHANNEL_JACK); +#elif defined(CONFIG_TWL4030_MADC) + value = twl4030_get_madc_conversion(ADC_CHANNEL_JACK); +#else /* CONFIG_TWL6030_MADC */ + value = twl6030_get_madc_conversion(ADC_CHANNEL_JACK); +#endif 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 9a5a7434467..255bf5229d6 100755..100644 --- a/arch/arm/mach-omap2/board-tuna-power.c +++ b/arch/arm/mach-omap2/board-tuna-power.c @@ -22,7 +22,15 @@ #include <linux/moduleparam.h> #include <linux/pda_power.h> #include <linux/platform_device.h> + +#if defined(CONFIG_TWL6030_GPADC) #include <linux/i2c/twl6030-gpadc.h> +#elif defined(CONFIG_TWL4030_MADC) +#include <linux/i2c/twl4030-madc.h> +#else /* CONFIG_TWL6030_MADC */ +#include <linux/i2c/twl6030-madc.h> +#endif + #include <linux/delay.h> #include <plat/cpu.h> @@ -263,11 +271,23 @@ static int twl6030_get_adc_data(int ch) int i, j; for (i = 0; i < ADC_NUM_SAMPLES; i++) { +#if defined(CONFIG_TWL6030_GPADC) adc_data = twl6030_get_gpadc_conversion(ch); +#elif defined(CONFIG_TWL4030_MADC) + adc_data = twl4030_get_madc_conversion(ch); +#else /* CONFIG_TWL6030_MADC */ + adc_data = twl6030_get_madc_conversion(ch); +#endif if (adc_data == -EAGAIN) { for (j = 0; j < ADC_LIMIT_ERR_COUNT; j++) { msleep(20); +#if defined(CONFIG_TWL6030_GPADC) adc_data = twl6030_get_gpadc_conversion(ch); +#elif defined(CONFIG_TWL4030_MADC) + adc_data = twl4030_get_madc_conversion(ch); +#else /* CONFIG_TWL6030_MADC */ + adc_data = twl6030_get_madc_conversion(ch); +#endif 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 69adc3132a3..0dfb0477121 100755..100644 --- a/arch/arm/mach-omap2/board-tuna-sensors.c +++ b/arch/arm/mach-omap2/board-tuna-sensors.c @@ -17,7 +17,14 @@ #include <linux/i2c.h> #include <linux/mpu.h> #include <linux/gp2a.h> + +#if defined(CONFIG_TWL6030_GPADC) #include <linux/i2c/twl6030-gpadc.h> +#elif defined(CONFIG_TWL4030_MADC) +#include <linux/i2c/twl4030-madc.h> +#else /* CONFIG_TWL6030_MADC */ +#include <linux/i2c/twl6030-madc.h> +#endif #include "mux.h" #include "board-tuna.h" @@ -33,7 +40,13 @@ static int gp2a_light_adc_value(void) { +#if defined(CONFIG_TWL6030_GPADC) return twl6030_get_gpadc_conversion(GP2A_LIGHT_ADC_CHANNEL); +#elif defined(CONFIG_TWL4030_MADC) + return twl4030_get_madc_conversion(GP2A_LIGHT_ADC_CHANNEL); +#else /* CONFIG_TWL6030_MADC */ + return twl6030_get_madc_conversion(GP2A_LIGHT_ADC_CHANNEL); +#endif } static void gp2a_power(bool on) |