Commit b4d86d19 authored by Daniel Lezcano's avatar Daniel Lezcano

Merge branch 'omap-for-v5.8/dt-timer' of...

Merge branch 'omap-for-v5.8/dt-timer' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into timers/drivers/next
parents ac593e62 ac819eda
...@@ -105,6 +105,7 @@ pwm7: dmtimer-pwm { ...@@ -105,6 +105,7 @@ pwm7: dmtimer-pwm {
ti,timers = <&timer7>; ti,timers = <&timer7>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&dmtimer7_pins>; pinctrl-0 = <&dmtimer7_pins>;
ti,clock-source = <0x01>;
}; };
vmmcsd_fixed: regulator-3v3 { vmmcsd_fixed: regulator-3v3 {
......
...@@ -156,6 +156,7 @@ pwm11: dmtimer-pwm@11 { ...@@ -156,6 +156,7 @@ pwm11: dmtimer-pwm@11 {
pinctrl-0 = <&pwm_pins>; pinctrl-0 = <&pwm_pins>;
ti,timers = <&timer11>; ti,timers = <&timer11>;
#pwm-cells = <3>; #pwm-cells = <3>;
ti,clock-source = <0x01>;
}; };
/* HS USB Host PHY on PORT 1 */ /* HS USB Host PHY on PORT 1 */
......
...@@ -65,6 +65,7 @@ pwm10: dmtimer-pwm { ...@@ -65,6 +65,7 @@ pwm10: dmtimer-pwm {
pinctrl-0 = <&pwm_pins>; pinctrl-0 = <&pwm_pins>;
ti,timers = <&timer10>; ti,timers = <&timer10>;
#pwm-cells = <3>; #pwm-cells = <3>;
ti,clock-source = <0x01>;
}; };
}; };
......
...@@ -150,6 +150,7 @@ pwm11: dmtimer-pwm { ...@@ -150,6 +150,7 @@ pwm11: dmtimer-pwm {
compatible = "ti,omap-dmtimer-pwm"; compatible = "ti,omap-dmtimer-pwm";
ti,timers = <&timer11>; ti,timers = <&timer11>;
#pwm-cells = <3>; #pwm-cells = <3>;
ti,clock-source = <0x01>;
}; };
hsusb2_phy: hsusb2_phy { hsusb2_phy: hsusb2_phy {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment