enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip64/edge: bump to 6.6-rc4; rebase patches

Browse Source
This commit is contained in:
Ricardo Pardini 2023-10-02 14:17:52 +02:00 committed by Igor
parent 41ade999f0
commit 21ff27f9f1
26 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patch/kernel/archive/rockchip64-6.6/add-maker-friendlyarm.patch
View File

@ -14,10 +14,10 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
5 files changed, 157 insertions(+)
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index 4e176280113a..8dabe409f072 100644
index d21e75d69294..671e4d650dee 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -30,5 +30,6 @@ source "drivers/soc/ti/Kconfig"
@@ -31,5 +31,6 @@ source "drivers/soc/ti/Kconfig"
source "drivers/soc/ux500/Kconfig"
source "drivers/soc/versatile/Kconfig"
source "drivers/soc/xilinx/Kconfig"
@ -25,10 +25,10 @@ index 4e176280113a..8dabe409f072 100644
endmenu
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 3b0f9fb3b5c8..9652d3a514af 100644
index 0706a27d13be..c926f67cc4ad 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -36,3 +36,4 @@ obj-y += ti/
@@ -35,3 +35,4 @@ obj-y += ti/
obj-$(CONFIG_ARCH_U8500) += ux500/
obj-$(CONFIG_PLAT_VERSATILE) += versatile/
obj-y += xilinx/

4
patch/kernel/archive/rockchip64-6.6/add-rockchip-iep-driver.patch
View File

@ -216,10 +216,10 @@ index e729e7a22b23..4e30c5279ac6 100644
compatible = "rockchip,rk3328-dw-hdmi";
reg = <0x0 0xff3c0000 0x0 0x20000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 928948e7c7bb..63fed464a660 100644
index 9da0b6d77c8d..8e781efbf143 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1377,12 +1377,25 @@ vdec_mmu: iommu@ff660480 {
@@ -1404,12 +1404,25 @@ vdec_mmu: iommu@ff660480 {
#iommu-cells = <0>;
};

20
patch/kernel/archive/rockchip64-6.6/board-pbp-add-dp-alt-mode.patch
View File

@ -41,7 +41,7 @@ index 054c6a4d1a45..48b865d30b14 100644
};
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 8b1667be4915..aae021e192a4 100644
index 4efcb78b0ab1..6a641d9f752c 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -40,6 +40,7 @@
@ -52,7 +52,7 @@ index 8b1667be4915..aae021e192a4 100644
#include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/kernel.h>
@@ -1157,6 +1158,22 @@ static int rockchip_typec_phy_probe(struct platform_device *pdev)
@@ -1156,6 +1157,22 @@ static int rockchip_typec_phy_probe(struct platform_device *pdev)
dev_err(dev, "Invalid or missing extcon\n");
return PTR_ERR(tcphy->extcon);
}
@ -76,7 +76,7 @@ index 8b1667be4915..aae021e192a4 100644
pm_runtime_enable(dev);
diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
index cdf8261e22db..05172e17b2bf 100644
index 426c88a516e5..e9094255a9be 100644
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -9,6 +9,8 @@
@ -175,7 +175,7 @@ index cdf8261e22db..05172e17b2bf 100644
ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);
if (ret)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 1596afee6c86..f4c41de58f17 100644
index d962f67c95ae..5ac809870867 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -8,6 +8,7 @@
@ -274,7 +274,7 @@ index 1596afee6c86..f4c41de58f17 100644
tcpm_register_partner_altmodes(port);
}
break;
@@ -3720,6 +3762,7 @@ static int tcpm_src_attach(struct tcpm_port *port)
@@ -3650,6 +3692,7 @@ static int tcpm_src_attach(struct tcpm_port *port)
static void tcpm_typec_disconnect(struct tcpm_port *port)
{
if (port->connected) {
@ -282,7 +282,7 @@ index 1596afee6c86..f4c41de58f17 100644
typec_partner_set_usb_power_delivery(port->partner, NULL);
typec_unregister_partner(port->partner);
port->partner = NULL;
@@ -3806,6 +3849,8 @@ static void tcpm_detach(struct tcpm_port *port)
@@ -3739,6 +3782,8 @@ static void tcpm_detach(struct tcpm_port *port)
}
tcpm_reset_port(port);
@ -291,7 +291,7 @@ index 1596afee6c86..f4c41de58f17 100644
}
static void tcpm_src_detach(struct tcpm_port *port)
@@ -6179,6 +6224,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
@@ -6109,6 +6154,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
return ret;
}
@ -356,7 +356,7 @@ index 1596afee6c86..f4c41de58f17 100644
static int tcpm_fw_get_caps(struct tcpm_port *port,
struct fwnode_handle *fwnode)
{
@@ -6189,6 +6292,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
@@ -6119,6 +6222,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
if (!fwnode)
return -EINVAL;
@ -380,7 +380,7 @@ index 1596afee6c86..f4c41de58f17 100644
/*
* This fwnode has a "compatible" property, but is never populated as a
* struct device. Instead we simply parse it to read the properties.
@@ -6645,6 +6765,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
@@ -6571,6 +6691,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
goto out_destroy_wq;
port->try_role = port->typec_caps.prefer_role;
@ -398,7 +398,7 @@ index 1596afee6c86..f4c41de58f17 100644
port->typec_caps.fwnode = tcpc->fwnode;
port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */
@@ -6687,6 +6818,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
@@ -6613,6 +6744,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
port->port_altmode, ALTMODE_DISCOVERY_MAX);
port->registered = true;

