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

Commit 898a7f36 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt3' of... 

Merge tag 'at91-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Merge "Third batch of DT changes for 4.2" from Nicolas Ferre:

- USB host clock refine following changes in drivers
- one little fix for usart pinctrl

* tag 'at91-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: remove useless usb clock
  ARM: at91/dt: remove useless uhpck clock references from ehci defintions
  USB: atmel: update DT bindings documentation
  ARM: at91/dt: at91sam9x5: fix usart1 sck pin definition
parents 220684f3 f8073708

Documentation/devicetree/bindings/usb/atmel-usb.txt

+25 −0
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ OHCI 
Required properties:

 - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers

   used in host mode.

 - reg: Address and length of the register set for the device

 - interrupts: Should contain ehci interrupt

 - clocks: Should reference the peripheral, host and system clocks

 - clock-names: Should contains two strings

		"ohci_clk" for the peripheral clock

		"hclk" for the host clock

		"uhpck" for the system clock

 - num-ports: Number of ports.

 - atmel,vbus-gpio: If present, specifies a gpio that needs to be

   activated for the bus to be powered.
@@ -14,6 +21,8 @@ Required properties: 
usb0: ohci@00500000 {

	compatible = "atmel,at91rm9200-ohci", "usb-ohci";

	reg = <0x00500000 0x100000>;

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

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

	interrupts = <20 4>;

	num-ports = <2>;

};
@@ -23,11 +32,19 @@ EHCI 
Required properties:

 - compatible: Should be "atmel,at91sam9g45-ehci" for USB controllers

   used in host mode.

 - reg: Address and length of the register set for the device

 - interrupts: Should contain ehci interrupt

 - clocks: Should reference the peripheral and the UTMI clocks

 - clock-names: Should contains two strings

		"ehci_clk" for the peripheral clock

		"usb_clk" for the UTMI clock



usb1: ehci@00800000 {

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

	reg = <0x00800000 0x100000>;

	interrupts = <22 4>;

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

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

};



AT91 USB device controller
@@ -53,6 +70,8 @@ usb1: gadget@fffa4000 { 
	compatible = "atmel,at91rm9200-udc";

	reg = <0xfffa4000 0x4000>;

	interrupts = <10 4>;

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

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

	atmel,vbus-gpio = <&pioC 5 0>;

};
@@ -65,6 +84,10 @@ Required properties: 
	       "sama5d3-udc"

 - reg: Address and length of the register set for the device

 - interrupts: Should contain usba interrupt

 - clocks: Should reference the peripheral and host clocks

 - clock-names: Should contains two strings

		"pclk" for the peripheral clock

		"hclk" for the host clock

 - ep childnode: To specify the number of endpoints and their properties.



Optional properties:
@@ -86,6 +109,8 @@ usb2: gadget@fff78000 { 
	reg = <0x00600000 0x80000

	       0xfff78000 0x400>;

	interrupts = <27 4 0>;

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

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

	atmel,vbus-gpio = <&pioB 19 0>;



	ep0 {

arch/arm/boot/dts/at91rm9200.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -940,8 +940,8 @@ 
			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00300000 0x100000>;

			interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;

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

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

			clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;

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

			status = "disabled";

		};

	};

arch/arm/boot/dts/at91sam9260.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1008,8 +1008,8 @@ 
			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00500000 0x100000>;

			interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;

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

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

			clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;

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

			status = "disabled";

		};

	};

arch/arm/boot/dts/at91sam9261.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 
			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00500000 0x100000>;

			interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&usb>, <&ohci_clk>, <&hclk0>, <&uhpck>;

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

			clocks = <&ohci_clk>, <&hclk0>, <&uhpck>;

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

			status = "disabled";

		};

arch/arm/boot/dts/at91sam9263.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1010,8 +1010,8 @@ 
			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00a00000 0x100000>;

			interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;

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

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

			clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;

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

			status = "disabled";

		};

	};