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

Commit 30fa7e0e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-fixes3' of... 

Merge tag 'at91-fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes

Pull "Third fixes batch for AT91 on 4.0" from Nicolas Ferre:
- clock fixes for USB
- compatible string changes for handling USB IP differences
  (+ needed AHB matrix syscon)
- fix of a compilation error in PM code

* tag 'at91-fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: pm_slowclock: fix the compilation error
  ARM: at91/dt: fix USB high-speed clock to select UTMI
  ARM: at91/dt: fix at91 udc compatible strings
  ARM: at91/dt: declare matrix node as a syscon device
  ARM: at91/dt: at91sam9261: fix clocks and clock-names in udc definition
parents b85b634e e7b848d7

arch/arm/boot/dts/at91sam9260.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ 
			};



			usb1: gadget@fffa4000 {

				compatible = "atmel,at91rm9200-udc";

				compatible = "atmel,at91sam9260-udc";

				reg = <0xfffa4000 0x4000>;

				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;

				clocks = <&udc_clk>, <&udpck>;

arch/arm/boot/dts/at91sam9261.dtsi

+5 −4
Original line number Diff line number Diff line
@@ -124,11 +124,12 @@ 
			};



			usb1: gadget@fffa4000 {

				compatible = "atmel,at91rm9200-udc";

				compatible = "atmel,at91sam9261-udc";

				reg = <0xfffa4000 0x4000>;

				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;

				clocks = <&usb>, <&udc_clk>, <&udpck>;

				clock-names = "usb_clk", "udc_clk", "udpck";

				clocks = <&udc_clk>, <&udpck>;

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

				atmel,matrix = <&matrix>;

				status = "disabled";

			};
@@ -262,7 +263,7 @@ 
			};



			matrix: matrix@ffffee00 {

				compatible = "atmel,at91sam9260-bus-matrix";

				compatible = "atmel,at91sam9260-bus-matrix", "syscon";

				reg = <0xffffee00 0x200>;

			};

arch/arm/boot/dts/at91sam9263.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ 
			};



			usb1: gadget@fff78000 {

				compatible = "atmel,at91rm9200-udc";

				compatible = "atmel,at91sam9263-udc";

				reg = <0xfff78000 0x4000>;

				interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;

				clocks = <&udc_clk>, <&udpck>;

arch/arm/boot/dts/at91sam9g45.dtsi

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

			reg = <0x00800000 0x100000>;

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

			status = "disabled";

		};

arch/arm/boot/dts/at91sam9x5.dtsi

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

				       0xf803c000 0x400>;

				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;

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

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

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

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

			reg = <0x00700000 0x100000>;

			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

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

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

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

			status = "disabled";

		};