[PATCH v2 6/8] drivers:input:ads7846(+tsc2046): recognise old binding for coordinate flipping

From	"H. Nikolaus Schaller" <hns@goldelico.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 6/8] drivers:input:ads7846(+tsc2046): recognise old binding for coordinate flipping
Date	2015-11-13 21:40 +0100
Message-ID	<qutiy-2JT-13@gated-at.bofh.it> (permalink)
References	<qutix-2JT-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

By this patch we still recognise the old binding ti,swap-xy in parallel to
the common binding touchscreen-swapped-x-y. This keeps compatibility
to older (out-of-tree) device tree binaries.

We do this in a separate patch so that it can be easily reverted in the
future to retire the old API. A notice is printed to remind developers
of using old API.

We also fix the bindings name for all in-tree device tree sources in
a separate patch.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 drivers/input/touchscreen/ads7846.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 4525f00..b9896fd 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -1259,7 +1259,11 @@ static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev)
 	of_property_read_u16(node, "ti,vref-mv", &pdata->vref_mv);
 	pdata->keep_vref_on = of_property_read_bool(node, "ti,keep-vref-on");
 
-	pdata->swap_xy = of_property_read_bool(node, "touchscreen-swapped-x-y");
+	pdata->swap_xy = of_property_read_bool(node, "ti,swap-xy");
+	if (pdata->swap_xy)
+		dev_notice(dev, "please update device tree to use touchscreen-swapped-x-y");
+	pdata->swap_xy |= of_property_read_bool(node,
+						"touchscreen-swapped-x-y");
 
 	of_property_read_u16(node, "ti,settle-delay-usec",
 			     &pdata->settle_delay_usecs);
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH v2 0/8] drivers: touchscreen: tsc2007 and ads7846/tsc2046 improvements (use common touchscreen bindings, pre-calibration, spi fix and provide iio raw values) "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
  [PATCH v2 2/8] drivers:input:tsc2007: send pendown and penup only once like ads7846(+tsc2046) driver does "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
  [PATCH v2 6/8] drivers:input:ads7846(+tsc2046): recognise old binding for coordinate flipping "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
    Re: [PATCH v2 6/8] drivers:input:ads7846(+tsc2046): recognise old  binding for coordinate flipping Rob Herring <robh+dt@kernel.org> - 2015-11-15 03:20 +0100
      Re: [PATCH v2 6/8] drivers:input:ads7846(+tsc2046): recognise old binding for coordinate flipping "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-15 12:00 +0100
  [PATCH v2 3/8] drivers:input:tsc2007: add iio interface to read external ADC input, temperature and raw conversion values "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
  [PATCH v2 4/8] DT:omap3+tsc2007: use new common touchscreen bindings "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
  [PATCH v2 8/8] DT:omap3+ads7846: use new common touchscreen bindings "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
  [PATCH v2 5/8] drivers:input:ads7846(+tsc2046): add new common binding names, pre-calibration and flipping "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
    Re: [PATCH v2 5/8] drivers:input:ads7846(+tsc2046): add new common  binding names, pre-calibration and flipping Sebastian Reichel <sre@kernel.org> - 2015-11-13 23:40 +0100
  [PATCH v2 1/8] drivers:input:tsc2007: add new common binding names, pre-calibration, flipping and rotation "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-13 21:40 +0100
    Re: [PATCH v2 1/8] drivers:input:tsc2007: add new common binding  names, pre-calibration, flipping and rotation Rob Herring <robh@kernel.org> - 2015-11-15 03:20 +0100
      Re: [PATCH v2 1/8] drivers:input:tsc2007: add new common binding names, pre-calibration, flipping and rotation "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-11-15 12:40 +0100

csiph-web