convert grf.txt to YAML
Subsystems (3)
v7 cover convert grf.txt to YAML
Changed V7:
rebase
add compatible for rk3308 USB grf
add "rockchip,rk3308-usb2phy-grf" to "usb2phy@[0-9a-f]+$"
patternProperties too add USB support to rk3308.dtsi
restyle
limit grf reg size
change sub nodename
remove applied patches
Changed V6:
remove some #phy-cells in rockchip-usb-phy.yaml
rename nodename for phy-rockchip-inno-usb2
remove applied patches
Changed V5:
changed compatibles for rk3066/rk3188
add rockchip-usb-phy.yaml
move and restyle grf nodes rk3066/rk3188
remove applied patches
Changed V4:
revert separate schemas for each 'if' subset
add additionalProperties
move properties to top level
Changed V3:
remove select
change unevaluatedProperties
add separate schemas for each 'if' subset
Changed V2:
add rockchip,rk3328-grf-gpio.yaml
rename grf-gpio nodename
Johan Jonker (3):
dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml
ARM: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
arm64: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
Tobias Schramm (2):
dt-bindings: soc: rockchip: grf: add compatible for RK3308 USB grf
arm64: dts: rockchip: add USB support to rk3308.dtsi
.../bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +--- .../devicetree/bindings/soc/rockchip/grf.yaml | 6 +- arch/arm/boot/dts/rk322x.dtsi | 4 +- arch/arm/boot/dts/rv1108.dtsi | 2 +- arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 74 +++++++++++++++++++++- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 +- 8 files changed, 87 insertions(+), 18 deletions(-)
Signature · 1 line
2.11.0
PATCH v7 1/5 dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml
The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" in phy-provider.yaml has required "#phy-cells" for phy nodes. The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent notifications. Remove unneeded "#phy-cells" from parent node. Also sort example.
make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ phy/phy-provider.yaml
--- .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml +3 -8
@@ -30,9 +30,6 @@ properties: "#clock-cells": const: 0 - "#phy-cells": - const: 0 - clocks: maxItems: 1
@@ -120,7 +117,6 @@ required: - reg - clock-output-names - "#clock-cells" - - "#phy-cells" - host-port - otg-port
@@ -131,26 +127,25 @@ examples: #include <dt-bindings/clock/rk3399-cru.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> - u2phy0: usb2-phy@e450 { + u2phy0: usb2phy@e450 { compatible = "rockchip,rk3399-usb2phy"; reg = <0xe450 0x10>; clocks = <&cru SCLK_USB2PHY0_REF>; clock-names = "phyclk"; clock-output-names = "clk_usbphy0_480m"; #clock-cells = <0>; - #phy-cells = <0>; u2phy0_host: host-port { - #phy-cells = <0>; interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>; interrupt-names = "linestate"; + #phy-cells = <0>; }; u2phy0_otg: otg-port { - #phy-cells = <0>; interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>; interrupt-names = "otg-bvalid", "otg-id", "linestate"; + #phy-cells = <0>; }; };
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +2 -2
@@ -184,7 +184,7 @@ allOf: - "#size-cells" patternProperties: - "usb2-phy@[0-9a-f]+$": + "usb2phy@[0-9a-f]+$": type: object $ref: "/schemas/phy/phy-rockchip-inno-usb2.yaml#"
@@ -233,7 +233,7 @@ examples: #phy-cells = <0>; }; - u2phy0: usb2-phy@e450 { + u2phy0: usb2phy@e450 { compatible = "rockchip,rk3399-usb2phy"; reg = <0xe450 0x10>; clocks = <&cru SCLK_USB2PHY0_REF>;
Signature · 1 line
2.11.0
Re: [PATCH v7 1/5] dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml
Quoted 11 lines · Johan Jonker
The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" in
phy-provider.yamlhas required "#phy-cells" for phy nodes. The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent notifications. Remove unneeded "#phy-cells" from parent node. Also sort example.make ARCH=arm
dtbs_checkDT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/phy/phy-provider.yaml
Quoted 5 lines
Signed-off-by Johan Jonker <[email protected]>Acked-by Rob Herring <[email protected]>--- .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++--
I dont have grf.yaml, I guess it would be easier to split this into two or apply this thru rockchip tree. If you prefer latter:
Signature · 1 line
~Vinod
Heiko Stübner
maintainerRe: [PATCH v7 1/5] dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml
Hi Vinod,
Am Donnerstag, 3. Juni 2021, 07:54:24 CEST schrieb Vinod Koul:
Quoted 18 lines · Johan Jonker
Quoted 11 lines
The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" in
phy-provider.yamlhas required "#phy-cells" for phy nodes. The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent notifications. Remove unneeded "#phy-cells" from parent node. Also sort example.make ARCH=arm
dtbs_checkDT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/phy/phy-provider.yamlQuoted 5 lines
Signed-off-by Johan Jonker <[email protected]>Acked-by Rob Herring <[email protected]>--- .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++--
Quoted 4 lines
I dont have
grf.yaml, I guess it would be easier to split this into two or apply this thru rockchip tree. If you prefer latter:Acked-by Vinod Koul <[email protected]>
before we do any more rounds, I'll just do that with your Ack, thanks :-)
Heiko
Re: [PATCH v7 1/5] dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml
Quoted 22 lines · Heiko Stübner
Hi Vinod,
Am Donnerstag, 3. Juni 2021, 07:54:24 CEST schrieb Vinod Koul:
Quoted 18 lines · Johan Jonker
Quoted 16 lines
The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" in
phy-provider.yamlhas required "#phy-cells" for phy nodes. The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent notifications. Remove unneeded "#phy-cells" from parent node. Also sort example.make ARCH=arm
dtbs_checkDT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/phy/phy-provider.yamlSigned-off-by Johan Jonker <[email protected]>Acked-by Rob Herring <[email protected]>--- .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++--
Quoted 6 lines
Quoted 4 lines
I dont have
grf.yaml, I guess it would be easier to split this into two or apply this thru rockchip tree. If you prefer latter:Acked-by Vinod Koul <[email protected]>before we do any more rounds, I'll just do that with your Ack, thanks :-)
This is generating warnings on linux-next now:
/builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml:
syscon@ff770000: usb2phy@e450: '#phy-cells' does not match any of the
regexes: 'pinctrl-[0-9]+'
From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.yaml /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml:
usb2phy@e450: '#phy-cells' does not match any of the regexes:
'pinctrl-[0-9]+'
From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml
Rob
Re: [PATCH v7 1/5] dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml
Quoted 41 lines · Rob Herring
Quoted 22 lines · Heiko Stübner
Hi Vinod,
Am Donnerstag, 3. Juni 2021, 07:54:24 CEST schrieb Vinod Koul:
Quoted 18 lines · Johan Jonker
Quoted 16 lines
The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" in
phy-provider.yamlhas required "#phy-cells" for phy nodes. The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent notifications. Remove unneeded "#phy-cells" from parent node. Also sort example.make ARCH=arm
dtbs_checkDT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/phy/phy-provider.yamlSigned-off-by Johan Jonker <[email protected]>Acked-by Rob Herring <[email protected]>--- .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++--Quoted 6 lines
Quoted 4 lines
I dont have
grf.yaml, I guess it would be easier to split this into two or apply this thru rockchip tree. If you prefer latter:Acked-by Vinod Koul <[email protected]>before we do any more rounds, I'll just do that with your Ack, thanks :-)
This is generating warnings on linux-next now:
/builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml:
syscon@ff770000: usb2phy@e450: '#phy-cells' does not match any of the
regexes: 'pinctrl-[0-9]+'
From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.yaml /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml:
usb2phy@e450: '#phy-cells' does not match any of the regexes:
'pinctrl-[0-9]+'
From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml
Quoted 2 lines
Rob
Hi Rob, Heiko,
Sorry...
That '#phy-cells' in the grf.yaml example also needs to go.
Is that something Heiko can fix in his git tree or do I have to resubmit the complete patch or just a fix? Please advise.
Kind regards,
Johan
===
Quoted 23 lines
examples:
- |#include <dt-bindings/clock/rk3399-cru.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/power/rk3399-power.h> grf: syscon@ff770000 { compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0xff770000 0x10000>; #address-cells = <1>; #size-cells = <1>; mipi_dphy_rx0: mipi-dphy-rx0 { compatible = "rockchip,rk3399-mipi-dphy-rx0"; clocks = <&cru SCLK_MIPIDPHY_REF>, <&cru SCLK_DPHY_RX0_CFG>, <&cru PCLK_VIO_GRF>; clock-names = "dphy-ref", "dphy-cfg", "grf"; power-domains = <&power RK3399_PD_VIO>; #phy-cells = <0>; }; u2phy0: usb2phy@e450 {
Quoted 8 lines
compatible = "rockchip,rk3399-usb2phy";
reg = <0xe450 0x10>;
clocks = <&cru SCLK_USB2PHY0_REF>;
clock-names = "phyclk";
#clock-cells = <0>;
clock-output-names = "clk_usbphy0_480m";
#phy-cells = <0>;Remove
Quoted 17 lines
u2phy0_host: host-port {
#phy-cells = <0>;
interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>;
interrupt-names = "linestate";
};
u2phy0_otg: otg-port {
#phy-cells = <0>;
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>,
<GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>,
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>;
interrupt-names = "otg-bvalid", "otg-id",
"linestate";
};
};
};Heiko Stuebner
maintainerPATCH 1/1 dt-bindings: soc: rockchip: drop unnecessary #phy-cells from grf.yaml
The recent yaml conversion of the grf and inno-usb2-phy bindings left the #phy-cells in place in the main usb2phy node inside the example in grf.yaml, causing new warnings.
Drop it to make the bindingcheck happy.
---
Like this I guess?
Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 - 1 file changed, 1 deletion(-)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +0 -1
@@ -242,7 +242,6 @@ examples: clock-names = "phyclk"; #clock-cells = <0>; clock-output-names = "clk_usbphy0_480m"; - #phy-cells = <0>; u2phy0_host: host-port { #phy-cells = <0>;
Signature · 1 line
2.29.2
Re: [PATCH] dt-bindings: soc: rockchip: drop unnecessary #phy-cells from grf.yaml
Quoted 11 lines · Heiko Stuebner
The recent yaml conversion of the grf and inno-usb2-phy bindings left the #phy-cells in place in the main usb2phy node inside the example in
grf.yaml, causing new warnings.Drop it to make the bindingcheck happy.
Fixes e71ccdff376b ("dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml")Signed-off-by Heiko Stuebner <[email protected]>---
Like this I guess?
Hi Heiko,
When I apply this patch locally and give the command below the notifications are gone.
make ARCH=arm dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/soc/rockchip/grf.yaml
Thanks,
Johan
Quoted 17 lines
Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 - 1 file changed, 1 deletion(-)Documentation/devicetree/bindings/soc/rockchip/grf.yaml +0
-1@@ -242,7 +242,6 @@ examples: clock-names = "phyclk"; #clock-cells = <0>; clock-output-names = "clk_usbphy0_480m"; - #phy-cells = <0>; u2phy0_host: host-port { #phy-cells = <0>;
Heiko Stübner
maintainerRe: [PATCH] dt-bindings: soc: rockchip: drop unnecessary #phy-cells from grf.yaml
Am Montag, 7. Juni 2021, 17:37:06 CEST schrieb Johan Jonker:
Quoted 14 lines · Heiko Stuebner
Quoted 11 lines
The recent yaml conversion of the grf and inno-usb2-phy bindings left the #phy-cells in place in the main usb2phy node inside the example in
grf.yaml, causing new warnings.Drop it to make the bindingcheck happy.
Fixes e71ccdff376b ("dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml")Signed-off-by Heiko Stuebner <[email protected]>---
Like this I guess?
Quoted 7 lines
Hi Heiko,
When I apply this patch locally and give the command below the notifications are gone.
make ARCH=arm
dt_binding_checkDT_SCHEMA_FILES=Documentation/devicetree/bindings/soc/rockchip/grf.yaml
so I've applied the patch on top now in my tree.
Heiko
PATCH v7 2/5 dt-bindings: soc: rockchip: grf: add compatible for RK3308 USB grf
In reply to Johan JonkerFrom: Tobias Schramm <[email protected]>
The RK3308 has a USB GRF.
This patch adds a compatible string for it.
---
Changed:
Add "rockchip,rk3308-usb2phy-grf" to "usb2phy@[0-9a-f]+$" patternProperties too.
--- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +2 -0
@@ -31,6 +31,7 @@ properties: - rockchip,rk3308-core-grf - rockchip,rk3308-detect-grf - rockchip,rk3308-grf + - rockchip,rk3308-usb2phy-grf - rockchip,rk3328-grf - rockchip,rk3328-usb2phy-grf - rockchip,rk3368-grf
@@ -174,6 +175,7 @@ allOf: enum: - rockchip,px30-usb2phy-grf - rockchip,rk3228-grf + - rockchip,rk3308-usb2phy-grf - rockchip,rk3328-usb2phy-grf - rockchip,rk3399-grf - rockchip,rv1108-grf
Signature · 1 line
2.11.0
Re: [PATCH v7 2/5] dt-bindings: soc: rockchip: grf: add compatible for RK3308 USB grf
Quoted 7 lines · Johan Jonker
From: Tobias Schramm <[email protected]>
The RK3308 has a USB GRF.
This patch adds a compatible string for it.Signed-off-by Tobias Schramm <[email protected]>Signed-off-by Johan Jonker <[email protected]>
Quoted 9 lines
---
Changed:
Add "rockchip,rk3308-usb2phy-grf" to "usb2phy@[0-9a-f]+$" patternProperties too.--- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++ 1 file changed, 2 insertions(+)
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v7 3/5 ARM: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
In reply to Johan JonkerThe pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" in phy-provider.yaml has required "#phy-cells" for phy nodes. The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent notifications.
make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ phy/phy-provider.yaml
--- arch/arm/boot/dts/rk322x.dtsi | 4 ++-- arch/arm/boot/dts/rv1108.dtsi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/rk322x.dtsi +2 -2
@@ -190,7 +190,7 @@ status = "disabled"; }; - u2phy0: usb2-phy@760 { + u2phy0: usb2phy@760 { compatible = "rockchip,rk3228-usb2phy"; reg = <0x0760 0x0c>; clocks = <&cru SCLK_OTGPHY0>;
@@ -217,7 +217,7 @@ }; }; - u2phy1: usb2-phy@800 { + u2phy1: usb2phy@800 { compatible = "rockchip,rk3228-usb2phy"; reg = <0x0800 0x0c>; clocks = <&cru SCLK_OTGPHY1>;
arch/arm/boot/dts/rv1108.dtsi +1 -1
@@ -265,7 +265,7 @@ #address-cells = <1>; #size-cells = <1>; - u2phy: usb2-phy@100 { + u2phy: usb2phy@100 { compatible = "rockchip,rv1108-usb2phy"; reg = <0x100 0x0c>; clocks = <&cru SCLK_USBPHY>;
Signature · 1 line
2.11.0
PATCH v7 4/5 arm64: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
In reply to Johan JonkerThe pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" in phy-provider.yaml has required "#phy-cells" for phy nodes. The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent notifications.
make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ phy/phy-provider.yaml
--- arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/px30.dtsi +1 -1
@@ -822,7 +822,7 @@ #address-cells = <1>; #size-cells = <1>; - u2phy: usb2-phy@100 { + u2phy: usb2phy@100 { compatible = "rockchip,px30-usb2phy"; reg = <0x100 0x20>; clocks = <&pmucru SCLK_USBPHY_REF>;
arch/arm64/boot/dts/rockchip/rk3328.dtsi +1 -1
@@ -819,7 +819,7 @@ #address-cells = <1>; #size-cells = <1>; - u2phy: usb2-phy@100 { + u2phy: usb2phy@100 { compatible = "rockchip,rk3328-usb2phy"; reg = <0x100 0x10>; clocks = <&xin24m>;
arch/arm64/boot/dts/rockchip/rk3399.dtsi +2 -2
@@ -1418,7 +1418,7 @@ status = "disabled"; }; - u2phy0: usb2-phy@e450 { + u2phy0: usb2phy@e450 { compatible = "rockchip,rk3399-usb2phy"; reg = <0xe450 0x10>; clocks = <&cru SCLK_USB2PHY0_REF>;
@@ -1445,7 +1445,7 @@ }; }; - u2phy1: usb2-phy@e460 { + u2phy1: usb2phy@e460 { compatible = "rockchip,rk3399-usb2phy"; reg = <0xe460 0x10>; clocks = <&cru SCLK_USB2PHY1_REF>;
Signature · 1 line
2.11.0
PATCH v7 5/5 arm64: dts: rockchip: add USB support to rk3308.dtsi
In reply to Johan JonkerFrom: Tobias Schramm <[email protected]>
The Rockchip RK3308 features an integrated USB 2.0 phy, an USB OTG controller and OHCI/EHCI interfaces.
This patch adds all of those to the RK3308 dtsi and thereby enables USB support on the RK3308.
---
Changed:
restyle
limit grf reg size
change sub nodename
--- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 74 +++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3308.dtsi +73 -1
@@ -164,7 +164,7 @@ grf: grf@ff000000 { compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd"; - reg = <0x0 0xff000000 0x0 0x10000>; + reg = <0x0 0xff000000 0x0 0x08000>; reboot-mode { compatible = "syscon-reboot-mode";
@@ -177,6 +177,42 @@ }; }; + usb2phy_grf: syscon@ff008000 { + compatible = "rockchip,rk3308-usb2phy-grf", "syscon", "simple-mfd"; + reg = <0x0 0xff008000 0x0 0x4000>; + #address-cells = <1>; + #size-cells = <1>; + + u2phy: usb2phy@100 { + compatible = "rockchip,rk3308-usb2phy"; + reg = <0x100 0x10>; + assigned-clocks = <&cru USB480M>; + assigned-clock-parents = <&u2phy>; + clocks = <&cru SCLK_USBPHY_REF>; + clock-names = "phyclk"; + clock-output-names = "usb480m_phy"; + #clock-cells = <0>; + status = "disabled"; + + u2phy_otg: otg-port { + interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "otg-bvalid", "otg-id", + "linestate"; + #phy-cells = <0>; + status = "disabled"; + }; + + u2phy_host: host-port { + interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "linestate"; + #phy-cells = <0>; + status = "disabled"; + }; + }; + }; + detect_grf: syscon@ff00b000 { compatible = "rockchip,rk3308-detect-grf", "syscon", "simple-mfd"; reg = <0x0 0xff00b000 0x0 0x1000>;
@@ -579,6 +615,42 @@ status = "disabled"; }; + usb20_otg: usb@ff400000 { + compatible = "rockchip,rk3308-usb", "rockchip,rk3066-usb", + "snps,dwc2"; + reg = <0x0 0xff400000 0x0 0x40000>; + interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_OTG>; + clock-names = "otg"; + dr_mode = "otg"; + g-np-tx-fifo-size = <16>; + g-rx-fifo-size = <280>; + g-tx-fifo-size = <256 128 128 64 32 16>; + phys = <&u2phy_otg>; + phy-names = "usb2-phy"; + status = "disabled"; + }; + + usb_host_ehci: usb@ff440000 { + compatible = "generic-ehci"; + reg = <0x0 0xff440000 0x0 0x10000>; + interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_HOST>, <&cru HCLK_HOST_ARB>, <&u2phy>; + phys = <&u2phy_host>; + phy-names = "usb"; + status = "disabled"; + }; + + usb_host_ohci: usb@ff450000 { + compatible = "generic-ohci"; + reg = <0x0 0xff450000 0x0 0x10000>; + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_HOST>, <&cru HCLK_HOST_ARB>, <&u2phy>; + phys = <&u2phy_host>; + phy-names = "usb"; + status = "disabled"; + }; + sdmmc: mmc@ff480000 { compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xff480000 0x0 0x4000>;
Signature · 1 line
2.11.0
Quoted 5 lines · Johan Jonker
Changed V7:
rebase
add compatible for rk3308 USB grfadd "rockchip,rk3308-usb2phy-grf" to "usb2phy@[0-9a-f]+$" patternProperties too
Quoted 7 lines
add USB support to
rk3308.dtsi
restyle
limit grf reg size
change sub nodename
remove applied patches[...]
Applied, thanks!
[1/5] dt-bindings: phy: rename phy nodename in phy-rockchip-inno-usb2.yaml
commit: e71ccdff376b0bd1bf4d47642b7ec4d791293b96
[2/5] dt-bindings: soc: rockchip: grf: add compatible for RK3308 USB grf
commit: da76290fa39dc647bf7a1bac6467e66c8e465e54
[3/5] ARM: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
commit: 2fd2300a9c17ee1c48b1b7a7fabbb90fd12a64f1
[4/5] arm64: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
commit: 8c3d64251ac5c5a3d10364f6b07d3603ac1e7b4a
[5/5] arm64: dts: rockchip: add USB support to rk3308.dtsi
commit: 9fcf74b274a1dc5bcda37c34470061ef1e1130ddBest regards,
Signature · 1 line
Heiko Stuebner <[email protected]>