summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-06-26 16:58:08 +0800
committerThierry Reding <thierry.reding@avionic-design.de>2012-07-23 13:23:53 +0200
commit071407eefd708d7e273b67af150f8dff6c51eb58 (patch)
tree8ce88fd8a1c0d456d9a9c0b5e027886047e325c9
parent200efedd87662e3510b2e9ac8b56c8a32baf3e12 (diff)
downloadop-kernel-dev-071407eefd708d7e273b67af150f8dff6c51eb58.zip
op-kernel-dev-071407eefd708d7e273b67af150f8dff6c51eb58.tar.gz
pwm: pwm-mxs: encode soc name in compatible string
Encode soc name in the compatible string to know the specific version hardware block. This is the general approach adopted for most bindings. Change mxs-pwm binding to use the approach. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
-rw-r--r--Documentation/devicetree/bindings/pwm/mxs-pwm.txt4
-rw-r--r--drivers/pwm/pwm-mxs.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/pwm/mxs-pwm.txt b/Documentation/devicetree/bindings/pwm/mxs-pwm.txt
index 48ead0d..b16f4a5 100644
--- a/Documentation/devicetree/bindings/pwm/mxs-pwm.txt
+++ b/Documentation/devicetree/bindings/pwm/mxs-pwm.txt
@@ -1,7 +1,7 @@
Freescale MXS PWM controller
Required properties:
-- compatible: should be "fsl,mxs-pwm"
+- compatible: should be "fsl,imx23-pwm"
- reg: physical base address and length of the controller's registers
- #pwm-cells: should be 2. The first cell specifies the per-chip index
of the PWM to use and the second cell is the duty cycle in nanoseconds.
@@ -10,7 +10,7 @@ Required properties:
Example:
pwm: pwm@80064000 {
- compatible = "fsl,imx28-pwm", "fsl,mxs-pwm";
+ compatible = "fsl,imx28-pwm", "fsl,imx23-pwm";
reg = <0x80064000 2000>;
#pwm-cells = <2>;
fsl,pwm-number = <8>;
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index 9602708..d9a3805 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -186,7 +186,7 @@ static int __devexit mxs_pwm_remove(struct platform_device *pdev)
}
static struct of_device_id mxs_pwm_dt_ids[] = {
- { .compatible = "fsl,mxs-pwm", },
+ { .compatible = "fsl,imx23-pwm", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mxs_pwm_dt_ids);
OpenPOWER on IntegriCloud