* [RESEND PATCH 1/2] ARM: at91/dt: trivial: fix USB udc compatible string @ 2015-06-17 8:59 Nicolas Ferre 2015-06-17 8:59 ` [RESEND PATCH 2/2] ARM: at91/dt: update udc compatible strings Nicolas Ferre 0 siblings, 1 reply; 4+ messages in thread From: Nicolas Ferre @ 2015-06-17 8:59 UTC (permalink / raw) To: linux-arm-kernel To please checkpatch and the tiresome reader, add the "atmel," prefix to the USB udc compatible string. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: <stable@vger.kernel.org> #4.0+ --- Documentation/devicetree/bindings/usb/atmel-usb.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt index 1be8d7a26c15..5883b73ea1b5 100644 --- a/Documentation/devicetree/bindings/usb/atmel-usb.txt +++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt @@ -79,9 +79,9 @@ Atmel High-Speed USB device controller Required properties: - compatible: Should be one of the following - "at91sam9rl-udc" - "at91sam9g45-udc" - "sama5d3-udc" + "atmel,at91sam9rl-udc" + "atmel,at91sam9g45-udc" + "atmel,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 -- 2.1.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND PATCH 2/2] ARM: at91/dt: update udc compatible strings 2015-06-17 8:59 [RESEND PATCH 1/2] ARM: at91/dt: trivial: fix USB udc compatible string Nicolas Ferre @ 2015-06-17 8:59 ` Nicolas Ferre 2015-07-01 20:35 ` Kevin Hilman 0 siblings, 1 reply; 4+ messages in thread From: Nicolas Ferre @ 2015-06-17 8:59 UTC (permalink / raw) To: linux-arm-kernel From: Boris Brezillon <boris.brezillon@free-electrons.com> at91sam9g45, at91sam9x5 and sama5 SoCs should not use "atmel,at91sam9rl-udc" for their USB device compatible property since this compatible is attached to a specific hardware bug fix. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Tested-by: Bo Shen <voice.shen@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: <stable@vger.kernel.org> #4.0+ --- Hi, This patch was forgotten while dealing with the series "usb: atmel_usba_udc: Rework errata handling". This patch and the previous one should be added to mainline as fixes, the soonest. In fact, the errata handling is now broken because of this desynchronization. We'll try to queue it during 4.2-rc phase for inclusion in arm-soc tree. Bye, arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- arch/arm/boot/dts/sama5d3.dtsi | 2 +- arch/arm/boot/dts/sama5d4.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index d260ba779ae5..18177f5a7464 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -1148,7 +1148,7 @@ usb2: gadget at fff78000 { #address-cells = <1>; #size-cells = <0>; - compatible = "atmel,at91sam9rl-udc"; + compatible = "atmel,at91sam9g45-udc"; reg = <0x00600000 0x80000 0xfff78000 0x400>; interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>; diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 7521bdf17ef2..b6c8df8d380e 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -1108,7 +1108,7 @@ usb2: gadget at f803c000 { #address-cells = <1>; #size-cells = <0>; - compatible = "atmel,at91sam9rl-udc"; + compatible = "atmel,at91sam9g45-udc"; reg = <0x00500000 0x80000 0xf803c000 0x400>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>; diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index 5ab7548e04e1..9e2444b07bce 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi @@ -1321,7 +1321,7 @@ usb0: gadget at 00500000 { #address-cells = <1>; #size-cells = <0>; - compatible = "atmel,at91sam9rl-udc"; + compatible = "atmel,sama5d3-udc"; reg = <0x00500000 0x100000 0xf8030000 0x4000>; interrupts = <33 IRQ_TYPE_LEVEL_HIGH 2>; diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index 653a1f851f2b..3ee22ee13c5a 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -127,7 +127,7 @@ usb0: gadget at 00400000 { #address-cells = <1>; #size-cells = <0>; - compatible = "atmel,at91sam9rl-udc"; + compatible = "atmel,sama5d3-udc"; reg = <0x00400000 0x100000 0xfc02c000 0x4000>; interrupts = <47 IRQ_TYPE_LEVEL_HIGH 2>; -- 2.1.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND PATCH 2/2] ARM: at91/dt: update udc compatible strings 2015-06-17 8:59 ` [RESEND PATCH 2/2] ARM: at91/dt: update udc compatible strings Nicolas Ferre @ 2015-07-01 20:35 ` Kevin Hilman 2015-07-02 7:53 ` Nicolas Ferre 0 siblings, 1 reply; 4+ messages in thread From: Kevin Hilman @ 2015-07-01 20:35 UTC (permalink / raw) To: linux-arm-kernel Nicolas Ferre <nicolas.ferre@atmel.com> writes: > From: Boris Brezillon <boris.brezillon@free-electrons.com> > > at91sam9g45, at91sam9x5 and sama5 SoCs should not use > "atmel,at91sam9rl-udc" for their USB device compatible property since > this compatible is attached to a specific hardware bug fix. > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > Tested-by: Bo Shen <voice.shen@atmel.com> > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > Cc: <stable@vger.kernel.org> #4.0+ > --- > Hi, > > This patch was forgotten while dealing with the series "usb: atmel_usba_udc: > Rework errata handling". This patch and the previous one should be added to > mainline as fixes, the soonest. In fact, the errata handling is now broken > because of this desynchronization. > > We'll try to queue it during 4.2-rc phase for inclusion in arm-soc tree. I've picked both of these up for the arm-soc/late branch which I'll try to get in before -rc1, if not it will make it for -rc2. Thanks, Kevin ^ permalink raw reply [flat|nested] 4+ messages in thread
* [RESEND PATCH 2/2] ARM: at91/dt: update udc compatible strings 2015-07-01 20:35 ` Kevin Hilman @ 2015-07-02 7:53 ` Nicolas Ferre 0 siblings, 0 replies; 4+ messages in thread From: Nicolas Ferre @ 2015-07-02 7:53 UTC (permalink / raw) To: linux-arm-kernel Le 01/07/2015 22:35, Kevin Hilman a ?crit : > Nicolas Ferre <nicolas.ferre@atmel.com> writes: > >> From: Boris Brezillon <boris.brezillon@free-electrons.com> >> >> at91sam9g45, at91sam9x5 and sama5 SoCs should not use >> "atmel,at91sam9rl-udc" for their USB device compatible property since >> this compatible is attached to a specific hardware bug fix. >> >> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> >> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> >> Tested-by: Bo Shen <voice.shen@atmel.com> >> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> Cc: <stable@vger.kernel.org> #4.0+ >> --- >> Hi, >> >> This patch was forgotten while dealing with the series "usb: atmel_usba_udc: >> Rework errata handling". This patch and the previous one should be added to >> mainline as fixes, the soonest. In fact, the errata handling is now broken >> because of this desynchronization. >> >> We'll try to queue it during 4.2-rc phase for inclusion in arm-soc tree. > > I've picked both of these up for the arm-soc/late branch which I'll try > to get in before -rc1, if not it will make it for -rc2. Brilliant! Thanks a lot Kevin. Bye, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-02 7:53 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-06-17 8:59 [RESEND PATCH 1/2] ARM: at91/dt: trivial: fix USB udc compatible string Nicolas Ferre 2015-06-17 8:59 ` [RESEND PATCH 2/2] ARM: at91/dt: update udc compatible strings Nicolas Ferre 2015-07-01 20:35 ` Kevin Hilman 2015-07-02 7:53 ` Nicolas Ferre
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).