Fix USB port on Rockpi S (#2461)
* Fix USB port on Rockpi S * Rename patches for clarity * Add patches to DEV * Remove deprecated patch
This commit is contained in:
Igor Pečovnik
GitHub
parent
b7d4a7a577
commit
fa2fd517d1
@ -0,0 +1,24 @@
|
||||
From 3f90a9ef2e8d7e647572b2f2f2f54dce20c654c5 Mon Sep 17 00:00:00 2001
|
||||
From: ashthespy <ashthespy@gmail.com>
|
||||
Date: Mon, 3 Feb 2020 21:29:44 +0100
|
||||
Subject: [PATCH 23/23] ASoC: rockchip: i2s: add compatible for rk3308
|
||||
|
||||
---
|
||||
sound/soc/rockchip/rockchip_i2s.c | 1 +
|
||||
1 files changed, 1 insertions(+)
|
||||
|
||||
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
|
||||
index e6125ebfe5a9..dcee123b0939 100644
|
||||
--- a/sound/soc/rockchip/rockchip_i2s.c
|
||||
+++ b/sound/soc/rockchip/rockchip_i2s.c
|
||||
@@ -598,6 +598,7 @@ static const struct of_device_id rockchip_i2s_match[] = {
|
||||
{ .compatible = "rockchip,rk3066-i2s", },
|
||||
{ .compatible = "rockchip,rk3128-i2s", },
|
||||
{ .compatible = "rockchip,rk3188-i2s", },
|
||||
+ { .compatible = "rockchip,rk3308-i2s", },
|
||||
{ .compatible = "rockchip,rk3288-i2s", },
|
||||
{ .compatible = "rockchip,rk3308-i2s", },
|
||||
{ .compatible = "rockchip,rk3328-i2s", },
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,95 @@
|
||||
This patch adds usb2-phy support for RK3308 SoCs and amend phy Documentation.
|
||||
|
||||
Signed-off-by: Akash Gajjar <akash@xxxxxxxxxxxx>
|
||||
---
|
||||
.../bindings/phy/phy-rockchip-inno-usb2.txt | 1 +
|
||||
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 44 +++++++++++++++++++
|
||||
2 files changed, 45 insertions(+)
|
||||
|
||||
--- a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml 2020-12-01 17:38:51.952047047 +0200
|
||||
+++ b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml 2020-12-01 17:39:09.880064488 +0200
|
||||
@@ -14,6 +14,7 @@
|
||||
enum:
|
||||
- rockchip,px30-usb2phy
|
||||
- rockchip,rk3228-usb2phy
|
||||
+ - rockchip,rk3308-usb2phy
|
||||
- rockchip,rk3328-usb2phy
|
||||
- rockchip,rk3366-usb2phy
|
||||
- rockchip,rk3399-usb2phy
|
||||
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
||||
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
||||
@@ -1425,6 +1468,7 @@ static const struct rockchip_usb2phy_cfg rv1108_phy_cfgs[] = {
|
||||
static const struct of_device_id rockchip_usb2phy_dt_match[] = {
|
||||
{ .compatible = "rockchip,px30-usb2phy", .data = &rk3328_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3228-usb2phy", .data = &rk3228_phy_cfgs },
|
||||
+ { .compatible = "rockchip,rk3308-usb2phy", .data = &rk3328_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3328-usb2phy", .data = &rk3328_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3366-usb2phy", .data = &rk3366_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3399-usb2phy", .data = &rk3399_phy_cfgs },
|
||||
--
|
||||
2.17.1
|
||||
Add the ehci/ochi usb node support for the RK3308 soc.
|
||||
|
||||
Signed-off-by: Akash Gajjar <akash@xxxxxxxxxxxx>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 49 ++++++++++++++++++++++++
|
||||
1 file changed, 49 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi 2020-12-01 17:42:28.328250544 +0200
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi 2020-12-01 17:45:19.464400997 +0200
|
||||
@@ -586,6 +586,55 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+ usb2phy_grf: syscon@ff008000 {
|
||||
+ compatible = "rockchip,rk3308-usb2phy-grf", "syscon",
|
||||
+ "simple-mfd";
|
||||
+ reg = <0x0 0xff008000 0x0 0x4000>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ u2phy: usb2-phy@100 {
|
||||
+ compatible = "rockchip,rk3308-usb2phy";
|
||||
+ reg = <0x100 0x10>;
|
||||
+ clocks = <&cru SCLK_USBPHY_REF>;
|
||||
+ clock-names = "phyclk";
|
||||
+ #clock-cells = <0>;
|
||||
+ assigned-clocks = <&cru USB480M>;
|
||||
+ assigned-clock-parents = <&u2phy>;
|
||||
+ clock-output-names = "usb480m_phy";
|
||||
+ status = "disabled";
|
||||
+
|
||||
+ u2phy_host: host-port {
|
||||
+ #phy-cells = <0>;
|
||||
+ interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ interrupt-names = "linestate";
|
||||
+ 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>;
|
||||
+ clock-names = "usbhost", "arbiter", "utmi";
|
||||
+ 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>;
|
||||
+ clock-names = "usbhost", "arbiter", "utmi";
|
||||
+ 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>;
|
||||
@ -0,0 +1,23 @@
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts 2020-12-01 17:53:08.008768652 +0200
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts 2020-12-01 17:54:29.728826515 +0200
|
||||
@@ -335,3 +335,20 @@
|
||||
pinctrl-0 = <&uart4_xfer &uart4_rts &uart4_cts>;
|
||||
status = "okay";
|
||||
};
|
||||
+
|
||||
+&u2phy {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ u2phy_host: host-port {
|
||||
+ phy-supply = <&vcc5v0_otg>;
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&usb_host_ehci {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&usb_host_ohci{
|
||||
+ status = "okay";
|
||||
+};
|
||||
@ -0,0 +1,95 @@
|
||||
This patch adds usb2-phy support for RK3308 SoCs and amend phy Documentation.
|
||||
|
||||
Signed-off-by: Akash Gajjar <akash@xxxxxxxxxxxx>
|
||||
---
|
||||
.../bindings/phy/phy-rockchip-inno-usb2.txt | 1 +
|
||||
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 44 +++++++++++++++++++
|
||||
2 files changed, 45 insertions(+)
|
||||
|
||||
--- a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml 2020-12-01 17:38:51.952047047 +0200
|
||||
+++ b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml 2020-12-01 17:39:09.880064488 +0200
|
||||
@@ -14,6 +14,7 @@
|
||||
enum:
|
||||
- rockchip,px30-usb2phy
|
||||
- rockchip,rk3228-usb2phy
|
||||
+ - rockchip,rk3308-usb2phy
|
||||
- rockchip,rk3328-usb2phy
|
||||
- rockchip,rk3366-usb2phy
|
||||
- rockchip,rk3399-usb2phy
|
||||
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
||||
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
||||
@@ -1425,6 +1468,7 @@ static const struct rockchip_usb2phy_cfg rv1108_phy_cfgs[] = {
|
||||
static const struct of_device_id rockchip_usb2phy_dt_match[] = {
|
||||
{ .compatible = "rockchip,px30-usb2phy", .data = &rk3328_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3228-usb2phy", .data = &rk3228_phy_cfgs },
|
||||
+ { .compatible = "rockchip,rk3308-usb2phy", .data = &rk3328_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3328-usb2phy", .data = &rk3328_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3366-usb2phy", .data = &rk3366_phy_cfgs },
|
||||
{ .compatible = "rockchip,rk3399-usb2phy", .data = &rk3399_phy_cfgs },
|
||||
--
|
||||
2.17.1
|
||||
Add the ehci/ochi usb node support for the RK3308 soc.
|
||||
|
||||
Signed-off-by: Akash Gajjar <akash@xxxxxxxxxxxx>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 49 ++++++++++++++++++++++++
|
||||
1 file changed, 49 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi 2020-12-01 17:42:28.328250544 +0200
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi 2020-12-01 17:45:19.464400997 +0200
|
||||
@@ -586,6 +586,55 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+ usb2phy_grf: syscon@ff008000 {
|
||||
+ compatible = "rockchip,rk3308-usb2phy-grf", "syscon",
|
||||
+ "simple-mfd";
|
||||
+ reg = <0x0 0xff008000 0x0 0x4000>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ u2phy: usb2-phy@100 {
|
||||
+ compatible = "rockchip,rk3308-usb2phy";
|
||||
+ reg = <0x100 0x10>;
|
||||
+ clocks = <&cru SCLK_USBPHY_REF>;
|
||||
+ clock-names = "phyclk";
|
||||
+ #clock-cells = <0>;
|
||||
+ assigned-clocks = <&cru USB480M>;
|
||||
+ assigned-clock-parents = <&u2phy>;
|
||||
+ clock-output-names = "usb480m_phy";
|
||||
+ status = "disabled";
|
||||
+
|
||||
+ u2phy_host: host-port {
|
||||
+ #phy-cells = <0>;
|
||||
+ interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ interrupt-names = "linestate";
|
||||
+ 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>;
|
||||
+ clock-names = "usbhost", "arbiter", "utmi";
|
||||
+ 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>;
|
||||
+ clock-names = "usbhost", "arbiter", "utmi";
|
||||
+ 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>;
|
||||
@ -0,0 +1,23 @@
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts 2020-12-01 17:53:08.008768652 +0200
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts 2020-12-01 17:54:29.728826515 +0200
|
||||
@@ -335,3 +335,20 @@
|
||||
pinctrl-0 = <&uart4_xfer &uart4_rts &uart4_cts>;
|
||||
status = "okay";
|
||||
};
|
||||
+
|
||||
+&u2phy {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ u2phy_host: host-port {
|
||||
+ phy-supply = <&vcc5v0_otg>;
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&usb_host_ehci {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&usb_host_ohci{
|
||||
+ status = "okay";
|
||||
+};
|
||||
Loading…
Reference in New Issue
Block a user