Switch over to using software nodes/properties to describe the
touchscreen instead of using the legacy platform data. This will
allow to drop support for the platform data from tsc2007 driver
and rely solely on the generic driver properties.

Note: "model" is not part of defined device propertioes and is not
used by the tsc2007 driver, so it can be safely dropped.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/mfd/timberdale.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 07e5aa10a146..2fb8e850a81e 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/mfd/core.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 
 #include <linux/timb_gpio.h>
@@ -25,7 +26,6 @@
 #include <linux/spi/max7301.h>
 #include <linux/spi/mc33880.h>
 
-#include <linux/platform_data/tsc2007.h>
 #include <linux/platform_data/media/timb_radio.h>
 #include <linux/platform_data/media/timb_video.h>
 
@@ -49,16 +49,21 @@ struct timberdale_device {
 
 /*--------------------------------------------------------------------------*/
 
-static struct tsc2007_platform_data timberdale_tsc2007_platform_data = {
-	.model = 2003,
-	.x_plate_ohms = 100
+static const struct property_entry timberdale_tsc2007_properties[] = {
+	PROPERTY_ENTRY_U32("ti,x-plate-ohms", 100),
+	{ }
+};
+
+static const struct software_node timberdale_tsc2007_node = {
+	.name = "tsc2007",
+	.properties = timberdale_tsc2007_properties,
 };
 
 static struct i2c_board_info timberdale_i2c_board_info[] = {
 	{
 		I2C_BOARD_INFO("tsc2007", 0x48),
-		.platform_data = &timberdale_tsc2007_platform_data,
-		.irq = IRQ_TIMBERDALE_TSC_INT
+		.irq = IRQ_TIMBERDALE_TSC_INT,
+		.swnode = &timberdale_tsc2007_node,
 	},
 };
 
-- 
2.45.2.803.g4e1b14247a-goog


-- 
Dmitry

On Wed, 03 Jul 2024 12:05:23 -0700, Dmitry Torokhov wrote:
> Switch over to using software nodes/properties to describe the
> touchscreen instead of using the legacy platform data. This will
> allow to drop support for the platform data from tsc2007 driver
> and rely solely on the generic driver properties.
> 
> Note: "model" is not part of defined device propertioes and is not
> used by the tsc2007 driver, so it can be safely dropped.
> 
> [...]

Applied, thanks!

[1/1] mfd: timberdale: attach device properties to tsc2007 board info
      commit: c298391abf6505c4040632b310a14f6bd9b7afff

--
Lee Jones [李琼斯]

On Thu, 11 Jul 2024, Lee Jones wrote:

> On Wed, 03 Jul 2024 12:05:23 -0700, Dmitry Torokhov wrote:
> > Switch over to using software nodes/properties to describe the
> > touchscreen instead of using the legacy platform data. This will
> > allow to drop support for the platform data from tsc2007 driver
> > and rely solely on the generic driver properties.
> > 
> > Note: "model" is not part of defined device propertioes and is not
> > used by the tsc2007 driver, so it can be safely dropped.
> > 
> > [...]
> 
> Applied, thanks!
> 
> [1/1] mfd: timberdale: attach device properties to tsc2007 board info
>       commit: c298391abf6505c4040632b310a14f6bd9b7afff

Remember to run spell-check on commit messages.

If fixed the issues and applied, thanks.

-- 
Lee Jones [李琼斯]