eternalwrt/eternalwrt-mt798x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: refresh patches

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2026-03-26 11:49:27 +08:00
parent 2a98d7b63c
commit 0fff5aa84e
29 changed files with 77 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/generic/backport-6.12/831-01-v6.13-regulator-Add-of_regulator_get_optional-for-pure-DT.patch
+7 -7
View File
@@ -34,7 +34,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1966,8 +1966,8 @@ static struct regulator_dev *regulator_d
@@ -1998,8 +1998,8 @@ static struct regulator_dev *regulator_d
regulator_supply_alias(&dev, &supply);
/* first do a dt based lookup */
@@ -65,7 +65,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return ERR_PTR(-ENODEV);
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -600,7 +600,8 @@ err_node_put:
@@ -603,7 +603,8 @@ err_node_put:
/**
* of_get_regulator - get a regulator device node based on supply name
@@ -75,7 +75,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
* @supply: regulator supply name
*
* Extract the regulator device node corresponding to the supply name.
@@ -608,15 +609,16 @@ err_node_put:
@@ -611,15 +612,16 @@ err_node_put:
* Return: Pointer to the &struct device_node corresponding to the regulator
* if found, or %NULL if not found.
*/
@@ -95,7 +95,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
if (regnode)
return regnode;
@@ -640,6 +642,7 @@ static struct regulator_dev *of_find_reg
@@ -643,6 +645,7 @@ static struct regulator_dev *of_find_reg
/**
* of_regulator_dev_lookup - lookup a regulator device with device tree only
* @dev: Device pointer for regulator supply lookup.
@@ -103,7 +103,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
* @supply: Supply name or regulator ID.
*
* Return: Pointer to the &struct regulator_dev on success, or ERR_PTR()
@@ -654,13 +657,13 @@ static struct regulator_dev *of_find_reg
@@ -657,13 +660,13 @@ static struct regulator_dev *of_find_reg
* * -%ENODEV if lookup fails permanently.
* * -%EPROBE_DEFER if lookup could succeed in the future.
*/
@@ -119,7 +119,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
if (node) {
r = of_find_regulator_by_node(node);
of_node_put(node);
@@ -677,6 +680,42 @@ struct regulator_dev *of_regulator_dev_l
@@ -680,6 +683,42 @@ struct regulator_dev *of_regulator_dev_l
return ERR_PTR(-ENODEV);
}
@@ -184,7 +184,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
int regulator_register_supply_alias(struct device *dev, const char *id,
struct device *alias_dev,
const char *alias_id);
@@ -349,6 +362,13 @@ devm_regulator_get_optional(struct devic
@@ -354,6 +367,13 @@ devm_regulator_get_optional(struct devic
{
return ERR_PTR(-ENODEV);
}
target/linux/generic/backport-6.12/831-02-v6.13-regulator-Add-devres-version-of-of_regulator_get_optional.patch
+2 -2
View File
@@ -110,7 +110,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
enum regulator_get_type get_type);
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -680,8 +680,8 @@ struct regulator_dev *of_regulator_dev_l
@@ -683,8 +683,8 @@ struct regulator_dev *of_regulator_dev_l
return ERR_PTR(-ENODEV);
}
@@ -147,7 +147,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
#endif
int regulator_register_supply_alias(struct device *dev, const char *id,
@@ -369,6 +379,13 @@ static inline struct regulator *__must_c
@@ -374,6 +384,13 @@ static inline struct regulator *__must_c
{
return ERR_PTR(-ENODEV);
}
target/linux/generic/backport-6.12/831-03-v6.15-regulator-Add-devm_-of_regulator_get.patch
+1 -1
View File
@@ -51,7 +51,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
* @node: device node for regulator "consumer"
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -695,6 +695,27 @@ struct regulator *_of_regulator_get(stru
@@ -698,6 +698,27 @@ struct regulator *_of_regulator_get(stru
}
/**
target/linux/generic/hack-6.12/755-net-phy-motorcomm-yt8821-bus-collision-workaround.patch
+4 -4
View File
@@ -49,9 +49,9 @@ Signed-off-by: Jakub Vaněk <linuxtardis@gmail.com>
--- a/drivers/net/phy/motorcomm.c
+++ b/drivers/net/phy/motorcomm.c
@@ -214,6 +214,9 @@
#define YT8521_RC1R_RGMII_2_100_NS 14
#define YT8521_RC1R_RGMII_2_250_NS 15
@@ -228,6 +228,9 @@
#define YT8521_LED_100_ON_EN BIT(5)
#define YT8521_LED_10_ON_EN BIT(4)
+#define YTPHY_MDIO_ADDRESS_CONTROL_REG 0xA005
+#define YTPHY_MACR_EN_PHY_ADDR_0 BIT(6)
@@ -59,7 +59,7 @@ Signed-off-by: Jakub Vaněk <linuxtardis@gmail.com>
#define YTPHY_MISC_CONFIG_REG 0xA006
#define YTPHY_MCR_FIBER_SPEED_MASK BIT(0)
#define YTPHY_MCR_FIBER_1000BX (0x1 << 0)
@@ -2659,6 +2662,23 @@ static int yt8821_config_init(struct phy
@@ -2777,6 +2780,23 @@ static int yt8821_config_init(struct phy
int ret;
u16 set;
target/linux/rockchip/patches-6.12/009-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rk3588-nanopc-t6.patch
+2 -4
View File
@@ -13,8 +13,6 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 47 +++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 560eeb56c804cc..bf8e1f1116d147 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -10,6 +10,7 @@
@@ -43,7 +41,7 @@ index 560eeb56c804cc..bf8e1f1116d147 100644
ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>;
@@ -318,6 +330,26 @@
@@ -332,6 +344,26 @@
status = "okay";
};
@@ -70,7 +68,7 @@ index 560eeb56c804cc..bf8e1f1116d147 100644
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0m2_xfer>;
@@ -1039,3 +1071,18 @@
@@ -1075,3 +1107,18 @@
&usb_host1_ohci {
status = "okay";
};
target/linux/rockchip/patches-6.12/009-03-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK3588.patch
-2
View File
@@ -36,8 +36,6 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 2 +-
21 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index cb350727d11680..0d9b5020acc099 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -360,7 +360,7 @@
target/linux/rockchip/patches-6.12/009-04-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator.patch
-2
View File
@@ -65,8 +65,6 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 4 ++++
30 files changed, 117 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 0d9b5020acc099..bbe500cc924b4c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -565,6 +565,10 @@
target/linux/rockchip/patches-6.12/009-05-v6.16-arm64-dts-rockchip-enable-HDMI1-on-FriendlyElec-NanoPC-T6.patch
-2
View File
@@ -12,8 +12,6 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index bbe500cc924b4c..8542d9ebb6c0dd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -52,6 +52,17 @@
target/linux/rockchip/patches-6.12/009-06-v6.16-arm64-dts-rockchip-enable-HDMI-sound-on-FriendlyElec.patch
-2
View File
@@ -13,8 +13,6 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
.../arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 8542d9ebb6c0dd..cecfb788bf9e27 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -371,6 +371,9 @@
target/linux/rockchip/patches-6.12/009-07-v6.16-arm64-dts-rockchip-fix-usb-c-port-functionality-on.patch
-2
View File
@@ -45,8 +45,6 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index cecfb788bf9e27..3d8b6f0c554188 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -174,8 +174,6 @@
target/linux/rockchip/patches-6.12/009-08-v6.18-arm64-dts-rockchip-enable-HDMI-Receiver-on-NanoPC-T6.patch
-2
View File
@@ -12,8 +12,6 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 3d8b6f0c554188..e647a30dca624a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -391,6 +391,17 @@
target/linux/rockchip/patches-6.12/040-01-v6.13-phy-phy-rockchip-samsung-hdptx-Don-t-request.patch
+3 -3
View File
@@ -32,7 +32,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
RST_MAX
};
@@ -679,11 +676,6 @@ static void rk_hdptx_phy_disable(struct
@@ -680,11 +677,6 @@ static void rk_hdptx_phy_disable(struct
{
u32 val;
@@ -44,7 +44,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
reset_control_assert(hdptx->rsts[RST_APB].rstc);
usleep_range(20, 30);
reset_control_deassert(hdptx->rsts[RST_APB].rstc);
@@ -804,10 +796,6 @@ static int rk_hdptx_ropll_tmds_cmn_confi
@@ -805,10 +797,6 @@ static int rk_hdptx_ropll_tmds_cmn_confi
rk_hdptx_pre_power_up(hdptx);
@@ -55,7 +55,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
rk_hdptx_multi_reg_write(hdptx, rk_hdtpx_common_cmn_init_seq);
rk_hdptx_multi_reg_write(hdptx, rk_hdtpx_tmds_cmn_init_seq);
@@ -1130,13 +1118,10 @@ static int rk_hdptx_phy_probe(struct pla
@@ -1131,13 +1119,10 @@ static int rk_hdptx_phy_probe(struct pla
return dev_err_probe(dev, PTR_ERR(hdptx->regmap),
"Failed to init regmap\n");
target/linux/rockchip/patches-6.12/040-02-v6.15-phy-phy-rockchip-samsung-hdptx-annotate-regmap.patch
+1 -1
View File
@@ -19,7 +19,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -574,13 +574,13 @@ static const struct reg_sequence rk_hdtp
@@ -575,13 +575,13 @@ static const struct reg_sequence rk_hdtp
static bool rk_hdptx_phy_is_rw_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
target/linux/rockchip/patches-6.12/040-04-v6.15-phy-phy-rockchip-samsung-hdptx-Add-the-_MASK-suffix-to.patch
+1 -1
View File
@@ -157,7 +157,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
#define HDMI14_MAX_RATE 340000000
#define HDMI20_MAX_RATE 600000000
@@ -825,8 +825,8 @@ static int rk_hdptx_ropll_tmds_cmn_confi
@@ -826,8 +826,8 @@ static int rk_hdptx_ropll_tmds_cmn_confi
regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_POSTDIV_SEL_MASK,
FIELD_PREP(PLL_PCG_POSTDIV_SEL_MASK, cfg->pms_sdiv));
target/linux/rockchip/patches-6.12/040-05-v6.15-phy-phy-rockchip-samsung-hdptx-Add-eDP-mode-support-for.patch
+10 -10
View File
@@ -312,8 +312,8 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
};
static const struct ropll_config ropll_tmds_cfg[] = {
@@ -571,6 +722,90 @@ static const struct reg_sequence rk_hdtp
REG_SEQ0(LANE_REG(0606), 0x1c),
@@ -572,6 +723,90 @@ static const struct reg_sequence rk_hdtp
REG_SEQ0(LANE_REG(061e), 0x0a),
};
+static struct tx_drv_ctrl tx_drv_ctrl_rbr[4][4] = {
@@ -403,7 +403,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
static bool rk_hdptx_phy_is_rw_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
@@ -859,9 +1094,45 @@ static int rk_hdptx_ropll_tmds_mode_conf
@@ -860,9 +1095,45 @@ static int rk_hdptx_ropll_tmds_mode_conf
return rk_hdptx_post_enable_lane(hdptx);
}
@@ -449,7 +449,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
u32 status;
int ret;
@@ -875,10 +1146,14 @@ static int rk_hdptx_phy_consumer_get(str
@@ -876,10 +1147,14 @@ static int rk_hdptx_phy_consumer_get(str
if (status & HDPTX_O_PLL_LOCK_DONE)
dev_warn(hdptx->dev, "PLL locked by unknown consumer!\n");
@@ -468,7 +468,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
}
return 0;
@@ -890,6 +1165,7 @@ dec_usage:
@@ -891,6 +1166,7 @@ dec_usage:
static int rk_hdptx_phy_consumer_put(struct rk_hdptx_phy *hdptx, bool force)
{
@@ -476,7 +476,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
u32 status;
int ret;
@@ -903,8 +1179,12 @@ static int rk_hdptx_phy_consumer_put(str
@@ -904,8 +1180,12 @@ static int rk_hdptx_phy_consumer_put(str
} else {
ret = regmap_read(hdptx->grf, GRF_HDPTX_STATUS, &status);
if (!ret) {
@@ -491,7 +491,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
return 0;
} else if (force) {
return 0;
@@ -915,11 +1195,262 @@ static int rk_hdptx_phy_consumer_put(str
@@ -916,11 +1196,262 @@ static int rk_hdptx_phy_consumer_put(str
return ret;
}
@@ -755,7 +755,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
/*
* FIXME: Temporary workaround to pass pixel_clk_rate
@@ -935,9 +1466,37 @@ static int rk_hdptx_phy_power_on(struct
@@ -936,9 +1467,37 @@ static int rk_hdptx_phy_power_on(struct
if (ret)
return ret;
@@ -796,7 +796,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
return ret;
}
@@ -949,9 +1508,308 @@ static int rk_hdptx_phy_power_off(struct
@@ -950,9 +1509,308 @@ static int rk_hdptx_phy_power_off(struct
return rk_hdptx_phy_consumer_put(hdptx, false);
}
@@ -1105,7 +1105,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
.owner = THIS_MODULE,
};
@@ -1193,5 +2051,6 @@ module_platform_driver(rk_hdptx_phy_driv
@@ -1194,5 +2052,6 @@ module_platform_driver(rk_hdptx_phy_driv
MODULE_AUTHOR("Algea Cao <algea.cao@rock-chips.com>");
MODULE_AUTHOR("Cristian Ciocaltea <cristian.ciocaltea@collabora.com>");
target/linux/rockchip/patches-6.12/040-06-v6.15-phy-phy-rockchip-samsung-hdptx-Add-support-for-RK3576.patch
+2 -2
View File
@@ -22,7 +22,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -2022,6 +2022,13 @@ static const struct dev_pm_ops rk_hdptx_
@@ -2023,6 +2023,13 @@ static const struct dev_pm_ops rk_hdptx_
rk_hdptx_phy_runtime_resume, NULL)
};
@@ -36,7 +36,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
static const struct rk_hdptx_phy_cfg rk3588_hdptx_phy_cfgs = {
.num_phys = 2,
.phy_ids = {
@@ -2032,6 +2039,10 @@ static const struct rk_hdptx_phy_cfg rk3
@@ -2033,6 +2040,10 @@ static const struct rk_hdptx_phy_cfg rk3
static const struct of_device_id rk_hdptx_phy_of_match[] = {
{
target/linux/rockchip/patches-6.12/040-11-v6.16-phy-rockchip-samsung-hdptx-Drop-superfluous-cfgs-driver.patch
+2 -2
View File
@@ -32,7 +32,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
struct phy *phy;
struct clk_bulk_data *clks;
int nr_clks;
@@ -1896,6 +1893,7 @@ static int rk_hdptx_phy_runtime_resume(s
@@ -1897,6 +1894,7 @@ static int rk_hdptx_phy_runtime_resume(s
static int rk_hdptx_phy_probe(struct platform_device *pdev)
{
@@ -40,7 +40,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
struct phy_provider *phy_provider;
struct device *dev = &pdev->dev;
struct rk_hdptx_phy *hdptx;
@@ -1914,14 +1912,14 @@ static int rk_hdptx_phy_probe(struct pla
@@ -1915,14 +1913,14 @@ static int rk_hdptx_phy_probe(struct pla
return dev_err_probe(dev, PTR_ERR(regs),
"Failed to ioremap resource\n");
target/linux/rockchip/patches-6.12/040-12-v6.16-phy-rockchip-samsung-hdptx-Avoid-Hz-hHz-unit-conversion.patch
+10 -10
View File
@@ -102,7 +102,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
};
@@ -896,10 +896,10 @@ static void rk_hdptx_phy_disable(struct
@@ -897,10 +897,10 @@ static void rk_hdptx_phy_disable(struct
regmap_write(hdptx->grf, GRF_HDPTX_CON0, val);
}
@@ -115,7 +115,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
unsigned long k = 0, lc, k_sub, lc_sub;
unsigned int fvco, sdc;
u32 mdiv, sdiv, n = 8;
@@ -969,14 +969,14 @@ static bool rk_hdptx_phy_clk_pll_calc(un
@@ -970,14 +970,14 @@ static bool rk_hdptx_phy_clk_pll_calc(un
}
static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx,
@@ -132,7 +132,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
cfg = &ropll_tmds_cfg[i];
break;
}
@@ -990,8 +990,8 @@ static int rk_hdptx_ropll_tmds_cmn_confi
@@ -991,8 +991,8 @@ static int rk_hdptx_ropll_tmds_cmn_confi
}
}
@@ -143,7 +143,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
cfg->sdm_num_sign, cfg->sdm_num, cfg->sdm_deno);
rk_hdptx_pre_power_up(hdptx);
@@ -1030,19 +1030,19 @@ static int rk_hdptx_ropll_tmds_cmn_confi
@@ -1031,19 +1031,19 @@ static int rk_hdptx_ropll_tmds_cmn_confi
ret = rk_hdptx_post_enable_pll(hdptx);
if (!ret)
@@ -166,7 +166,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
/* For 1/40 bitrate clk */
rk_hdptx_multi_reg_write(hdptx, rk_hdtpx_tmds_lntop_highbr_seq);
} else {
@@ -1095,7 +1095,7 @@ static void rk_hdptx_dp_reset(struct rk_
@@ -1096,7 +1096,7 @@ static void rk_hdptx_dp_reset(struct rk_
}
static int rk_hdptx_phy_consumer_get(struct rk_hdptx_phy *hdptx,
@@ -175,7 +175,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
{
enum phy_mode mode = phy_get_mode(hdptx->phy);
u32 status;
@@ -1413,8 +1413,8 @@ static int rk_hdptx_dp_aux_init(struct r
@@ -1414,8 +1414,8 @@ static int rk_hdptx_dp_aux_init(struct r
static int rk_hdptx_phy_power_on(struct phy *phy)
{
struct rk_hdptx_phy *hdptx = phy_get_drvdata(phy);
@@ -185,7 +185,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
int ret, lane;
/*
@@ -1422,10 +1422,10 @@ static int rk_hdptx_phy_power_on(struct
@@ -1423,10 +1423,10 @@ static int rk_hdptx_phy_power_on(struct
* from the HDMI bridge driver until phy_configure_opts_hdmi
* becomes available in the PHY API.
*/
@@ -199,7 +199,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
ret = rk_hdptx_phy_consumer_get(hdptx, rate);
if (ret)
@@ -1787,7 +1787,7 @@ static int rk_hdptx_phy_clk_prepare(stru
@@ -1788,7 +1788,7 @@ static int rk_hdptx_phy_clk_prepare(stru
{
struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
@@ -208,7 +208,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
}
static void rk_hdptx_phy_clk_unprepare(struct clk_hw *hw)
@@ -1808,18 +1808,17 @@ static unsigned long rk_hdptx_phy_clk_re
@@ -1809,18 +1809,17 @@ static unsigned long rk_hdptx_phy_clk_re
static long rk_hdptx_phy_clk_round_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *parent_rate)
{
@@ -229,7 +229,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
return -EINVAL;
return rate;
@@ -1830,7 +1829,7 @@ static int rk_hdptx_phy_clk_set_rate(str
@@ -1831,7 +1830,7 @@ static int rk_hdptx_phy_clk_set_rate(str
{
struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
target/linux/rockchip/patches-6.12/040-13-v6.16-phy-rockchip-samsung-hdptx-Setup-TMDS-char-rate-via.patch
+4 -4
View File
@@ -32,7 +32,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
struct clk_bulk_data *clks;
int nr_clks;
struct reset_control_bulk_data rsts[RST_MAX];
@@ -1414,20 +1415,24 @@ static int rk_hdptx_phy_power_on(struct
@@ -1415,20 +1416,24 @@ static int rk_hdptx_phy_power_on(struct
{
struct rk_hdptx_phy *hdptx = phy_get_drvdata(phy);
enum phy_mode mode = phy_get_mode(phy);
@@ -67,7 +67,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
if (ret)
return ret;
@@ -1458,7 +1463,7 @@ static int rk_hdptx_phy_power_on(struct
@@ -1459,7 +1464,7 @@ static int rk_hdptx_phy_power_on(struct
regmap_write(hdptx->grf, GRF_HDPTX_CON0,
HDPTX_MODE_SEL << 16 | FIELD_PREP(HDPTX_MODE_SEL, 0x0));
@@ -76,7 +76,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
if (ret)
rk_hdptx_phy_consumer_put(hdptx, true);
}
@@ -1473,8 +1478,27 @@ static int rk_hdptx_phy_power_off(struct
@@ -1474,8 +1479,27 @@ static int rk_hdptx_phy_power_off(struct
return rk_hdptx_phy_consumer_put(hdptx, false);
}
@@ -106,7 +106,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
{
int i;
@@ -1734,12 +1758,18 @@ static int rk_hdptx_phy_configure(struct
@@ -1735,12 +1759,18 @@ static int rk_hdptx_phy_configure(struct
enum phy_mode mode = phy_get_mode(phy);
int ret;
target/linux/rockchip/patches-6.12/040-14-v6.16-phy-rockchip-samsung-hdptx-Provide-config-params.patch
+1 -1
View File
@@ -17,7 +17,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -1801,10 +1801,22 @@ static int rk_hdptx_phy_configure(struct
@@ -1802,10 +1802,22 @@ static int rk_hdptx_phy_configure(struct
return 0;
}
target/linux/rockchip/patches-6.12/040-15-v6.16-phy-rockchip-samsung-hdptx-Restrict-altering-TMDS-char.patch
+3 -3
View File
@@ -49,7 +49,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
atomic_t usage_count;
@@ -1760,10 +1761,12 @@ static int rk_hdptx_phy_configure(struct
@@ -1761,10 +1762,12 @@ static int rk_hdptx_phy_configure(struct
if (mode != PHY_MODE_DP) {
ret = rk_hdptx_phy_verify_hdmi_config(hdptx, &opts->hdmi);
@@ -64,7 +64,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
return ret;
}
@@ -1850,20 +1853,31 @@ static unsigned long rk_hdptx_phy_clk_re
@@ -1851,20 +1854,31 @@ static unsigned long rk_hdptx_phy_clk_re
static long rk_hdptx_phy_clk_round_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *parent_rate)
{
@@ -106,7 +106,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
}
static int rk_hdptx_phy_clk_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -1871,6 +1885,20 @@ static int rk_hdptx_phy_clk_set_rate(str
@@ -1872,6 +1886,20 @@ static int rk_hdptx_phy_clk_set_rate(str
{
struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
target/linux/rockchip/patches-6.12/040-16-v6.16-phy-rockchip-samsung-hdptx-Rename-ambiguous.patch
+3 -3
View File
@@ -29,7 +29,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
bool restrict_rate_change;
atomic_t usage_count;
@@ -1032,7 +1032,7 @@ static int rk_hdptx_ropll_tmds_cmn_confi
@@ -1033,7 +1033,7 @@ static int rk_hdptx_ropll_tmds_cmn_confi
ret = rk_hdptx_post_enable_pll(hdptx);
if (!ret)
@@ -38,7 +38,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
return ret;
}
@@ -1832,7 +1832,7 @@ static int rk_hdptx_phy_clk_prepare(stru
@@ -1833,7 +1833,7 @@ static int rk_hdptx_phy_clk_prepare(stru
{
struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
@@ -47,7 +47,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
}
static void rk_hdptx_phy_clk_unprepare(struct clk_hw *hw)
@@ -1847,7 +1847,7 @@ static unsigned long rk_hdptx_phy_clk_re
@@ -1848,7 +1848,7 @@ static unsigned long rk_hdptx_phy_clk_re
{
struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
target/linux/rockchip/patches-6.12/040-17-v6.16-phy-rockchip-samsung-hdptx-Optimize-internal-rate-handlin.patch
+8 -8
View File
@@ -17,7 +17,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -970,31 +970,34 @@ static bool rk_hdptx_phy_clk_pll_calc(un
@@ -971,31 +971,34 @@ static bool rk_hdptx_phy_clk_pll_calc(un
return true;
}
@@ -61,7 +61,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
rk_hdptx_pre_power_up(hdptx);
@@ -1032,19 +1035,18 @@ static int rk_hdptx_ropll_tmds_cmn_confi
@@ -1033,19 +1036,18 @@ static int rk_hdptx_ropll_tmds_cmn_confi
ret = rk_hdptx_post_enable_pll(hdptx);
if (!ret)
@@ -84,7 +84,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
/* For 1/40 bitrate clk */
rk_hdptx_multi_reg_write(hdptx, rk_hdtpx_tmds_lntop_highbr_seq);
} else {
@@ -1096,8 +1098,7 @@ static void rk_hdptx_dp_reset(struct rk_
@@ -1097,8 +1099,7 @@ static void rk_hdptx_dp_reset(struct rk_
HDPTX_I_BGR_EN << 16 | FIELD_PREP(HDPTX_I_BGR_EN, 0x0));
}
@@ -94,7 +94,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
{
enum phy_mode mode = phy_get_mode(hdptx->phy);
u32 status;
@@ -1116,11 +1117,9 @@ static int rk_hdptx_phy_consumer_get(str
@@ -1117,11 +1118,9 @@ static int rk_hdptx_phy_consumer_get(str
if (mode == PHY_MODE_DP) {
rk_hdptx_dp_reset(hdptx);
} else {
@@ -109,7 +109,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
}
return 0;
@@ -1433,7 +1432,7 @@ static int rk_hdptx_phy_power_on(struct
@@ -1434,7 +1433,7 @@ static int rk_hdptx_phy_power_on(struct
dev_dbg(hdptx->dev, "%s rate=%llu\n", __func__, hdptx->hdmi_cfg.tmds_char_rate);
}
@@ -118,7 +118,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
if (ret)
return ret;
@@ -1464,7 +1463,7 @@ static int rk_hdptx_phy_power_on(struct
@@ -1465,7 +1464,7 @@ static int rk_hdptx_phy_power_on(struct
regmap_write(hdptx->grf, GRF_HDPTX_CON0,
HDPTX_MODE_SEL << 16 | FIELD_PREP(HDPTX_MODE_SEL, 0x0));
@@ -127,7 +127,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
if (ret)
rk_hdptx_phy_consumer_put(hdptx, true);
}
@@ -1832,7 +1831,7 @@ static int rk_hdptx_phy_clk_prepare(stru
@@ -1833,7 +1832,7 @@ static int rk_hdptx_phy_clk_prepare(stru
{
struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
@@ -136,7 +136,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
}
static void rk_hdptx_phy_clk_unprepare(struct clk_hw *hw)
@@ -1899,7 +1898,7 @@ static int rk_hdptx_phy_clk_set_rate(str
@@ -1900,7 +1899,7 @@ static int rk_hdptx_phy_clk_set_rate(str
* while the latter being executed only once, i.e. when clock remains
* in the prepared state during rate changes.
*/
target/linux/rockchip/patches-6.12/040-18-v6.16-phy-rockchip-samsung-hdptx-Add-high-color-depth-managemen.patch
+5 -5
View File
@@ -16,7 +16,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -1030,6 +1030,9 @@ static int rk_hdptx_ropll_tmds_cmn_confi
@@ -1031,6 +1031,9 @@ static int rk_hdptx_ropll_tmds_cmn_confi
regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_POSTDIV_SEL_MASK,
FIELD_PREP(PLL_PCG_POSTDIV_SEL_MASK, cfg->pms_sdiv));
@@ -26,7 +26,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_CLK_EN_MASK,
FIELD_PREP(PLL_PCG_CLK_EN_MASK, 0x1));
@@ -1429,7 +1432,8 @@ static int rk_hdptx_phy_power_on(struct
@@ -1430,7 +1433,8 @@ static int rk_hdptx_phy_power_on(struct
hdptx->hdmi_cfg.tmds_char_rate *= 100;
}
@@ -36,7 +36,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
}
ret = rk_hdptx_phy_consumer_get(hdptx);
@@ -1494,6 +1498,19 @@ static int rk_hdptx_phy_verify_hdmi_conf
@@ -1495,6 +1499,19 @@ static int rk_hdptx_phy_verify_hdmi_conf
!rk_hdptx_phy_clk_pll_calc(hdmi->tmds_char_rate, NULL))
return -EINVAL;
@@ -56,7 +56,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
return 0;
}
@@ -1766,6 +1783,9 @@ static int rk_hdptx_phy_configure(struct
@@ -1767,6 +1784,9 @@ static int rk_hdptx_phy_configure(struct
hdptx->hdmi_cfg = opts->hdmi;
hdptx->restrict_rate_change = true;
}
@@ -66,7 +66,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
return ret;
}
@@ -1974,6 +1994,7 @@ static int rk_hdptx_phy_probe(struct pla
@@ -1975,6 +1995,7 @@ static int rk_hdptx_phy_probe(struct pla
return -ENOMEM;
hdptx->dev = dev;
target/linux/rockchip/patches-6.12/100-rockchip-use-system-LED-for-OpenWrt.patch
+2 -2
View File
@@ -775,7 +775,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
chosen {
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -20,6 +20,10 @@
@@ -21,6 +21,10 @@
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
@@ -786,7 +786,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
};
adc-keys-0 {
@@ -53,7 +57,6 @@
@@ -76,7 +80,6 @@
sys_led: led-0 {
gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
label = "system-led";
target/linux/rockchip/patches-6.12/124-01-mfd-Add-Rockchip-mfpwm-driver.patch
+1 -1
View File
@@ -43,7 +43,7 @@ Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1244,6 +1244,21 @@ config MFD_RC5T583
@@ -1268,6 +1268,21 @@ config MFD_RC5T583
Additional drivers must be enabled in order to use the
different functionality of the device.
target/linux/rockchip/patches-6.12/600-ethernet-stmmac-Add-property-to-disable-VLAN-hw-filter.patch
+1 -1
View File
@@ -35,7 +35,7 @@ Signed-off-by: jensen <jensenhuang@friendlyarm.com>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7707,7 +7707,7 @@ int stmmac_dvr_probe(struct device *devi
@@ -7717,7 +7717,7 @@ int stmmac_dvr_probe(struct device *devi
ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
priv->hw->hw_vlan_en = true;
}
target/linux/rockchip/patches-6.12/602-net-ethernet-stmmac-add-devname-configuration-from-OF.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7530,6 +7530,7 @@ int stmmac_dvr_probe(struct device *devi
@@ -7540,6 +7540,7 @@ int stmmac_dvr_probe(struct device *devi
{
struct net_device *ndev = NULL;
struct stmmac_priv *priv;
@@ -8,7 +8,7 @@
u32 rxq;
int i, ret = 0;
@@ -7538,6 +7539,9 @@ int stmmac_dvr_probe(struct device *devi
@@ -7548,6 +7549,9 @@ int stmmac_dvr_probe(struct device *devi
if (!ndev)
return -ENOMEM;
target/linux/rockchip/patches-6.12/610-arm64-rockchip-add-OF-node-for-eth.patch
+2 -2
View File
@@ -753,7 +753,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
&pcie30phy {
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -508,6 +508,20 @@
@@ -600,6 +600,20 @@
pinctrl-names = "default";
pinctrl-0 = <&pcie2_0_rst>;
status = "okay";
@@ -774,7 +774,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
};
&pcie2x1l1 {
@@ -524,6 +538,20 @@
@@ -616,6 +630,20 @@
pinctrl-names = "default";
pinctrl-0 = <&pcie2_2_rst>;
status = "okay";