mfd: timberdale: Attach device properties to TSC2007 board info

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 properties and is not
used by the TSC2007 driver, so it can be safely dropped.

Signed-off-by: Dmitry Torokhov <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Lee Jones <[email protected]>

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 333d5b874de346d0a3d2dfe7b52ef8bad8b00044..b059713db875f204c11df28acb5574d46368e8cb 100644 (file)
--- 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,
        },
 };