139 lines
4.1 KiB
Diff
139 lines
4.1 KiB
Diff
diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c
|
|
index 494cf2b5bf7b..384461b70684 100644
|
|
--- a/drivers/soc/rockchip/grf.c
|
|
+++ b/drivers/soc/rockchip/grf.c
|
|
@@ -108,6 +108,20 @@ static const struct rockchip_grf_info rk3399_grf __initconst = {
|
|
.num_values = ARRAY_SIZE(rk3399_defaults),
|
|
};
|
|
|
|
+#define RK3566_GRF_USB3OTG0_CON1 0x0104
|
|
+
|
|
+static const struct rockchip_grf_value rk3566_defaults[] __initconst = {
|
|
+ { "usb3otg port switch", RK3566_GRF_USB3OTG0_CON1, HIWORD_UPDATE(0, 1, 12) },
|
|
+ { "usb3otg clock switch", RK3566_GRF_USB3OTG0_CON1, HIWORD_UPDATE(1, 1, 7) },
|
|
+ { "usb3otg disable usb3", RK3566_GRF_USB3OTG0_CON1, HIWORD_UPDATE(1, 1, 0) },
|
|
+};
|
|
+
|
|
+static const struct rockchip_grf_info rk3566_pipegrf __initconst = {
|
|
+ .values = rk3566_defaults,
|
|
+ .num_values = ARRAY_SIZE(rk3566_defaults),
|
|
+};
|
|
+
|
|
+
|
|
static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
|
|
{
|
|
.compatible = "rockchip,rk3036-grf",
|
|
@@ -130,6 +144,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
|
|
}, {
|
|
.compatible = "rockchip,rk3399-grf",
|
|
.data = (void *)&rk3399_grf,
|
|
+ }, {
|
|
+ .compatible = "rockchip,rk3566-pipe-grf",
|
|
+ .data = (void *)&rk3566_pipegrf,
|
|
},
|
|
{ /* sentinel */ },
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi
|
|
index 3839eef5e4f7..0b957068ff89 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi
|
|
@@ -6,6 +6,10 @@ / {
|
|
compatible = "rockchip,rk3566";
|
|
};
|
|
|
|
+&pipegrf {
|
|
+ compatible = "rockchip,rk3566-pipe-grf", "syscon";
|
|
+};
|
|
+
|
|
&power {
|
|
power-domain@RK3568_PD_PIPE {
|
|
reg = <RK3568_PD_PIPE>;
|
|
@@ -18,3 +22,10 @@ power-domain@RK3568_PD_PIPE {
|
|
#power-domain-cells = <0>;
|
|
};
|
|
};
|
|
+
|
|
+&usb_host0_xhci {
|
|
+ phys = <&usb2phy0_otg>;
|
|
+ phy-names = "usb2-phy";
|
|
+ extcon = <&usb2phy0>;
|
|
+ maximum-speed = "high-speed";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
|
index 5b0f528d6818..8ba9334f9753 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
|
@@ -99,6 +99,10 @@ opp-1992000000 {
|
|
};
|
|
};
|
|
|
|
+&pipegrf {
|
|
+ compatible = "rockchip,rk3568-pipe-grf", "syscon";
|
|
+};
|
|
+
|
|
&power {
|
|
power-domain@RK3568_PD_PIPE {
|
|
reg = <RK3568_PD_PIPE>;
|
|
@@ -114,3 +118,8 @@ power-domain@RK3568_PD_PIPE {
|
|
#power-domain-cells = <0>;
|
|
};
|
|
};
|
|
+
|
|
+&usb_host0_xhci {
|
|
+ phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>;
|
|
+ phy-names = "usb2-phy", "usb3-phy";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
|
index 7cdef800cb3c..ca20d7b91fe5 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
|
@@ -230,6 +230,40 @@ scmi_shmem: sram@0 {
|
|
};
|
|
};
|
|
|
|
+ usb_host0_xhci: usb@fcc00000 {
|
|
+ compatible = "rockchip,rk3568-dwc3", "snps,dwc3";
|
|
+ reg = <0x0 0xfcc00000 0x0 0x400000>;
|
|
+ interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&cru CLK_USB3OTG0_REF>, <&cru CLK_USB3OTG0_SUSPEND>,
|
|
+ <&cru ACLK_USB3OTG0>;
|
|
+ clock-names = "ref_clk", "suspend_clk",
|
|
+ "bus_clk";
|
|
+ dr_mode = "host";
|
|
+ phy_type = "utmi_wide";
|
|
+ power-domains = <&power RK3568_PD_PIPE>;
|
|
+ resets = <&cru SRST_USB3OTG0>;
|
|
+ snps,dis_u2_susphy_quirk;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ usb_host1_xhci: usb@fd000000 {
|
|
+ compatible = "rockchip,rk3568-dwc3", "snps,dwc3";
|
|
+ reg = <0x0 0xfd000000 0x0 0x400000>;
|
|
+ interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&cru CLK_USB3OTG1_REF>, <&cru CLK_USB3OTG1_SUSPEND>,
|
|
+ <&cru ACLK_USB3OTG1>;
|
|
+ clock-names = "ref_clk", "suspend_clk",
|
|
+ "bus_clk";
|
|
+ dr_mode = "host";
|
|
+ phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>;
|
|
+ phy-names = "usb2-phy", "usb3-phy";
|
|
+ phy_type = "utmi_wide";
|
|
+ power-domains = <&power RK3568_PD_PIPE>;
|
|
+ resets = <&cru SRST_USB3OTG1>;
|
|
+ snps,dis_u2_susphy_quirk;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
gic: interrupt-controller@fd400000 {
|
|
compatible = "arm,gic-v3";
|
|
reg = <0x0 0xfd400000 0 0x10000>, /* GICD */
|
|
@@ -297,7 +331,6 @@ pmu_io_domains: io-domains {
|
|
};
|
|
|
|
pipegrf: syscon@fdc50000 {
|
|
- compatible = "rockchip,rk3568-pipe-grf", "syscon";
|
|
reg = <0x0 0xfdc50000 0x0 0x1000>;
|
|
};
|
|
|