diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 17:26:31 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 17:26:31 +0200 |
commit | 0e5e5845304158a672e7af806e4b1b6363ae70c1 (patch) | |
tree | 98d9c1d2d66f5f83adef847afa9776c2529b13de /arch/arm/boot/dts/stih416-pinctrl.dtsi | |
parent | d0d89bb6f438ca9a54b82c1ecf89e328d95b9652 (diff) | |
parent | 2cdce7a98b1fbd3839aec5fc79a0f237c9b75dcc (diff) |
Merge tag 'sti-dt-for-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/dt
Merge "STi DT updates for v4.2, round 2." from Maxime Coquelin:
Highlights:
-----------
- Add USB3 support to STiH410 & STiH418
- Add PWM support to STiH416 & STiH407 family
- Add restart support to STiH416 & STiH407 family
- Add PMU support to STiH416 & STiH407 family
- Reorder includes in STiH407 DT files
* tag 'sti-dt-for-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: STi: DT: STih407: Re-order #include <*.dtsi> files
ARM: STi: Ensure requested STi's SysCfg Controlled IRQs are enabled at boot
ARM: STi: STiH407: Enable PMU IRQs
ARM: STi: STiH407: Enable Cortex-A9 PMU support
ARM: STi: STiH416: Enable PMU IRQs
ARM: STi: STiH416: Enable Cortex-A9 PMU support
ARM: STi: STiH416: Add Restart support for STiH416
ARM: STi: STiH407: Add Restart support for STiH407
ARM: STi: STiH416-b2020e: Enable PWM on the B2020 Rev-E
ARM: STi: STiH416: Add DT nodes for PWM
ARM: STi: STiH416: Add Pinctrl settings for PWM
ARM: STi: STiH407: Add DT nodes for for PWM
ARM: DT: STi: STiH418: Enable USB3 port on stih418-b2199.
ARM: DT: STi: STiH418: Add miphy28lp optional oscillator clock properties
ARM: DT: STi: stihxxx-b2120: Enable USB3 port on stih407-b2120 and stih410-b2120
ARM: DT: STi: STiH407: Add dwc3 usb3 DT node.
ARM: DT: STi: STiH407: Update picophyreset for the usb3 controllers usb2 phy
Diffstat (limited to 'arch/arm/boot/dts/stih416-pinctrl.dtsi')
-rw-r--r-- | arch/arm/boot/dts/stih416-pinctrl.dtsi | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi index 9cccf2d6aa26..051fc16f3706 100644 --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi @@ -216,6 +216,29 @@ }; }; }; + + pwm1 { + pinctrl_pwm1_chan0_default: pwm1-0-default { + st,pins { + pwm-out = <&pio3 0 ALT1 OUT>; + }; + }; + pinctrl_pwm1_chan1_default: pwm1-1-default { + st,pins { + pwm-out = <&pio4 4 ALT1 OUT>; + }; + }; + pinctrl_pwm1_chan2_default: pwm1-2-default { + st,pins { + pwm-out = <&pio4 6 ALT3 OUT>; + }; + }; + pinctrl_pwm1_chan3_default: pwm1-3-default { + st,pins { + pwm-out = <&pio4 7 ALT3 OUT>; + }; + }; + }; }; pin-controller-front { @@ -310,6 +333,14 @@ st,bank-name = "PIO31"; }; + pwm0 { + pinctrl_pwm0_chan0_default: pwm0-0-default { + st,pins { + pwm-out = <&pio9 7 ALT2 OUT>; + }; + }; + }; + serial2-oe { pinctrl_serial2_oe: serial2-1 { st,pins { @@ -540,6 +571,25 @@ }; }; }; + + pwm0 { + pinctrl_pwm0_chan1_default: pwm0-1-default { + st,pins { + pwm-out = <&pio13 2 ALT2 OUT>; + }; + }; + pinctrl_pwm0_chan2_default: pwm0-2-default { + st,pins { + pwm-out = <&pio15 2 ALT4 OUT>; + }; + }; + pinctrl_pwm0_chan3_default: pwm0-3-default { + st,pins { + pwm-out = <&pio17 4 ALT1 OUT>; + }; + }; + }; + }; pin-controller-fvdp-fe { |