rockchip64: rewrite patches
This commit is contained in:
parent
a6d1719859
commit
c817f70a17
@ -669,9 +669,7 @@ index 111111111111..222222222222 100644
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -815,10 +815,11 @@ &pcie_phy {
|
||||
};
|
||||
|
||||
@@ -425,6 +816,7 @@ &pcie_phy {
|
||||
&pcie0 {
|
||||
ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
|
||||
num-lanes = <2>;
|
||||
@ -679,9 +677,7 @@ index 111111111111..222222222222 100644
|
||||
status = "okay";
|
||||
|
||||
vpcie12v-supply = <&vcc12v_dcin>;
|
||||
vpcie3v3-supply = <&pcie_power>;
|
||||
vpcie1v8-supply = <&avdd_1v8_s0>;
|
||||
@@ -436,36 +828,116 @@ &pcie0 {
|
||||
@@ -434,36 +826,116 @@ &pcie0 {
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
@ -806,7 +802,7 @@ index 111111111111..222222222222 100644
|
||||
hdd_a_power_en: hdd-a-power-en {
|
||||
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
@@ -485,7 +957,7 @@ usb_lan_en: usb-lan-en {
|
||||
@@ -483,7 +955,7 @@ usb_lan_en: usb-lan-en {
|
||||
|
||||
vcc3v0-sd {
|
||||
sdmmc0_pwr_h: sdmmc0-pwr-h {
|
||||
@ -815,7 +811,7 @@ index 111111111111..222222222222 100644
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -505,10 +977,28 @@ &pwm1 {
|
||||
@@ -503,10 +975,28 @@ &pwm1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@ -844,7 +840,7 @@ index 111111111111..222222222222 100644
|
||||
vqmmc-supply = <&vcc1v8_sys_s0>;
|
||||
status = "okay";
|
||||
};
|
||||
@@ -516,8 +1006,9 @@ &sdhci {
|
||||
@@ -514,8 +1004,9 @@ &sdhci {
|
||||
&sdmmc {
|
||||
bus-width = <4>;
|
||||
cap-sd-highspeed;
|
||||
@ -855,7 +851,7 @@ index 111111111111..222222222222 100644
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
|
||||
vmmc-supply = <&vcc3v0_sd>;
|
||||
@@ -546,6 +1037,27 @@ &spi5 {
|
||||
@@ -544,6 +1035,27 @@ &spi5 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@ -883,7 +879,7 @@ index 111111111111..222222222222 100644
|
||||
&tcphy1 {
|
||||
/* phy for &usbdrd_dwc3_1 */
|
||||
status = "okay";
|
||||
@@ -559,61 +1071,122 @@ &tsadc {
|
||||
@@ -557,61 +1069,122 @@ &tsadc {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@ -12,9 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
|
||||
@@ -813,11 +813,10 @@ &io_domains {
|
||||
&pcie_phy {
|
||||
status = "okay";
|
||||
@@ -815,7 +815,6 @@ &pcie_phy {
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
@ -22,8 +20,6 @@ index 111111111111..222222222222 100644
|
||||
num-lanes = <2>;
|
||||
pinctrl-0 = <&pcie_prst &pcie_clkreqn_cpm>;
|
||||
status = "okay";
|
||||
|
||||
vpcie12v-supply = <&vcc12v_dcin>;
|
||||
--
|
||||
Armbian
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@ index 111111111111..222222222222 100644
|
||||
|
||||
ports {
|
||||
#address-cells = <1>;
|
||||
@@ -982,6 +1006,7 @@ spiflash: flash@0 {
|
||||
@@ -981,6 +1005,7 @@ spiflash: flash@0 {
|
||||
};
|
||||
|
||||
&tcphy0 {
|
||||
@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -1015,6 +1040,8 @@ &tsadc {
|
||||
@@ -1014,6 +1039,8 @@ &tsadc {
|
||||
|
||||
&u2phy0 {
|
||||
status = "okay";
|
||||
@ -87,7 +87,7 @@ index 111111111111..222222222222 100644
|
||||
|
||||
u2phy0_otg: otg-port {
|
||||
status = "okay";
|
||||
@@ -1091,7 +1118,9 @@ &usbdrd3_0 {
|
||||
@@ -1090,7 +1117,9 @@ &usbdrd3_0 {
|
||||
};
|
||||
|
||||
&usbdrd_dwc3_0 {
|
||||
|
||||
@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -5997,27 +5997,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
|
||||
@@ -6003,27 +6003,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
|
||||
static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
|
||||
{
|
||||
struct stmmac_priv *priv = netdev_priv(dev);
|
||||
|
||||
@ -118,7 +118,7 @@ diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/kernel/dma/pool.c
|
||||
+++ b/kernel/dma/pool.c
|
||||
@@ -189,13 +189,11 @@ static int __init dma_atomic_pool_init(void)
|
||||
@@ -195,13 +195,11 @@ static int __init dma_atomic_pool_init(void)
|
||||
int ret = 0;
|
||||
|
||||
/*
|
||||
|
||||
@ -20,7 +20,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
|
||||
@@ -1242,7 +1242,7 @@ rknn_mmu_2: iommu@fdad9000 {
|
||||
@@ -1242,7 +1242,7 @@ rknn_mmu_2: iommu@fdada000 {
|
||||
};
|
||||
|
||||
vpu121: video-codec@fdb50000 {
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
From 3e3aee95bc3f1dbc3da203a04f0e0d4a70b193e7 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Ling <ling_kasim@hotmail.com>
|
||||
Date: Sat, 13 Apr 2024 18:25:27 +0800
|
||||
Subject: [PATCH] arm64: dts: rk3588s-roc-pc: Enable USB type-C port
|
||||
Subject: arm64: dts: rk3588s-roc-pc: Enable USB type-C port
|
||||
|
||||
Signed-off-by: Alex Ling <ling_kasim@hotmail.com>
|
||||
---
|
||||
.../boot/dts/rockchip/rk3588s-roc-pc.dts | 98 ++++++++++++++++++-
|
||||
arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 98 +++++++++-
|
||||
1 file changed, 97 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
|
||||
index c5d6206b49bb9..c6d8e126ff633 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
|
||||
@@ -319,6 +319,57 @@ hym8563: rtc@51 {
|
||||
@ -106,8 +106,8 @@ index c5d6206b49bb9..c6d8e126ff633 100644
|
||||
};
|
||||
|
||||
&usb_host1_ehci {
|
||||
@@ -864,6 +934,32 @@ &usb_host2_xhci {
|
||||
status = "okay";
|
||||
@@ -865,6 +935,32 @@ &usb_host2_xhci {
|
||||
dr_mode = "host";
|
||||
};
|
||||
|
||||
+&usbdp_phy0 {
|
||||
@ -140,5 +140,5 @@ index c5d6206b49bb9..c6d8e126ff633 100644
|
||||
status = "okay";
|
||||
};
|
||||
--
|
||||
2.43.0
|
||||
Armbian
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user