From e63193a95d75cb726bdd5c2075ccf9813164f117 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 26 Nov 2023 00:21:01 +0800 Subject: [PATCH] rockchip: refresh patches Fixes: #1118 Signed-off-by: Tianling Shen --- ...et-ethernet-r8169-add-LED-configuration-from-OF.patch | 4 ++-- ...thernet-r8169-add-devname-configuration-from-OF.patch | 2 +- ...-02-PM-devfreq-event-add-support-for-rk3368-dfi.patch | 9 ++++----- ...804-05-PM-devfreq-event-make-dfi-more-extension.patch | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/target/linux/rockchip/patches-6.1/600-net-ethernet-r8169-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-6.1/600-net-ethernet-r8169-add-LED-configuration-from-OF.patch index 039570635d..88c53c9094 100644 --- a/target/linux/rockchip/patches-6.1/600-net-ethernet-r8169-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-6.1/600-net-ethernet-r8169-add-LED-configuration-from-OF.patch @@ -39,7 +39,7 @@ static void rtl8168_config_eee_mac(struct rtl8169_private *tp) { /* Adjust EEE LED frequency */ -@@ -3238,6 +3256,8 @@ static void rtl_hw_start_8168h_1(struct +@@ -3242,6 +3260,8 @@ static void rtl_hw_start_8168h_1(struct r8168_mac_ocp_write(tp, 0xc094, 0x0000); r8168_mac_ocp_write(tp, 0xc09e, 0x0000); @@ -48,7 +48,7 @@ rtl_hw_aspm_clkreq_enable(tp, true); } -@@ -3610,6 +3630,8 @@ static void rtl_hw_start_8125b(struct rt +@@ -3614,6 +3634,8 @@ static void rtl_hw_start_8125b(struct rt rtl_ephy_init(tp, e_info_8125b); rtl_hw_start_8125_common(tp); diff --git a/target/linux/rockchip/patches-6.1/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch b/target/linux/rockchip/patches-6.1/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch index b39474bb75..4947739c4c 100644 --- a/target/linux/rockchip/patches-6.1/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-6.1/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch @@ -23,7 +23,7 @@ static int rtl8169_led_configuration(struct rtl8169_private *tp) { u32 led_data; -@@ -3630,6 +3646,7 @@ static void rtl_hw_start_8125b(struct rt +@@ -3634,6 +3650,7 @@ static void rtl_hw_start_8125b(struct rt rtl_ephy_init(tp, e_info_8125b); rtl_hw_start_8125_common(tp); diff --git a/target/linux/rockchip/patches-6.1/804-02-PM-devfreq-event-add-support-for-rk3368-dfi.patch b/target/linux/rockchip/patches-6.1/804-02-PM-devfreq-event-add-support-for-rk3368-dfi.patch index 4708b965c1..e1bbf285f6 100644 --- a/target/linux/rockchip/patches-6.1/804-02-PM-devfreq-event-add-support-for-rk3368-dfi.patch +++ b/target/linux/rockchip/patches-6.1/804-02-PM-devfreq-event-add-support-for-rk3368-dfi.patch @@ -174,12 +174,11 @@ Signed-off-by: Finley Xiao data->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(data->regs)) return PTR_ERR(data->regs); -@@ -204,23 +289,59 @@ static int rockchip_dfi_probe(struct pla - if (IS_ERR(data->regmap_pmu)) - return PTR_ERR(data->regmap_pmu); - } +@@ -205,23 +290,58 @@ static int rockchip_dfi_probe(struct pla + if (IS_ERR(data->regmap_pmu)) + return PTR_ERR(data->regmap_pmu); + - data->dev = dev; -+ + desc->ops = &rockchip_dfi_ops; + + return 0; diff --git a/target/linux/rockchip/patches-6.1/804-05-PM-devfreq-event-make-dfi-more-extension.patch b/target/linux/rockchip/patches-6.1/804-05-PM-devfreq-event-make-dfi-more-extension.patch index 7666de6a2e..a07e8f8db3 100644 --- a/target/linux/rockchip/patches-6.1/804-05-PM-devfreq-event-make-dfi-more-extension.patch +++ b/target/linux/rockchip/patches-6.1/804-05-PM-devfreq-event-make-dfi-more-extension.patch @@ -172,8 +172,8 @@ Signed-off-by: CanYang He data->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(data->regs)) @@ -524,6 +537,10 @@ static __init int rockchip_dfi_init(stru - return PTR_ERR(data->regmap_pmu); - } + if (IS_ERR(data->regmap_pmu)) + return PTR_ERR(data->regmap_pmu); + regmap_read(data->regmap_pmu, PMUGRF_OS_REG2, &val); + data->dram_type = READ_DRAMTYPE_INFO(val);