aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCooper Jr., Franklin <fcooper@ti.com>2016-07-11 15:11:46 -0400
committerSekhar Nori <nsekhar@ti.com>2016-08-09 02:51:56 -0400
commit38b8da79163be3fe4a83f02df77edb0157b1b49f (patch)
treee4d92b41a7424a5145c0126d4cd62d04770a6cd6
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
ARM: dts: da850: Add new ECAP and EPWM bindings
For some devices, the PWMSS is a parent of eCAP and ePWM and provides the functional clocks for those submodules. The ti,am33xx-ecap and ti,am33xx-ehrpwm bindings were based on this parent child relationship where the functional clock would be grabbed from the module's parent. However, DA850 doesn't have a PWMSS and the eCAP and ePWM provides their functional clock themselves. Therefore, prefer the new binding that doesn't assume this parent child relationship. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Acked-by: Rob Herring <robh@kernel.org> [nsekhar@ti.com: minor commit message fixes] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-rw-r--r--arch/arm/boot/dts/da850.dtsi15
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 25f0f8e6dde5..09cf663c4170 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -274,31 +274,36 @@
274 status = "disabled"; 274 status = "disabled";
275 }; 275 };
276 ehrpwm0: pwm@300000 { 276 ehrpwm0: pwm@300000 {
277 compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm"; 277 compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm",
278 "ti,am33xx-ehrpwm";
278 #pwm-cells = <3>; 279 #pwm-cells = <3>;
279 reg = <0x300000 0x2000>; 280 reg = <0x300000 0x2000>;
280 status = "disabled"; 281 status = "disabled";
281 }; 282 };
282 ehrpwm1: pwm@302000 { 283 ehrpwm1: pwm@302000 {
283 compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm"; 284 compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm",
285 "ti,am33xx-ehrpwm";
284 #pwm-cells = <3>; 286 #pwm-cells = <3>;
285 reg = <0x302000 0x2000>; 287 reg = <0x302000 0x2000>;
286 status = "disabled"; 288 status = "disabled";
287 }; 289 };
288 ecap0: ecap@306000 { 290 ecap0: ecap@306000 {
289 compatible = "ti,da850-ecap", "ti,am33xx-ecap"; 291 compatible = "ti,da850-ecap", "ti,am3352-ecap",
292 "ti,am33xx-ecap";
290 #pwm-cells = <3>; 293 #pwm-cells = <3>;
291 reg = <0x306000 0x80>; 294 reg = <0x306000 0x80>;
292 status = "disabled"; 295 status = "disabled";
293 }; 296 };
294 ecap1: ecap@307000 { 297 ecap1: ecap@307000 {
295 compatible = "ti,da850-ecap", "ti,am33xx-ecap"; 298 compatible = "ti,da850-ecap", "ti,am3352-ecap",
299 "ti,am33xx-ecap";
296 #pwm-cells = <3>; 300 #pwm-cells = <3>;
297 reg = <0x307000 0x80>; 301 reg = <0x307000 0x80>;
298 status = "disabled"; 302 status = "disabled";
299 }; 303 };
300 ecap2: ecap@308000 { 304 ecap2: ecap@308000 {
301 compatible = "ti,da850-ecap", "ti,am33xx-ecap"; 305 compatible = "ti,da850-ecap", "ti,am3352-ecap",
306 "ti,am33xx-ecap";
302 #pwm-cells = <3>; 307 #pwm-cells = <3>;
303 reg = <0x308000 0x80>; 308 reg = <0x308000 0x80>;
304 status = "disabled"; 309 status = "disabled";