6
patch/kernel/archive/rockchip64-6.6/board-rockpi4-0003-arm64-dts-pcie.patch
View File

@ -101,10 +101,10 @@ Subject: [ARCHEOLOGY] Rock Pi 4 enable PCIe in device tree for "dev" target
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 980c4534313a..be5c59be0c9d 100644
index 7dccbe8a9393..c89bbe5b1034 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -113,6 +113,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator {
@@ -112,6 +112,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator {
regulator-name = "vcc3v3_pcie";
regulator-always-on;
regulator-boot-on;
@ -113,7 +113,7 @@ index 980c4534313a..be5c59be0c9d 100644
vin-supply = <&vcc5v0_sys>;
};
@@ -528,9 +530,11 @@ &pcie0 {
@@ -527,9 +529,11 @@ &pcie0 {
num-lanes = <4>;
pinctrl-0 = <&pcie_clkreqnb_cpm>;
pinctrl-names = "default";

12
patch/kernel/archive/rockchip64-6.6/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch
View File

@ -15,10 +15,10 @@ Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
4 files changed, 2571 insertions(+)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 947473d2da7d..35cf63ff5457 100644
index f1e1dbc509f6..8ce353dad530 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -174,6 +174,7 @@ config SND_SOC_ALL_CODECS
@@ -177,6 +177,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_PCM512x_I2C
imply SND_SOC_PCM512x_SPI
imply SND_SOC_PEB2466
@ -26,7 +26,7 @@ index 947473d2da7d..35cf63ff5457 100644
imply SND_SOC_RK3328
imply SND_SOC_RK817
imply SND_SOC_RT274
@@ -1331,6 +1332,10 @@ config SND_SOC_PEB2466
@@ -1370,6 +1371,10 @@ config SND_SOC_PEB2466
To compile this driver as a module, choose M here: the module
will be called snd-soc-peb2466.
@ -38,10 +38,10 @@ index 947473d2da7d..35cf63ff5457 100644
tristate "Rockchip RK3328 audio CODEC"
select REGMAP_MMIO
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index b48a9a323b84..23a6bf365bd7 100644
index a87e56938ce5..8f539b13864d 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -196,6 +196,7 @@ snd-soc-pcm512x-objs := pcm512x.o
@@ -199,6 +199,7 @@ snd-soc-pcm512x-objs := pcm512x.o
snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
snd-soc-pcm512x-spi-objs := pcm512x-spi.o
snd-soc-peb2466-objs := peb2466.o
@ -49,7 +49,7 @@ index b48a9a323b84..23a6bf365bd7 100644
snd-soc-rk3328-objs := rk3328_codec.o
snd-soc-rk817-objs := rk817_codec.o
snd-soc-rl6231-objs := rl6231.o
@@ -573,6 +574,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
@@ -580,6 +581,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o
obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o
obj-$(CONFIG_SND_SOC_PEB2466) += snd-soc-peb2466.o

2
patch/kernel/archive/rockchip64-6.6/general-add-panel-simple-dsi.patch
View File

@ -62,7 +62,7 @@ Subject: [ARCHEOLOGY] general add panel simple dsi (#3140)
2 files changed, 773 insertions(+)
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
index 30cf553c8d1d..04e219b32c08 100644
index 433e93d57949..02076386ed5f 100644
--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o

6
patch/kernel/archive/rockchip64-6.6/general-add-xtx-spi-nor-chips.patch
View File

@ -27,7 +27,7 @@ index e347b435a038..364413da729b 100644
obj-$(CONFIG_MTD_SPI_NOR) += controllers/
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 72973cfb1d20..6f30fed5760e 100644
index 1b0c6770c14e..0cd1b57ecfcd 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2015,6 +2015,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
@ -39,10 +39,10 @@ index 72973cfb1d20..6f30fed5760e 100644
static const struct flash_info spi_nor_generic_flash = {
diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index 2453bd5743ac..ce395aee5472 100644
index 9217379b9cfe..28b90256425a 100644
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -646,6 +646,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
@@ -647,6 +647,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
extern const struct spi_nor_manufacturer spi_nor_winbond;
extern const struct spi_nor_manufacturer spi_nor_xilinx;
extern const struct spi_nor_manufacturer spi_nor_xmc;

4
patch/kernel/archive/rockchip64-6.6/general-disable-mtu-validation.patch
View File

@ -15,10 +15,10 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
1 file changed, 12 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 6931973028ae..e2374cd8e59e 100644
index 83c567a89a46..c8bdc72d7cc8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5607,27 +5607,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
@@ -5668,27 +5668,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);

4
patch/kernel/archive/rockchip64-6.6/general-fix-es8316-kernel-panic.patch
View File

@ -88,10 +88,10 @@ Subject: [ARCHEOLOGY] Enable es8316 on RockPi4 (#1885)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 65e497b455d3..fdc79ce5460f 100644
index a8f347f1affb..a9a7746f1adb 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -701,7 +701,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component)
@@ -702,7 +702,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component)
snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE,
ES8316_GPIO_ENABLE_INTERRUPT, 0);

4
patch/kernel/archive/rockchip64-6.6/general-fix-inno-usb2-phy-init.patch
View File

@ -8,10 +8,10 @@ Subject: remove usb2phy extcon initialization causing kernel oops
1 file changed, 5 deletions(-)
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index a0bc10aa7961..c2405f84e9e8 100644
index b982c3f0d4b5..25514646ad8e 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -1169,11 +1169,6 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
@@ -1286,11 +1286,6 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
goto out;
}

2
patch/kernel/archive/rockchip64-6.6/general-increasing_DMA_block_memory_allocation_to_2048.patch
View File

@ -210,7 +210,7 @@ Subject: [ARCHEOLOGY] Increasing DMA block memory allocation to 2048k on all
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
index 1acec2e22827..364dd5537925 100644
index b481c48a31a6..78b03eec8243 100644
--- a/kernel/dma/pool.c
+++ b/kernel/dma/pool.c
@@ -189,13 +189,11 @@ static int __init dma_atomic_pool_init(void)

4
patch/kernel/archive/rockchip64-6.6/general-legacy-rockchip-hwrng.patch
View File

@ -60,7 +60,7 @@ index c5fe355c6deb..3eaef6941a8f 100644
compatible = "rockchip,rk3308-tsadc";
reg = <0x0 0xff1f0000 0x0 0x100>;
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index e0b3786ca51b..144f15e7f23c 100644
index 8de74dcfa18c..89000c996d77 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -383,6 +383,19 @@ config HW_RANDOM_STM32
@ -82,7 +82,7 @@ index e0b3786ca51b..144f15e7f23c 100644
+
config HW_RANDOM_PIC32
tristate "Microchip PIC32 Random Number Generator support"
depends on HW_RANDOM && MACH_PIC32
depends on MACH_PIC32 || COMPILE_TEST
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index 32549a1186dc..fd3bbf6e08e1 100644
--- a/drivers/char/hw_random/Makefile

2
patch/kernel/archive/rockchip64-6.6/general-possibility-of-disabling-rk808-rtc.patch
View File

@ -35,7 +35,7 @@ index 0ed7c0d7784e..528917b236f9 100644
}
diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
index e8fc9e2ab1d0..ddba14eadda4 100644
index 11a831e92da8..9ec56d4abcfa 100644
--- a/drivers/mfd/rk8xx-core.c
+++ b/drivers/mfd/rk8xx-core.c
@@ -120,6 +120,7 @@ static const struct mfd_cell rk818s[] = {

12
patch/kernel/archive/rockchip64-6.6/general-rk808-configurable-switch-voltage-steps.patch
View File

@ -39,10 +39,10 @@ Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
index 460525ed006c..f99a5be93648 100644
index 867a2cf243f6..52575e71ce33 100644
--- a/drivers/regulator/rk808-regulator.c
+++ b/drivers/regulator/rk808-regulator.c
@@ -203,6 +203,7 @@ struct rk8xx_register_bit {
@@ -204,6 +204,7 @@ struct rk8xx_register_bit {
struct rk808_regulator_data {
struct gpio_desc *dvs_gpio[2];
@ -50,7 +50,7 @@ index 460525ed006c..f99a5be93648 100644
};
static const struct linear_range rk808_ldo3_voltage_ranges[] = {
@@ -415,7 +416,8 @@ static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev)
@@ -416,7 +417,8 @@ static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev)
}
static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev,
@ -60,7 +60,7 @@ index 460525ed006c..f99a5be93648 100644
{
int ret, delta_sel;
unsigned int old_sel, tmp, val, mask = rdev->desc->vsel_mask;
@@ -434,8 +436,8 @@ static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev,
@@ -435,8 +437,8 @@ static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev,
* the risk of overshoot. Put it into a multi-step, can effectively
* avoid this problem, a step is 100mv here.
*/
@ -71,7 +71,7 @@ index 460525ed006c..f99a5be93648 100644
val = old_sel << (ffs(mask) - 1);
val |= tmp;
@@ -469,12 +471,13 @@ static int rk808_buck1_2_set_voltage_sel(struct regulator_dev *rdev,
@@ -470,12 +472,13 @@ static int rk808_buck1_2_set_voltage_sel(struct regulator_dev *rdev,
struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev);
int id = rdev_get_id(rdev);
struct gpio_desc *gpio = pdata->dvs_gpio[id];
@ -86,7 +86,7 @@ index 460525ed006c..f99a5be93648 100644
gpio_level = gpiod_get_value(gpio);
if (gpio_level == 0) {
@@ -1656,6 +1659,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev,
@@ -1657,6 +1660,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev,
0 : tmp);
}

4
patch/kernel/archive/rockchip64-6.6/general-workaround-broadcom-bt-serdev.patch
View File

@ -9,10 +9,10 @@ Subject: Workaround to make several broadcom bluetooth serdev devices work
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index de2ea589aa49..df197c3a7894 100644
index 0a5445ac5e1b..06b442260c94 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -129,7 +129,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
@@ -134,7 +134,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
if (btbcm_set_bdaddr_from_efi(hdev) != 0) {
bt_dev_info(hdev, "BCM: Using default device address (%pMR)",
&bda->bdaddr);

10
patch/kernel/archive/rockchip64-6.6/net-usb-r8152-add-LED-configuration-from-OF.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
1 file changed, 23 insertions(+)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index e88bedca8f32..ef6dfc8eeb37 100644
index 0c13d9950cd8..b7a300572a05 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -11,6 +11,7 @@
@ -24,7 +24,7 @@ index e88bedca8f32..ef6dfc8eeb37 100644
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -6897,6 +6898,22 @@ static void rtl_tally_reset(struct r8152 *tp)
@@ -6879,6 +6880,22 @@ static void rtl_tally_reset(struct r8152 *tp)
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
}
@ -47,7 +47,7 @@ index e88bedca8f32..ef6dfc8eeb37 100644
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -6938,6 +6955,8 @@ static void r8152b_init(struct r8152 *tp)
@@ -6920,6 +6937,8 @@ static void r8152b_init(struct r8152 *tp)
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@ -56,7 +56,7 @@ index e88bedca8f32..ef6dfc8eeb37 100644
}
static void r8153_init(struct r8152 *tp)
@@ -7078,6 +7097,8 @@ static void r8153_init(struct r8152 *tp)
@@ -7060,6 +7079,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
@ -65,7 +65,7 @@ index e88bedca8f32..ef6dfc8eeb37 100644
}
static void r8153b_init(struct r8152 *tp)
@@ -7160,6 +7181,8 @@ static void r8153b_init(struct r8152 *tp)
@@ -7142,6 +7163,8 @@ static void r8153b_init(struct r8152 *tp)
rtl_tally_reset(tp);
tp->coalesce = 15000; /* 15 us */

