linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it
@ 2017-04-12 17:27 Javier Martinez Canillas
  2017-04-12 17:27 ` [PATCH v5 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Javier Martinez Canillas
                   ` (7 more replies)
  0 siblings, 8 replies; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas, Benoît Cousson, Wolfram Sang,
	Mark Rutland, linux-omap, Russell King, linux-arm-kernel,
	linux-i2c

Hello,

This series add OF device ID tables to mfd I2C drivers whose devices are
either used in Device Tree source files or are listed in binding docs as
a compatible string.

That's done because the plan is to change the I2C core to report proper OF
modaliases instead of always reporting a MODALIAS=i2c:<foo> regardless if
a device was registered via DT or using the legacy platform data mechanism.

So these patches will make sure that mfd I2C drivers modules will continue
to be autoloaded once the I2C core is changed to report proper OF modalias.

Users didn't have a vendor prefix in the used compatible strings, but since
there wasn't a DT binding document for these drivers, it can be said that
were working for mere luck and so this series fixes the users and add a DT
binding doc for the drivers.

Most patches can be applied independently, with the exception of patches
2 to 4 that should be applied in the same tree to keep bisect-ability. I
suggest these to go through the MFD subsystem tree.

Best regards,
Javier

Changes in v5:
- Add missing properties for interrupts to DT binding doc (Rob Herring).
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Lee Jones <lee.jones@linaro.org>'s Acked-by tag.
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Lee Jones <lee.jones@linaro.org>'s Acked-by tag.
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Rob Herring's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Rob Herring's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Lee Jones <lee.jones@linaro.org>'s Acked-by tag.
- Add Rob Herring's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.

Changes in v4:
- Use "dt-bindings: mfd:" prefix in subject line (Rob Herring).
- Add information about what functions the device serve (Lee Jones).
- Avoid using MFD in Device Tree (Lee Jones).
- Drop -mfd suffix in compatible string (Lee Jones).
- Avoid using MFD in Device Tree (Lee Jones).
- Use "dt-bindings: mfd:" prefix in subject line (Rob Herring).
- Add information about what functions the device serve (Lee Jones).

Changes in v3:
- Add a vendor prefix to the compatible string (Rob Herring).
- Add a vendor prefix to the compatible string (Rob Herring).

Changes in v2:
- Don't use of_match_ptr() to avoid build warning when CONFIG_OF is disabled.
- Don't use of_match_ptr() to avoid build warning when CONFIG_OF is disabled.

Javier Martinez Canillas (8):
  dt-bindings: mfd: Add retu/tahvo ASIC chips bindings
  mfd: retu: Drop -mfd suffix from I2C device ID name
  mfd: retu: Add OF device ID table
  ARM: dts: n8x0: Add vendor prefix to retu node
  i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example
  dt-bindings: mfd: Add TI tps6105x chip bindings
  mfd: tps6105x: Add OF device ID table
  ARM: ux500: Add vendor prefix to tps61052 node

 .../devicetree/bindings/i2c/i2c-cbus-gpio.txt      |  4 ++--
 Documentation/devicetree/bindings/mfd/retu.txt     | 23 ++++++++++++++++++++++
 Documentation/devicetree/bindings/mfd/tps6105x.txt | 17 ++++++++++++++++
 arch/arm/boot/dts/omap2420-n8x0-common.dtsi        |  4 ++--
 arch/arm/boot/dts/ste-hrefprev60.dtsi              |  2 +-
 arch/arm/mach-omap1/board-nokia770.c               |  4 ++--
 drivers/mfd/retu-mfd.c                             | 12 +++++++++--
 drivers/mfd/tps6105x.c                             |  8 ++++++++
 8 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/retu.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/tps6105x.txt

