Commit 7cf0bb80 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

parents 441ba630 ac819eda

arch/arm/boot/dts/am335x-guardian.dts

+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 {

arch/arm/boot/dts/am3517-evm.dts

+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 */

arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi

+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>;

	};



};

arch/arm/boot/dts/omap3-gta04.dtsi

+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 {