Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

5.4.188

Browse Source
This commit is contained in:
GitHub 2022-07-16 02:02:42 +00:00
parent 156decef00
commit 5b812add0b
19 changed files with 47 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.4
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .187
LINUX_KERNEL_HASH-5.4.187 = 189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
LINUX_VERSION-5.4 = .188
LINUX_KERNEL_HASH-5.4.188 = 9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc

9
target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch
View File

@ -22,11 +22,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
net/dsa/switch.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index 6a9607518823..dd71e3301b27 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -65,19 +65,12 @@ static int dsa_switch_bridge_join(struct dsa_switch *ds,
@@ -65,19 +65,12 @@ static int dsa_switch_bridge_join(struct
return 0;
}
@ -48,7 +46,7 @@ index 6a9607518823..dd71e3301b27 100644
/* If the bridge was vlan_filtering, the bridge core doesn't trigger an
* event for changing vlan_filtering setting upon slave ports leaving
* it. That is a good thing, because that lets us handle it and also
@@ -103,6 +96,26 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
@@ -103,6 +96,26 @@ static int dsa_switch_bridge_leave(struc
if (err && err != EOPNOTSUPP)
return err;
}
@ -75,6 +73,3 @@ index 6a9607518823..dd71e3301b27 100644
return 0;
}
--
2.34.1

7
target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
View File

@ -39,11 +39,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
net/dsa/switch.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index dd71e3301b27..f517d6d7efa2 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -112,9 +112,11 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
@@ -112,9 +112,11 @@ static int dsa_switch_bridge_leave(struc
ds->ops->crosschip_bridge_leave(ds, info->sw_index, info->port,
info->br);
@ -58,6 +56,3 @@ index dd71e3301b27..f517d6d7efa2 100644
return 0;
}
--
2.34.1

16
target/linux/generic/hack-5.4/601-netfilter-export-udp_get_timeouts-function.patch
View File

@ -8,23 +8,18 @@ Subject: [PATCH] net: patch linux kernel to support shortcut-fe-cm
nf_conntrack_timeout.h | 2 +
1 file changed, 2 insertion(+)
diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
index 6dd7239..e1f6d69 100644
--- a/include/net/netfilter/nf_conntrack_timeout.h
+++ b/include/net/netfilter/nf_conntrack_timeout.h
@@ -123,5 +123,7 @@ static inline void nf_ct_destroy_timeout(struct nf_conn *ct)
extern struct nf_ct_timeout *(*nf_ct_timeout_find_get_hook)(struct net *net, const char *name);
@@ -124,4 +124,6 @@ extern struct nf_ct_timeout *(*nf_ct_tim
extern void (*nf_ct_timeout_put_hook)(struct nf_ct_timeout *timeout);
#endif
+
+extern unsigned int *udp_get_timeouts(struct net *net);
+extern unsigned int *udp_get_timeouts(struct net *net);
+
#endif /* _NF_CONNTRACK_TIMEOUT_H */
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index 7365b43..2238d55 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -29,10 +29,11 @@ static const unsigned int udp_timeouts[UDP_CT_MAX] = {
@@ -29,10 +29,11 @@ static const unsigned int udp_timeouts[U
[UDP_CT_REPLIED] = 120*HZ,
};
@ -37,6 +32,3 @@ index 7365b43..2238d55 100644
static void udp_error_log(const struct sk_buff *skb,
const struct nf_hook_state *state,
--
2.17.1

2
target/linux/generic/hack-5.4/902-debloat_proc.patch
View File

@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3643,6 +3643,8 @@ static __net_initdata struct pernet_oper
@@ -3641,6 +3641,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{

2
target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Tianling Shen <cnsztl@gmail.com>
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -75,6 +75,19 @@ &emmc_phy {
@@ -68,6 +68,19 @@
status = "disabled";
};

2
target/linux/rockchip/patches-5.4/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -101,6 +101,19 @@
@@ -96,6 +96,19 @@
max-link-speed = <1>;
num-lanes = <1>;
vpcie3v3-supply = <&vcc3v3_sys>;

2
target/linux/rockchip/patches-5.4/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch
View File

@ -429,5 +429,3 @@
+ realtek,led-data = <0x87>;
+ };
+};
--
2.25.1

4
target/linux/rockchip/patches-5.4/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
View File

@ -1,8 +1,8 @@
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
@@ -2,6 +2,7 @@
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb

9
target/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch
View File

@ -768,10 +768,10 @@
+
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -363,6 +363,11 @@ int stmmac_mdio_register(struct net_device *ndev)
@@ -363,6 +363,11 @@ int stmmac_mdio_register(struct net_devi
goto bus_register_fail;
}
+ stmmac_mdio_write(new_bus,0,31,2627);
+ stmmac_mdio_write(new_bus,0,25,0x1801);
+ stmmac_mdio_write(new_bus,0,31,0);
@ -779,11 +779,10 @@
+
if (priv->plat->phy_node || mdio_node)
goto bus_register_done;
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2187,6 +2187,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
@@ -2187,6 +2187,8 @@ static int stmmac_init_dma_engine(struct
if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
atds = 1;

9
target/linux/rockchip/patches-5.4/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch
View File

@ -9,11 +9,9 @@ Subject: [PATCH] Add support for OrangePi R1 Plus LTS
2 files changed, 45 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 23373c752..552d97555 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -5,6 +5,7 @@
@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-ev
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb
@ -21,9 +19,6 @@ index 23373c752..552d97555 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts
new file mode 100644
index 000000000..c65f7c417
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts
@@ -0,0 +1,70 @@
@ -97,5 +92,3 @@ index 000000000..c65f7c417
+&lan_led {
+ label = "orangepi-r1-plus-lts:green:lan";
+};
--
2.25.1

2
target/linux/rockchip/patches-5.4/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch
View File

@ -35,7 +35,7 @@ to status_led in accordance with the board schematics.
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -4,6 +4,8 @@
@@ -4,6 +4,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-do
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb

20
target/linux/rockchip/patches-5.4/601-net-phy-Add-driver-for-Motorcomm-YT8531-PHYs.patch
View File

@ -12,7 +12,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -112,6 +112,10 @@ static void stmmac_exit_fs(struct net_device *dev);
@@ -112,6 +112,10 @@ static void stmmac_exit_fs(struct net_de
#define STMMAC_COAL_TIMER(x) (jiffies + usecs_to_jiffies(x))
@ -23,7 +23,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
/**
* stmmac_verify_args - verify the driver parameters.
* Description: it checks the driver parameters and set a default in case of
@@ -4431,6 +4435,74 @@ int stmmac_reinit_ringparam(struct net_device *dev, u32 rx_size, u32 tx_size)
@@ -4433,6 +4437,74 @@ static int stmmac_hw_init(struct stmmac_
return 0;
}
@ -98,7 +98,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
/**
* stmmac_dvr_probe
* @device: device pointer
@@ -4655,6 +4727,16 @@ int stmmac_dvr_probe(struct device *device,
@@ -4657,6 +4729,16 @@ int stmmac_dvr_probe(struct device *devi
netdev_err(ndev, "failed to setup phy (%d)\n", ret);
goto error_phy_setup;
}
@ -131,7 +131,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
static int ytphy_read_ext(struct phy_device *phydev, u32 regnum)
{
int ret;
@@ -263,6 +270,38 @@ static int yt8521_config_intr(struct phy_device *phydev)
@@ -263,6 +270,38 @@ static int yt8521_config_intr(struct phy
return phy_write(phydev, REG_INT_MASK, val);
}
@ -170,7 +170,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
static int yt8521_ack_interrupt(struct phy_device *phydev)
{
int val;
@@ -273,6 +312,121 @@ static int yt8521_ack_interrupt(struct phy_device *phydev)
@@ -273,6 +312,121 @@ static int yt8521_ack_interrupt(struct p
return (val < 0) ? val : 0;
}
@ -292,7 +292,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
static struct phy_driver ytphy_drvs[] = {
{
.phy_id = PHY_ID_YT8010,
@@ -323,7 +477,30 @@ static struct phy_driver ytphy_drvs[] = {
@@ -323,7 +477,30 @@ static struct phy_driver ytphy_drvs[] =
.config_intr = yt8521_config_intr,
.suspend = genphy_suspend,
.resume = genphy_resume,
@ -324,7 +324,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
};
module_phy_driver(ytphy_drvs);
@@ -339,6 +516,8 @@ static struct mdio_device_id __maybe_unused motorcomm_tbl[] = {
@@ -339,6 +516,8 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_YT8512, MOTORCOMM_PHY_ID_MASK },
{ PHY_ID_YT8512B, MOTORCOMM_PHY_ID_MASK },
{ PHY_ID_YT8521, MOTORCOMM_PHY_ID_MASK },
@ -343,7 +343,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
MODULE_DESCRIPTION("PHY library");
MODULE_AUTHOR("Andy Fleming");
@@ -440,6 +441,33 @@ int phy_unregister_fixup_for_id(const char *bus_id)
@@ -440,6 +441,33 @@ int phy_unregister_fixup_for_id(const ch
}
EXPORT_SYMBOL(phy_unregister_fixup_for_id);
@ -377,7 +377,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
/* Returns 1 if fixup matches phydev in bus_id and phy_uid.
* Fixups can be set to match any in one or more fields.
*/
@@ -808,6 +836,50 @@ static int get_phy_c22_id(struct mii_bus *bus, int addr, u32 *phy_id)
@@ -808,6 +836,50 @@ static int get_phy_id(struct mii_bus *bu
return 0;
}
@ -428,7 +428,7 @@ Subject: [PATCH] net: phy: Add driver for Motorcomm YT8531(S) PHYs
/**
* get_phy_device - reads the specified PHY device and returns its @phy_device
* struct
@@ -831,6 +903,15 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
@@ -831,6 +903,15 @@ struct phy_device *get_phy_device(struct
if (r)
return ERR_PTR(r);

6
target/linux/rockchip/patches-5.4/803-PM-devfreq-rockchip-add-devfreq-driver-for-rk3328-dmc.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
3 files changed, 862 insertions(+), 3 deletions(-)
create mode 100644 drivers/devfreq/rk3328_dmc.c
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index defe1d438710..5ae0832f046b 100644
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -116,6 +116,18 @@ config ARM_TEGRA20_DEVFREQ
@ -34,11 +32,9 @@ index defe1d438710..5ae0832f046b 100644
config ARM_RK3399_DMC_DEVFREQ
tristate "ARM RK3399 DMC DEVFREQ Driver"
depends on (ARCH_ROCKCHIP && HAVE_ARM_SMCCC) || \
diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile
index 338ae8440db6..ec568406ef50 100644
--- a/drivers/devfreq/Makefile
+++ b/drivers/devfreq/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += governor_passive.o
@@ -9,6 +9,7 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += gov
# DEVFREQ Drivers
obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += exynos-bus.o

16
target/linux/rockchip/patches-5.4/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch
View File

@ -15,11 +15,9 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
include/soc/rockchip/rockchip_sip.h | 11 +++
4 files changed, 147 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c
index 9273bce4d7b6..555aaf4e758d 100644
--- a/drivers/clk/rockchip/clk-ddr.c
+++ b/drivers/clk/rockchip/clk-ddr.c
@@ -87,6 +87,133 @@ static const struct clk_ops rockchip_ddrclk_sip_ops = {
@@ -87,6 +87,133 @@ static const struct clk_ops rockchip_ddr
.get_parent = rockchip_ddrclk_get_parent,
};
@ -153,7 +151,7 @@ index 9273bce4d7b6..555aaf4e758d 100644
struct clk *rockchip_clk_register_ddrclk(const char *name, int flags,
const char *const *parent_names,
u8 num_parents, int mux_offset,
@@ -114,6 +241,9 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags,
@@ -114,6 +241,9 @@ struct clk *rockchip_clk_register_ddrclk
case ROCKCHIP_DDRCLK_SIP:
init.ops = &rockchip_ddrclk_sip_ops;
break;
@ -163,11 +161,9 @@ index 9273bce4d7b6..555aaf4e758d 100644
default:
pr_err("%s: unsupported ddrclk type %d\n", __func__, ddr_flag);
kfree(ddrclk);
diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c
index c186a1985bf4..ac6e6163a232 100644
--- a/drivers/clk/rockchip/clk-rk3328.c
+++ b/drivers/clk/rockchip/clk-rk3328.c
@@ -314,9 +314,10 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = {
@@ -314,9 +314,10 @@ static struct rockchip_clk_branch rk3328
RK3328_CLKGATE_CON(14), 1, GFLAGS),
/* PD_DDR */
@ -181,11 +177,9 @@ index c186a1985bf4..ac6e6163a232 100644
GATE(0, "clk_ddrmsch", "clk_ddr", CLK_IGNORE_UNUSED,
RK3328_CLKGATE_CON(18), 6, GFLAGS),
GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED,
diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
index 2271a84124b0..7405aaf965ec 100644
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@ -362,7 +362,8 @@ struct clk *rockchip_clk_register_mmc(const char *name,
@@ -362,7 +362,8 @@ struct clk *rockchip_clk_register_mmc(co
* DDRCLK flags, including method of setting the rate
* ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate.
*/
@ -195,8 +189,6 @@ index 2271a84124b0..7405aaf965ec 100644
struct clk *rockchip_clk_register_ddrclk(const char *name, int flags,
const char *const *parent_names,
diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h
index c46a9ae2a2ab..fa7e0a2d72cc 100644
--- a/include/soc/rockchip/rockchip_sip.h
+++ b/include/soc/rockchip/rockchip_sip.h
@@ -16,5 +16,16 @@

18
target/linux/rockchip/patches-5.4/805-PM-devfreq-rockchip-dfi-add-more-soc-support.patch
View File

@ -8,8 +8,6 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
drivers/devfreq/event/rockchip-dfi.c | 554 ++++++++++++++++++++++++---
1 file changed, 505 insertions(+), 49 deletions(-)
diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index 5d1042188727..80be0efdfb9b 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -18,25 +18,66 @@
@ -19,9 +17,8 @@ index 5d1042188727..80be0efdfb9b 100644
-#include <soc/rockchip/rk3399_grf.h>
-
-#define RK3399_DMC_NUM_CH 2
-
+#define PX30_PMUGRF_OS_REG2 0x208
+
+#define RK3128_GRF_SOC_CON0 0x140
+#define RK3128_GRF_OS_REG1 0x1cc
+#define RK3128_GRF_DFI_WRNUM 0x220
@ -364,7 +361,7 @@ index 5d1042188727..80be0efdfb9b 100644
/* enable count, use software mode */
writel_relaxed(SOFTWARE_EN, dfi_regs + DDRMON_CTRL);
@@ -100,12 +369,22 @@ static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev)
@@ -100,12 +369,22 @@ static int rockchip_dfi_get_busier_ch(st
rockchip_dfi_stop_hardware_counter(edev);
/* Find out which channel is busier */
@ -391,7 +388,7 @@ index 5d1042188727..80be0efdfb9b 100644
if (tmp > max) {
busier_ch = i;
max = tmp;
@@ -121,7 +400,8 @@ static int rockchip_dfi_disable(struct devfreq_event_dev *edev)
@@ -121,7 +400,8 @@ static int rockchip_dfi_disable(struct d
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
rockchip_dfi_stop_hardware_counter(edev);
@ -401,7 +398,7 @@ index 5d1042188727..80be0efdfb9b 100644
return 0;
}
@@ -131,10 +411,13 @@ static int rockchip_dfi_enable(struct devfreq_event_dev *edev)
@@ -131,10 +411,13 @@ static int rockchip_dfi_enable(struct de
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
int ret;
@ -419,7 +416,7 @@ index 5d1042188727..80be0efdfb9b 100644
}
rockchip_dfi_start_hardware_counter(edev);
@@ -151,8 +434,11 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev,
@@ -151,8 +434,11 @@ static int rockchip_dfi_get_event(struct
{
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
int busier_ch;
@ -431,7 +428,7 @@ index 5d1042188727..80be0efdfb9b 100644
edata->load_count = info->ch_usage[busier_ch].access;
edata->total_count = info->ch_usage[busier_ch].total;
@@ -167,23 +453,117 @@ static const struct devfreq_event_ops rockchip_dfi_ops = {
@@ -167,23 +453,117 @@ static const struct devfreq_event_ops ro
.set_event = rockchip_dfi_set_event,
};
@ -561,7 +558,7 @@ index 5d1042188727..80be0efdfb9b 100644
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
data->regs = devm_ioremap_resource(&pdev->dev, res);
@@ -203,21 +583,97 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
@@ -203,21 +583,97 @@ static int rockchip_dfi_probe(struct pla
if (IS_ERR(data->regmap_pmu))
return PTR_ERR(data->regmap_pmu);
}
@ -663,3 +660,4 @@ index 5d1042188727..80be0efdfb9b 100644
+ dev_err(dev, "failed to add devfreq-event device\n");
return PTR_ERR(data->edev);
}

13
target/linux/rockchip/patches-5.4/809-arm64-dts-doornet1-add-rk3328-dmc-relate-node.patch
View File

@ -7,8 +7,6 @@ Subject: [PATCH] arm64-dts-doornet1-add-rk3328-dmc-relate-node
.../boot/dts/rockchip/rk3328-doornet1.dts | 73 +++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts
index 8333351..d984163 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts
@@ -7,6 +7,7 @@
@ -19,7 +17,7 @@ index 8333351..d984163 100644
#include "rk3328.dtsi"
/ {
@@ -56,6 +57,72 @@
@@ -58,6 +59,72 @@
enable-active-high;
};
@ -92,7 +90,7 @@ index 8333351..d984163 100644
leds {
compatible = "gpio-leds";
pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
@@ -138,6 +205,10 @@
@@ -140,6 +207,10 @@
cpu-supply = <&vdd_arm>;
};
@ -103,7 +101,7 @@ index 8333351..d984163 100644
&gmac2io {
assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
assigned-clock-parents = <&gmac_clk>, <&gmac_clk>;
@@ -201,6 +272,7 @@
@@ -185,6 +256,7 @@
regulator-name = "vdd_log";
regulator-always-on;
regulator-boot-on;
@ -111,7 +109,7 @@ index 8333351..d984163 100644
regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1450000>;
regulator-ramp-delay = <12500>;
@@ -215,6 +287,7 @@
@@ -199,6 +271,7 @@
regulator-name = "vdd_arm";
regulator-always-on;
regulator-boot-on;
@ -119,6 +117,3 @@ index 8333351..d984163 100644
regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1450000>;
regulator-ramp-delay = <12500>;
--
2.25.1

16
target/linux/rockchip/patches-5.4/810-drv-net-phy-add-JLSemi-jl2xxx-driver.patch
View File

@ -14,8 +14,6 @@ Subject: [PATCH] drv: net: phy: add JLSemi jl2xxx driver
create mode 100644 drivers/net/phy/jl2xxx-core.h
create mode 100644 drivers/net/phy/jl2xxx.c
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 1ab7d6301..ba77b7f45 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -473,6 +473,11 @@ config INTEL_XWAY_PHY
@ -30,8 +28,6 @@ index 1ab7d6301..ba77b7f45 100644
config LSI_ET1011C_PHY
tristate "LSI ET1011C PHY"
---help---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 9e4c2f43b..75ef2a50f 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -88,6 +88,8 @@ obj-$(CONFIG_DP83867_PHY) += dp83867.o
@ -43,9 +39,6 @@ index 9e4c2f43b..75ef2a50f 100644
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_LXT_PHY) += lxt.o
obj-$(CONFIG_MARVELL_PHY) += marvell.o
diff --git a/drivers/net/phy/jl2xxx-core.c b/drivers/net/phy/jl2xxx-core.c
new file mode 100644
index 000000000..8ab7a7b3d
--- /dev/null
+++ b/drivers/net/phy/jl2xxx-core.c
@@ -0,0 +1,438 @@
@ -487,9 +480,6 @@ index 000000000..8ab7a7b3d
+
+ return __jlsemi_restore_page(phydev, oldpage, ret);
+}
diff --git a/drivers/net/phy/jl2xxx-core.h b/drivers/net/phy/jl2xxx-core.h
new file mode 100644
index 000000000..ef657de39
--- /dev/null
+++ b/drivers/net/phy/jl2xxx-core.h
@@ -0,0 +1,104 @@
@ -597,9 +587,6 @@ index 000000000..ef657de39
+
+#endif /* _JLSEMI_CORE_H */
+
diff --git a/drivers/net/phy/jl2xxx.c b/drivers/net/phy/jl2xxx.c
new file mode 100644
index 000000000..1b34d29a7
--- /dev/null
+++ b/drivers/net/phy/jl2xxx.c
@@ -0,0 +1,126 @@
@ -729,6 +716,3 @@ index 000000000..1b34d29a7
+};
+
+MODULE_DEVICE_TABLE(mdio, jlsemi_tbl);
--
2.34.1

1
target/linux/rockchip/patches-5.4/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch
View File

@ -191,4 +191,3 @@ Co-authored-by: gzelvis <gzelvis@gmail.com>
/ {
chosen {