mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
Revert "rockchip:fix rk3399 build with kernel 5.15"
This reverts commit f449543c7f.
This commit is contained in:
AmadeusGhost
parent
3ff761aa6d
commit
da34b3a2fb
@ -1,26 +0,0 @@
|
|||||||
From 3ccdf969a87be79df3daa9fe2d42f68f90ab7774 Mon Sep 17 00:00:00 2001
|
|
||||||
From: W_Y_CPP <383152993@qq.com>
|
|
||||||
Date: Mon, 17 Jan 2022 21:34:38 +0900
|
|
||||||
Subject: [PATCH] add MODULE_SUPPORTED_DEVICE macro
|
|
||||||
|
|
||||||
---
|
|
||||||
include/linux/module.h | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/include/linux/module.h b/include/linux/module.h
|
|
||||||
index c9f1200b2..a4190c861 100644
|
|
||||||
--- a/include/linux/module.h
|
|
||||||
+++ b/include/linux/module.h
|
|
||||||
@@ -32,6 +32,9 @@
|
|
||||||
#include <linux/percpu.h>
|
|
||||||
#include <asm/module.h>
|
|
||||||
|
|
||||||
+/* Not Yet Implemented */
|
|
||||||
+#define MODULE_SUPPORTED_DEVICE(name)
|
|
||||||
+
|
|
||||||
#define MODULE_NAME_LEN MAX_PARAM_PREFIX_LEN
|
|
||||||
|
|
||||||
struct modversion_info {
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -1,8 +1,16 @@
|
|||||||
From 3ee3529e5a31e6183f3ea7f7624533bd582432fc Mon Sep 17 00:00:00 2001
|
From 42824d4b753f84ccf885eca602c5037338b546c8 Mon Sep 17 00:00:00 2001
|
||||||
From: W_Y_CPP <383152993@qq.com>
|
From: Zhi Chen <zhichen@codeaurora.org>
|
||||||
Date: Tue, 18 Jan 2022 21:45:34 -0500
|
Date: Tue, 13 Jan 2015 14:28:18 -0800
|
||||||
Subject: [PATCH] add net-conntrack-events-support-multiple-registrant for 5.15
|
Subject: [PATCH 3/3] net: conntrack events, support multiple registrant
|
||||||
|
|
||||||
|
Merging this patch from kernel 3.4:
|
||||||
|
This was supported by old (.28) kernel versions but removed
|
||||||
|
because of it's overhead.
|
||||||
|
But we need this feature for NA connection manager. Both ipv4
|
||||||
|
and ipv6 modules needs to register themselves to ct events.
|
||||||
|
|
||||||
|
Change-Id: Iebfb254590fb594f5baf232f849d1b7ae45ef757
|
||||||
|
Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
||||||
---
|
---
|
||||||
include/net/netfilter/nf_conntrack_ecache.h | 15 ++-
|
include/net/netfilter/nf_conntrack_ecache.h | 15 ++-
|
||||||
include/net/netns/conntrack.h | 3 +
|
include/net/netns/conntrack.h | 3 +
|
||||||
|
|||||||
@ -1,19 +1,3 @@
|
|||||||
From ff52cd74910cb21ff3e612ddb359101ce7ad274e Mon Sep 17 00:00:00 2001
|
|
||||||
From: W_Y_CPP <383152993@qq.com>
|
|
||||||
Date: Wed, 19 Jan 2022 04:56:01 -0500
|
|
||||||
Subject: [PATCH] net-patch-linux-kernel-to-support-shortcut-fe
|
|
||||||
|
|
||||||
---
|
|
||||||
include/linux/if_bridge.h | 3 +++
|
|
||||||
include/linux/skbuff.h | 4 +++
|
|
||||||
include/linux/timer.h | 4 +++
|
|
||||||
include/net/netfilter/nf_conntrack_ecache.h | 2 ++
|
|
||||||
net/Kconfig | 3 +++
|
|
||||||
net/bridge/br_if.c | 22 ++++++++++++++++
|
|
||||||
net/core/dev.c | 10 +++++++++++++++++++--
|
|
||||||
net/netfilter/nf_conntrack_ecache.c | 25 ++++++++++++++++--
|
|
||||||
8 files changed, 115 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
|
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
|
||||||
index 509e18c7e..d0ea4afbb 100644
|
index 509e18c7e..d0ea4afbb 100644
|
||||||
--- a/include/linux/if_bridge.h
|
--- a/include/linux/if_bridge.h
|
||||||
@ -233,4 +217,4 @@ index 9d8075db0..fc49b77e4 100644
|
|||||||
+EXPORT_SYMBOL_GPL(nf_conntrack_unregister_chain_notifier);
|
+EXPORT_SYMBOL_GPL(nf_conntrack_unregister_chain_notifier);
|
||||||
#else
|
#else
|
||||||
void nf_conntrack_unregister_notifier(struct net *net)
|
void nf_conntrack_unregister_notifier(struct net *net)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,70 +0,0 @@
|
|||||||
From: William Wu <william.wu@rock-chips.com>
|
|
||||||
|
|
||||||
RK3328 has one USB 3.0 OTG controller which uses DWC_USB3
|
|
||||||
core's general architecture. It can act as static xHCI host
|
|
||||||
controller, static device controller, USB 3.0/2.0 OTG basing
|
|
||||||
on ID of USB3.0 PHY.
|
|
||||||
|
|
||||||
Signed-off-by: William Wu <william.wu@rock-chips.com>
|
|
||||||
Signed-off-by: Leonidas P. Papadakos <papadakospan@gmail.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
NOTE: This binding still has issues. From the original thread:
|
|
||||||
|
|
||||||
the rk3328 usb3-phy has an issue with detecting any plugin events
|
|
||||||
after a previous device got removed - see the inno-usb3-phy driver
|
|
||||||
in the vendor kernel.
|
|
||||||
|
|
||||||
The current state is good-enough for enabling the USB3 attached LAN
|
|
||||||
port of the NanoPi R2S. However, it might explode depending on your
|
|
||||||
use-case. You've been warned.
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 27 ++++++++++++++++++++++++
|
|
||||||
1 file changed, 27 insertions(+)
|
|
||||||
|
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
||||||
@@ -985,22 +985,30 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
usbdrd3: usb@ff600000 {
|
|
||||||
- compatible = "rockchip,rk3328-dwc3", "snps,dwc3";
|
|
||||||
- reg = <0x0 0xff600000 0x0 0x100000>;
|
|
||||||
- interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ compatible = "rockchip,rk3328-dwc3", "rockchip,rk3399-dwc3";
|
|
||||||
clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
|
|
||||||
<&cru ACLK_USB3OTG>;
|
|
||||||
clock-names = "ref_clk", "suspend_clk",
|
|
||||||
"bus_clk";
|
|
||||||
- dr_mode = "otg";
|
|
||||||
- phy_type = "utmi_wide";
|
|
||||||
- snps,dis-del-phy-power-chg-quirk;
|
|
||||||
- snps,dis_enblslpm_quirk;
|
|
||||||
- snps,dis-tx-ipgap-linecheck-quirk;
|
|
||||||
- snps,dis-u2-freeclk-exists-quirk;
|
|
||||||
- snps,dis_u2_susphy_quirk;
|
|
||||||
- snps,dis_u3_susphy_quirk;
|
|
||||||
+ #address-cells = <2>;
|
|
||||||
+ #size-cells = <2>;
|
|
||||||
+ ranges;
|
|
||||||
status = "disabled";
|
|
||||||
+
|
|
||||||
+ usbdrd_dwc3: dwc3@ff600000 {
|
|
||||||
+ compatible = "snps,dwc3";
|
|
||||||
+ reg = <0x0 0xff600000 0x0 0x100000>;
|
|
||||||
+ interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ dr_mode = "otg";
|
|
||||||
+ phy_type = "utmi_wide";
|
|
||||||
+ snps,dis_enblslpm_quirk;
|
|
||||||
+ snps,dis-u2-freeclk-exists-quirk;
|
|
||||||
+ snps,dis_u2_susphy_quirk;
|
|
||||||
+ snps,dis_u3_susphy_quirk;
|
|
||||||
+ snps,dis-del-phy-power-chg-quirk;
|
|
||||||
+ snps,dis-tx-ipgap-linecheck-quirk;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
gic: interrupt-controller@ff811000 {
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
From 0fc3b9b7619c4878f73a6a7989863f0d1a3fd392 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Bauer <mail@david-bauer.net>
|
|
||||||
Date: Fri, 10 Jul 2020 21:12:16 +0200
|
|
||||||
Subject: [PATCH] rockchip: enabled LAN port on NanoPi R2S
|
|
||||||
|
|
||||||
Enable the USB3 port on the FriendlyARM NanoPi R2S.
|
|
||||||
This is required for the USB3 attached LAN port to work.
|
|
||||||
|
|
||||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
||||||
---
|
|
||||||
.../boot/dts/rockchip/rk3328-nanopi-r2s.dts | 27 +++++++++++++++++++
|
|
||||||
1 file changed, 27 insertions(+)
|
|
||||||
|
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
|
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
|
|
||||||
@@ -44,6 +44,18 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+ vcc_rtl8153: vcc-rtl8153-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&rtl8153_en_drv>;
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-name = "vcc_rtl8153";
|
|
||||||
+ regulator-min-microvolt = <5000000>;
|
|
||||||
+ regulator-max-microvolt = <5000000>;
|
|
||||||
+ enable-active-high;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
leds {
|
|
||||||
compatible = "gpio-leds";
|
|
||||||
pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
|
|
||||||
@@ -273,6 +285,12 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+ usb {
|
|
||||||
+ rtl8153_en_drv: rtl8153-en-drv {
|
|
||||||
+ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
&io_domains {
|
|
||||||
@@ -379,3 +397,12 @@
|
|
||||||
&usb_host0_ohci {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+&usbdrd3 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usbdrd_dwc3 {
|
|
||||||
+ dr_mode = "host";
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From faa767a9d0ced5642da0ae50b53d87de258f9525 Mon Sep 17 00:00:00 2001
|
|
||||||
From: hmz007 <hmz007@gmail.com>
|
|
||||||
Date: Tue, 19 Nov 2019 17:24:30 +0800
|
|
||||||
Subject: [PATCH] phy: rockchip: add driver for Rockchip USB 3.0 PHY
|
|
||||||
|
|
||||||
Signed-off-by: hmz007 <hmz007@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/phy/rockchip/Kconfig | 8 +
|
|
||||||
drivers/phy/rockchip/Makefile | 1 +
|
|
||||||
drivers/phy/rockchip/phy-rockchip-inno-usb3.c | 1175 +++++++++++++++++
|
|
||||||
3 files changed, 1184 insertions(+)
|
|
||||||
create mode 100644 drivers/phy/rockchip/phy-rockchip-inno-usb3.c
|
|
||||||
|
|
||||||
--- a/drivers/phy/rockchip/Kconfig
|
|
||||||
+++ b/drivers/phy/rockchip/Kconfig
|
|
||||||
@@ -56,6 +56,15 @@ config PHY_ROCKCHIP_INNO_DSIDPHY
|
|
||||||
Enable this to support the Rockchip MIPI/LVDS/TTL PHY with
|
|
||||||
Innosilicon IP block.
|
|
||||||
|
|
||||||
+config PHY_ROCKCHIP_INNO_USB3
|
|
||||||
+ tristate "Rockchip INNO USB 3.0 PHY Driver"
|
|
||||||
+ depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF
|
|
||||||
+ depends on USB_SUPPORT
|
|
||||||
+ select GENERIC_PHY
|
|
||||||
+ select USB_PHY
|
|
||||||
+ help
|
|
||||||
+ Support for Rockchip USB 3.0 PHY with Innosilicon IP block.
|
|
||||||
+
|
|
||||||
config PHY_ROCKCHIP_PCIE
|
|
||||||
tristate "Rockchip PCIe PHY Driver"
|
|
||||||
depends on (ARCH_ROCKCHIP && OF) || COMPILE_TEST
|
|
||||||
--- a/drivers/phy/rockchip/Makefile
|
|
||||||
+++ b/drivers/phy/rockchip/Makefile
|
|
||||||
@@ -5,6 +5,7 @@ obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-
|
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o
|
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o
|
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o
|
|
||||||
+obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB3) += phy-rockchip-inno-usb3.o
|
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o
|
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_TYPEC) += phy-rockchip-typec.o
|
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o
|
|
||||||
Loading…
Reference in New Issue
Block a user