aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudiu Beznea <claudiu.beznea@microchip.com>2017-03-22 09:29:35 -0400
committerThierry Reding <thierry.reding@gmail.com>2017-04-06 11:45:03 -0400
commit44521afa57bb6f0016c1c1ad70cc8ef352c6d83b (patch)
tree86542686c0d5224bf1920afd5aeeb81ac96b97de
parent1a722aad587967985f927e4ec2650ca64632c3e1 (diff)
pwm: atmel: Enable PWM on sama5d2
sama5d2 can use the same atmel_pwm_data as sama5d3. Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-rw-r--r--Documentation/devicetree/bindings/pwm/atmel-pwm.txt1
-rw-r--r--drivers/pwm/pwm-atmel.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pwm/atmel-pwm.txt b/Documentation/devicetree/bindings/pwm/atmel-pwm.txt
index 02331b904d4e..c8c831d7b0d1 100644
--- a/Documentation/devicetree/bindings/pwm/atmel-pwm.txt
+++ b/Documentation/devicetree/bindings/pwm/atmel-pwm.txt
@@ -4,6 +4,7 @@ Required properties:
4 - compatible: should be one of: 4 - compatible: should be one of:
5 - "atmel,at91sam9rl-pwm" 5 - "atmel,at91sam9rl-pwm"
6 - "atmel,sama5d3-pwm" 6 - "atmel,sama5d3-pwm"
7 - "atmel,sama5d2-pwm"
7 - reg: physical base address and length of the controller's registers 8 - reg: physical base address and length of the controller's registers
8 - #pwm-cells: Should be 3. See pwm.txt in this directory for a 9 - #pwm-cells: Should be 3. See pwm.txt in this directory for a
9 description of the cells format. 10 description of the cells format.
diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c
index f147154d9cb2..530d7dc5f1b5 100644
--- a/drivers/pwm/pwm-atmel.c
+++ b/drivers/pwm/pwm-atmel.c
@@ -312,6 +312,9 @@ static const struct of_device_id atmel_pwm_dt_ids[] = {
312 .compatible = "atmel,sama5d3-pwm", 312 .compatible = "atmel,sama5d3-pwm",
313 .data = &atmel_pwm_regs_v2, 313 .data = &atmel_pwm_regs_v2,
314 }, { 314 }, {
315 .compatible = "atmel,sama5d2-pwm",
316 .data = &atmel_pwm_regs_v2,
317 }, {
315 /* sentinel */ 318 /* sentinel */
316 }, 319 },
317}; 320};