Skip to content

Commit

Permalink
Merge branch 'omap-for-v5.8/dt-timer' into omap-for-v5.8/dt
Browse files Browse the repository at this point in the history
  • Loading branch information
tmlind committed May 5, 2020
2 parents 441ba63 + ac819ed commit 7cf0bb8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/dts/am335x-guardian.dts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
ti,timers = <&timer7>;
pinctrl-names = "default";
pinctrl-0 = <&dmtimer7_pins>;
ti,clock-source = <0x01>;
};

vmmcsd_fixed: regulator-3v3 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/am3517-evm.dts
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
pinctrl-0 = <&pwm_pins>;
ti,timers = <&timer11>;
#pwm-cells = <3>;
ti,clock-source = <0x01>;
};

/* HS USB Host PHY on PORT 1 */
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
pinctrl-0 = <&pwm_pins>;
ti,timers = <&timer10>;
#pwm-cells = <3>;
ti,clock-source = <0x01>;
};

};
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-gta04.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
compatible = "ti,omap-dmtimer-pwm";
ti,timers = <&timer11>;
#pwm-cells = <3>;
ti,clock-source = <0x01>;
};

hsusb2_phy: hsusb2_phy {
Expand Down

0 comments on commit 7cf0bb8

Please sign in to comment.