Skip to contentSkip to conversation

isp1704_charger: Add DT support

PATCH Applied Sebastian Reichel 5 participants 11 messages Nov 14, 2013 – Dec 24, 2013

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

PATCH v2 1/2 isp1704_charger: Add DT support

This patch introduces device tree support to the isp1704 charger driver. Adding support involved moving the handling of the enable GPIO from board code into the driver.

---
 arch/arm/mach-omap2/board-rx51-peripherals.c | 10 +----
 drivers/power/isp1704_charger.c              | 56 +++++++++++++++++++++++++---
 include/linux/power/isp1704_charger.h        |  2 +-
 3 files changed, 52 insertions(+), 16 deletions(-)
arch/arm/mach-omap2/board-rx51-peripherals.c +1 -9
index a791fef..2986d16 100644
@@ -273,13 +273,8 @@ static struct platform_device rx51_battery_device = {
 	.id	= -1,
 };
 
-static void rx51_charger_set_power(bool on)
-{
-	gpio_set_value(RX51_USB_TRANSCEIVER_RST_GPIO, on);
-}
-
 static struct isp1704_charger_data rx51_charger_data = {
-	.set_power	= rx51_charger_set_power,
+	.enable_gpio	= RX51_USB_TRANSCEIVER_RST_GPIO,
 };
 
 static struct platform_device rx51_charger_device = {
@@ -291,9 +286,6 @@ static struct platform_device rx51_charger_device = {
 
 static void __init rx51_charger_init(void)
 {
-	WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
-		GPIOF_OUT_INIT_HIGH, "isp1704_reset"));
-
 	platform_device_register(&rx51_battery_device);
 	platform_device_register(&rx51_charger_device);
 }
drivers/power/isp1704_charger.c +50 -6

98 lines not on this page · raw message

include/linux/power/isp1704_charger.h +1 -1
index 68096a6..05081a9 100644
@@ -23,7 +23,7 @@
 #define __ISP1704_CHARGER_H
 
 struct isp1704_charger_data {
-	void		(*set_power)(bool on);
+	int		enable_gpio;
 };
 
 #endif
Signature · 1 line
1.8.4.2
#1 lore raw

PATCH v2 2/2 dt: binding documentation for isp1704 charger

Add devicetree binding documentation for isp1704-charger.

---
 Documentation/devicetree/bindings/power/isp1704.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt
Documentation/devicetree/bindings/power/isp1704.txt new file +17 -0
new file mode 100644
index 0000000..bbeec11
@@ -0,0 +1,17 @@
+Binding for NXP ISP1704 USB Charger Detection
+
+Required properties:
+- compatible: Should contain one of the following:
+ * "nxp,isp1704"
+- nxp,enable-gpio: Should contain a phandle to the
+  GPIO pin connected to the chip's enable pin.
+- usb-phy: Should contain a phandle to the USB PHY
+  the ISP1704 is connected to.
+
+Example:
+
+isp1704 {
+	compatible = "nxp,isp1704";
+	nxp,enable-gpio = <&gpio3 3 GPIO_ACTIVE_LOW>;
+	usb-phy = <&usb2_phy>;
+};
Signature · 1 line
1.8.4.2
#2 lore raw

Re: [PATCH 2/2] dt: binding documentation for isp1704 charger

Quoted 14 lines · Sebastian Reichel

Add devicetree binding documentation for isp1704-charger.

---
 Documentation/devicetree/bindings/power/isp1704.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt
Documentation/devicetree/bindings/power/isp1704.txt new file +0 -0
new file mode 100644
index 0000000..bbeec11

Documentation/devicetree/bindings/power/isp1704.txt line 6

Quoted 6 lines
Documentation/devicetree/bindings/power/isp1704.txt new file +6 -0
@@ -0,0 +1,17 @@
+Binding for NXP ISP1704 USB Charger Detection
+
+Required properties:
+- compatible: Should contain one of the following:
+ * "nxp,isp1704"
+- nxp,enable-gpio: Should contain a phandle to the

