Commit b4d86d19 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

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
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@
		ti,timers = <&timer7>;
		pinctrl-names = "default";
		pinctrl-0 = <&dmtimer7_pins>;
		ti,clock-source = <0x01>;
	};

	vmmcsd_fixed: regulator-3v3 {
+1 −0
Original line number Diff line number Diff line
@@ -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 */
+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@
		pinctrl-0 = <&pwm_pins>;
		ti,timers = <&timer10>;
		#pwm-cells = <3>;
		ti,clock-source = <0x01>;
	};

};
+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@
		compatible = "ti,omap-dmtimer-pwm";
		ti,timers = <&timer11>;
		#pwm-cells = <3>;
		ti,clock-source = <0x01>;
	};

	hsusb2_phy: hsusb2_phy {