Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 30 deletions
Documentation/devicetree/bindings/usb/atmel-usb.txt
View file @ 898a7f36
...@@ -5,6 +5,13 @@ OHCI ...@@ -5,6 +5,13 @@ OHCI
Required properties: Required properties:
- compatible: Should be "atmel,at91rm9200-ohci" for USB controllers - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers
used in host mode. 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. - num-ports: Number of ports.
- atmel,vbus-gpio: If present, specifies a gpio that needs to be - atmel,vbus-gpio: If present, specifies a gpio that needs to be
activated for the bus to be powered. activated for the bus to be powered.
...@@ -14,6 +21,8 @@ Required properties: ...@@ -14,6 +21,8 @@ Required properties:
usb0: ohci@00500000 { usb0: ohci@00500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00500000 0x100000>; reg = <0x00500000 0x100000>;
clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
clock-names = "ohci_clk", "hclk", "uhpck";
interrupts = <20 4>; interrupts = <20 4>;
num-ports = <2>; num-ports = <2>;
}; };
...@@ -23,11 +32,19 @@ EHCI ...@@ -23,11 +32,19 @@ EHCI
Required properties: Required properties:
- compatible: Should be "atmel,at91sam9g45-ehci" for USB controllers - compatible: Should be "atmel,at91sam9g45-ehci" for USB controllers
used in host mode. 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 { usb1: ehci@00800000 {
compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
reg = <0x00800000 0x100000>; reg = <0x00800000 0x100000>;
interrupts = <22 4>; interrupts = <22 4>;
clocks = <&utmi>, <&uhphs_clk>;
clock-names = "usb_clk", "ehci_clk";
}; };
AT91 USB device controller AT91 USB device controller
...@@ -53,6 +70,8 @@ usb1: gadget@fffa4000 { ...@@ -53,6 +70,8 @@ usb1: gadget@fffa4000 {
compatible = "atmel,at91rm9200-udc"; compatible = "atmel,at91rm9200-udc";
reg = <0xfffa4000 0x4000>; reg = <0xfffa4000 0x4000>;
interrupts = <10 4>; interrupts = <10 4>;
clocks = <&udc_clk>, <&udpck>;
clock-names = "pclk", "hclk";
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 0>;
}; };
...@@ -65,6 +84,10 @@ Required properties: ...@@ -65,6 +84,10 @@ Required properties:
"sama5d3-udc" "sama5d3-udc"
- reg: Address and length of the register set for the device - reg: Address and length of the register set for the device
- interrupts: Should contain usba interrupt - 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. - ep childnode: To specify the number of endpoints and their properties.
Optional properties: Optional properties:
...@@ -86,6 +109,8 @@ usb2: gadget@fff78000 { ...@@ -86,6 +109,8 @@ usb2: gadget@fff78000 {
reg = <0x00600000 0x80000 reg = <0x00600000 0x80000
0xfff78000 0x400>; 0xfff78000 0x400>;
interrupts = <27 4 0>; interrupts = <27 4 0>;
clocks = <&utmi>, <&udphs_clk>;
clock-names = "hclk", "pclk";
atmel,vbus-gpio = <&pioB 19 0>; atmel,vbus-gpio = <&pioB 19 0>;
ep0 { ep0 {
......
arch/arm/boot/dts/at91rm9200.dtsi
View file @ 898a7f36
...@@ -940,8 +940,8 @@ usb0: ohci@00300000 { ...@@ -940,8 +940,8 @@ usb0: ohci@00300000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00300000 0x100000>; reg = <0x00300000 0x100000>;
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>; clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; clock-names = "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/at91sam9260.dtsi
View file @ 898a7f36
...@@ -1008,8 +1008,8 @@ usb0: ohci@00500000 { ...@@ -1008,8 +1008,8 @@ usb0: ohci@00500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00500000 0x100000>; reg = <0x00500000 0x100000>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>; clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; clock-names = "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/at91sam9261.dtsi
View file @ 898a7f36
...@@ -75,8 +75,8 @@ usb0: ohci@00500000 { ...@@ -75,8 +75,8 @@ usb0: ohci@00500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00500000 0x100000>; reg = <0x00500000 0x100000>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&ohci_clk>, <&hclk0>, <&uhpck>; clocks = <&ohci_clk>, <&hclk0>, <&uhpck>;
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; clock-names = "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
......
arch/arm/boot/dts/at91sam9263.dtsi
View file @ 898a7f36
...@@ -1010,8 +1010,8 @@ usb0: ohci@00a00000 { ...@@ -1010,8 +1010,8 @@ usb0: ohci@00a00000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00a00000 0x100000>; reg = <0x00a00000 0x100000>;
interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>; clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; clock-names = "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ 898a7f36
...@@ -1291,8 +1291,8 @@ usb0: ohci@00700000 { ...@@ -1291,8 +1291,8 @@ usb0: ohci@00700000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00700000 0x100000>; reg = <0x00700000 0x100000>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>; clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; clock-names = "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
...@@ -1300,8 +1300,8 @@ usb1: ehci@00800000 { ...@@ -1300,8 +1300,8 @@ usb1: ehci@00800000 {
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 = <&utmi>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>; clocks = <&utmi>, <&uhphs_clk>;
clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck"; clock-names = "usb_clk", "ehci_clk";
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ 898a7f36
...@@ -949,9 +949,8 @@ usb0: ohci@00500000 { ...@@ -949,9 +949,8 @@ usb0: ohci@00500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00500000 0x00100000>; reg = <0x00500000 0x00100000>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
<&uhpck>; clock-names = "ohci_clk", "hclk", "uhpck";
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ 898a7f36
...@@ -505,7 +505,7 @@ pinctrl_usart1_cts: usart1_cts-0 { ...@@ -505,7 +505,7 @@ pinctrl_usart1_cts: usart1_cts-0 {
pinctrl_usart1_sck: usart1_sck-0 { pinctrl_usart1_sck: usart1_sck-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC29 periph C */ <AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC29 periph C */
}; };
}; };
...@@ -1222,8 +1222,8 @@ usb0: ohci@00600000 { ...@@ -1222,8 +1222,8 @@ usb0: ohci@00600000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00600000 0x100000>; reg = <0x00600000 0x100000>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>; clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; clock-names = "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
...@@ -1231,8 +1231,8 @@ usb1: ehci@00700000 { ...@@ -1231,8 +1231,8 @@ usb1: ehci@00700000 {
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 = <&utmi>, <&uhphs_clk>, <&uhpck>; clocks = <&utmi>, <&uhphs_clk>;
clock-names = "usb_clk", "ehci_clk", "uhpck"; clock-names = "usb_clk", "ehci_clk";
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ 898a7f36
...@@ -1439,9 +1439,8 @@ usb1: ohci@00600000 { ...@@ -1439,9 +1439,8 @@ usb1: ohci@00600000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00600000 0x100000>; reg = <0x00600000 0x100000>;
interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
<&uhpck>; clock-names = "ohci_clk", "hclk", "uhpck";
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
...@@ -1449,8 +1448,8 @@ usb2: ehci@00700000 { ...@@ -1449,8 +1448,8 @@ usb2: ehci@00700000 {
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 = <&utmi>, <&uhphs_clk>, <&uhpck>; clocks = <&utmi>, <&uhphs_clk>;
clock-names = "usb_clk", "ehci_clk", "uhpck"; clock-names = "usb_clk", "ehci_clk";
status = "disabled"; status = "disabled";
}; };
......
arch/arm/boot/dts/sama5d4.dtsi
View file @ 898a7f36
...@@ -258,9 +258,8 @@ usb1: ohci@00500000 { ...@@ -258,9 +258,8 @@ usb1: ohci@00500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00500000 0x100000>; reg = <0x00500000 0x100000>;
interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
<&uhpck>; clock-names = "ohci_clk", "hclk", "uhpck";
clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
...@@ -268,8 +267,8 @@ usb2: ehci@00600000 { ...@@ -268,8 +267,8 @@ usb2: ehci@00600000 {
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 = <&utmi>, <&uhphs_clk>, <&uhpck>; clocks = <&utmi>, <&uhphs_clk>;
clock-names = "usb_clk", "ehci_clk", "uhpck"; clock-names = "usb_clk", "ehci_clk";
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7