diff options
| author | Sanchayan Maity <maitysanchayan@gmail.com> | 2015-08-07 12:36:20 +0530 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-08-07 15:28:54 +0200 |
| commit | 094cd6dca1eef30766a1c7265550e51f96029bc5 (patch) | |
| tree | b93eeeb9bb138025a3ad47d9269ce036a58b6882 /arch | |
| parent | d79071b433ab0e3b426f2f480eed506856aaf0d0 (diff) | |
ARM: dts: vf500-colibri: Fix pin multiplexing of touchscreen pins
Remove the pen detect pull up gpio entry from the DT node and fix
it's pin multiplexing. Pen detect pull up pin was specified as an
input which resulted in continuous interrupts on the pen irq line
due to toggling on switching from irq detection to measurement
mode.
While at it also fix the pinmux of ADC pins as per the recommended
settings in TRM and remove the unnecessary pullup for the GPIO for
FET gate drivers.
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/vf500-colibri.dtsi | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/vf500-colibri.dtsi b/arch/arm/boot/dts/vf500-colibri.dtsi index 4807a3276d1a..fe733e52bccd 100644 --- a/arch/arm/boot/dts/vf500-colibri.dtsi +++ b/arch/arm/boot/dts/vf500-colibri.dtsi @@ -27,7 +27,6 @@ yp-gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; ym-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; pen-detect-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; - pen-pullup-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; pinctrl-names = "idle","default","gpios"; pinctrl-0 = <&pinctrl_touchctrl_idle>; pinctrl-1 = <&pinctrl_touchctrl_default>; @@ -40,26 +39,26 @@ vf610-colibri { pinctrl_touchctrl_idle: touchctrl_idle { fsl,pins = < - VF610_PAD_PTA18__GPIO_8 0x206d - VF610_PAD_PTA19__GPIO_9 0x206d + VF610_PAD_PTA18__GPIO_8 0x006d + VF610_PAD_PTA19__GPIO_9 0x006c >; }; pinctrl_touchctrl_default: touchctrl_default { fsl,pins = < - VF610_PAD_PTA18__ADC0_SE0 0x2060 - VF610_PAD_PTA19__ADC0_SE1 0x2060 - VF610_PAD_PTA16__ADC1_SE0 0x2060 - VF610_PAD_PTB2__ADC1_SE2 0x2060 + VF610_PAD_PTA18__ADC0_SE0 0x0040 + VF610_PAD_PTA19__ADC0_SE1 0x0040 + VF610_PAD_PTA16__ADC1_SE0 0x0040 + VF610_PAD_PTB2__ADC1_SE2 0x0040 >; }; pinctrl_touchctrl_gpios: touchctrl_gpios { fsl,pins = < - VF610_PAD_PTA23__GPIO_13 0x22ed - VF610_PAD_PTB23__GPIO_93 0x22ed - VF610_PAD_PTA22__GPIO_12 0x22ed - VF610_PAD_PTA11__GPIO_4 0x22ed + VF610_PAD_PTA23__GPIO_13 0x22e9 + VF610_PAD_PTB23__GPIO_93 0x22e9 + VF610_PAD_PTA22__GPIO_12 0x22e9 + VF610_PAD_PTA11__GPIO_4 0x22e9 >; }; }; |