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

Commit 05438894 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes 

Merge "at91: fixes for 3.16 #2" from Nicolas Ferre:

Second AT91 fixes series for 3.16
- fix clock definitions after the move to CCF for:
  * at91sam9n12 (ohci)
  * at91sam9x5 (ohci, pwm)

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91

:
  ARM: at91/dt: add missing clocks property to pwm node in sam9x5.dtsi
  ARM: at91/dt: fix usb0 clocks definition in sam9n12 dtsi
  ARM: at91: at91sam9x5: correct typo error for ohci clock

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 81cca645 e0d69e11

arch/arm/boot/dts/at91sam9n12.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ 
			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00500000 0x00100000>;

			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

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

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

				 <&uhpck>;

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

			status = "disabled";

arch/arm/boot/dts/at91sam9x5.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1124,6 +1124,7 @@ 
				compatible = "atmel,at91sam9rl-pwm";

				reg = <0xf8034000 0x300>;

				interrupts = <18 IRQ_TYPE_LEVEL_HIGH 4>;

				clocks = <&pwm_clk>;

				#pwm-cells = <3>;

				status = "disabled";

			};
@@ -1155,8 +1156,7 @@ 
			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00600000 0x100000>;

			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

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

				 <&uhpck>;

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

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

			status = "disabled";

		};