@@ -39,6 +39,7 @@
#include <linux/usb/nop-usb-xceiv.h>
#include <linux/platform_data/usb-omap.h>
#include <linux/sizes.h>
+#include <linux/pinctrl/consumer.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -124,6 +125,11 @@ struct dsps_glue {
struct timer_list timer[2]; /* otg_workaround timer */
unsigned long last_timer[2]; /* last timer data for each instance */
u32 __iomem *usb_ctrl[2];
+
+ /* two pin states - default, sleep */
+ struct pinctrl *pinctrl;
+ struct pinctrl_state *pins_default;
+ struct pinctrl_state *pins_sleep;
};
#define DSPS_AM33XX_CONTROL_MODULE_PHYS_0 0x44e10620
@@ -636,6 +642,36 @@ static int dsps_probe(struct platform_device *pdev)
ret = -ENOMEM;
goto err1;
}
+
+ glue->pinctrl = devm_pinctrl_get(&pdev->dev);
+ if (!IS_ERR(glue->pinctrl)) {
+ glue->pins_default = pinctrl_lookup_state(glue->pinctrl,
+ PINCTRL_STATE_DEFAULT);
+ if (IS_ERR(glue->pins_default))
+ dev_dbg(&pdev->dev, "could not get default pinstate\n");
+ else
+ if (pinctrl_select_state(glue->pinctrl,
+ glue->pins_default))
+ dev_err(&pdev->dev,
+ "could not set default pinstate\n");
+
+ glue->pins_sleep = pinctrl_lookup_state(glue->pinctrl,
+ PINCTRL_STATE_SLEEP);
+ if (IS_ERR(glue->pins_sleep))
+ dev_dbg(&pdev->dev, "could not get sleep pinstate\n");
+ } else {
+ /*
+ * Since we continue even when pinctrl node is not found,
+ * Invalidate pins as not available. This is to make sure that
+ * IS_ERR(pins_xxx) results in failure when used.
+ */
+ glue->pins_default = ERR_PTR(-ENODATA);
+ glue->pins_sleep = ERR_PTR(-ENODATA);
+
+ dev_dbg(&pdev->dev, "did not get pins for i2c error: %li\n",
+ PTR_ERR(glue->pinctrl));
+ }
+
platform_set_drvdata(pdev, glue);
/* enable the usbss clocks */
@@ -700,6 +736,11 @@ static int dsps_suspend(struct device *dev)
for (i = 0; i < wrp->instances; i++)
musb_dsps_phy_control(glue, i, 0);
+ /* Optionally let pins go into sleep states */
+ if (!IS_ERR(glue->pins_sleep))
+ if (pinctrl_select_state(glue->pinctrl, glue->pins_sleep))
+ dev_err(dev, "could not set pins to sleep state\n");
+
return 0;
}
@@ -710,6 +751,11 @@ static int dsps_resume(struct device *dev)
const struct dsps_musb_wrapper *wrp = glue->wrp;
int i;
+ /* Optionaly enable pins to be muxed in and configured */
+ if (!IS_ERR(glue->pins_default))
+ if (pinctrl_select_state(glue->pinctrl, glue->pins_default))
+ dev_err(dev, "could not set default pins\n");
+
for (i = 0; i < wrp->instances; i++)
musb_dsps_phy_control(glue, i, 1);
Amend the musb controller to optionally take a pin control handle and set the state of the pins to: - "default" on boot, resume - "sleep" on suspend() By optionally putting the pins into sleep state in the suspend callback we can accomplish two things. - One is to minimize current leakage from pins and thus save power, - second, we can prevent the IP from driving pins output in an uncontrolled manner, which may happen if the power domain drops the domain regulator. If any of the above pin states are missing in dt, a warning message about the missing state is displayed. If certain pin-states are not available, to remove this warning message pass respective state name with null phandler. Todo: - if an idle state is available for pins, add support for it. Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> Cc: Felipe Balbi <balbi@ti.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-usb@vger.kernel.org --- :100644 100644 e1b661d... a9580fe... M drivers/usb/musb/musb_dsps.c drivers/usb/musb/musb_dsps.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)