diff options
author | Dan Murphy | 2020-07-28 13:53:40 -0500 |
---|---|---|
committer | Dan Murphy | 2020-07-28 13:53:40 -0500 |
commit | 901b24483d4e7c1be2b6ff50bd155ad933f3c359 (patch) | |
tree | 20b5973df7bff900d040db722805035416e5697c | |
parent | f3a538e4e9741b42df4ec3c60e5f0479430cdb06 (diff) | |
parent | ac127539ececef9981fb734d1966f5b5d887a0f8 (diff) | |
download | ti-upstream-tools-901b24483d4e7c1be2b6ff50bd155ad933f3c359.tar.gz ti-upstream-tools-901b24483d4e7c1be2b6ff50bd155ad933f3c359.tar.xz ti-upstream-tools-901b24483d4e7c1be2b6ff50bd155ad933f3c359.zip |
Merge pull request #9 in LCPDPUB/ti-upstream-tools from ~A0132425/ti-upstream-tools:ehrpwm-v2 to master
* commit 'ac127539ececef9981fb734d1966f5b5d887a0f8':
system_test: am335x-boneblack-ehrpwm.dtso: Enable eCAP0 PWM for testing
-rw-r--r-- | arch/arm/boot/dts/ti/system_test/am3_ehrpwm/am335x-boneblack-ehrpwm.dtso | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ti/system_test/am3_ehrpwm/am335x-boneblack-ehrpwm.dtso b/arch/arm/boot/dts/ti/system_test/am3_ehrpwm/am335x-boneblack-ehrpwm.dtso index 3d1774d..b4125a7 100644 --- a/arch/arm/boot/dts/ti/system_test/am3_ehrpwm/am335x-boneblack-ehrpwm.dtso +++ b/arch/arm/boot/dts/ti/system_test/am3_ehrpwm/am335x-boneblack-ehrpwm.dtso | |||
@@ -1,6 +1,6 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
2 | /** | 2 | /** |
3 | * DT overlay for BBB eHRPWM testing | 3 | * DT overlay for BBB eHRPWM and eCAP PWM testing |
4 | * | 4 | * |
5 | * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ | 5 | * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ |
6 | */ | 6 | */ |
@@ -16,6 +16,22 @@ | |||
16 | AM33XX_IOPAD(0x824, PIN_OUTPUT | MUX_MODE4 ) /* (R2) lcd_data1.ehrpwm2B */ | 16 | AM33XX_IOPAD(0x824, PIN_OUTPUT | MUX_MODE4 ) /* (R2) lcd_data1.ehrpwm2B */ |
17 | >; | 17 | >; |
18 | }; | 18 | }; |
19 | |||
20 | ecap0_pins: backlight_pins { | ||
21 | pinctrl-single,pins = < | ||
22 | AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, 0x0, MUX_MODE0) | ||
23 | >; | ||
24 | }; | ||
25 | }; | ||
26 | |||
27 | &epwmss0 { | ||
28 | status = "okay"; | ||
29 | }; | ||
30 | |||
31 | &ecap0 { | ||
32 | status = "okay"; | ||
33 | pinctrl-names = "default"; | ||
34 | pinctrl-0 = <&ecap0_pins>; | ||
19 | }; | 35 | }; |
20 | 36 | ||
21 | &epwmss2 { | 37 | &epwmss2 { |