12
patch/kernel/archive/rockchip64-6.6/regulator-add-fan53200-driver.patch
View File

@ -17,10 +17,10 @@ Signed-off-by: Rock Shen <rock_shen@asus.com>
4 files changed, 532 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index d8bae57af16d..b486a36d5e08 100644
index a789119e6483..3337a1e1eb66 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -712,6 +712,7 @@ CONFIG_REGULATOR_BD718XX=y
@@ -731,6 +731,7 @@ CONFIG_REGULATOR_BD718XX=y
CONFIG_REGULATOR_BD9571MWV=y
CONFIG_REGULATOR_CROS_EC=y
CONFIG_REGULATOR_FAN53555=y
@ -29,10 +29,10 @@ index d8bae57af16d..b486a36d5e08 100644
CONFIG_REGULATOR_HI6421V530=y
CONFIG_REGULATOR_HI655X=y
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 823f8e6e4801..bad043e639f6 100644
index 965d4f0c18a6..62c8aad24b38 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -385,6 +385,17 @@ config REGULATOR_FAN53880
@@ -393,6 +393,17 @@ config REGULATOR_FAN53880
(PMIC), it is controlled by I2C and provides one BUCK, one BOOST
and four LDO outputs.
@ -51,10 +51,10 @@ index 823f8e6e4801..bad043e639f6 100644
tristate "GPIO regulator support"
depends on GPIOLIB || COMPILE_TEST
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 15e0d614ff66..6f7ac4582796 100644
index 23074714a81a..484fcc264cc7 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
@@ -47,6 +47,7 @@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o
obj-$(CONFIG_REGULATOR_FAN53880) += fan53880.o

