-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
37 changed files
with
119 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.6 = .63 | ||
LINUX_KERNEL_HASH-6.6.63 = d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 | ||
LINUX_VERSION-6.6 = .66 | ||
LINUX_KERNEL_HASH-6.6.66 = 9d757937c4661c2f512c62641b74ef74eff9bb13dc5dbcbaaa108c21152f1e52 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -296,15 +296,15 @@ Signed-off-by: David S. Miller <[email protected]> | |
static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int type) | ||
{ | ||
/* based on RTL8168FP_OOBMAC_BASE in vendor driver */ | ||
@@ -5283,6 +5341,7 @@ static int rtl_init_one(struct pci_dev * | ||
@@ -5289,6 +5347,7 @@ static int rtl_init_one(struct pci_dev * | ||
raw_spin_lock_init(&tp->cfg9346_usage_lock); | ||
raw_spin_lock_init(&tp->config25_lock); | ||
raw_spin_lock_init(&tp->mac_ocp_lock); | ||
+ mutex_init(&tp->led_lock); | ||
|
||
dev->tstats = devm_netdev_alloc_pcpu_stats(&pdev->dev, | ||
struct pcpu_sw_netstats); | ||
@@ -5439,6 +5498,12 @@ static int rtl_init_one(struct pci_dev * | ||
@@ -5445,6 +5504,12 @@ static int rtl_init_one(struct pci_dev * | ||
if (rc) | ||
return rc; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -59,7 +59,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
obj-$(CONFIG_R8169) += r8169.o | ||
--- a/drivers/net/ethernet/realtek/r8169_main.c | ||
+++ b/drivers/net/ethernet/realtek/r8169_main.c | ||
@@ -5498,11 +5498,10 @@ static int rtl_init_one(struct pci_dev * | ||
@@ -5504,11 +5504,10 @@ static int rtl_init_one(struct pci_dev * | ||
if (rc) | ||
return rc; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -311,7 +311,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
rtl_enable_rxdvgate(tp); | ||
fsleep(2000); | ||
break; | ||
@@ -4215,8 +4273,7 @@ static unsigned int rtl_quirk_packet_pad | ||
@@ -4221,8 +4279,7 @@ static unsigned int rtl_quirk_packet_pad | ||
|
||
switch (tp->mac_version) { | ||
case RTL_GIGA_MAC_VER_34: | ||
|
@@ -321,7 +321,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
padto = max_t(unsigned int, padto, ETH_ZLEN); | ||
break; | ||
default: | ||
@@ -5250,7 +5307,7 @@ static void rtl_hw_initialize(struct rtl | ||
@@ -5256,7 +5313,7 @@ static void rtl_hw_initialize(struct rtl | ||
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48: | ||
rtl_hw_init_8168g(tp); | ||
break; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -225,7 +225,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
void r8169_get_led_name(struct rtl8169_private *tp, int idx, | ||
char *buf, int buf_len) | ||
{ | ||
@@ -5555,10 +5606,12 @@ static int rtl_init_one(struct pci_dev * | ||
@@ -5561,10 +5612,12 @@ static int rtl_init_one(struct pci_dev * | ||
if (rc) | ||
return rc; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -124,7 +124,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
u32 ocp_base; | ||
}; | ||
|
||
@@ -5151,6 +5153,8 @@ static void rtl_remove_one(struct pci_de | ||
@@ -5157,6 +5159,8 @@ static void rtl_remove_one(struct pci_de | ||
|
||
cancel_work_sync(&tp->wk.work); | ||
|
||
|
@@ -133,7 +133,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
unregister_netdev(tp->dev); | ||
|
||
if (tp->dash_type != RTL_DASH_NONE) | ||
@@ -5611,9 +5615,9 @@ static int rtl_init_one(struct pci_dev * | ||
@@ -5617,9 +5621,9 @@ static int rtl_init_one(struct pci_dev * | ||
|
||
if (IS_ENABLED(CONFIG_R8169_LEDS)) { | ||
if (rtl_is_8125(tp)) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
|
||
--- a/drivers/net/ethernet/realtek/r8169_main.c | ||
+++ b/drivers/net/ethernet/realtek/r8169_main.c | ||
@@ -5153,7 +5153,8 @@ static void rtl_remove_one(struct pci_de | ||
@@ -5159,7 +5159,8 @@ static void rtl_remove_one(struct pci_de | ||
|
||
cancel_work_sync(&tp->wk.work); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (err) | ||
--- a/scripts/mod/modpost.c | ||
+++ b/scripts/mod/modpost.c | ||
@@ -1693,7 +1693,9 @@ static void read_symbols(const char *mod | ||
@@ -1666,7 +1666,9 @@ static void read_symbols(const char *mod | ||
symname = remove_dot(info.strtab + sym->st_name); | ||
|
||
handle_symbol(mod, &info, sym, symname); | ||
|
@@ -151,7 +151,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
check_sec_ref(mod, &info); | ||
@@ -1866,8 +1868,10 @@ static void add_header(struct buffer *b, | ||
@@ -1839,8 +1841,10 @@ static void add_header(struct buffer *b, | ||
buf_printf(b, "BUILD_SALT;\n"); | ||
buf_printf(b, "BUILD_LTO_INFO;\n"); | ||
buf_printf(b, "\n"); | ||
|
@@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
buf_printf(b, "\n"); | ||
buf_printf(b, "__visible struct module __this_module\n"); | ||
buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n"); | ||
@@ -1881,8 +1885,10 @@ static void add_header(struct buffer *b, | ||
@@ -1854,8 +1858,10 @@ static void add_header(struct buffer *b, | ||
buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n"); | ||
buf_printf(b, "};\n"); | ||
|
||
|
@@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
buf_printf(b, | ||
"\n" | ||
@@ -1890,8 +1896,10 @@ static void add_header(struct buffer *b, | ||
@@ -1863,8 +1869,10 @@ static void add_header(struct buffer *b, | ||
"MODULE_INFO(retpoline, \"Y\");\n" | ||
"#endif\n"); | ||
|
||
|
@@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
if (strstarts(mod->name, "tools/testing")) | ||
buf_printf(b, "\nMODULE_INFO(test, \"Y\");\n"); | ||
@@ -2001,11 +2009,13 @@ static void add_depends(struct buffer *b | ||
@@ -1974,11 +1982,13 @@ static void add_depends(struct buffer *b | ||
|
||
static void add_srcversion(struct buffer *b, struct module *mod) | ||
{ | ||
|
@@ -198,7 +198,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
static void write_buf(struct buffer *b, const char *fname) | ||
@@ -2088,7 +2098,9 @@ static void write_mod_c_file(struct modu | ||
@@ -2061,7 +2071,9 @@ static void write_mod_c_file(struct modu | ||
add_exported_symbols(&buf, mod); | ||
add_versions(&buf, mod); | ||
add_depends(&buf, mod); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#include <linux/mutex.h> | ||
#include <linux/err.h> | ||
#include <linux/property.h> | ||
@@ -3470,3 +3471,5 @@ static int __init regmap_initcall(void) | ||
@@ -3483,3 +3484,5 @@ static int __init regmap_initcall(void) | ||
return 0; | ||
} | ||
postcore_initcall(regmap_initcall); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -758,7 +758,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#include <net/netfilter/nf_flow_table.h> | ||
#include <net/netfilter/nf_conntrack.h> | ||
#include <net/netfilter/nf_conntrack_core.h> | ||
@@ -377,8 +376,7 @@ flow_offload_lookup(struct nf_flowtable | ||
@@ -373,8 +372,7 @@ flow_offload_lookup(struct nf_flowtable | ||
} | ||
EXPORT_SYMBOL_GPL(flow_offload_lookup); | ||
|
||
|
@@ -768,7 +768,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
void (*iter)(struct nf_flowtable *flowtable, | ||
struct flow_offload *flow, void *data), | ||
void *data) | ||
@@ -439,6 +437,7 @@ static void nf_flow_offload_gc_step(stru | ||
@@ -435,6 +433,7 @@ static void nf_flow_offload_gc_step(stru | ||
nf_flow_offload_stats(flow_table, flow); | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
|
||
--- a/drivers/net/phy/sfp.c | ||
+++ b/drivers/net/phy/sfp.c | ||
@@ -471,6 +471,9 @@ static const struct sfp_quirk sfp_quirks | ||
@@ -472,6 +472,9 @@ static const struct sfp_quirk sfp_quirks | ||
// FS 2.5G Base-T | ||
SFP_QUIRK_M("FS", "SFP-2.5G-T", sfp_quirk_oem_2_5g), | ||
|
||
|
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report | ||
// 2500MBd NRZ in their EEPROM | ||
SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex), | ||
@@ -2589,7 +2592,8 @@ static void sfp_sm_main(struct sfp *sfp, | ||
@@ -2590,7 +2593,8 @@ static void sfp_sm_main(struct sfp *sfp, | ||
* or t_start_up, so assume there is a fault. | ||
*/ | ||
sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, | ||
|
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
} else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { | ||
init_done: | ||
/* Create mdiobus and start trying for PHY */ | ||
@@ -2843,10 +2847,12 @@ static void sfp_check_state(struct sfp * | ||
@@ -2844,10 +2848,12 @@ static void sfp_check_state(struct sfp * | ||
mutex_lock(&sfp->st_mutex); | ||
state = sfp_get_state(sfp); | ||
changed = state ^ sfp->state; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -105,8 +105,8 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#include <linux/inet_diag.h> | ||
#include <linux/sock_diag.h> | ||
|
||
@@ -21,23 +20,6 @@ static int (*inet_rcv_compat)(struct sk_ | ||
static DEFINE_MUTEX(sock_diag_table_mutex); | ||
@@ -22,23 +21,6 @@ static const struct sock_diag_inet_compa | ||
|
||
static struct workqueue_struct *broadcast_wq; | ||
|
||
-DEFINE_COOKIE(sock_cookie); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -246,7 +246,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
&vmalloc_op, | ||
--- a/mm/vmstat.c | ||
+++ b/mm/vmstat.c | ||
@@ -2135,10 +2135,12 @@ void __init init_mm_internals(void) | ||
@@ -2136,10 +2136,12 @@ void __init init_mm_internals(void) | ||
start_shepherd_timer(); | ||
#endif | ||
#ifdef CONFIG_PROC_FS | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ Signed-off-by: Rafał Miłecki <[email protected]> | |
|
||
--- a/drivers/base/core.c | ||
+++ b/drivers/base/core.c | ||
@@ -1657,7 +1657,7 @@ static void device_links_purge(struct de | ||
@@ -1658,7 +1658,7 @@ static void device_links_purge(struct de | ||
#define FW_DEVLINK_FLAGS_RPM (FW_DEVLINK_FLAGS_ON | \ | ||
DL_FLAG_PM_RUNTIME) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/init/Kconfig | ||
+++ b/init/Kconfig | ||
@@ -1451,6 +1451,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW | ||
@@ -1460,6 +1460,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW | ||
the unaligned access emulation. | ||
see arch/parisc/kernel/unaligned.c for reference | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
|
||
--- a/drivers/mmc/core/bus.c | ||
+++ b/drivers/mmc/core/bus.c | ||
@@ -364,6 +364,8 @@ int mmc_add_card(struct mmc_card *card) | ||
@@ -366,6 +366,8 @@ int mmc_add_card(struct mmc_card *card) | ||
|
||
mmc_add_card_debugfs(card); | ||
card->dev.of_node = mmc_of_find_child_device(card->host, 0); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -76,7 +76,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
static inline const char *rtn_type(char *buf, size_t len, unsigned int t) | ||
--- a/net/ipv4/ipmr.c | ||
+++ b/net/ipv4/ipmr.c | ||
@@ -180,6 +180,7 @@ static int ipmr_rule_action(struct fib_r | ||
@@ -190,6 +190,7 @@ static int ipmr_rule_action(struct fib_r | ||
case FR_ACT_UNREACHABLE: | ||
return -ENETUNREACH; | ||
case FR_ACT_PROHIBIT: | ||
|
@@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
tb_id = fib_rule_get_table(rule, arg); | ||
--- a/net/ipv6/ip6mr.c | ||
+++ b/net/ipv6/ip6mr.c | ||
@@ -170,6 +170,8 @@ static int ip6mr_rule_action(struct fib_ | ||
@@ -180,6 +180,8 @@ static int ip6mr_rule_action(struct fib_ | ||
return -ENETUNREACH; | ||
case FR_ACT_PROHIBIT: | ||
return -EACCES; | ||
|
@@ -138,15 +138,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
static const struct rt6_info ip6_blk_hole_entry_template = { | ||
.dst = { | ||
.__rcuref = RCUREF_INIT(1), | ||
@@ -1040,6 +1054,7 @@ static const int fib6_prop[RTN_MAX + 1] | ||
@@ -1043,6 +1057,7 @@ static const int fib6_prop[RTN_MAX + 1] | ||
[RTN_BLACKHOLE] = -EINVAL, | ||
[RTN_UNREACHABLE] = -EHOSTUNREACH, | ||
[RTN_PROHIBIT] = -EACCES, | ||
+ [RTN_POLICY_FAILED] = -EACCES, | ||
[RTN_THROW] = -EAGAIN, | ||
[RTN_NAT] = -EINVAL, | ||
[RTN_XRESOLVE] = -EINVAL, | ||
@@ -1075,6 +1090,10 @@ static void ip6_rt_init_dst_reject(struc | ||
@@ -1078,6 +1093,10 @@ static void ip6_rt_init_dst_reject(struc | ||
rt->dst.output = ip6_pkt_prohibit_out; | ||
rt->dst.input = ip6_pkt_prohibit; | ||
break; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]> | |
|
||
--- a/net/netfilter/nf_flow_table_core.c | ||
+++ b/net/netfilter/nf_flow_table_core.c | ||
@@ -662,6 +662,23 @@ static struct pernet_operations nf_flow_ | ||
@@ -658,6 +658,23 @@ static struct pernet_operations nf_flow_ | ||
.exit_batch = nf_flow_table_pernet_exit, | ||
}; | ||
|
||
|
@@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]> | |
static int __init nf_flow_table_module_init(void) | ||
{ | ||
int ret; | ||
@@ -674,8 +691,14 @@ static int __init nf_flow_table_module_i | ||
@@ -670,8 +687,14 @@ static int __init nf_flow_table_module_i | ||
if (ret) | ||
goto out_offload; | ||
|
||
|
@@ -49,7 +49,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]> | |
out_offload: | ||
unregister_pernet_subsys(&nf_flow_table_net_ops); | ||
return ret; | ||
@@ -683,6 +706,7 @@ out_offload: | ||
@@ -679,6 +702,7 @@ out_offload: | ||
|
||
static void __exit nf_flow_table_module_exit(void) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/netfilter/nf_tables_api.c | ||
+++ b/net/netfilter/nf_tables_api.c | ||
@@ -8377,7 +8377,7 @@ static int nft_register_flowtable_net_ho | ||
@@ -8417,7 +8417,7 @@ static int nft_register_flowtable_net_ho | ||
err = flowtable->data.type->setup(&flowtable->data, | ||
hook->ops.dev, | ||
FLOW_BLOCK_BIND); | ||
|
2 changes: 1 addition & 1 deletion
2
target/linux/generic/pending-6.6/901-usb-add-more-modem-support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <[email protected]> | |
|
||
--- a/init/Kconfig | ||
+++ b/init/Kconfig | ||
@@ -1811,6 +1811,15 @@ config DEBUG_RSEQ | ||
@@ -1820,6 +1820,15 @@ config DEBUG_RSEQ | ||
|
||
If unsure, say N. | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,14 +27,13 @@ Signed-off-by: Heiko Stuebner <[email protected]> | |
2 files changed, 555 insertions(+) | ||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | ||
|
||
--- a/arch/arm64/boot/dts/rockchip/Makefile | ||
+++ b/arch/arm64/boot/dts/rockchip/Makefile | ||
@@ -90,6 +90,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-so | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb | ||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb | ||
|
||
--- a/arch/arm64/boot/dts/rockchip/Makefile | ||
+++ b/arch/arm64/boot/dts/rockchip/Makefile | ||
@@ -90,6 +90,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-so | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb | ||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb | ||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb |
Oops, something went wrong.