Nit: phandle + gpio-specifier

Otherwise this looks fine.

Mark.

maintainer
#3 lore raw
In reply to Sebastian Reichel
Quoted 31 lines · Sebastian Reichel

This patch introduces device tree support to the isp1704 charger driver. Adding support involved moving the handling of the enable GPIO from board code into the driver.

---
 arch/arm/mach-omap2/board-rx51-peripherals.c | 10 +----
 drivers/power/isp1704_charger.c              | 56 +++++++++++++++++++++++++---
 include/linux/power/isp1704_charger.h        |  2 +-
 3 files changed, 52 insertions(+), 16 deletions(-)
arch/arm/mach-omap2/board-rx51-peripherals.c +1 -6
index a791fef..2986d16 100644
@@ -273,13 +273,8 @@ static struct platform_device rx51_battery_device = {
 	.id	= -1,
 };
 
-static void rx51_charger_set_power(bool on)
-{
-	gpio_set_value(RX51_USB_TRANSCEIVER_RST_GPIO, on);
-}
-
 static struct isp1704_charger_data rx51_charger_data = {
-	.set_power	= rx51_charger_set_power,
+	.enable_gpio	= RX51_USB_TRANSCEIVER_RST_GPIO,
 };
 
 static struct platform_device rx51_charger_device = {

arch/arm/mach-omap2/board-rx51-peripherals.c static struct platform_device rx51_charger_device = { · line 291

Quoted 9 lines
arch/arm/mach-omap2/board-rx51-peripherals.c +0 -3
@@ -291,9 +286,6 @@ static struct platform_device rx51_charger_device = {
 
 static void __init rx51_charger_init(void)
 {
-	WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
-		GPIOF_OUT_INIT_HIGH, "isp1704_reset"));
-
 	platform_device_register(&rx51_battery_device);
 	platform_device_register(&rx51_charger_device);
 }

Can you please separate out the changes to board-rx51-peripherals.c as they have a huge chance of merge conflicts for v3.14 when we're planning to flip omap3 to be device tree only?

To remove the dependency, how about add .enable_gpio to the isp1704_charger.h and to the board-rx51-peripherals.c without removing .set_power in the first patch?

Then we can set up an immutable branch that can be merged both to linux-omap tree and Anton's tree to avoid merge conflicts.

Then the rest of the patches can go via Anton's tree and you can just have .set_power do nothing, and then it can be removed later on when no longer used at all.

Regards,

Tony
--
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

#4 lore raw

v2 cover DT support for isp1704-charger

Hi,

This is the second iteration of the isp1704 DT patches.

Changes since v1:
* reword the binding documentation slightly according to the suggestions of Mark Rutland
* keep supporting the set_power callback and leave the board code in its current state. This solves potential merge problems. The additional code can be removed in the next merge window.

-- Sebastian

Sebastian Reichel (2):
isp1704_charger: Add DT support
dt: binding documentation for isp1704 charger

 .../devicetree/bindings/power/isp1704.txt          | 17 +++++++
 drivers/power/isp1704_charger.c                    | 55 ++++++++++++++++++++--
 include/linux/power/isp1704_charger.h              |  1 +
 3 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt
Signature · 1 line
1.8.4.3
#5 lore raw

PATCH v2 1/2 isp1704_charger: Add DT support

This patch introduces device tree support to the isp1704 charger driver. Adding support involved moving the handling of the enable GPIO from board code into the driver.

---
 drivers/power/isp1704_charger.c       | 55 ++++++++++++++++++++++++++++++++---
 include/linux/power/isp1704_charger.h |  1 +
 2 files changed, 52 insertions(+), 4 deletions(-)
drivers/power/isp1704_charger.c +51 -4
index 1bb3a91..2535989 100644
@@ -29,6 +29,8 @@
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
@@ -88,6 +90,8 @@ static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on)
 
 	if (board && board->set_power)
 		board->set_power(on);