12
patch/kernel/archive/rockchip64-6.6/rk3308-0001-pinctrl-slew-mux.patch
View File

@ -93,10 +93,10 @@ index 365c4b0ca465..bacc2987c55b 100644
static void pinconf_generic_dump_one(struct pinctrl_dev *pctldev,
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 0276b52f3716..dde241eaf07a 100644
index 45e416f68e74..94af47ad9667 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -2534,6 +2534,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
@@ -2533,6 +2533,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
return ret;
}
@ -123,7 +123,7 @@ index 0276b52f3716..dde241eaf07a 100644
#define RK3328_SCHMITT_BITS_PER_PIN 1
#define RK3328_SCHMITT_PINS_PER_REG 16
#define RK3328_SCHMITT_BANK_STRIDE 8
@@ -2647,6 +2667,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank,
@@ -2646,6 +2666,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank,
return regmap_update_bits(regmap, reg, rmask, data);
}
@ -175,7 +175,7 @@ index 0276b52f3716..dde241eaf07a 100644
/*
* Pinmux_ops handling
*/
@@ -2879,6 +2944,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
@@ -2878,6 +2943,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
if (rc < 0)
return rc;
break;
@ -191,7 +191,7 @@ index 0276b52f3716..dde241eaf07a 100644
default:
return -ENOTSUPP;
break;
@@ -2953,6 +3027,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
@@ -2952,6 +3026,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
if (rc < 0)
return rc;
@ -218,7 +218,7 @@ index 0276b52f3716..dde241eaf07a 100644
arg = rc;
break;
default:
@@ -3760,6 +3854,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
@@ -3759,6 +3853,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
.pull_calc_reg = rk3308_calc_pull_reg_and_bit,
.drv_calc_reg = rk3308_calc_drv_reg_and_bit,
.schmitt_calc_reg = rk3308_calc_schmitt_reg_and_bit,

