diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-08-18 16:45:26 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-08-20 11:45:30 +0200 |
| commit | e54fafbb6ac87dfb8587748ca592c5efed5158f2 (patch) | |
| tree | c79ed1bcc9600ae46ca97cf4c59fa869cb1dddbf | |
| parent | d518ee721d4f1cd35c913c17bf9f89a84532f37e (diff) | |
stmpe-adc: enable it for Colibri/Apalis iMX6
imx6qdl-apalis.dtsi: enable stmpe-adc in device tree
defconfig: add stmpe-adc to minimal defconfig
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 3c809132db51..f6e7ab6ef259 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -364,7 +364,7 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; - stmpe_touchscreen { + stmpe_touchscreen { compatible = "st,stmpe-ts"; reg = <0>; /* 3.25 MHz ADC clock speed */ @@ -389,6 +389,17 @@ /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + stmpe_adc { + compatible = "st,stmpe-adc"; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + }; }; }; diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 5396a8a5ade8..0a172acf67bc 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -149,7 +149,6 @@ CONFIG_TOUCHSCREEN_STMPE=y CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y -CONFIG_MFD_STMPE=y CONFIG_SERIO_SERPORT=m CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y @@ -202,7 +201,6 @@ CONFIG_MXC_TVIN_ADV7180=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_SOC_CAMERA=y -CONFIG_VIDEO_MX3=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_DVB_AU8522_V4L is not set # CONFIG_DVB_TUNER_DIB0070 is not set @@ -276,7 +274,6 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y -CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_RTC_CLASS=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_DRV_DS1307=y @@ -286,10 +283,10 @@ CONFIG_DMADEVICES=y CONFIG_MXC_PXP_V2=y CONFIG_IMX_SDMA=y CONFIG_STAGING=y +CONFIG_STMPE_ADC=y CONFIG_COMMON_CLK_DEBUG=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y -CONFIG_STMPE_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index 2e4ef92bbcc8..4eb88176c330 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -274,10 +274,10 @@ CONFIG_DMADEVICES=y CONFIG_MXC_PXP_V2=y CONFIG_IMX_SDMA=y CONFIG_STAGING=y +CONFIG_STMPE_ADC=y CONFIG_COMMON_CLK_DEBUG=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y -CONFIG_STMPE_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT2_FS=y |