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

Commit 3440ef16 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91/dt: fix USB high-speed clock to select UTMI 



The UTMI clock must be selected by any high-speed USB IP. The logic behind it
needs this particular clock.
So, correct the clock in the device tree files affected.

Reported-by: default avatarBo Shen <voice.shen@atmel.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: <stable@vger.kernel.org> #3.18
parent 70a9beaa

arch/arm/boot/dts/at91sam9g45.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -1300,7 +1300,7 @@ 
			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			reg = <0x00800000 0x100000>;

			reg = <0x00800000 0x100000>;

			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;

			clocks = <&utmi>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;

			clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";

			clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";

			status = "disabled";

			status = "disabled";

		};

		};

arch/arm/boot/dts/at91sam9x5.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -1066,7 +1066,7 @@ 
				reg = <0x00500000 0x80000

				reg = <0x00500000 0x80000

				       0xf803c000 0x400>;

				       0xf803c000 0x400>;

				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;

				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&usb>, <&udphs_clk>;

				clocks = <&utmi>, <&udphs_clk>;

				clock-names = "hclk", "pclk";

				clock-names = "hclk", "pclk";

				status = "disabled";

				status = "disabled";
@@ -1185,7 +1185,7 @@ 
			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			reg = <0x00700000 0x100000>;

			reg = <0x00700000 0x100000>;

			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&usb>, <&uhphs_clk>, <&uhpck>;

			clocks = <&utmi>, <&uhphs_clk>, <&uhpck>;

			clock-names = "usb_clk", "ehci_clk", "uhpck";

			clock-names = "usb_clk", "ehci_clk", "uhpck";

			status = "disabled";

			status = "disabled";

		};

		};

arch/arm/boot/dts/sama5d3.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -1415,7 +1415,7 @@ 
			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			reg = <0x00700000 0x100000>;

			reg = <0x00700000 0x100000>;

			interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;

			interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&usb>, <&uhphs_clk>, <&uhpck>;

			clocks = <&utmi>, <&uhphs_clk>, <&uhpck>;

			clock-names = "usb_clk", "ehci_clk", "uhpck";

			clock-names = "usb_clk", "ehci_clk", "uhpck";

			status = "disabled";

			status = "disabled";

		};

		};

arch/arm/boot/dts/sama5d4.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -260,7 +260,7 @@ 
			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

			reg = <0x00600000 0x100000>;

			reg = <0x00600000 0x100000>;

			interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;

			interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&usb>, <&uhphs_clk>, <&uhpck>;

			clocks = <&utmi>, <&uhphs_clk>, <&uhpck>;

			clock-names = "usb_clk", "ehci_clk", "uhpck";

			clock-names = "usb_clk", "ehci_clk", "uhpck";

			status = "disabled";

			status = "disabled";

		};

		};