6
patch/kernel/archive/rockchip64-6.6/rk3308-0003-pinctrl-io-voltage-domains.patch
View File

@ -79,10 +79,10 @@ Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008)
2 files changed, 24 insertions(+), 45 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index dde241eaf07a..ca19decddd44 100644
index 94af47ad9667..9b9200634bb6 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -41,6 +41,12 @@
@@ -40,6 +40,12 @@
#include "pinconf.h"
#include "pinctrl-rockchip.h"
@ -95,7 +95,7 @@ index dde241eaf07a..ca19decddd44 100644
/*
* Generate a bitmask for setting a value (v) with a write mask bit in hiword
* register 31:16 area.
@@ -3515,6 +3521,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
@@ -3514,6 +3520,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
if (ret)
return ret;

6
patch/kernel/archive/rockchip64-6.6/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
View File

@ -95,10 +95,10 @@ Subject: [ARCHEOLOGY] Fix 2.5G Ethernet on Helios64 Mainline kernel (#2567)
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 63fed464a660..01ec8c2967b7 100644
index 8e781efbf143..7c0ce9be1376 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -461,6 +461,7 @@ usbdrd_dwc3_0: usb@fe800000 {
@@ -488,6 +488,7 @@ usbdrd_dwc3_0: usb@fe800000 {
snps,dis_u2_susphy_quirk;
snps,dis-del-phy-power-chg-quirk;
snps,dis-tx-ipgap-linecheck-quirk;
@ -106,7 +106,7 @@ index 63fed464a660..01ec8c2967b7 100644
power-domains = <&power RK3399_PD_USB3>;
status = "disabled";
};
@@ -497,6 +498,7 @@ usbdrd_dwc3_1: usb@fe900000 {
@@ -524,6 +525,7 @@ usbdrd_dwc3_1: usb@fe900000 {
snps,dis_u2_susphy_quirk;
snps,dis-del-phy-power-chg-quirk;
snps,dis-tx-ipgap-linecheck-quirk;

2
patch/kernel/archive/rockchip64-6.6/rk3399-fix-usb-phy.patch
View File

@ -9,7 +9,7 @@ rockchip64: increase timeout for usb3 type C phy init
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index aae021e192a4..5b09e19b2add 100644
index 6a641d9f752c..3862d7a4fcdb 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -904,7 +904,7 @@ static int rockchip_usb3_phy_power_on(struct phy *phy)

4
patch/kernel/archive/rockchip64-6.6/rk3399-rp64-rng.patch
View File

@ -9,10 +9,10 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
1 file changed, 10 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 01ec8c2967b7..abc73a9adf1a 100644
index 7c0ce9be1376..9364f495cdeb 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2092,6 +2092,16 @@ edp_out: port@1 {
@@ -2119,6 +2119,16 @@ edp_out: port@1 {
};
};

6
patch/kernel/archive/rockchip64-6.6/rk3399-sd-drive-level-8ma.patch
View File

@ -109,10 +109,10 @@ Subject: [ARCHEOLOGY] add better strength on SDCard and put back previous
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index abc73a9adf1a..00e7f2656f0f 100644
index 9364f495cdeb..7eafff9bdeef 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2555,25 +2555,25 @@ sdio0_int: sdio0-int {
@@ -2582,25 +2582,25 @@ sdio0_int: sdio0-int {
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
@ -145,7 +145,7 @@ index abc73a9adf1a..00e7f2656f0f 100644
};
sdmmc_cd: sdmmc-cd {
@@ -2583,7 +2583,7 @@ sdmmc_cd: sdmmc-cd {
@@ -2610,7 +2610,7 @@ sdmmc_cd: sdmmc-cd {
sdmmc_wp: sdmmc-wp {
rockchip,pins =

4
patch/kernel/archive/rockchip64-6.6/rk3399-sd-pwr-pinctrl.patch
View File

@ -8,10 +8,10 @@ Subject: rk3399: add sd power pin to pinctrl node
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 00e7f2656f0f..848f3f2150d9 100644
index 7eafff9bdeef..b8e847e8aae6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2550,6 +2550,11 @@ sdio0_int: sdio0-int {
@@ -2577,6 +2577,11 @@ sdio0_int: sdio0-int {
rockchip,pins =
<0 RK_PA4 1 &pcfg_pull_up>;
};

4
patch/kernel/archive/rockchip64-6.6/rk3399-unlock-temperature.patch
View File

@ -98,10 +98,10 @@ Subject: [ARCHEOLOGY] Increase performance with rk3399-dev
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 848f3f2150d9..4d1dcc83f5cb 100644
index b8e847e8aae6..cde74afa556f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -831,17 +831,17 @@ cpu_thermal: cpu-thermal {
@@ -858,17 +858,17 @@ cpu_thermal: cpu-thermal {
trips {
cpu_alert0: cpu_alert0 {

2
patch/kernel/archive/rockchip64-6.6/rk356x-vop2-support.patch
View File

@ -146,7 +146,7 @@ Subject: [ARCHEOLOGY] [RFC] RK3288 : Add HDMI resolutions (#1887)
1 file changed, 68 insertions(+), 79 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 112699949db9..fa0954b4e241 100644
index 341550199111..05c5a4fb16b2 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -92,86 +92,88 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)