Commit d0d7c584 authored by Jonathan Cameron's avatar Jonathan Cameron

Merge branch 'ib-5.8-jz47xx-ts' into HEAD

Immutable branch may be needed in input for a joystick set that is
dependent on it.
parents 8525df47 b96952f4
...@@ -500,6 +500,7 @@ config INA2XX_ADC ...@@ -500,6 +500,7 @@ config INA2XX_ADC
config INGENIC_ADC config INGENIC_ADC
tristate "Ingenic JZ47xx SoCs ADC driver" tristate "Ingenic JZ47xx SoCs ADC driver"
depends on MIPS || COMPILE_TEST depends on MIPS || COMPILE_TEST
select IIO_BUFFER
help help
Say yes here to build support for the Ingenic JZ47xx SoCs ADC unit. Say yes here to build support for the Ingenic JZ47xx SoCs ADC unit.
......
This diff is collapsed.
...@@ -7,5 +7,11 @@ ...@@ -7,5 +7,11 @@
#define INGENIC_ADC_AUX 0 #define INGENIC_ADC_AUX 0
#define INGENIC_ADC_BATTERY 1 #define INGENIC_ADC_BATTERY 1
#define INGENIC_ADC_AUX2 2 #define INGENIC_ADC_AUX2 2
#define INGENIC_ADC_TOUCH_XP 3
#define INGENIC_ADC_TOUCH_YP 4
#define INGENIC_ADC_TOUCH_XN 5
#define INGENIC_ADC_TOUCH_YN 6
#define INGENIC_ADC_TOUCH_XD 7
#define INGENIC_ADC_TOUCH_YD 8
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment