mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 04:23:35 +02:00
ARM: dts: imx6: rename touch screen's node name to touchscreen
Rename touch to touchscreen.
Rename stmpe_touchscreen to touchscreen.
Rename stmpe_adc to adc.
Fix below CHECK_DTBS warning:
arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dtb: touch@48 (ti,tsc2004): 'wakeup-gpios' does not match any of the regexes: '^pinctrl-[0-9]+$'
from schema $id: http://devicetree.org/schemas/input/touchscreen/ti,tsc2005.yaml#
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
parent
f0b7393621
commit
5058aa3d4d
|
|
@ -47,7 +47,7 @@ touchscreen@41 {
|
|||
interrupt-parent = <&gpio7>;
|
||||
irq-trigger = <0x1>;
|
||||
|
||||
stmpe_touchscreen {
|
||||
touchscreen {
|
||||
compatible = "st,stmpe-ts";
|
||||
st,sample-time = <4>;
|
||||
st,mod-12b = <1>;
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ touch: stmpe811@44 {
|
|||
vio-supply = <®_3p3v>;
|
||||
vcc-supply = <®_3p3v>;
|
||||
|
||||
stmpe_touchscreen {
|
||||
touchscreen {
|
||||
compatible = "st,stmpe-ts";
|
||||
st,sample-time = <4>;
|
||||
st,mod-12b = <1>;
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ stmpe811@41 {
|
|||
/* ADC conversion time: 80 clocks */
|
||||
st,sample-time = <4>;
|
||||
|
||||
stmpe_ts: stmpe_touchscreen {
|
||||
stmpe_ts: touchscreen {
|
||||
compatible = "st,stmpe-ts";
|
||||
/* 8 sample average control */
|
||||
st,ave-ctrl = <3>;
|
||||
|
|
@ -665,7 +665,7 @@ stmpe_ts: stmpe_touchscreen {
|
|||
st,touch-det-delay = <5>;
|
||||
};
|
||||
|
||||
stmpe_adc: stmpe_adc {
|
||||
stmpe_adc: adc {
|
||||
compatible = "st,stmpe-adc";
|
||||
#io-channel-cells = <1>;
|
||||
/* forbid to use ADC channels 3-0 (touch) */
|
||||
|
|
|
|||
|
|
@ -572,7 +572,7 @@ stmpe811@41 {
|
|||
/* ADC converstion time: 80 clocks */
|
||||
st,sample-time = <4>;
|
||||
|
||||
stmpe_ts: stmpe_touchscreen {
|
||||
stmpe_ts: touchscreen {
|
||||
compatible = "st,stmpe-ts";
|
||||
/* 8 sample average control */
|
||||
st,ave-ctrl = <3>;
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ stmpe: touchctrl@44 {
|
|||
interrupts = <12 IRQ_TYPE_NONE>;
|
||||
status = "disabled";
|
||||
|
||||
stmpe_touchscreen {
|
||||
touchscreen {
|
||||
compatible = "st,stmpe-ts";
|
||||
st,sample-time = <4>;
|
||||
st,mod-12b = <1>;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ stmpe: touchscreen@44 {
|
|||
wakeup-source;
|
||||
status = "disabled";
|
||||
|
||||
stmpe_touchscreen {
|
||||
touchscreen {
|
||||
compatible = "st,stmpe-ts";
|
||||
st,sample-time = <4>;
|
||||
st,mod-12b = <1>;
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ &i2c3 {
|
|||
pinctrl-0 = <&pinctrl_i2c3>;
|
||||
status = "okay";
|
||||
|
||||
touch@48 {
|
||||
touchscreen@48 {
|
||||
compatible = "ti,tsc2004";
|
||||
reg = <0x48>;
|
||||
pinctrl-names = "default";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user