mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-28 06:38:13 -04:00
Merge branch 'omap-for-v5.8/dt-timer' into omap-for-v5.8/dt
This commit is contained in:
@@ -105,6 +105,7 @@ pwm7: dmtimer-pwm {
|
||||
ti,timers = <&timer7>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&dmtimer7_pins>;
|
||||
ti,clock-source = <0x01>;
|
||||
};
|
||||
|
||||
vmmcsd_fixed: regulator-3v3 {
|
||||
|
||||
@@ -156,6 +156,7 @@ pwm11: dmtimer-pwm@11 {
|
||||
pinctrl-0 = <&pwm_pins>;
|
||||
ti,timers = <&timer11>;
|
||||
#pwm-cells = <3>;
|
||||
ti,clock-source = <0x01>;
|
||||
};
|
||||
|
||||
/* HS USB Host PHY on PORT 1 */
|
||||
|
||||
@@ -65,6 +65,7 @@ pwm10: dmtimer-pwm {
|
||||
pinctrl-0 = <&pwm_pins>;
|
||||
ti,timers = <&timer10>;
|
||||
#pwm-cells = <3>;
|
||||
ti,clock-source = <0x01>;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
@@ -150,6 +150,7 @@ pwm11: dmtimer-pwm {
|
||||
compatible = "ti,omap-dmtimer-pwm";
|
||||
ti,timers = <&timer11>;
|
||||
#pwm-cells = <3>;
|
||||
ti,clock-source = <0x01>;
|
||||
};
|
||||
|
||||
hsusb2_phy: hsusb2_phy {
|
||||
|
||||
Reference in New Issue
Block a user