Add DT USB definitions for SAM9X60, SAMA5D2 and SAMA7
Subsystems (4)
v2 cover Add DT USB definitions for SAM9X60, SAMA5D2 and SAMA7
This patch series originates from the bigger patch series:
https://lists.denx.de/pipermail/u-boot/2022-December/502865.html
Add the basic DT USB definitions for SAM9X60, SAMA5D2 and SAMA7. The required pinctrl definitions have been added as well as additional definitions for the UTMI related clocks and their relationship with the Reset driver.
v1 -> v2:
- split patches for SoC/Board separately
- use usb@
Sergiu Moga (9):
ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
ARM: dts: sam9x60_curiosity: Add pinctrl and gpio properties for USB
ARM: dts: sam9x60ek: Add pinctrl and gpio properties for USB
dt-bindings: reset: add sama7g5 definitions
dt-bindings: clk: at91: Define additional UTMI related clocks
ARM: dts: sama7g5: Add USB and UTMI DT nodes
ARM: dts: sama7g5ek: Add pinctrl, gpio and phy properties for USB
ARM: dts: sama5d2_icp: Add pinctrl nodes for USB related DT nodes
ARM: dts: sama5d27_wlsom1_ek: Add pinctrl nodes for USB DT nodes
arch/arm/dts/at91-sam9x60_curiosity.dts | 21 +++++++ arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 25 ++++++++ arch/arm/dts/at91-sama5d2_icp.dts | 22 +++++++ arch/arm/dts/at91-sama7g5ek.dts | 34 +++++++++++ arch/arm/dts/sam9x60.dtsi | 18 ++++++ arch/arm/dts/sam9x60ek.dts | 21 +++++++ arch/arm/dts/sama7g5.dtsi | 73 +++++++++++++++++++++++ include/dt-bindings/clk/at91.h | 5 ++ include/dt-bindings/reset/sama7g5-reset.h | 10 ++++ 9 files changed, 229 insertions(+) create mode 100644 include/dt-bindings/reset/sama7g5-reset.h
Signature · 1 line
2.34.1
PATCH v2 1/9 ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
---
v1 -> v2:
- use usb@
arch/arm/dts/sam9x60.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/dts/sam9x60.dtsi +18 -0
@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>; + clock-names = "ohci_clk", "hclk", "uhpck"; + status = "disabled"; + }; + + usb2: usb@700000 { + compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; + reg = <0x00700000 0x100000>; + clocks = <&pmc PMC_TYPE_CORE 8>, <&pmc PMC_TYPE_PERIPHERAL 22>; + clock-names = "usb_clk", "ehci_clk"; + assigned-clocks = <&pmc PMC_TYPE_CORE 8>; + assigned-clock-rates = <480000000>; + status = "disabled"; + }; + ebi: ebi@10000000 { compatible = "microchip,sam9x60-ebi"; #address-cells = <2>;
Signature · 1 line
2.34.1
Re: [PATCH v2 1/9] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Quoted 16 lines · Sergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- use usb@arch/arm/dts/sam9x60.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)arch/arm/dts/sam9x60.dtsi +0
-0
arch/arm/dts/sam9x60.dtsi line 75
Quoted 7 lines
arch/arm/dts/sam9x60.dtsi +4
-0@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
./scripts/checkpatch.pl on this patch indicates
WARNING: line length of 121 exceeds 100 columns
#93: FILE: arch/arm/dts/sam9x60.dtsi:75:
+ clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
Please run checkpatch on all your patches.
Also, wait a few days before sending V2 , no need to send V2 immediately while review of V1 is still ongoing.
Re: [PATCH v2 1/9] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Quoted 33 lines · Marek Vasut
Quoted 16 lines · Sergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- use usb@
arch/arm/dts/sam9x60.dtsi| 18 ++++++++++++++++++1 file changed, 18 insertions(+)arch/arm/dts/sam9x60.dtsi +0
-0arch/arm/dts/sam9x60.dtsi line 76
Quoted 8 lines
arch/arm/dts/sam9x60.dtsi +4
-0@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
./scripts/checkpatch.plon this patch indicatesWARNING: line length of 121 exceeds 100 columns
#93: FILE:arch/arm/dts/sam9x60.dtsi:75:
+ clocks = <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_SYSTEM21>;
Quoted 4 lines
Please run checkpatch on all your patches.
Also, wait a few days before sending V2 , no need to send V2 immediately while review of V1 is still ongoing.
It was my understanding that exceeding the character per line limit on DT's is acceptable. All of our DT's are like this.
Re: [PATCH v2 1/9] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Quoted 34 lines · On 1/3/23 16:56, [email protected] wrote:
Quoted 33 lines · Marek Vasut
Quoted 16 lines · Sergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- use usb@arch/arm/dts/sam9x60.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)arch/arm/dts/sam9x60.dtsi +0
-0arch/arm/dts/sam9x60.dtsi line 76
Quoted 8 lines
arch/arm/dts/sam9x60.dtsi +4
-0@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
./scripts/checkpatch.plon this patch indicatesWARNING: line length of 121 exceeds 100 columns
#93: FILE:arch/arm/dts/sam9x60.dtsi:75:
+ clocks = <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_SYSTEM21>;
Quoted 7 lines
Quoted 4 lines
Please run checkpatch on all your patches.
Also, wait a few days before sending V2 , no need to send V2 immediately while review of V1 is still ongoing.
It was my understanding that exceeding the character per line limit on DT's is acceptable. All of our DT's are like this.
Not to my knowledge or per what is in other DTs.
Is that some exception here ?
Re: [PATCH v2 1/9] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Quoted 37 lines · Marek Vasut
Quoted 36 lines · On 1/3/23 16:56, [email protected] wrote:
Quoted 35 lines · Marek Vasut
Quoted 16 lines · Sergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- use usb@
arch/arm/dts/sam9x60.dtsi| 18 ++++++++++++++++++1 file changed, 18 insertions(+)arch/arm/dts/sam9x60.dtsi +0
-0arch/arm/dts/sam9x60.dtsi line 76
Quoted 8 lines
arch/arm/dts/sam9x60.dtsi +4
-0@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
./scripts/checkpatch.plon this patch indicatesWARNING: line length of 121 exceeds 100 columns
#93: FILE:arch/arm/dts/sam9x60.dtsi:75:
+ clocks = <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_SYSTEM21>;Please run checkpatch on all your patches.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Also, wait a few days before sending V2 , no need to send V2 immediately while review of V1 is still ongoing.
It was my understanding that exceeding the character per line limit on DT's is acceptable. All of our DT's are like this.
Not to my knowledge or per what is in other DTs.
Is that some exception here ?
DTs have not had restrictions on 80 chars per line. Have a look in Linux.
Also, as we have a requirement to keep the DT from Linux, we either have to patch up Linux if there is a problem in the DT, or keep it in sync with Linux.
We may have exceptions if there is a too big amount of work to be done now to change things, to have differences in term of DT between Uboot and Linux. But the general guideline is to keep the DT in sync with Linux as it's ABI.
Eugen
Re: [PATCH v2 1/9] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Quoted 49 lines · On 1/4/23 08:24, [email protected] wrote:
Quoted 37 lines · Marek Vasut
Quoted 36 lines · On 1/3/23 16:56, [email protected] wrote:
Quoted 35 lines · Marek Vasut
Quoted 16 lines · Sergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- use usb@arch/arm/dts/sam9x60.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)arch/arm/dts/sam9x60.dtsi +0
-0arch/arm/dts/sam9x60.dtsi line 76
Quoted 8 lines
arch/arm/dts/sam9x60.dtsi +4
-0@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
./scripts/checkpatch.plon this patch indicatesWARNING: line length of 121 exceeds 100 columns
#93: FILE:arch/arm/dts/sam9x60.dtsi:75:
+ clocks = <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_SYSTEM21>;Please run checkpatch on all your patches.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Also, wait a few days before sending V2 , no need to send V2 immediately while review of V1 is still ongoing.
It was my understanding that exceeding the character per line limit on DT's is acceptable. All of our DT's are like this.
Not to my knowledge or per what is in other DTs.
Is that some exception here ?DTs have not had restrictions on 80 chars per line. Have a look in Linux.
Quoted 7 lines
Also, as we have a requirement to keep the DT from Linux, we either have to patch up Linux if there is a problem in the DT, or keep it in sync with Linux.
We may have exceptions if there is a too big amount of work to be done now to change things, to have differences in term of DT between Uboot and Linux. But the general guideline is to keep the DT in sync with Linux as it's ABI.
Linux checkpatch.pl --strict does complain about the line length for sam9x60.dtsi , it was demoted from warning to check there.
Can you send a separate follow-up patch to U-Boot checkpatch.pl which does the same , so we'd be in sync with Linux ?
Re: [PATCH v2 1/9] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Quoted 60 lines · Marek Vasut
Quoted 51 lines · On 1/4/23 08:24, [email protected] wrote:
Quoted 42 lines · Marek Vasut
Quoted 41 lines · On 1/3/23 16:56, [email protected] wrote:
Quoted 39 lines · Marek Vasut
Quoted 16 lines · Sergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- use usb@
arch/arm/dts/sam9x60.dtsi| 18 ++++++++++++++++++1 file changed, 18 insertions(+)arch/arm/dts/sam9x60.dtsi +0
-0arch/arm/dts/sam9x60.dtsi line 77
Quoted 9 lines
arch/arm/dts/sam9x60.dtsi +4
-0@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
./scripts/checkpatch.plon this patch indicatesWARNING: line length of 121 exceeds 100 columns
#93: FILE:arch/arm/dts/sam9x60.dtsi:75:
+ clocks = <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_SYSTEM21>;Please run checkpatch on all your patches.
Also, wait a few days before sending V2 , no need to send V2 immediately
while review of V1 is still ongoing.Quoted 5 lines
Quoted 2 lines
It was my understanding that exceeding the character per line limit on DT's is acceptable. All of our DT's are like this.
Not to my knowledge or per what is in other DTs.
Is that some exception here ?DTs have not had restrictions on 80 chars per line. Have a look in Linux.
Quoted 7 lines
Also, as we have a requirement to keep the DT from Linux, we either have to patch up Linux if there is a problem in the DT, or keep it in sync with Linux.
We may have exceptions if there is a too big amount of work to be done now to change things, to have differences in term of DT between Uboot and Linux. But the general guideline is to keep the DT in sync with Linux as it's ABI.
Quoted 5 lines
Linux checkpatch.pl --strict does complain about the line length for
sam9x60.dtsi, it was demoted from warning to check there.Can you send a separate follow-up patch to U-Boot checkpatch.pl which does the same , so we'd be in sync with Linux ?
I am sorry, I do not know at the moment where that change is supposed to be made in checkpatch.pl. So, right now, I would rather focus my time on updating these patch series to be good enough and only afterwards I would take a look at where exactly I should make the change for checkpatch.pl as well, if that's fine. Thanks for the understanding.
Re: [PATCH v2 1/9] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
Quoted 61 lines · On 1/4/23 11:17, [email protected] wrote:
Quoted 60 lines · Marek Vasut
Quoted 58 lines · On 1/4/23 08:24, [email protected] wrote:
Quoted 42 lines · Marek Vasut
Quoted 41 lines · On 1/3/23 16:56, [email protected] wrote:
Quoted 39 lines · Marek Vasut
Quoted 16 lines · Sergiu Moga
Add the OHCI and EHCI DT nodes for the sam9x60 SoC's.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- use usb@arch/arm/dts/sam9x60.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)arch/arm/dts/sam9x60.dtsi +0
-0arch/arm/dts/sam9x60.dtsi line 77
Quoted 9 lines
arch/arm/dts/sam9x60.dtsi +4
-0@@ -69,6 +69,24 @@ #size-cells = <1>; ranges; + usb1: usb@600000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00600000 0x100000>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_SYSTEM 21>;
./scripts/checkpatch.plon this patch indicatesWARNING: line length of 121 exceeds 100 columns
#93: FILE:arch/arm/dts/sam9x60.dtsi:75:
+ clocks = <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_PERIPHERAL22>, <&pmcPMC_TYPE_SYSTEM21>;Please run checkpatch on all your patches.
Also, wait a few days before sending V2 , no need to send V2 immediately
while review of V1 is still ongoing.Quoted 5 lines
Quoted 2 lines
It was my understanding that exceeding the character per line limit on DT's is acceptable. All of our DT's are like this.
Not to my knowledge or per what is in other DTs.
Is that some exception here ?DTs have not had restrictions on 80 chars per line. Have a look in Linux.
Also, as we have a requirement to keep the DT from Linux, we either have to patch up Linux if there is a problem in the DT, or keep it in sync with Linux.
We may have exceptions if there is a too big amount of work to be done now to change things, to have differences in term of DT between Uboot and Linux. But the general guideline is to keep the DT in sync with Linux as it's ABI.
Quoted 8 lines
Quoted 5 lines
Linux checkpatch.pl --strict does complain about the line length for
sam9x60.dtsi, it was demoted from warning to check there.Can you send a separate follow-up patch to U-Boot checkpatch.pl which does the same , so we'd be in sync with Linux ?
I am sorry, I do not know at the moment where that change is supposed to be made in checkpatch.pl.
Have a look at linux checkpatch.pl git log , it will be there already. It changes DT line length WARNING to CHECK .
Quoted 4 lines
So, right now, I would rather focus my time on
updating these patch series to be good enough and only afterwards I would take a look at where exactly I should make the change for checkpatch.pl as well, if that's fine. Thanks for the understanding.
Right, that's why I wrote separate follow up patch.
PATCH v2 2/9 ARM: dts: sam9x60_curiosity: Add pinctrl and gpio properties for USB
In reply to Sergiu MogaAdd the required pinctrl and gpio properties needed by the USB DT nodes of the sam9x60_curiosity boards.
---
v1 -> v2:
- this patch was not here, previously split from 1/6 of v1
arch/arm/dts/at91-sam9x60_curiosity.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/dts/at91-sam9x60_curiosity.dts +21 -0
@@ -49,6 +49,13 @@ atmel,pins = <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; }; + + usb1 { + pinctrl_usb_default: usb_default { + atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE + AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; + }; + }; }; }; };
@@ -89,3 +96,17 @@ phy-mode = "rmii"; status = "okay"; }; + +&usb1 { + num-ports = <3>; + atmel,vbus-gpio = <0 + &pioD 15 GPIO_ACTIVE_HIGH + &pioD 18 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb_default>; + status = "okay"; +}; + +&usb2 { + status = "okay"; +};
Signature · 1 line
2.34.1
PATCH v2 3/9 ARM: dts: sam9x60ek: Add pinctrl and gpio properties for USB
In reply to Sergiu MogaAdd the required pinctrl and gpio properties required by the USB DT nodes of the sam9x60ek boards.
---
v1 -> v2:
- this patch was not here, previously split from 1/6 of v1
arch/arm/dts/sam9x60ek.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/dts/sam9x60ek.dts +21 -0
@@ -139,6 +139,13 @@ <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; }; + usb1 { + pinctrl_usb_default: usb_default { + atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE + AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; + }; + }; + }; }; };
@@ -213,3 +220,17 @@ phy-mode = "rmii"; status = "okay"; }; + +&usb1 { + num-ports = <3>; + atmel,vbus-gpio = <0 + &pioD 15 GPIO_ACTIVE_HIGH + &pioD 16 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb_default>; + status = "okay"; +}; + +&usb2 { + status = "okay"; +};
Signature · 1 line
2.34.1
PATCH v2 4/9 dt-bindings: reset: add sama7g5 definitions
In reply to Sergiu MogaUpstream linux commit 5994f58977e0.
Add reset bindings for SAMA7G5. At the moment only USB PHYs are included.
---
v1 -> v2:
- nothing
include/dt-bindings/reset/sama7g5-reset.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 include/dt-bindings/reset/sama7g5-reset.h
include/dt-bindings/reset/sama7g5-reset.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef __DT_BINDINGS_RESET_SAMA7G5_H +#define __DT_BINDINGS_RESET_SAMA7G5_H + +#define SAMA7G5_RESET_USB_PHY1 4 +#define SAMA7G5_RESET_USB_PHY2 5 +#define SAMA7G5_RESET_USB_PHY3 6 + +#endif /* __DT_BINDINGS_RESET_SAMA7G5_H */
Signature · 1 line
2.34.1
Re: [PATCH v2 4/9] dt-bindings: reset: add sama7g5 definitions
Quoted 22 lines · Sergiu Moga
Upstream linux commit
5994f58977e0.Add reset bindings for SAMA7G5. At the moment only USB PHYs are included.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- nothinginclude/dt-bindings/reset/sama7g5-reset.h | 10 ++++++++++ 1 file changed, 10 insertions(+)create mode 100644
include/dt-bindings/reset/sama7g5-reset.hinclude/dt-bindings/reset/sama7g5-reset.h new file +0
-0
include/dt-bindings/reset/sama7g5-reset.h line 8
Quoted 8 lines
include/dt-bindings/reset/sama7g5-reset.h new file +8
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef __DT_BINDINGS_RESET_SAMA7G5_H +#define __DT_BINDINGS_RESET_SAMA7G5_H + +#define SAMA7G5_RESET_USB_PHY1 4 +#define SAMA7G5_RESET_USB_PHY2 5 +#define SAMA7G5_RESET_USB_PHY3 6
Is there no reset with ID 0/1/2/3 ?
Re: [PATCH v2 4/9] dt-bindings: reset: add sama7g5 definitions
Quoted 26 lines · Marek Vasut
Quoted 25 lines · Sergiu Moga
Upstream linux commit
5994f58977e0.Add reset bindings for SAMA7G5. At the moment only USB PHYs are included.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- nothing
include/dt-bindings/reset/sama7g5-reset.h| 10 ++++++++++1 file changed, 10 insertions(+)create mode 100644
include/dt-bindings/reset/sama7g5-reset.hinclude/dt-bindings/reset/sama7g5-reset.h new file +2
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +
Quoted 8 lines
include/dt-bindings/reset/sama7g5-reset.h line 8
Quoted 6 lines
include/dt-bindings/reset/sama7g5-reset.h new file +6
-0+#ifndef __DT_BINDINGS_RESET_SAMA7G5_H +#define __DT_BINDINGS_RESET_SAMA7G5_H + +#define SAMA7G5_RESET_USB_PHY1 4 +#define SAMA7G5_RESET_USB_PHY2 5 +#define SAMA7G5_RESET_USB_PHY3 6Is there no reset with ID 0/1/2/3 ?
No, there is not.
Re: [PATCH v2 4/9] dt-bindings: reset: add sama7g5 definitions
Quoted 36 lines · On 1/3/23 16:55, [email protected] wrote:
Quoted 26 lines · Marek Vasut
Quoted 25 lines · Sergiu Moga
Upstream linux commit
5994f58977e0.Add reset bindings for SAMA7G5. At the moment only USB PHYs are included.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- nothinginclude/dt-bindings/reset/sama7g5-reset.h | 10 ++++++++++ 1 file changed, 10 insertions(+)create mode 100644
include/dt-bindings/reset/sama7g5-reset.hinclude/dt-bindings/reset/sama7g5-reset.h new file +2
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +Quoted 8 lines
include/dt-bindings/reset/sama7g5-reset.h line 8
Quoted 6 lines
include/dt-bindings/reset/sama7g5-reset.h new file +6
-0+#ifndef __DT_BINDINGS_RESET_SAMA7G5_H +#define __DT_BINDINGS_RESET_SAMA7G5_H + +#define SAMA7G5_RESET_USB_PHY1 4 +#define SAMA7G5_RESET_USB_PHY2 5 +#define SAMA7G5_RESET_USB_PHY3 6Is there no reset with ID 0/1/2/3 ?
Quoted 1 line
No, there is not.
Please just add a comment into the file then, explaining that.
Re: [PATCH v2 4/9] dt-bindings: reset: add sama7g5 definitions
Quoted 37 lines · Marek Vasut
Quoted 36 lines · On 1/3/23 16:55, [email protected] wrote:
Quoted 34 lines · Marek Vasut
Quoted 23 lines · Sergiu Moga
Upstream linux commit
5994f58977e0.Add reset bindings for SAMA7G5. At the moment only USB PHYs are included.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- nothing
include/dt-bindings/reset/sama7g5-reset.h| 10 ++++++++++1 file changed, 10 insertions(+)create mode 100644
include/dt-bindings/reset/sama7g5-reset.hinclude/dt-bindings/reset/sama7g5-reset.h new file +0
-0include/dt-bindings/reset/sama7g5-reset.h line 8
Quoted 8 lines
include/dt-bindings/reset/sama7g5-reset.h new file +8
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef __DT_BINDINGS_RESET_SAMA7G5_H +#define __DT_BINDINGS_RESET_SAMA7G5_H + +#define SAMA7G5_RESET_USB_PHY1 4 +#define SAMA7G5_RESET_USB_PHY2 5 +#define SAMA7G5_RESET_USB_PHY3 6Is there no reset with ID 0/1/2/3 ?
Quoted 3 lines
Quoted 1 line
No, there is not.
Please just add a comment into the file then, explaining that.
Would this not make the commit different from the upstream linux commit referenced in the commit message? Perhaps it would be better to place this comment in the commit message instead?
Re: [PATCH v2 4/9] dt-bindings: reset: add sama7g5 definitions
Quoted 38 lines · On 1/3/23 17:35, [email protected] wrote:
Quoted 37 lines · Marek Vasut
Quoted 36 lines · On 1/3/23 16:55, [email protected] wrote:
Quoted 34 lines · Marek Vasut
Quoted 23 lines · Sergiu Moga
Upstream linux commit
5994f58977e0.Add reset bindings for SAMA7G5. At the moment only USB PHYs are included.
Signed-off-by Sergiu Moga <[email protected]>---
v1 -> v2:
- nothinginclude/dt-bindings/reset/sama7g5-reset.h | 10 ++++++++++ 1 file changed, 10 insertions(+)create mode 100644
include/dt-bindings/reset/sama7g5-reset.hinclude/dt-bindings/reset/sama7g5-reset.h new file +0
-0include/dt-bindings/reset/sama7g5-reset.h line 8
Quoted 8 lines
include/dt-bindings/reset/sama7g5-reset.h new file +8
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef __DT_BINDINGS_RESET_SAMA7G5_H +#define __DT_BINDINGS_RESET_SAMA7G5_H + +#define SAMA7G5_RESET_USB_PHY1 4 +#define SAMA7G5_RESET_USB_PHY2 5 +#define SAMA7G5_RESET_USB_PHY3 6Is there no reset with ID 0/1/2/3 ?
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
No, there is not.
Please just add a comment into the file then, explaining that.
Would this not make the commit different from the upstream linux commit referenced in the commit message? Perhaps it would be better to place this comment in the commit message instead?
That works too, thanks.
PATCH v2 5/9 dt-bindings: clk: at91: Define additional UTMI related clocks
In reply to Sergiu MogaAdd definitions for an additional main UTMI clock as well as its respective subclocks.
---
v1 -> v2:
- nothing
include/dt-bindings/clk/at91.h | 5 +++++ 1 file changed, 5 insertions(+)
include/dt-bindings/clk/at91.h +5 -0
@@ -18,5 +18,10 @@#define PMC_TYPE_PERIPHERAL 3#define PMC_TYPE_GCK 4#define PMC_TYPE_SLOW 5 +#define UTMI 6 + +#define UTMI1 0 +#define UTMI2 1 +#define UTMI3 2#endif
Signature · 1 line
2.34.1
PATCH v2 6/9 ARM: dts: sama7g5: Add USB and UTMI DT nodes
In reply to Sergiu MogaDefine the USB and UTMI DT nodes for the sama7g5 SoC's.
---
v1 -> v2:
- use usb@
arch/arm/dts/sama7g5.dtsi | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)
arch/arm/dts/sama7g5.dtsi +73 -0
@@ -16,6 +16,8 @@ #include <dt-bindings/dma/at91.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/mfd/at91-usart.h> +#include <dt-bindings/reset/sama7g5-reset.h> +#include <dt-bindings/clock/at91.h> / { model = "Microchip SAMA7G5 family SoC";
@@ -103,6 +105,54 @@ }; }; + utmi_clk: utmi-clk { + compatible = "microchip,sama7g5-utmi-clk"; + sfr-phandle = <&sfr>; + #clock-cells = <1>; + clocks = <&pmc PMC_TYPE_CORE 27>; + clock-names = "utmi_clk"; + resets = <&reset_controller SAMA7G5_RESET_USB_PHY1>, + <&reset_controller SAMA7G5_RESET_USB_PHY2>, + <&reset_controller SAMA7G5_RESET_USB_PHY3>; + reset-names = "usb0_reset", "usb1_reset", "usb2_reset"; + }; + + utmi { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + usb_phy0: phy@0 { + compatible = "microchip,sama7g5-usb-phy"; + sfr-phandle = <&sfr>; + reg = <0>; + clocks = <&utmi_clk UTMI1>; + clock-names = "utmi_clk"; + status = "disabled"; + #phy-cells = <0>; + }; + + usb_phy1: phy@1 { + compatible = "microchip,sama7g5-usb-phy"; + sfr-phandle = <&sfr>; + reg = <1>; + clocks = <&utmi_clk UTMI2>; + clock-names = "utmi_clk"; + status = "disabled"; + #phy-cells = <0>; + }; + + usb_phy2: phy@2 { + compatible = "microchip,sama7g5-usb-phy"; + sfr-phandle = <&sfr>; + reg = <2>; + clocks = <&utmi_clk UTMI3>; + clock-names = "utmi_clk"; + status = "disabled"; + #phy-cells = <0>; + }; + }; + vddout25: fixed-regulator-vddout25 { compatible = "regulator-fixed";
@@ -127,6 +177,24 @@ #size-cells = <1>; ranges; + usb2: usb@400000 { + compatible = "microchip,sama7g5-ohci", "usb-ohci"; + reg = <0x00400000 0x100000>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 106>, <&utmi_clk UTMI1>, <&usb_clk>; + clock-names = "ohci_clk", "hclk", "uhpck"; + status = "disabled"; + }; + + usb3: usb@500000 { + compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; + reg = <0x00500000 0x100000>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&usb_clk>, <&pmc PMC_TYPE_PERIPHERAL 106>; + clock-names = "usb_clk", "ehci_clk"; + status = "disabled"; + }; + nfc_sram: sram@600000 { compatible = "mmio-sram"; no-memory-wc;
@@ -559,6 +627,11 @@ status = "disabled"; }; + sfr: sfr@e1624000 { + compatible = "microchip,sama7g5-sfr", "syscon"; + reg = <0xe1624000 0x4000>; + }; + eic: interrupt-controller@e1628000 { compatible = "microchip,sama7g5-eic"; reg = <0xe1628000 0xec>;
Signature · 1 line
2.34.1
PATCH v2 7/9 ARM: dts: sama7g5ek: Add pinctrl, gpio and phy properties for USB
In reply to Sergiu MogaAdd the required pinctrl, gpio and phy properties required by the USB DT nodes of the sama7g5ek boards.
---
v1 -> v2:
- this patch was not here, previously split from 4/6 of v1
arch/arm/dts/at91-sama7g5ek.dts | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
arch/arm/dts/at91-sama7g5ek.dts +34 -0
@@ -761,6 +761,11 @@ pinmux = <PIN_PB1__SPDIF_TX>; bias-disable; }; + + pinctrl_usb_default: usb_default { + pinmux = <PIN_PC6__GPIO>; + bias-disable; + }; }; &pwm {
@@ -837,6 +842,35 @@ status = "okay"; }; +&usb2 { + num-ports = <3>; + atmel,vbus-gpio = <0 + 0 + &pioA PIN_PC6 GPIO_ACTIVE_HIGH + >; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb_default>; + phys = <&usb_phy2>; + phy-names = "usb"; + status = "okay"; +}; + +&usb3 { + status = "okay"; +}; + +&usb_phy0 { + status = "okay"; +}; + +&usb_phy1 { + status = "okay"; +}; + +&usb_phy2 { + status = "okay"; +}; + &vddout25 { vin-supply = <&vdd_3v3>; status = "okay";
Signature · 1 line
2.34.1
PATCH v2 8/9 ARM: dts: sama5d2_icp: Add pinctrl nodes for USB related DT nodes
In reply to Sergiu MogaAdd the pinctrl subnodes required by the USB related DT nodes.
---
v1 -> v2:
- nothing
arch/arm/dts/at91-sama5d2_icp.dts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm/dts/at91-sama5d2_icp.dts +22 -0
@@ -154,7 +154,29 @@ <PIN_PA13__SDMMC0_CD>; bias-disable; }; + + pinctrl_usb_default: usb_default { + pinmux = <PIN_PC17__GPIO>; + bias-disable; + }; + + pinctrl_usba_vbus: usba_vbus { + pinmux = <PIN_PD23__GPIO>; + bias-disable; + }; }; }; }; }; + +&usb1 { + num-ports = <3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb_default>; + status = "okay"; +}; + +&usb2 { + phy_type = "hsic"; + status = "okay"; +};
Signature · 1 line
2.34.1
PATCH v2 9/9 ARM: dts: sama5d27_wlsom1_ek: Add pinctrl nodes for USB DT nodes
In reply to Sergiu MogaAdd the pinctrl nodes required by the USB related DT nodes.
---
v1 -> v2:
- nothing
arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm/dts/at91-sama5d27_wlsom1_ek.dts +25 -0
@@ -143,7 +143,32 @@ pinmux = <PIN_PC9__GPIO>; bias-pull-up; }; + + pinctrl_usb_default: usb_default { + pinmux = <PIN_PA10__GPIO>; + bias-disable; + }; + + pinctrl_usba_vbus: usba_vbus { + pinmux = <PIN_PA16__GPIO>; + bias-disable; + }; }; }; }; }; + +&usb1 { + num-ports = <3>; + atmel,vbus-gpio = <0 + &pioA PIN_PA10 GPIO_ACTIVE_HIGH + 0 + >; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb_default>; + status = "okay"; +}; + +&usb2 { + status = "okay"; +};
Signature · 1 line
2.34.1
Quoted 33 lines · Sergiu Moga
This patch series originates from the bigger patch series:
https://lists.denx.de/pipermail/u-boot/2022-December/502865.htmlAdd the basic DT USB definitions for SAM9X60, SAMA5D2 and SAMA7. The required pinctrl definitions have been added as well as additional definitions for the UTMI related clocks and their relationship with the Reset driver.
v1 -> v2:
- split patches for SoC/Board separately
- use usb@Sergiu Moga (9):
ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
ARM: dts:sam9x60_curiosity: Add pinctrl and gpio properties for USB
ARM: dts: sam9x60ek: Add pinctrl and gpio properties for USB
dt-bindings: reset: add sama7g5 definitions
dt-bindings: clk: at91: Define additional UTMI related clocks
ARM: dts: sama7g5: Add USB and UTMI DT nodes
ARM: dts: sama7g5ek: Add pinctrl, gpio and phy properties for USB
ARM: dts:sama5d2_icp: Add pinctrl nodes for USB related DT nodes
ARM: dts:sama5d27_wlsom1_ek: Add pinctrl nodes for USB DT nodesarch/arm/dts/at91-sam9x60_curiosity.dts | 21 +++++++ arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 25 ++++++++ arch/arm/dts/at91-sama5d2_icp.dts | 22 +++++++ arch/arm/dts/at91-sama7g5ek.dts | 34 +++++++++++ arch/arm/dts/sam9x60.dtsi | 18 ++++++ arch/arm/dts/sam9x60ek.dts | 21 +++++++ arch/arm/dts/sama7g5.dtsi | 73 +++++++++++++++++++++++ include/dt-bindings/clk/at91.h | 5 ++ include/dt-bindings/reset/sama7g5-reset.h | 10 ++++ 9 files changed, 229 insertions(+)
Quoted 2 lines
create mode 100644
include/dt-bindings/reset/sama7g5-reset.h
Hi Marek,
If you have nothing against it, I will take the DTs through at91 tree now, as I am preparing my PR for 2023.04 .
As DT is ABI and this series is on the list for a while now, I see no reason to delay it.
Are you fine with that ?
Thanks,
Eugen
Quoted 38 lines · On 1/4/23 09:09, [email protected] wrote:
Quoted 33 lines · Sergiu Moga
This patch series originates from the bigger patch series:
https://lists.denx.de/pipermail/u-boot/2022-December/502865.htmlAdd the basic DT USB definitions for SAM9X60, SAMA5D2 and SAMA7. The required pinctrl definitions have been added as well as additional definitions for the UTMI related clocks and their relationship with the Reset driver.
v1 -> v2:
- split patches for SoC/Board separately
- use usb@Sergiu Moga (9):
ARM: dts: sam9x60: Add OHCI and EHCI DT nodes
ARM: dts:sam9x60_curiosity: Add pinctrl and gpio properties for USB
ARM: dts: sam9x60ek: Add pinctrl and gpio properties for USB
dt-bindings: reset: add sama7g5 definitions
dt-bindings: clk: at91: Define additional UTMI related clocks
ARM: dts: sama7g5: Add USB and UTMI DT nodes
ARM: dts: sama7g5ek: Add pinctrl, gpio and phy properties for USB
ARM: dts:sama5d2_icp: Add pinctrl nodes for USB related DT nodes
ARM: dts:sama5d27_wlsom1_ek: Add pinctrl nodes for USB DT nodesarch/arm/dts/at91-sam9x60_curiosity.dts | 21 +++++++ arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 25 ++++++++ arch/arm/dts/at91-sama5d2_icp.dts | 22 +++++++ arch/arm/dts/at91-sama7g5ek.dts | 34 +++++++++++ arch/arm/dts/sam9x60.dtsi | 18 ++++++ arch/arm/dts/sam9x60ek.dts | 21 +++++++ arch/arm/dts/sama7g5.dtsi | 73 +++++++++++++++++++++++ include/dt-bindings/clk/at91.h | 5 ++ include/dt-bindings/reset/sama7g5-reset.h | 10 ++++ 9 files changed, 229 insertions(+)Quoted 2 lines
create mode 100644
include/dt-bindings/reset/sama7g5-reset.h
Quoted 7 lines
Hi Marek,
If you have nothing against it, I will take the DTs through at91 tree now, as I am preparing my PR for 2023.04 .
As DT is ABI and this series is on the list for a while now, I see no reason to delay it.
Are you fine with that ?
I am hoping for a V3 with feedback on V1 and V2 addressed .