Skip to contentSkip to conversation

input: arizona-haptics - Add device property for HAP_ACT

PATCH In review Richard Fitzgerald 2 participants 2 messages Feb 16, 2017 – Feb 27, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input: arizona-haptics - Add device property for HAP_ACT

This adds a device property for setting the configuration for the HAP_ACT register field so that the connected actuator type can be configured on systems that are not using pdata.

---
 Documentation/devicetree/bindings/input/arizona-haptics.txt | 10 ++++++++++
 MAINTAINERS                                                 |  1 +
 drivers/input/misc/arizona-haptics.c                        |  7 +++++++
 3 files changed, 18 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/input/arizona-haptics.txt
Documentation/devicetree/bindings/input/arizona-haptics.txt new file +10 -0
new file mode 100644
index 0000000..a3e767b
@@ -0,0 +1,10 @@
+Cirrus Logic Arizona class audio SoCs
+
+This document lists haptics bindings for these codecs.
+Also see the primary binding document:
+  ../mfd/arizona.txt
+
+Optional properties:
+  - wlf,hap-act : Single value defining the actuator type, as per the HAP_ACT
+    register field. See the codec datasheet for the available HAP_ACT values
+    and their meaning.
MAINTAINERS +1 -0
index 26edd83..be4ea3e 100644
@@ -13377,6 +13377,7 @@ W:	https://github.com/CirrusLogic/linux-drivers/wiki
 S:	Supported
 F:	Documentation/hwmon/wm83??
 F:	Documentation/devicetree/bindings/extcon/extcon-arizona.txt
+F:	Documentation/devicetree/bindings/input/arizona*.txt
 F:	Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 F:	Documentation/devicetree/bindings/mfd/arizona.txt
 F:	arch/arm/mach-s3c64xx/mach-crag6410*
drivers/input/misc/arizona-haptics.c +7 -0
index 21dc1b8..0264d95 100644
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/slab.h>
+#include <linux/property.h>
 
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
@@ -164,6 +165,12 @@ static int arizona_haptics_probe(struct platform_device *pdev)
 
 	haptics->arizona = arizona;
 
+	if (!dev_get_platdata(arizona->dev))
+		device_property_read_u32(arizona->dev, "wlf,hap-act",
+					 &arizona->pdata.hap_act);
+
+	dev_dbg(arizona->dev, "hap_act=%u\n", arizona->pdata.hap_act);
+
 	ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
 				 ARIZONA_HAP_ACT, arizona->pdata.hap_act);
 	if (ret != 0) {
Signature · 6 lines
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer
#1 lore raw
Quoted 18 lines · Richard Fitzgerald

This adds a device property for setting the configuration for the HAP_ACT register field so that the connected actuator type can be configured on systems that are not using pdata.

---
 Documentation/devicetree/bindings/input/arizona-haptics.txt | 10 ++++++++++
 MAINTAINERS                                                 |  1 +
 drivers/input/misc/arizona-haptics.c                        |  7 +++++++
 3 files changed, 18 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/input/arizona-haptics.txt
Documentation/devicetree/bindings/input/arizona-haptics.txt new file +0 -0
new file mode 100644
index 0000000..a3e767b

Documentation/devicetree/bindings/input/arizona-haptics.txt line 10

Quoted 10 lines
Documentation/devicetree/bindings/input/arizona-haptics.txt new file +10 -0
@@ -0,0 +1,10 @@
+Cirrus Logic Arizona class audio SoCs
+
+This document lists haptics bindings for these codecs.
+Also see the primary binding document:
+  ../mfd/arizona.txt
+
+Optional properties:
+  - wlf,hap-act : Single value defining the actuator type, as per the HAP_ACT
+    register field. See the codec datasheet for the available HAP_ACT values
+    and their meaning.

What node does this property apply to? Document this in mfd/arizona.txt.

I would like the possible values documented here or a better education as to what this is because I have no idea if this property makes sense and I can't read everybody's datasheet. Just because you have it as platform data doesn't mean it belongs in DT.

Rob