* Marek Belisko <marek@xxxxxxxxxxxxx> [140930 13:19]: > Adding min/max values for various touschscreen properties. Assuming no other comments on this patch series, this should be safe to merge along with the other patches in this series without causing merge conflicts: Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > Signed-off-by: Marek Belisko <marek@xxxxxxxxxxxxx> > --- > arch/arm/boot/dts/omap3-gta04.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi > index fd34f91..2dafac3b 100644 > --- a/arch/arm/boot/dts/omap3-gta04.dtsi > +++ b/arch/arm/boot/dts/omap3-gta04.dtsi > @@ -284,6 +284,12 @@ > interrupts = <0 IRQ_TYPE_EDGE_FALLING>; > gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; > ti,x-plate-ohms = <600>; > + ti,min-x = <0x100>; > + ti,max-x = <0xf00>; > + ti,min-y = <0xf00>; > + ti,max-y = <0x100>; > + ti,min-rt = <0xfff>; > + ti,max-rt = <0>; > }; > }; > > -- > 1.9.3 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html