+	else if (board)
+		gpio_set_value(board->enable_gpio, on);
 }
 
 /*
@@ -400,12 +404,47 @@ static int isp1704_charger_probe(struct platform_device *pdev)
 	struct isp1704_charger	*isp;
 	int			ret = -ENODEV;
 
+	struct isp1704_charger_data *pdata = dev_get_platdata(&pdev->dev);
+	struct device_node *np = pdev->dev.of_node;
+
+	if (np) {
+		int gpio = of_get_named_gpio(np, "nxp,enable-gpio", 0);
+
+		if (gpio < 0)
+			return gpio;
+
+		pdata = devm_kzalloc(&pdev->dev,
+			sizeof(struct isp1704_charger_data), GFP_KERNEL);
+		pdata->enable_gpio = gpio;
+
+		dev_info(&pdev->dev, "init gpio %d\n", pdata->enable_gpio);
+
+		ret = devm_gpio_request_one(&pdev->dev, pdata->enable_gpio,
+					GPIOF_OUT_INIT_HIGH, "isp1704_reset");
+		if (ret)
+			goto fail0;
+	}
+
+	if (!pdata) {
+		dev_err(&pdev->dev, "missing platform data!\n");
+		return -ENODEV;
+	}
+
+
 	isp = devm_kzalloc(&pdev->dev, sizeof(*isp), GFP_KERNEL);
 	if (!isp)
 		return -ENOMEM;
 
-	isp->phy = usb_get_phy(USB_PHY_TYPE_USB2);
-	if (IS_ERR_OR_NULL(isp->phy))
+	if (np)
+		isp->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
+	else
+		isp->phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
+
+	if (IS_ERR(isp->phy)) {
+		ret = PTR_ERR(isp->phy);
+		goto fail0;
+	}
+	if (!isp->phy)
 		goto fail0;
 
 	isp->dev = &pdev->dev;
@@ -464,7 +503,6 @@ fail2:
 	power_supply_unregister(&isp->psy);
 fail1:
 	isp1704_charger_set_power(isp, 0);
-	usb_put_phy(isp->phy);
 fail0:
 	dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
 
@@ -477,15 +515,24 @@ static int isp1704_charger_remove(struct platform_device *pdev)
 
 	usb_unregister_notifier(isp->phy, &isp->nb);
 	power_supply_unregister(&isp->psy);
-	usb_put_phy(isp->phy);
 	isp1704_charger_set_power(isp, 0);
 
 	return 0;
 }
 
+
+#ifdef CONFIG_OF
+static const struct of_device_id omap_isp1704_of_match[] = {
+	{ .compatible = "nxp,isp1704", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, omap_isp1704_of_match);
+#endif
+
 static struct platform_driver isp1704_charger_driver = {
 	.driver = {
 		.name = "isp1704_charger",
+		.of_match_table = of_match_ptr(omap_isp1704_of_match),
 	},
 	.probe = isp1704_charger_probe,
 	.remove = isp1704_charger_remove,
include/linux/power/isp1704_charger.h +1 -0
index 68096a6..0105d9e 100644
@@ -24,6 +24,7 @@
 
 struct isp1704_charger_data {
 	void		(*set_power)(bool on);
+	int		enable_gpio;
 };
 
 #endif
Signature · 1 line
1.8.4.3
#6 lore raw

PATCH v2 2/2 dt: binding documentation for isp1704 charger

In reply to Sebastian Reichel

Add devicetree binding documentation for isp1704-charger.

---
 Documentation/devicetree/bindings/power/isp1704.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt
Documentation/devicetree/bindings/power/isp1704.txt new file +17 -0
new file mode 100644
index 0000000..fa35969
@@ -0,0 +1,17 @@
+Binding for NXP ISP1704 USB Charger Detection
+
+Required properties:
+- compatible: Should contain one of the following:
+ * "nxp,isp1704"
+- nxp,enable-gpio: Should contain a phandle + gpio-specifier
+  to the GPIO pin connected to the chip's enable pin.
+- usb-phy: Should contain a phandle to the USB PHY
+  the ISP1704 is connected to.
+
+Example:
+
+isp1704 {
+	compatible = "nxp,isp1704";
+	nxp,enable-gpio = <&gpio3 3 GPIO_ACTIVE_LOW>;
+	usb-phy = <&usb2_phy>;
+};
Signature · 1 line
1.8.4.3
#7 lore raw

Re: [PATCHv2 0/2] DT support for isp1704-charger

In reply to Sebastian Reichel
Quoted 9 lines · Sebastian Reichel

This is the second iteration of the isp1704 DT patches.

Changes since v1:
* reword the binding documentation slightly according to the suggestions of Mark Rutland
* keep supporting the set_power callback and leave the board code in its current state. This solves potential merge problems. The additional code can be removed in the next merge window.

Applied, thanks a lot!

Anton

#8 lore raw
In reply to Sebastian Reichel
Quoted 15 lines · On Thursday 14 November 2013 13:38:53 Sebastian Reichel wrote:
(quoted diff) +0 -0

b/drivers/power/isp1704_charger.c index fc04d19..db96778 100644

drivers/power/isp1704_charger.c +2 -0
@@ -28,6 +28,8 @@
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>

drivers/power/isp1704_charger.c static void isp1704_charger_set_power(struct · line 98

Quoted 10 lines
drivers/power/isp1704_charger.c +2 -2
@@ -89,8 +91,8 @@ static void isp1704_charger_set_power(struct
 isp1704_charger *isp, bool on) {
 	struct isp1704_charger_data	*board =
 isp->dev->platform_data;
 
-	if (board && board->set_power)
-		board->set_power(on);
+	if (board)
+		gpio_set_value(board->enable_gpio, on);
 }
 

You need to check if enable_gpio in board data was defined or not.

Signature · 2 lines
Pali Rohár
[email protected]
#9 lore raw
Quoted 20 lines · Pali Rohár
Quoted 19 lines · On Thursday 14 November 2013 13:38:53 Sebastian Reichel wrote:
(quoted diff) +0 -0

b/drivers/power/isp1704_charger.c index fc04d19..db96778 100644

drivers/power/isp1704_charger.c +2 -0
@@ -28,6 +28,8 @@
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
@@ -89,8 +91,8 @@ static void isp1704_charger_set_power(struct
 isp1704_charger *isp, bool on) {
 	struct isp1704_charger_data	*board =
 isp->dev->platform_data;
 
Quoted 8 lines

drivers/power/isp1704_charger.c static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on) · line 97

Quoted 6 lines
drivers/power/isp1704_charger.c +2 -2
-	if (board && board->set_power)
-		board->set_power(on);
+	if (board)
+		gpio_set_value(board->enable_gpio, on);
 }
 

You need to check if enable_gpio in board data was defined or not.

The device is not successful probed without valid enable_gpio.

-- Sebastian

#10 lore raw
Quoted 2 lines · On Thursday 14 November 2013 23:34:19 Sebastian Reichel wrote:
Quoted 1 line · Pali Rohár

On Thursday 14 November 2013 13:38:53 Sebastian Reichel

Quoted 30 lines · wrote:
Quoted 30 lines
Quoted 30 lines
(quoted diff) +0 -0

b/drivers/power/isp1704_charger.c index fc04d19..db96778 100644

drivers/power/isp1704_charger.c +2 -0
@@ -28,6 +28,8 @@
 
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/delay.h>
 
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 

#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>

drivers/power/isp1704_charger.c +2 -2
@@ -89,8 +91,8 @@ static void
 isp1704_charger_set_power(struct isp1704_charger *isp,
 bool on) {
 
 	struct isp1704_charger_data	*board =
 
 isp->dev->platform_data;
 
-	if (board && board->set_power)
-		board->set_power(on);
+	if (board)
+		gpio_set_value(board->enable_gpio, on);
Quoted 8 lines
Quoted 4 lines
Quoted 1 line

}

You need to check if enable_gpio in board data was defined or not.

The device is not successful probed without valid enable_gpio.

-- Sebastian

Then, OK.

Signature · 2 lines
Pali Rohár
[email protected]