* linux-next: manual merge of the pwm tree with the driver-core tree
@ 2012-11-29 5:25 Stephen Rothwell
2012-11-29 6:45 ` Thierry Reding
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-11-29 5:25 UTC (permalink / raw)
To: Thierry Reding
Cc: linux-next, linux-kernel, Bill Pemberton, Greg KH,
Philip, Avinash
[-- Attachment #1: Type: text/plain, Size: 2207 bytes --]
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-tiecap.c between commit 3e9fe83d278c ("pwm: remove use of
__devinit") from the driver-core tree and commit 333b08ee8c6e ("pwm:
tiecap: Add device-tree binding") from the pwm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/pwm/pwm-tiecap.c
index 87c091b,b4f9d47..0000000
--- a/drivers/pwm/pwm-tiecap.c
+++ b/drivers/pwm/pwm-tiecap.c
@@@ -184,7 -188,13 +188,13 @@@ static const struct pwm_ops ecap_pwm_op
.owner = THIS_MODULE,
};
+ static const struct of_device_id ecap_of_match[] = {
+ { .compatible = "ti,am33xx-ecap" },
+ {},
+ };
+ MODULE_DEVICE_TABLE(of, ecap_of_match);
+
-static int __devinit ecap_pwm_probe(struct platform_device *pdev)
+static int ecap_pwm_probe(struct platform_device *pdev)
{
int ret;
struct resource *r;
@@@ -231,11 -249,29 +249,29 @@@
}
pm_runtime_enable(&pdev->dev);
+ pm_runtime_get_sync(&pdev->dev);
+
+ status = pwmss_submodule_state_change(pdev->dev.parent,
+ PWMSS_ECAPCLK_EN);
+ if (!(status & PWMSS_ECAPCLK_EN_ACK)) {
+ dev_err(&pdev->dev, "PWMSS config space clock enable failed\n");
+ ret = -EINVAL;
+ goto pwmss_clk_failure;
+ }
+
+ pm_runtime_put_sync(&pdev->dev);
+
platform_set_drvdata(pdev, pc);
return 0;
+
+ pwmss_clk_failure:
+ pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+ pwmchip_remove(&pc->chip);
+ return ret;
}
-static int __devexit ecap_pwm_remove(struct platform_device *pdev)
+static int ecap_pwm_remove(struct platform_device *pdev)
{
struct ecap_pwm_chip *pc = platform_get_drvdata(pdev);
@@@ -246,10 -290,12 +290,12 @@@
static struct platform_driver ecap_pwm_driver = {
.driver = {
- .name = "ecap",
+ .name = "ecap",
+ .owner = THIS_MODULE,
+ .of_match_table = ecap_of_match,
},
.probe = ecap_pwm_probe,
- .remove = __devexit_p(ecap_pwm_remove),
+ .remove = ecap_pwm_remove,
};
module_platform_driver(ecap_pwm_driver);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the pwm tree with the driver-core tree
@ 2012-11-29 5:27 Stephen Rothwell
2012-11-29 6:46 ` Thierry Reding
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-11-29 5:27 UTC (permalink / raw)
To: Thierry Reding
Cc: linux-next, linux-kernel, Bill Pemberton, Greg KH,
Philip, Avinash
[-- Attachment #1: Type: text/plain, Size: 2249 bytes --]
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-tiehrpwm.c between commit 3e9fe83d278c ("pwm: remove use
of __devinit") from the driver-core tree and commit 53ad9e8d3703 ("pwm:
tiehrpwm: Add device-tree binding") from the pwm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/pwm/pwm-tiehrpwm.c
index 9ffd389,542d5f3..0000000
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@@ -392,7 -403,13 +403,13 @@@ static const struct pwm_ops ehrpwm_pwm_
.owner = THIS_MODULE,
};
+ static const struct of_device_id ehrpwm_of_match[] = {
+ { .compatible = "ti,am33xx-ehrpwm" },
+ {},
+ };
+ MODULE_DEVICE_TABLE(of, ehrpwm_of_match);
+
-static int __devinit ehrpwm_pwm_probe(struct platform_device *pdev)
+static int ehrpwm_pwm_probe(struct platform_device *pdev)
{
int ret;
struct resource *r;
@@@ -439,11 -471,29 +471,29 @@@
}
pm_runtime_enable(&pdev->dev);
+ pm_runtime_get_sync(&pdev->dev);
+
+ status = pwmss_submodule_state_change(pdev->dev.parent,
+ PWMSS_EPWMCLK_EN);
+ if (!(status & PWMSS_EPWMCLK_EN_ACK)) {
+ dev_err(&pdev->dev, "PWMSS config space clock enable failed\n");
+ ret = -EINVAL;
+ goto pwmss_clk_failure;
+ }
+
+ pm_runtime_put_sync(&pdev->dev);
+
platform_set_drvdata(pdev, pc);
return 0;
+
+ pwmss_clk_failure:
+ pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+ pwmchip_remove(&pc->chip);
+ return ret;
}
-static int __devexit ehrpwm_pwm_remove(struct platform_device *pdev)
+static int ehrpwm_pwm_remove(struct platform_device *pdev)
{
struct ehrpwm_pwm_chip *pc = platform_get_drvdata(pdev);
@@@ -454,10 -512,12 +512,12 @@@
static struct platform_driver ehrpwm_pwm_driver = {
.driver = {
- .name = "ehrpwm",
+ .name = "ehrpwm",
+ .owner = THIS_MODULE,
+ .of_match_table = ehrpwm_of_match,
},
.probe = ehrpwm_pwm_probe,
- .remove = __devexit_p(ehrpwm_pwm_remove),
+ .remove = ehrpwm_pwm_remove,
};
module_platform_driver(ehrpwm_pwm_driver);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the pwm tree with the driver-core tree
@ 2012-11-29 5:29 Stephen Rothwell
2012-11-29 6:48 ` Thierry Reding
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-11-29 5:29 UTC (permalink / raw)
To: Thierry Reding
Cc: linux-next, linux-kernel, Bill Pemberton, Greg KH, Peter Ujfalusi
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-twl6030.c between commit fd1091125a1d ("pwm: remove use
of __devexit_p") from the driver-core tree and commit 6179a58ec7e2 ("pwm:
Remove pwm-twl6030 driver") from the pwm tree.
I fixed it up (the latter removed the file) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the pwm tree with the driver-core tree
2012-11-29 5:25 Stephen Rothwell
@ 2012-11-29 6:45 ` Thierry Reding
0 siblings, 0 replies; 6+ messages in thread
From: Thierry Reding @ 2012-11-29 6:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bill Pemberton, Greg KH,
Philip, Avinash
[-- Attachment #1: Type: text/plain, Size: 2486 bytes --]
On Thu, Nov 29, 2012 at 04:25:14PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-tiecap.c between commit 3e9fe83d278c ("pwm: remove use of
> __devinit") from the driver-core tree and commit 333b08ee8c6e ("pwm:
> tiecap: Add device-tree binding") from the pwm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks Stephen.
Thierry
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/pwm/pwm-tiecap.c
> index 87c091b,b4f9d47..0000000
> --- a/drivers/pwm/pwm-tiecap.c
> +++ b/drivers/pwm/pwm-tiecap.c
> @@@ -184,7 -188,13 +188,13 @@@ static const struct pwm_ops ecap_pwm_op
> .owner = THIS_MODULE,
> };
>
> + static const struct of_device_id ecap_of_match[] = {
> + { .compatible = "ti,am33xx-ecap" },
> + {},
> + };
> + MODULE_DEVICE_TABLE(of, ecap_of_match);
> +
> -static int __devinit ecap_pwm_probe(struct platform_device *pdev)
> +static int ecap_pwm_probe(struct platform_device *pdev)
> {
> int ret;
> struct resource *r;
> @@@ -231,11 -249,29 +249,29 @@@
> }
>
> pm_runtime_enable(&pdev->dev);
> + pm_runtime_get_sync(&pdev->dev);
> +
> + status = pwmss_submodule_state_change(pdev->dev.parent,
> + PWMSS_ECAPCLK_EN);
> + if (!(status & PWMSS_ECAPCLK_EN_ACK)) {
> + dev_err(&pdev->dev, "PWMSS config space clock enable failed\n");
> + ret = -EINVAL;
> + goto pwmss_clk_failure;
> + }
> +
> + pm_runtime_put_sync(&pdev->dev);
> +
> platform_set_drvdata(pdev, pc);
> return 0;
> +
> + pwmss_clk_failure:
> + pm_runtime_put_sync(&pdev->dev);
> + pm_runtime_disable(&pdev->dev);
> + pwmchip_remove(&pc->chip);
> + return ret;
> }
>
> -static int __devexit ecap_pwm_remove(struct platform_device *pdev)
> +static int ecap_pwm_remove(struct platform_device *pdev)
> {
> struct ecap_pwm_chip *pc = platform_get_drvdata(pdev);
>
> @@@ -246,10 -290,12 +290,12 @@@
>
> static struct platform_driver ecap_pwm_driver = {
> .driver = {
> - .name = "ecap",
> + .name = "ecap",
> + .owner = THIS_MODULE,
> + .of_match_table = ecap_of_match,
> },
> .probe = ecap_pwm_probe,
> - .remove = __devexit_p(ecap_pwm_remove),
> + .remove = ecap_pwm_remove,
> };
>
> module_platform_driver(ecap_pwm_driver);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the pwm tree with the driver-core tree
2012-11-29 5:27 linux-next: manual merge of the pwm tree with the driver-core tree Stephen Rothwell
@ 2012-11-29 6:46 ` Thierry Reding
0 siblings, 0 replies; 6+ messages in thread
From: Thierry Reding @ 2012-11-29 6:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bill Pemberton, Greg KH,
Philip, Avinash
[-- Attachment #1: Type: text/plain, Size: 2517 bytes --]
On Thu, Nov 29, 2012 at 04:27:30PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-tiehrpwm.c between commit 3e9fe83d278c ("pwm: remove use
> of __devinit") from the driver-core tree and commit 53ad9e8d3703 ("pwm:
> tiehrpwm: Add device-tree binding") from the pwm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Also looking good, thanks.
Thierry
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/pwm/pwm-tiehrpwm.c
> index 9ffd389,542d5f3..0000000
> --- a/drivers/pwm/pwm-tiehrpwm.c
> +++ b/drivers/pwm/pwm-tiehrpwm.c
> @@@ -392,7 -403,13 +403,13 @@@ static const struct pwm_ops ehrpwm_pwm_
> .owner = THIS_MODULE,
> };
>
> + static const struct of_device_id ehrpwm_of_match[] = {
> + { .compatible = "ti,am33xx-ehrpwm" },
> + {},
> + };
> + MODULE_DEVICE_TABLE(of, ehrpwm_of_match);
> +
> -static int __devinit ehrpwm_pwm_probe(struct platform_device *pdev)
> +static int ehrpwm_pwm_probe(struct platform_device *pdev)
> {
> int ret;
> struct resource *r;
> @@@ -439,11 -471,29 +471,29 @@@
> }
>
> pm_runtime_enable(&pdev->dev);
> + pm_runtime_get_sync(&pdev->dev);
> +
> + status = pwmss_submodule_state_change(pdev->dev.parent,
> + PWMSS_EPWMCLK_EN);
> + if (!(status & PWMSS_EPWMCLK_EN_ACK)) {
> + dev_err(&pdev->dev, "PWMSS config space clock enable failed\n");
> + ret = -EINVAL;
> + goto pwmss_clk_failure;
> + }
> +
> + pm_runtime_put_sync(&pdev->dev);
> +
> platform_set_drvdata(pdev, pc);
> return 0;
> +
> + pwmss_clk_failure:
> + pm_runtime_put_sync(&pdev->dev);
> + pm_runtime_disable(&pdev->dev);
> + pwmchip_remove(&pc->chip);
> + return ret;
> }
>
> -static int __devexit ehrpwm_pwm_remove(struct platform_device *pdev)
> +static int ehrpwm_pwm_remove(struct platform_device *pdev)
> {
> struct ehrpwm_pwm_chip *pc = platform_get_drvdata(pdev);
>
> @@@ -454,10 -512,12 +512,12 @@@
>
> static struct platform_driver ehrpwm_pwm_driver = {
> .driver = {
> - .name = "ehrpwm",
> + .name = "ehrpwm",
> + .owner = THIS_MODULE,
> + .of_match_table = ehrpwm_of_match,
> },
> .probe = ehrpwm_pwm_probe,
> - .remove = __devexit_p(ehrpwm_pwm_remove),
> + .remove = ehrpwm_pwm_remove,
> };
>
> module_platform_driver(ehrpwm_pwm_driver);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the pwm tree with the driver-core tree
2012-11-29 5:29 Stephen Rothwell
@ 2012-11-29 6:48 ` Thierry Reding
0 siblings, 0 replies; 6+ messages in thread
From: Thierry Reding @ 2012-11-29 6:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bill Pemberton, Greg KH, Peter Ujfalusi
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
On Thu, Nov 29, 2012 at 04:29:45PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-twl6030.c between commit fd1091125a1d ("pwm: remove use
> of __devexit_p") from the driver-core tree and commit 6179a58ec7e2 ("pwm:
> Remove pwm-twl6030 driver") from the pwm tree.
>
> I fixed it up (the latter removed the file) and can carry the fix as
> necessary (no action is required).
Great, thanks!
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-11-29 6:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 5:27 linux-next: manual merge of the pwm tree with the driver-core tree Stephen Rothwell
2012-11-29 6:46 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 5:29 Stephen Rothwell
2012-11-29 6:48 ` Thierry Reding
2012-11-29 5:25 Stephen Rothwell
2012-11-29 6:45 ` Thierry Reding
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).