-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  2017-04-19 19:39   ` [v5,1/8] " Wolfram Sang
  2017-04-12 17:27 ` [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas, Mark Rutland

There are Device Tree source files defining a device node for the
retu/tahvo I2C chip, but there isn't a DT binding document for it.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Lee Jones <lee.jones@linaro.org>

---

Changes in v5:
- Add missing properties for interrupts to DT binding doc (Rob Herring).
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Lee Jones <lee.jones@linaro.org>'s Acked-by tag.

Changes in v4:
- Use "dt-bindings: mfd:" prefix in subject line (Rob Herring).
- Add information about what functions the device serve (Lee Jones).
- Avoid using MFD in Device Tree (Lee Jones).

Changes in v3: None
Changes in v2: None

 Documentation/devicetree/bindings/mfd/retu.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/retu.txt

diff --git a/Documentation/devicetree/bindings/mfd/retu.txt b/Documentation/devicetree/bindings/mfd/retu.txt
new file mode 100644
index 000000000000..e1ea3a36a038
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/retu.txt
@@ -0,0 +1,23 @@
+* Device tree bindings for Nokia Retu and Tahvo multi-function device
+
+Retu and Tahvo are a multi-function devices found on Nokia Internet
+Tablets (770, N800 and N810). The Retu chip provides watchdog timer
+and power button control functionalities while Tahvo chip provides
+USB transceiver functionality.
+
+Required properties:
+- compatible:		"nokia,retu" or "nokia,tahvo"
+- reg:			Specifies the I2C slave address of the ASIC chip
+- interrupts: 		The interrupt line the device is connected to
+- interrupt-parent:	The parent interrupt controller
+
+Example:
+
+i2c0 {
+	retu: retu@1 {
+		compatible = "nokia,retu";
+		interrupt-parent = <&gpio4>;
+		interrupts = <12 IRQ_TYPE_EDGE_RISING>;
+		reg = <0x1>;
+	};
+};
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
  2017-04-12 17:27 ` [PATCH v5 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  2017-04-19 19:40   ` [v5,2/8] " Wolfram Sang
  2017-04-12 17:27 ` [PATCH v5 3/8] mfd: retu: Add OF device ID table Javier Martinez Canillas
                   ` (5 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas, Benoît Cousson, Mark Rutland,
	linux-omap, Russell King, linux-arm-kernel

It's not correct to encode the subsystem in the I2C device name, so
drop the -mfd suffix. To maintain bisect-ability, change driver and
platform code / DTS users in the same patch.

Suggested-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>

---

Changes in v5:
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 ++--
 arch/arm/mach-omap1/board-nokia770.c        | 4 ++--
 drivers/mfd/retu-mfd.c                      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index 7e5ffc583c90..1b06430c8013 100644
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -15,8 +15,8 @@
 				>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			retu_mfd: retu@1 {
-				compatible = "retu-mfd";
+			retu: retu@1 {
+				compatible = "retu";
 				interrupt-parent = <&gpio4>;
 				interrupts = <12 IRQ_TYPE_EDGE_RISING>;
 				reg = <0x1>;
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index ee8d9f553db4..06243c0b12d2 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -233,10 +233,10 @@ static struct platform_device nokia770_cbus_device = {
 
 static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = {
 	{
-		I2C_BOARD_INFO("retu-mfd", 0x01),
+		I2C_BOARD_INFO("retu", 0x01),
 	},
 	{
-		I2C_BOARD_INFO("tahvo-mfd", 0x02),
+		I2C_BOARD_INFO("tahvo", 0x02),
 	},
 };
 
diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
index d4c114abeb75..53e1d386d2c0 100644
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -302,8 +302,8 @@ static int retu_remove(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id retu_id[] = {
-	{ "retu-mfd", 0 },
-	{ "tahvo-mfd", 0 },
+	{ "retu", 0 },
+	{ "tahvo", 0 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, retu_id);
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 3/8] mfd: retu: Add OF device ID table
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
  2017-04-12 17:27 ` [PATCH v5 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Javier Martinez Canillas
  2017-04-12 17:27 ` [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  2017-04-19 19:40   ` [v5,3/8] " Wolfram Sang
  2017-04-12 17:27 ` [PATCH v5 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
                   ` (4 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas

The driver doesn't have a struct of_device_id table but supported devices
are registered via Device Trees. This is working on the assumption that a
I2C device registered via OF will always match a legacy I2C device ID and
that the MODALIAS reported will always be of the form i2c:<device>.

But this could change in the future so the correct approach is to have a
OF device ID table if the devices are registered via OF.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Lee Jones <lee.jones@linaro.org>

---

Changes in v5:
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Lee Jones <lee.jones@linaro.org>'s Acked-by tag.

Changes in v4:
- Drop -mfd suffix in compatible string (Lee Jones).

Changes in v3:
- Add a vendor prefix to the compatible string (Rob Herring).

Changes in v2:
- Don't use of_match_ptr() to avoid build warning when CONFIG_OF is disabled.

 drivers/mfd/retu-mfd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
index 53e1d386d2c0..e7d27b7861c1 100644
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -308,9 +308,17 @@ static const struct i2c_device_id retu_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, retu_id);
 
+static const struct of_device_id retu_of_match[] = {
+	{ .compatible = "nokia,retu" },
+	{ .compatible = "nokia,tahvo" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, retu_of_match);
+
 static struct i2c_driver retu_driver = {
 	.driver		= {
 		.name = "retu-mfd",
+		.of_match_table = retu_of_match,
 	},
 	.probe		= retu_probe,
 	.remove		= retu_remove,
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 4/8] ARM: dts: n8x0: Add vendor prefix to retu node
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
                   ` (2 preceding siblings ...)
  2017-04-12 17:27 ` [PATCH v5 3/8] mfd: retu: Add OF device ID table Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  2017-04-19 19:40   ` [v5,4/8] " Wolfram Sang
  2017-04-12 17:27 ` [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example Javier Martinez Canillas
                   ` (3 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas, Benoît Cousson, Mark Rutland,
	linux-omap, Russell King, linux-arm-kernel

The retu device node doesn't have a vendor prefix
in its compatible string, fix it by adding one.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>

---

Changes in v5:
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index 1b06430c8013..91886231e5a8 100644
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -16,7 +16,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			retu: retu@1 {
-				compatible = "retu";
+				compatible = "nokia,retu";
 				interrupt-parent = <&gpio4>;
 				interrupts = <12 IRQ_TYPE_EDGE_RISING>;
 				reg = <0x1>;
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
                   ` (3 preceding siblings ...)
  2017-04-12 17:27 ` [PATCH v5 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  2017-04-19 18:51   ` Wolfram Sang
  2017-04-19 19:41   ` Wolfram Sang
  2017-04-12 17:27 ` [PATCH v5 6/8] dt-bindings: mfd: Add TI tps6105x chip bindings Javier Martinez Canillas
                   ` (2 subsequent siblings)
  7 siblings, 2 replies; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas, Wolfram Sang, linux-i2c, Mark Rutland

The example contains a device node for a retu device, but
its compatible string doesn't have a vendor prefix.

While being there, drop the -mfd suffix since isn't correct.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>

---

Changes in v5:
- Add Rob Herring's Acked-by tag.
- Add Aaro Koskinen's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.

Changes in v4:
- Avoid using MFD in Device Tree (Lee Jones).

Changes in v3: None
Changes in v2: None

 Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt b/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
index 8ce9cd2855b5..c143948b2a37 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
@@ -20,8 +20,8 @@ i2c@0 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 
-	retu-mfd: retu@1 {
-		compatible = "retu-mfd";
+	retu: retu@1 {
+		compatible = "nokia,retu";
 		reg = <0x1>;
 	};
 };
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 6/8] dt-bindings: mfd: Add TI tps6105x chip bindings
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
                   ` (4 preceding siblings ...)
  2017-04-12 17:27 ` [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  2017-04-12 17:27 ` [PATCH v5 7/8] mfd: tps6105x: Add OF device ID table Javier Martinez Canillas
  2017-04-12 17:27 ` [PATCH v5 8/8] ARM: ux500: Add vendor prefix to tps61052 node Javier Martinez Canillas
  7 siblings, 0 replies; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas, Mark Rutland

There are Device Tree source files defining a device node for the
tps61050/61052 I2C chip but there isn't a binding document for it.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>

---

Changes in v5:
- Add Rob Herring's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.

Changes in v4:
- Use "dt-bindings: mfd:" prefix in subject line (Rob Herring).
- Add information about what functions the device serve (Lee Jones).

Changes in v3: None
Changes in v2: None

 Documentation/devicetree/bindings/mfd/tps6105x.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/tps6105x.txt

diff --git a/Documentation/devicetree/bindings/mfd/tps6105x.txt b/Documentation/devicetree/bindings/mfd/tps6105x.txt
new file mode 100644
index 000000000000..93602c7a19c8
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/tps6105x.txt
@@ -0,0 +1,17 @@
+* Device tree bindings for TI TPS61050/61052 Boost Converters
+
+The TP61050/TPS61052 is a high-power "white LED driver". The
+device provides LED, GPIO and regulator functionalities.
+
+Required properties:
+- compatible:		"ti,tps61050" or "ti,tps61052"
+- reg:			Specifies the I2C slave address
+
+Example:
+
+i2c0 {
+	tps61052@33 {
+		compatible = "ti,tps61052";
+		reg = <0x33>;
+	};
+};
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 7/8] mfd: tps6105x: Add OF device ID table
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
                   ` (5 preceding siblings ...)
  2017-04-12 17:27 ` [PATCH v5 6/8] dt-bindings: mfd: Add TI tps6105x chip bindings Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  2017-04-12 17:27 ` [PATCH v5 8/8] ARM: ux500: Add vendor prefix to tps61052 node Javier Martinez Canillas
  7 siblings, 0 replies; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas

The driver doesn't have a struct of_device_id table but supported devices
are registered via Device Trees. This is working on the assumption that a
I2C device registered via OF will always match a legacy I2C device ID and
that the MODALIAS reported will always be of the form i2c:<device>.

But this could change in the future so the correct approach is to have a
OF device ID table if the devices are registered via OF.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Lee Jones <lee.jones@linaro.org>

---

Changes in v5:
- Add Rob Herring's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
- Add Lee Jones <lee.jones@linaro.org>'s Acked-by tag.

Changes in v4: None
Changes in v3:
- Add a vendor prefix to the compatible string (Rob Herring).

Changes in v2:
- Don't use of_match_ptr() to avoid build warning when CONFIG_OF is disabled.

 drivers/mfd/tps6105x.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
index baa12ea666fb..187848c93779 100644
--- a/drivers/mfd/tps6105x.c
+++ b/drivers/mfd/tps6105x.c
@@ -173,9 +173,17 @@ static const struct i2c_device_id tps6105x_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tps6105x_id);
 
+static const struct of_device_id tps6105x_of_match[] = {
+	{ .compatible = "ti,tps61050" },
+	{ .compatible = "ti,tps61052" },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, tps6105x_of_match);
+
 static struct i2c_driver tps6105x_driver = {
 	.driver = {
 		.name	= "tps6105x",
+		.of_match_table = tps6105x_of_match,
 	},
 	.probe		= tps6105x_probe,
 	.remove		= tps6105x_remove,
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v5 8/8] ARM: ux500: Add vendor prefix to tps61052 node
  2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
                   ` (6 preceding siblings ...)
  2017-04-12 17:27 ` [PATCH v5 7/8] mfd: tps6105x: Add OF device ID table Javier Martinez Canillas
@ 2017-04-12 17:27 ` Javier Martinez Canillas
  7 siblings, 0 replies; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-12 17:27 UTC (permalink / raw)
  To: linux-kernel
  Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
	Javier Martinez Canillas, Mark Rutland, Russell King,
	linux-arm-kernel

The tps61052 device node doesn't have a vendor prefix
in its compatible string, fix it by adding one.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>

---

Changes in v5:
- Add Rob Herring's Acked-by tag.
- Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index 5882a2606ac3..3f14b4df69b4 100644
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -30,7 +30,7 @@
 
 		i2c@80004000 {
 			tps61052@33 {
-				compatible = "tps61052";
+				compatible = "ti,tps61052";
 				reg = <0x33>;
 			};
 
-- 
2.9.3

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example
  2017-04-12 17:27 ` [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example Javier Martinez Canillas
@ 2017-04-19 18:51   ` Wolfram Sang
  2017-04-19 19:13     ` Javier Martinez Canillas
  2017-04-19 19:41   ` Wolfram Sang
  1 sibling, 1 reply; 16+ messages in thread
From: Wolfram Sang @ 2017-04-19 18:51 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
	Tony Lindgren, Lee Jones, linux-i2c, Mark Rutland

[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]

On Wed, Apr 12, 2017 at 02:27:56PM -0300, Javier Martinez Canillas wrote:
> The example contains a device node for a retu device, but
> its compatible string doesn't have a vendor prefix.
> 
> While being there, drop the -mfd suffix since isn't correct.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> Acked-by: Tony Lindgren <tony@atomide.com>

Wouldn't it be nice if we fix the driver also so it actually matches the
below compatible? I can't find such a change in linux-next.

> ---
> 
> Changes in v5:
> - Add Rob Herring's Acked-by tag.
> - Add Aaro Koskinen's Acked-by tag.
> - Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
> 
> Changes in v4:
> - Avoid using MFD in Device Tree (Lee Jones).
> 
> Changes in v3: None
> Changes in v2: None
> 
>  Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt b/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
> index 8ce9cd2855b5..c143948b2a37 100644
> --- a/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
> +++ b/Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
> @@ -20,8 +20,8 @@ i2c@0 {
>  	#address-cells = <1>;
>  	#size-cells = <0>;
>  
> -	retu-mfd: retu@1 {
> -		compatible = "retu-mfd";
> +	retu: retu@1 {
> +		compatible = "nokia,retu";
>  		reg = <0x1>;
>  	};
>  };
> -- 
> 2.9.3
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example
  2017-04-19 18:51   ` Wolfram Sang
@ 2017-04-19 19:13     ` Javier Martinez Canillas
  0 siblings, 0 replies; 16+ messages in thread
From: Javier Martinez Canillas @ 2017-04-19 19:13 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
	Tony Lindgren, Lee Jones, linux-i2c, Mark Rutland

Hello Wolfram,

On 04/19/2017 02:51 PM, Wolfram Sang wrote:
> On Wed, Apr 12, 2017 at 02:27:56PM -0300, Javier Martinez Canillas wrote:
>> The example contains a device node for a retu device, but
>> its compatible string doesn't have a vendor prefix.
>>
>> While being there, drop the -mfd suffix since isn't correct.
>>
>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
>> Acked-by: Rob Herring <robh@kernel.org>
>> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>> Acked-by: Tony Lindgren <tony@atomide.com>
> 
> Wouldn't it be nice if we fix the driver also so it actually matches the
> below compatible? I can't find such a change in linux-next.
> 

[snip]

>>  
>> -	retu-mfd: retu@1 {
>> -		compatible = "retu-mfd";
>> +	retu: retu@1 {
>> +		compatible = "nokia,retu";
>>  		reg = <0x1>;
>>  	};

You mean having a "nokia,retu" entry in a OF table?

That's done by patch 3/8 in this series:

http://www.spinics.net/lists/devicetree/msg173145.html

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [v5,1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings
  2017-04-12 17:27 ` [PATCH v5 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Javier Martinez Canillas
@ 2017-04-19 19:39   ` Wolfram Sang
  0 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2017-04-19 19:39 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
	Tony Lindgren, Lee Jones, Mark Rutland

[-- Attachment #1: Type: text/plain, Size: 2680 bytes --]

On Wed, Apr 12, 2017 at 02:27:52PM -0300, Javier Martinez Canillas wrote:
> There are Device Tree source files defining a device node for the
> retu/tahvo I2C chip, but there isn't a DT binding document for it.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> Acked-by: Tony Lindgren <tony@atomide.com>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> ---
> 
> Changes in v5:
> - Add missing properties for interrupts to DT binding doc (Rob Herring).
> - Add Rob Herring's Acked-by tag.
> - Add Aaro Koskinen's Acked-by tag.
> - Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag.
> - Add Lee Jones <lee.jones@linaro.org>'s Acked-by tag.
> 
> Changes in v4:
> - Use "dt-bindings: mfd:" prefix in subject line (Rob Herring).
> - Add information about what functions the device serve (Lee Jones).
> - Avoid using MFD in Device Tree (Lee Jones).
> 
> Changes in v3: None
> Changes in v2: None
> 
>  Documentation/devicetree/bindings/mfd/retu.txt | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/mfd/retu.txt
> 
> diff --git a/Documentation/devicetree/bindings/mfd/retu.txt b/Documentation/devicetree/bindings/mfd/retu.txt
> new file mode 100644
> index 000000000000..e1ea3a36a038
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/retu.txt
> @@ -0,0 +1,23 @@
> +* Device tree bindings for Nokia Retu and Tahvo multi-function device
> +
> +Retu and Tahvo are a multi-function devices found on Nokia Internet
> +Tablets (770, N800 and N810). The Retu chip provides watchdog timer
> +and power button control functionalities while Tahvo chip provides
> +USB transceiver functionality.
> +
> +Required properties:
> +- compatible:		"nokia,retu" or "nokia,tahvo"
> +- reg:			Specifies the I2C slave address of the ASIC chip

This should be "CBUS slave address". CBUS is a strange subset of I2C,
yet I'd like the distinction because 0x1 is not a valid I2C address.

> +- interrupts: 		The interrupt line the device is connected to
> +- interrupt-parent:	The parent interrupt controller
> +
> +Example:
> +
> +i2c0 {

To make it super clear, we are talking CBUS here, it might make sense to
add here:
+	compatible = "i2c-cbus-gpio";
+	...

? It could be argued that the above "i2c0" should be "cbus0" as well but
that is a separate issue, I'd think.

> +	retu: retu@1 {
> +		compatible = "nokia,retu";
> +		interrupt-parent = <&gpio4>;
> +		interrupts = <12 IRQ_TYPE_EDGE_RISING>;
> +		reg = <0x1>;
> +	};
> +};

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [v5,2/8] mfd: retu: Drop -mfd suffix from I2C device ID name
  2017-04-12 17:27 ` [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas
@ 2017-04-19 19:40   ` Wolfram Sang
  0 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2017-04-19 19:40 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
	Tony Lindgren, Lee Jones, Benoît Cousson, Mark Rutland,
	linux-omap, Russell King, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 577 bytes --]

On Wed, Apr 12, 2017 at 02:27:53PM -0300, Javier Martinez Canillas wrote:
> It's not correct to encode the subsystem in the I2C device name, so
> drop the -mfd suffix. To maintain bisect-ability, change driver and
> platform code / DTS users in the same patch.
> 
> Suggested-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> Acked-by: Tony Lindgren <tony@atomide.com>

Reviewed-by: Wolfram Sang <wsa@the-dreams.de>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [v5,3/8] mfd: retu: Add OF device ID table
  2017-04-12 17:27 ` [PATCH v5 3/8] mfd: retu: Add OF device ID table Javier Martinez Canillas
@ 2017-04-19 19:40   ` Wolfram Sang
  0 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2017-04-19 19:40 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
	Tony Lindgren, Lee Jones

[-- Attachment #1: Type: text/plain, Size: 825 bytes --]

On Wed, Apr 12, 2017 at 02:27:54PM -0300, Javier Martinez Canillas wrote:
> The driver doesn't have a struct of_device_id table but supported devices
> are registered via Device Trees. This is working on the assumption that a
> I2C device registered via OF will always match a legacy I2C device ID and
> that the MODALIAS reported will always be of the form i2c:<device>.
> 
> But this could change in the future so the correct approach is to have a
> OF device ID table if the devices are registered via OF.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> Acked-by: Tony Lindgren <tony@atomide.com>
> Acked-by: Lee Jones <lee.jones@linaro.org>

Reviewed-by: Wolfram Sang <wsa@the-dreams.de>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [v5,4/8] ARM: dts: n8x0: Add vendor prefix to retu node
  2017-04-12 17:27 ` [PATCH v5 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
@ 2017-04-19 19:40   ` Wolfram Sang
  0 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2017-04-19 19:40 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
	Tony Lindgren, Lee Jones, Benoît Cousson, Mark Rutland,
	linux-omap, Russell King, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

On Wed, Apr 12, 2017 at 02:27:55PM -0300, Javier Martinez Canillas wrote:
> The retu device node doesn't have a vendor prefix
> in its compatible string, fix it by adding one.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> Acked-by: Tony Lindgren <tony@atomide.com>

Reviewed-by: Wolfram Sang <wsa@the-dreams.de>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example
  2017-04-12 17:27 ` [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example Javier Martinez Canillas
  2017-04-19 18:51   ` Wolfram Sang
@ 2017-04-19 19:41   ` Wolfram Sang
  1 sibling, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2017-04-19 19:41 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
	Tony Lindgren, Lee Jones, linux-i2c, Mark Rutland

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

On Wed, Apr 12, 2017 at 02:27:56PM -0300, Javier Martinez Canillas wrote:
> The example contains a device node for a retu device, but
> its compatible string doesn't have a vendor prefix.
> 
> While being there, drop the -mfd suffix since isn't correct.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> Acked-by: Tony Lindgren <tony@atomide.com>
> 

Reviewed-by: Wolfram Sang <wsa@the-dreams.de>

I assume this goes with the rest of the series and not via my tree.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2017-04-19 19:42 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
2017-04-12 17:27 ` [PATCH v5 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Javier Martinez Canillas
2017-04-19 19:39   ` [v5,1/8] " Wolfram Sang
2017-04-12 17:27 ` [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas
2017-04-19 19:40   ` [v5,2/8] " Wolfram Sang
2017-04-12 17:27 ` [PATCH v5 3/8] mfd: retu: Add OF device ID table Javier Martinez Canillas
2017-04-19 19:40   ` [v5,3/8] " Wolfram Sang
2017-04-12 17:27 ` [PATCH v5 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
2017-04-19 19:40   ` [v5,4/8] " Wolfram Sang
2017-04-12 17:27 ` [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example Javier Martinez Canillas
2017-04-19 18:51   ` Wolfram Sang
2017-04-19 19:13     ` Javier Martinez Canillas
2017-04-19 19:41   ` Wolfram Sang
2017-04-12 17:27 ` [PATCH v5 6/8] dt-bindings: mfd: Add TI tps6105x chip bindings Javier Martinez Canillas
2017-04-12 17:27 ` [PATCH v5 7/8] mfd: tps6105x: Add OF device ID table Javier Martinez Canillas
2017-04-12 17:27 ` [PATCH v5 8/8] ARM: ux500: Add vendor prefix to tps61052 node Javier Martinez Canillas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).