Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5200d2 authored by Cooper Jr., Franklin's avatar Cooper Jr., Franklin Committed by Thierry Reding
Browse files

pwm: pwm-ti*: Get the clock from the PWMSS parent when using old bindings 



When using the old eCAP and ePWM bindings for AM335x and AM437x the clock
can be retrieved from the PWMSS parent. Newer bindings will insure that
this clock is provided via device tree.

Therefore, update this driver to support the newer and older bindings. In
the case of the older binding being used give a warning.

Signed-off-by: default avatarFranklin S Cooper Jr <fcooper@ti.com>
[thierry.reding@gmail.com: rewrite slightly for readability]
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent e1aaf89a

drivers/pwm/pwm-tiecap.c

+9 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static const struct pwm_ops ecap_pwm_ops = { 
};



static const struct of_device_id ecap_of_match[] = {

	{ .compatible	= "ti,am3352-ecap" },

	{ .compatible	= "ti,am33xx-ecap" },

	{},

};
@@ -202,6 +203,7 @@ MODULE_DEVICE_TABLE(of, ecap_of_match); 


static int ecap_pwm_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	int ret;

	struct resource *r;

	struct clk *clk;
@@ -213,6 +215,13 @@ static int ecap_pwm_probe(struct platform_device *pdev) 
		return -ENOMEM;



	clk = devm_clk_get(&pdev->dev, "fck");

	if (IS_ERR(clk)) {

		if (of_device_is_compatible(np, "ti,am33xx-ecap")) {

			dev_warn(&pdev->dev, "Binding is obsolete.\n");

			clk = devm_clk_get(pdev->dev.parent, "fck");

		}

	}



	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "failed to get clock\n");

		return PTR_ERR(clk);

drivers/pwm/pwm-tiehrpwm.c

+9 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ static const struct pwm_ops ehrpwm_pwm_ops = { 
};



static const struct of_device_id ehrpwm_of_match[] = {

	{ .compatible	= "ti,am3352-ehrpwm" },

	{ .compatible	= "ti,am33xx-ehrpwm" },

	{},

};
@@ -433,6 +434,7 @@ MODULE_DEVICE_TABLE(of, ehrpwm_of_match); 


static int ehrpwm_pwm_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	int ret;

	struct resource *r;

	struct clk *clk;
@@ -444,6 +446,13 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev) 
		return -ENOMEM;



	clk = devm_clk_get(&pdev->dev, "fck");

	if (IS_ERR(clk)) {

		if (of_device_is_compatible(np, "ti,am33xx-ecap")) {

			dev_warn(&pdev->dev, "Binding is obsolete.\n");

			clk = devm_clk_get(pdev->dev.parent, "fck");

		}

	}



	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "failed to get clock\n");

		return PTR_ERR(clk);