Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81717283 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge commit '7d56bedb' into omap-for-v5.1/fixes

parents 66913706 7d56bedb

arch/arm/boot/dts/am33xx-l4.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -1762,7 +1762,7 @@ 
			reg = <0xcc000 0x4>;

			reg = <0xcc000 0x4>;

			reg-names = "rev";

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>;

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>;

			clock-names = "fck";

			clock-names = "fck";

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <1>;
@@ -1785,7 +1785,7 @@ 
			reg = <0xd0000 0x4>;

			reg = <0xd0000 0x4>;

			reg-names = "rev";

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>;

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>;

			clock-names = "fck";

			clock-names = "fck";

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <1>;