From 1c786a24cb987f262db067b7deab86054ed59e82 Mon Sep 17 00:00:00 2001 From: yuanbo Date: Sat, 11 Sep 2021 14:44:01 +0800 Subject: [PATCH] optimize khdf build process Signed-off-by: yuanbo --- linux-4.19/hi3516dv300_patch/hdf.patch | 246 ++-- .../hi3516dv300_patch/hi3516dv300.patch | 1196 ++++++++--------- linux-5.10/hi3516dv300_patch/hdf.patch | 48 +- .../hi3516dv300_patch/hi3516dv300.patch | 1103 +++++---------- 4 files changed, 1039 insertions(+), 1554 deletions(-) diff --git a/linux-4.19/hi3516dv300_patch/hdf.patch b/linux-4.19/hi3516dv300_patch/hdf.patch index e52f2ed..fa339f2 100644 --- a/linux-4.19/hi3516dv300_patch/hdf.patch +++ b/linux-4.19/hi3516dv300_patch/hdf.patch @@ -1,5 +1,5 @@ diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S -index 23150c0f0f4d..2780470c5ab7 100644 +index 23150c0f0..2780470c5 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -121,6 +121,14 @@ SECTIONS @@ -18,72 +18,35 @@ index 23150c0f0f4d..2780470c5ab7 100644 .exit.data : { diff --git a/drivers/Kconfig b/drivers/Kconfig -index ab4d43923c4d..9a869a2af74e 100644 +index ab4d43923..70fade369 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig -@@ -219,4 +219,6 @@ source "drivers/siox/Kconfig" +@@ -217,6 +217,8 @@ source "drivers/visorbus/Kconfig" - source "drivers/slimbus/Kconfig" + source "drivers/siox/Kconfig" +source "drivers/hdf/khdf/Kconfig" + + source "drivers/slimbus/Kconfig" + endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index 578f469f72fb..c8296ce2c838 100644 +index 578f469f7..f4aae6a3a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -186,3 +186,4 @@ obj-$(CONFIG_MULTIPLEXER) += mux/ +@@ -185,4 +185,5 @@ obj-$(CONFIG_TEE) += tee/ + obj-$(CONFIG_MULTIPLEXER) += mux/ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/ obj-$(CONFIG_SIOX) += siox/ - obj-$(CONFIG_GNSS) += gnss/ +obj-$(CONFIG_DRIVERS_HDF) += hdf/ + obj-$(CONFIG_GNSS) += gnss/ diff --git a/drivers/hdf/Makefile b/drivers/hdf/Makefile new file mode 100644 -index 000000000000..59190dd70d34 +index 000000000..01ce6ab52 --- /dev/null +++ b/drivers/hdf/Makefile -@@ -0,0 +1,3 @@ -+export HDF_RELATIVE_PATH := drivers/huawei_platform/hdf -+export PROJECT_ROOT := ../../../../../ -+obj-$(CONFIG_DRIVERS_HDF) += khdf/ -diff --git a/drivers/hdf/framework b/drivers/hdf/framework -new file mode 120000 -index 000000000000..222a5f03668e ---- /dev/null -+++ b/drivers/hdf/framework @@ -0,0 +1 @@ -+../../../../../../../drivers/framework -\ No newline at end of file -diff --git a/drivers/hdf/khdf b/drivers/hdf/khdf -new file mode 120000 -index 000000000000..45cfd260b09c ---- /dev/null -+++ b/drivers/hdf/khdf -@@ -0,0 +1 @@ -+../../../../../../../drivers/adapter/khdf/linux -\ No newline at end of file -diff --git a/include/hdf b/include/hdf -new file mode 120000 -index 000000000000..cb247a4d855c ---- /dev/null -+++ b/include/hdf -@@ -0,0 +1 @@ -+../../../../../../drivers/framework/include -\ No newline at end of file --- -2.25.1 -diff --git a/include/linux/hid.h b/include/linux/hid.h -index a46b6832b373..c61a17de5eb5 100644 ---- a/include/linux/hid.h -+++ b/include/linux/hid.h -@@ -621,6 +621,7 @@ struct hid_device { /* device report descriptor */ - struct list_head debug_list; - spinlock_t debug_list_lock; - wait_queue_head_t debug_wait; -+ void *input_dev; - }; - - #define to_hid_device(pdev) \ ++obj-$(CONFIG_DRIVERS_HDF) += khdf/ diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index bd7ac53b7..d7efd1e3d 100644 --- a/drivers/hid/Makefile @@ -103,91 +66,7 @@ index bd7ac53b7..d7efd1e3d 100644 + -I../../../../../third_party/FreeBSD/sys/dev/evdev hid-y := hid-core.o hid-input.o hid-quirks.o hid-$(CONFIG_DEBUG_FS) += hid-debug.o - -diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c -index 11bd2ca22..a5d0d6c19 100644 ---- a/drivers/hid/hid-input.c -+++ b/drivers/hid/hid-input.c -@@ -32,6 +32,10 @@ - #include - #include - -+#if defined(CONFIG_DRIVERS_HDF_INPUT) -+#include "hdf_hid_adapter.h" -+#endif -+ - #include "hid-ids.h" - - #define unk KEY_UNKNOWN -@@ -1365,7 +1369,15 @@ void hidinput_report_event(struct hid_device *hid, struct hid_report *report) - return; - - list_for_each_entry(hidinput, &hid->inputs, list) -+#if defined(CONFIG_DRIVERS_HDF_INPUT) -+ { -+#endif - input_sync(hidinput->input); -+#if defined(CONFIG_DRIVERS_HDF_INPUT) -+ if(hid->input_dev) -+ HidReportEvent(hid->input_dev, EV_SYN, SYN_REPORT, 0); -+ } -+#endif - } - EXPORT_SYMBOL_GPL(hidinput_report_event); -@@ -1729,6 +1741,41 @@ static inline void hidinput_configure_usages(struct hid_input *hidinput, - report->field[i]->usage + j); - } - -+#if defined(CONFIG_DRIVERS_HDF_INPUT) -+static void transfer_info(struct input_dev *dev) -+{ -+ HidInfo *info = (HidInfo *)kmalloc(sizeof(HidInfo),GFP_KERNEL); -+ if (info == NULL) { -+ printk("%s: malloc failed\n",__func__); -+ return; -+ } -+ info->devName = dev->name; -+ memcpy(info->devProp, dev->propbit, sizeof(unsigned long) * BITS_TO_LONGS(INPUT_PROP_CNT)); -+ memcpy(info->eventType, dev->evbit, sizeof(unsigned long) * BITS_TO_LONGS(EV_CNT)); -+ memcpy(info->keyCode, dev->keybit, sizeof(unsigned long) * BITS_TO_LONGS(KEY_CNT)); -+ memcpy(info->relCode, dev->relbit, sizeof(unsigned long) * BITS_TO_LONGS(REL_CNT)); -+ memcpy(info->absCode, dev->absbit, sizeof(unsigned long) * BITS_TO_LONGS(ABS_CNT)); -+ memcpy(info->miscCode, dev->mscbit, sizeof(unsigned long) * BITS_TO_LONGS(MSC_CNT)); -+ memcpy(info->ledCode, dev->ledbit, sizeof(unsigned long) * BITS_TO_LONGS(LED_CNT)); -+ memcpy(info->soundCode, dev->sndbit, sizeof(unsigned long) * BITS_TO_LONGS(SND_CNT)); -+ memcpy(info->forceCode, dev->ffbit, sizeof(unsigned long) * BITS_TO_LONGS(FF_CNT)); -+ memcpy(info->switchCode, dev->swbit, sizeof(unsigned long) * BITS_TO_LONGS(SW_CNT)); -+ for (int i = 0; i < BITS_TO_LONGS(ABS_CNT); i++) { -+ if (dev->absbit[i] != 0) { -+ memcpy(info->axisInfo, dev->absinfo, sizeof(struct input_absinfo) * ABS_CNT); -+ break; -+ } -+ } -+ info->bustype = dev->id.bustype; -+ info->vendor = dev->id.vendor; -+ info->product = dev->id.product; -+ info->version = dev->id.version; -+ SendInfoToHdf(info); -+ kfree(info); -+ info = NULL; -+} -+#endif -+ - /* - * Register the input device; print a message. - * Configure the input layer interface -@@ -1811,7 +1858,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) - hidinput_cleanup_hidinput(hid, hidinput); - continue; - } -- -+#if defined(CONFIG_DRIVERS_HDF_INPUT) -+ transfer_info(hidinput->input); -+#endif - if (input_register_device(hidinput->input)) - goto out_unwind; - hidinput->registered = true; diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index bde5cef32..1cf2e9b9c 100644 --- a/drivers/hid/hid-core.c @@ -328,4 +207,103 @@ index bde5cef32..1cf2e9b9c 100644 +#endif mutex_lock(&hdev->ll_open_lock); if (!--hdev->ll_open_count) - hdev->ll_driver->close(hdev); \ No newline at end of file + hdev->ll_driver->close(hdev); +diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c +index 11bd2ca22..a5d0d6c19 100644 +--- a/drivers/hid/hid-input.c ++++ b/drivers/hid/hid-input.c +@@ -32,6 +32,10 @@ + #include + #include + ++#if defined(CONFIG_DRIVERS_HDF_INPUT) ++#include "hdf_hid_adapter.h" ++#endif ++ + #include "hid-ids.h" + + #define unk KEY_UNKNOWN +@@ -1365,7 +1369,15 @@ void hidinput_report_event(struct hid_device *hid, struct hid_report *report) + return; + + list_for_each_entry(hidinput, &hid->inputs, list) ++#if defined(CONFIG_DRIVERS_HDF_INPUT) ++ { ++#endif + input_sync(hidinput->input); ++#if defined(CONFIG_DRIVERS_HDF_INPUT) ++ if(hid->input_dev) ++ HidReportEvent(hid->input_dev, EV_SYN, SYN_REPORT, 0); ++ } ++#endif + } + EXPORT_SYMBOL_GPL(hidinput_report_event); + +@@ -1729,6 +1741,41 @@ static inline void hidinput_configure_usages(struct hid_input *hidinput, + report->field[i]->usage + j); + } + ++#if defined(CONFIG_DRIVERS_HDF_INPUT) ++static void transfer_info(struct input_dev *dev) ++{ ++ HidInfo *info = (HidInfo *)kmalloc(sizeof(HidInfo),GFP_KERNEL); ++ if (info == NULL) { ++ printk("%s: malloc failed\n",__func__); ++ return; ++ } ++ info->devName = dev->name; ++ memcpy(info->devProp, dev->propbit, sizeof(unsigned long) * BITS_TO_LONGS(INPUT_PROP_CNT)); ++ memcpy(info->eventType, dev->evbit, sizeof(unsigned long) * BITS_TO_LONGS(EV_CNT)); ++ memcpy(info->keyCode, dev->keybit, sizeof(unsigned long) * BITS_TO_LONGS(KEY_CNT)); ++ memcpy(info->relCode, dev->relbit, sizeof(unsigned long) * BITS_TO_LONGS(REL_CNT)); ++ memcpy(info->absCode, dev->absbit, sizeof(unsigned long) * BITS_TO_LONGS(ABS_CNT)); ++ memcpy(info->miscCode, dev->mscbit, sizeof(unsigned long) * BITS_TO_LONGS(MSC_CNT)); ++ memcpy(info->ledCode, dev->ledbit, sizeof(unsigned long) * BITS_TO_LONGS(LED_CNT)); ++ memcpy(info->soundCode, dev->sndbit, sizeof(unsigned long) * BITS_TO_LONGS(SND_CNT)); ++ memcpy(info->forceCode, dev->ffbit, sizeof(unsigned long) * BITS_TO_LONGS(FF_CNT)); ++ memcpy(info->switchCode, dev->swbit, sizeof(unsigned long) * BITS_TO_LONGS(SW_CNT)); ++ for (int i = 0; i < BITS_TO_LONGS(ABS_CNT); i++) { ++ if (dev->absbit[i] != 0) { ++ memcpy(info->axisInfo, dev->absinfo, sizeof(struct input_absinfo) * ABS_CNT); ++ break; ++ } ++ } ++ info->bustype = dev->id.bustype; ++ info->vendor = dev->id.vendor; ++ info->product = dev->id.product; ++ info->version = dev->id.version; ++ SendInfoToHdf(info); ++ kfree(info); ++ info = NULL; ++} ++#endif ++ + /* + * Register the input device; print a message. + * Configure the input layer interface +@@ -1811,7 +1858,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) + hidinput_cleanup_hidinput(hid, hidinput); + continue; + } +- ++#if defined(CONFIG_DRIVERS_HDF_INPUT) ++ transfer_info(hidinput->input); ++#endif + if (input_register_device(hidinput->input)) + goto out_unwind; + hidinput->registered = true; +diff --git a/include/linux/hid.h b/include/linux/hid.h +index a46b6832b..c61a17de5 100644 +--- a/include/linux/hid.h ++++ b/include/linux/hid.h +@@ -621,6 +621,7 @@ struct hid_device { /* device report descriptor */ + struct list_head debug_list; + spinlock_t debug_list_lock; + wait_queue_head_t debug_wait; ++ void *input_dev; + }; + + #define to_hid_device(pdev) \ +-- +2.25.1 + diff --git a/linux-4.19/hi3516dv300_patch/hi3516dv300.patch b/linux-4.19/hi3516dv300_patch/hi3516dv300.patch index cf19280..cdcc9f4 100644 --- a/linux-4.19/hi3516dv300_patch/hi3516dv300.patch +++ b/linux-4.19/hi3516dv300_patch/hi3516dv300.patch @@ -1,5 +1,5 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 1877da816f65..0b45060b73df 100644 +index 1877da816..0b45060b7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -330,7 +330,7 @@ config ARCH_MULTIPLATFORM @@ -21,7 +21,7 @@ index 1877da816f65..0b45060b73df 100644 source "arch/arm/mach-integrator/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile -index d1516f85f25d..b27a5776bcb4 100644 +index d1516f85f..b27a5776b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -173,6 +173,7 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge @@ -53,7 +53,7 @@ index d1516f85f25d..b27a5776bcb4 100644 # Do we have FASTFPE? diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile -index a3af4dc08c3e..78fb2aca5f46 100644 +index a3af4dc08..78fb2aca5 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -16,6 +16,8 @@ OBJCOPYFLAGS :=-O binary -R .comment -S @@ -100,7 +100,7 @@ index a3af4dc08c3e..78fb2aca5f46 100644 $(call if_changed,uimage) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index b5bd3de87c33..c9f4624cd31b 100644 +index b5bd3de87..c9f4624cd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -222,6 +222,71 @@ dtb-$(CONFIG_ARCH_HISI) += \ @@ -182,7 +182,7 @@ index b5bd3de87c33..c9f4624cd31b 100644 + diff --git a/arch/arm/boot/dts/hi3516a-demb.dts b/arch/arm/boot/dts/hi3516a-demb.dts new file mode 100644 -index 000000000000..f7f5ff2e9d0f +index 000000000..f7f5ff2e9 --- /dev/null +++ b/arch/arm/boot/dts/hi3516a-demb.dts @@ -0,0 +1,240 @@ @@ -428,7 +428,7 @@ index 000000000000..f7f5ff2e9d0f +}; diff --git a/arch/arm/boot/dts/hi3516a.dtsi b/arch/arm/boot/dts/hi3516a.dtsi new file mode 100644 -index 000000000000..12ef3cae1075 +index 000000000..12ef3cae1 --- /dev/null +++ b/arch/arm/boot/dts/hi3516a.dtsi @@ -0,0 +1,690 @@ @@ -1124,7 +1124,7 @@ index 000000000000..12ef3cae1075 +}; diff --git a/arch/arm/boot/dts/hi3516cv500-demb.dts b/arch/arm/boot/dts/hi3516cv500-demb.dts new file mode 100644 -index 000000000000..85eede3106ad +index 000000000..85eede310 --- /dev/null +++ b/arch/arm/boot/dts/hi3516cv500-demb.dts @@ -0,0 +1,234 @@ @@ -1364,7 +1364,7 @@ index 000000000000..85eede3106ad + diff --git a/arch/arm/boot/dts/hi3516cv500.dtsi b/arch/arm/boot/dts/hi3516cv500.dtsi new file mode 100644 -index 000000000000..3438ed16a097 +index 000000000..3438ed16a --- /dev/null +++ b/arch/arm/boot/dts/hi3516cv500.dtsi @@ -0,0 +1,890 @@ @@ -2260,7 +2260,7 @@ index 000000000000..3438ed16a097 +}; diff --git a/arch/arm/boot/dts/hi3516dv200-demb.dts b/arch/arm/boot/dts/hi3516dv200-demb.dts new file mode 100644 -index 000000000000..cfb267068cee +index 000000000..cfb267068 --- /dev/null +++ b/arch/arm/boot/dts/hi3516dv200-demb.dts @@ -0,0 +1,175 @@ @@ -2441,7 +2441,7 @@ index 000000000000..cfb267068cee + diff --git a/arch/arm/boot/dts/hi3516dv200.dtsi b/arch/arm/boot/dts/hi3516dv200.dtsi new file mode 100644 -index 000000000000..41c78206da71 +index 000000000..41c78206d --- /dev/null +++ b/arch/arm/boot/dts/hi3516dv200.dtsi @@ -0,0 +1,700 @@ @@ -3147,7 +3147,7 @@ index 000000000000..41c78206da71 +}; diff --git a/arch/arm/boot/dts/hi3516dv300-demb.dts b/arch/arm/boot/dts/hi3516dv300-demb.dts new file mode 100644 -index 000000000000..8e6c6abc33f7 +index 000000000..8e6c6abc3 --- /dev/null +++ b/arch/arm/boot/dts/hi3516dv300-demb.dts @@ -0,0 +1,270 @@ @@ -3423,7 +3423,7 @@ index 000000000000..8e6c6abc33f7 +}; diff --git a/arch/arm/boot/dts/hi3516dv300.dtsi b/arch/arm/boot/dts/hi3516dv300.dtsi new file mode 100644 -index 000000000000..a8ea89e91fa4 +index 000000000..a8ea89e91 --- /dev/null +++ b/arch/arm/boot/dts/hi3516dv300.dtsi @@ -0,0 +1,906 @@ @@ -4335,7 +4335,7 @@ index 000000000000..a8ea89e91fa4 +}; diff --git a/arch/arm/boot/dts/hi3516ev200-demb.dts b/arch/arm/boot/dts/hi3516ev200-demb.dts new file mode 100644 -index 000000000000..a6433d77df6b +index 000000000..a6433d77d --- /dev/null +++ b/arch/arm/boot/dts/hi3516ev200-demb.dts @@ -0,0 +1,166 @@ @@ -4507,7 +4507,7 @@ index 000000000000..a6433d77df6b + diff --git a/arch/arm/boot/dts/hi3516ev200.dtsi b/arch/arm/boot/dts/hi3516ev200.dtsi new file mode 100644 -index 000000000000..dd36cf20954e +index 000000000..dd36cf209 --- /dev/null +++ b/arch/arm/boot/dts/hi3516ev200.dtsi @@ -0,0 +1,678 @@ @@ -5191,7 +5191,7 @@ index 000000000000..dd36cf20954e +}; diff --git a/arch/arm/boot/dts/hi3516ev300-demb.dts b/arch/arm/boot/dts/hi3516ev300-demb.dts new file mode 100644 -index 000000000000..e3c6ee297a60 +index 000000000..e3c6ee297 --- /dev/null +++ b/arch/arm/boot/dts/hi3516ev300-demb.dts @@ -0,0 +1,174 @@ @@ -5371,7 +5371,7 @@ index 000000000000..e3c6ee297a60 + diff --git a/arch/arm/boot/dts/hi3516ev300.dtsi b/arch/arm/boot/dts/hi3516ev300.dtsi new file mode 100644 -index 000000000000..cb938726ad86 +index 000000000..cb938726a --- /dev/null +++ b/arch/arm/boot/dts/hi3516ev300.dtsi @@ -0,0 +1,699 @@ @@ -6076,7 +6076,7 @@ index 000000000000..cb938726ad86 +}; diff --git a/arch/arm/boot/dts/hi3518ev20x-demb.dts b/arch/arm/boot/dts/hi3518ev20x-demb.dts new file mode 100644 -index 000000000000..6e8af68e1ba5 +index 000000000..6e8af68e1 --- /dev/null +++ b/arch/arm/boot/dts/hi3518ev20x-demb.dts @@ -0,0 +1,197 @@ @@ -6279,7 +6279,7 @@ index 000000000000..6e8af68e1ba5 +}; diff --git a/arch/arm/boot/dts/hi3518ev20x.dtsi b/arch/arm/boot/dts/hi3518ev20x.dtsi new file mode 100644 -index 000000000000..d8ee3783dcaa +index 000000000..d8ee3783d --- /dev/null +++ b/arch/arm/boot/dts/hi3518ev20x.dtsi @@ -0,0 +1,577 @@ @@ -6862,7 +6862,7 @@ index 000000000000..d8ee3783dcaa +}; diff --git a/arch/arm/boot/dts/hi3518ev300-demb.dts b/arch/arm/boot/dts/hi3518ev300-demb.dts new file mode 100644 -index 000000000000..555489fbdaae +index 000000000..555489fbd --- /dev/null +++ b/arch/arm/boot/dts/hi3518ev300-demb.dts @@ -0,0 +1,166 @@ @@ -7034,7 +7034,7 @@ index 000000000000..555489fbdaae + diff --git a/arch/arm/boot/dts/hi3518ev300.dtsi b/arch/arm/boot/dts/hi3518ev300.dtsi new file mode 100644 -index 000000000000..c7b3cf799b30 +index 000000000..c7b3cf799 --- /dev/null +++ b/arch/arm/boot/dts/hi3518ev300.dtsi @@ -0,0 +1,678 @@ @@ -7718,7 +7718,7 @@ index 000000000000..c7b3cf799b30 +}; diff --git a/arch/arm/boot/dts/hi3519av100-emmc.dts b/arch/arm/boot/dts/hi3519av100-emmc.dts new file mode 100644 -index 000000000000..16dfa440c260 +index 000000000..16dfa440c --- /dev/null +++ b/arch/arm/boot/dts/hi3519av100-emmc.dts @@ -0,0 +1,25 @@ @@ -7749,7 +7749,7 @@ index 000000000000..16dfa440c260 +}; diff --git a/arch/arm/boot/dts/hi3519av100-flash.dts b/arch/arm/boot/dts/hi3519av100-flash.dts new file mode 100644 -index 000000000000..25ac959d635c +index 000000000..25ac959d6 --- /dev/null +++ b/arch/arm/boot/dts/hi3519av100-flash.dts @@ -0,0 +1,25 @@ @@ -7780,7 +7780,7 @@ index 000000000000..25ac959d635c +}; diff --git a/arch/arm/boot/dts/hi3519av100-smp-emmc.dts b/arch/arm/boot/dts/hi3519av100-smp-emmc.dts new file mode 100644 -index 000000000000..3859b13417fc +index 000000000..3859b1341 --- /dev/null +++ b/arch/arm/boot/dts/hi3519av100-smp-emmc.dts @@ -0,0 +1,25 @@ @@ -7811,7 +7811,7 @@ index 000000000000..3859b13417fc +}; diff --git a/arch/arm/boot/dts/hi3519av100-smp-flash.dts b/arch/arm/boot/dts/hi3519av100-smp-flash.dts new file mode 100644 -index 000000000000..fe2f6bb1f4a4 +index 000000000..fe2f6bb1f --- /dev/null +++ b/arch/arm/boot/dts/hi3519av100-smp-flash.dts @@ -0,0 +1,25 @@ @@ -7842,7 +7842,7 @@ index 000000000000..fe2f6bb1f4a4 +}; diff --git a/arch/arm/boot/dts/hi3519av100-smp.dts b/arch/arm/boot/dts/hi3519av100-smp.dts new file mode 100644 -index 000000000000..c82d8c9340f3 +index 000000000..c82d8c934 --- /dev/null +++ b/arch/arm/boot/dts/hi3519av100-smp.dts @@ -0,0 +1,289 @@ @@ -8137,7 +8137,7 @@ index 000000000000..c82d8c9340f3 +}; diff --git a/arch/arm/boot/dts/hi3519av100.dts b/arch/arm/boot/dts/hi3519av100.dts new file mode 100644 -index 000000000000..eb5b4cced123 +index 000000000..eb5b4cced --- /dev/null +++ b/arch/arm/boot/dts/hi3519av100.dts @@ -0,0 +1,280 @@ @@ -8423,7 +8423,7 @@ index 000000000000..eb5b4cced123 +}; diff --git a/arch/arm/boot/dts/hi3519av100.dtsi b/arch/arm/boot/dts/hi3519av100.dtsi new file mode 100644 -index 000000000000..b94f1054ee3b +index 000000000..b94f1054e --- /dev/null +++ b/arch/arm/boot/dts/hi3519av100.dtsi @@ -0,0 +1,1070 @@ @@ -9499,7 +9499,7 @@ index 000000000000..b94f1054ee3b +}; diff --git a/arch/arm/boot/dts/hi3520dv500-demb.dts b/arch/arm/boot/dts/hi3520dv500-demb.dts new file mode 100644 -index 000000000000..4416d9e64783 +index 000000000..4416d9e64 --- /dev/null +++ b/arch/arm/boot/dts/hi3520dv500-demb.dts @@ -0,0 +1,211 @@ @@ -9716,7 +9716,7 @@ index 000000000000..4416d9e64783 + diff --git a/arch/arm/boot/dts/hi3521a-demb.dts b/arch/arm/boot/dts/hi3521a-demb.dts new file mode 100644 -index 000000000000..e4527d391ef1 +index 000000000..e4527d391 --- /dev/null +++ b/arch/arm/boot/dts/hi3521a-demb.dts @@ -0,0 +1,103 @@ @@ -9825,7 +9825,7 @@ index 000000000000..e4527d391ef1 +}; diff --git a/arch/arm/boot/dts/hi3521a.dtsi b/arch/arm/boot/dts/hi3521a.dtsi new file mode 100644 -index 000000000000..7189dc2ff3bf +index 000000000..7189dc2ff --- /dev/null +++ b/arch/arm/boot/dts/hi3521a.dtsi @@ -0,0 +1,406 @@ @@ -10237,7 +10237,7 @@ index 000000000000..7189dc2ff3bf +}; diff --git a/arch/arm/boot/dts/hi3521dv200-demb.dts b/arch/arm/boot/dts/hi3521dv200-demb.dts new file mode 100644 -index 000000000000..502fd484701f +index 000000000..502fd4847 --- /dev/null +++ b/arch/arm/boot/dts/hi3521dv200-demb.dts @@ -0,0 +1,211 @@ @@ -10454,7 +10454,7 @@ index 000000000000..502fd484701f + diff --git a/arch/arm/boot/dts/hi3521dv200.dtsi b/arch/arm/boot/dts/hi3521dv200.dtsi new file mode 100644 -index 000000000000..ab06ef7149b1 +index 000000000..ab06ef714 --- /dev/null +++ b/arch/arm/boot/dts/hi3521dv200.dtsi @@ -0,0 +1,719 @@ @@ -11179,7 +11179,7 @@ index 000000000000..ab06ef7149b1 +}; diff --git a/arch/arm/boot/dts/hi3531a-demb.dts b/arch/arm/boot/dts/hi3531a-demb.dts new file mode 100644 -index 000000000000..e0a47d7bdb38 +index 000000000..e0a47d7bd --- /dev/null +++ b/arch/arm/boot/dts/hi3531a-demb.dts @@ -0,0 +1,146 @@ @@ -11331,7 +11331,7 @@ index 000000000000..e0a47d7bdb38 +}; diff --git a/arch/arm/boot/dts/hi3531a.dtsi b/arch/arm/boot/dts/hi3531a.dtsi new file mode 100644 -index 000000000000..d845b411d619 +index 000000000..d845b411d --- /dev/null +++ b/arch/arm/boot/dts/hi3531a.dtsi @@ -0,0 +1,508 @@ @@ -11845,7 +11845,7 @@ index 000000000000..d845b411d619 +}; diff --git a/arch/arm/boot/dts/hi3536dv100-demb.dts b/arch/arm/boot/dts/hi3536dv100-demb.dts new file mode 100644 -index 000000000000..cb6968fb2377 +index 000000000..cb6968fb2 --- /dev/null +++ b/arch/arm/boot/dts/hi3536dv100-demb.dts @@ -0,0 +1,192 @@ @@ -12043,7 +12043,7 @@ index 000000000000..cb6968fb2377 +}; diff --git a/arch/arm/boot/dts/hi3536dv100.dtsi b/arch/arm/boot/dts/hi3536dv100.dtsi new file mode 100644 -index 000000000000..ca1c88fe9fd2 +index 000000000..ca1c88fe9 --- /dev/null +++ b/arch/arm/boot/dts/hi3536dv100.dtsi @@ -0,0 +1,445 @@ @@ -12494,7 +12494,7 @@ index 000000000000..ca1c88fe9fd2 +}; diff --git a/arch/arm/boot/dts/hi3556av100-emmc.dts b/arch/arm/boot/dts/hi3556av100-emmc.dts new file mode 100644 -index 000000000000..83247dd6d8b1 +index 000000000..83247dd6d --- /dev/null +++ b/arch/arm/boot/dts/hi3556av100-emmc.dts @@ -0,0 +1,25 @@ @@ -12525,7 +12525,7 @@ index 000000000000..83247dd6d8b1 +}; diff --git a/arch/arm/boot/dts/hi3556av100-flash.dts b/arch/arm/boot/dts/hi3556av100-flash.dts new file mode 100644 -index 000000000000..5f4841ed134d +index 000000000..5f4841ed1 --- /dev/null +++ b/arch/arm/boot/dts/hi3556av100-flash.dts @@ -0,0 +1,25 @@ @@ -12556,7 +12556,7 @@ index 000000000000..5f4841ed134d +}; diff --git a/arch/arm/boot/dts/hi3556av100.dts b/arch/arm/boot/dts/hi3556av100.dts new file mode 100644 -index 000000000000..24f47531da2b +index 000000000..24f47531d --- /dev/null +++ b/arch/arm/boot/dts/hi3556av100.dts @@ -0,0 +1,275 @@ @@ -12837,7 +12837,7 @@ index 000000000000..24f47531da2b +}; diff --git a/arch/arm/boot/dts/hi3556av100.dtsi b/arch/arm/boot/dts/hi3556av100.dtsi new file mode 100644 -index 000000000000..d347e5426d5f +index 000000000..d347e5426 --- /dev/null +++ b/arch/arm/boot/dts/hi3556av100.dtsi @@ -0,0 +1,974 @@ @@ -13817,7 +13817,7 @@ index 000000000000..d347e5426d5f +}; diff --git a/arch/arm/boot/dts/hi3556v200-demb.dts b/arch/arm/boot/dts/hi3556v200-demb.dts new file mode 100644 -index 000000000000..2a5dcc10ff35 +index 000000000..2a5dcc10f --- /dev/null +++ b/arch/arm/boot/dts/hi3556v200-demb.dts @@ -0,0 +1,250 @@ @@ -14073,7 +14073,7 @@ index 000000000000..2a5dcc10ff35 + diff --git a/arch/arm/boot/dts/hi3556v200.dtsi b/arch/arm/boot/dts/hi3556v200.dtsi new file mode 100644 -index 000000000000..e91daaa9d583 +index 000000000..e91daaa9d --- /dev/null +++ b/arch/arm/boot/dts/hi3556v200.dtsi @@ -0,0 +1,896 @@ @@ -14975,7 +14975,7 @@ index 000000000000..e91daaa9d583 +}; diff --git a/arch/arm/boot/dts/hi3559v200-demb.dts b/arch/arm/boot/dts/hi3559v200-demb.dts new file mode 100644 -index 000000000000..d7d0d1a8a1c6 +index 000000000..d7d0d1a8a --- /dev/null +++ b/arch/arm/boot/dts/hi3559v200-demb.dts @@ -0,0 +1,250 @@ @@ -15231,7 +15231,7 @@ index 000000000000..d7d0d1a8a1c6 + diff --git a/arch/arm/boot/dts/hi3559v200.dtsi b/arch/arm/boot/dts/hi3559v200.dtsi new file mode 100644 -index 000000000000..faad1be323ff +index 000000000..faad1be32 --- /dev/null +++ b/arch/arm/boot/dts/hi3559v200.dtsi @@ -0,0 +1,895 @@ @@ -16132,7 +16132,7 @@ index 000000000000..faad1be323ff +}; diff --git a/arch/arm/boot/dts/hi3562v100-demb.dts b/arch/arm/boot/dts/hi3562v100-demb.dts new file mode 100644 -index 000000000000..cfb69e58e54c +index 000000000..cfb69e58e --- /dev/null +++ b/arch/arm/boot/dts/hi3562v100-demb.dts @@ -0,0 +1,233 @@ @@ -16371,7 +16371,7 @@ index 000000000000..cfb69e58e54c + diff --git a/arch/arm/boot/dts/hi3562v100.dtsi b/arch/arm/boot/dts/hi3562v100.dtsi new file mode 100644 -index 000000000000..b1aa847225a2 +index 000000000..b1aa84722 --- /dev/null +++ b/arch/arm/boot/dts/hi3562v100.dtsi @@ -0,0 +1,868 @@ @@ -17245,7 +17245,7 @@ index 000000000000..b1aa847225a2 +}; diff --git a/arch/arm/boot/dts/hi3566v100-demb.dts b/arch/arm/boot/dts/hi3566v100-demb.dts new file mode 100644 -index 000000000000..d4bb320caa92 +index 000000000..d4bb320ca --- /dev/null +++ b/arch/arm/boot/dts/hi3566v100-demb.dts @@ -0,0 +1,233 @@ @@ -17484,7 +17484,7 @@ index 000000000000..d4bb320caa92 + diff --git a/arch/arm/boot/dts/hi3566v100.dtsi b/arch/arm/boot/dts/hi3566v100.dtsi new file mode 100644 -index 000000000000..b1aa847225a2 +index 000000000..b1aa84722 --- /dev/null +++ b/arch/arm/boot/dts/hi3566v100.dtsi @@ -0,0 +1,868 @@ @@ -18358,7 +18358,7 @@ index 000000000000..b1aa847225a2 +}; diff --git a/arch/arm/boot/dts/hi3568v100-emmc.dts b/arch/arm/boot/dts/hi3568v100-emmc.dts new file mode 100644 -index 000000000000..6b6d9caf377e +index 000000000..6b6d9caf3 --- /dev/null +++ b/arch/arm/boot/dts/hi3568v100-emmc.dts @@ -0,0 +1,25 @@ @@ -18389,7 +18389,7 @@ index 000000000000..6b6d9caf377e +}; diff --git a/arch/arm/boot/dts/hi3568v100-flash.dts b/arch/arm/boot/dts/hi3568v100-flash.dts new file mode 100644 -index 000000000000..9ef23c7dff3f +index 000000000..9ef23c7df --- /dev/null +++ b/arch/arm/boot/dts/hi3568v100-flash.dts @@ -0,0 +1,25 @@ @@ -18420,7 +18420,7 @@ index 000000000000..9ef23c7dff3f +}; diff --git a/arch/arm/boot/dts/hi3568v100.dts b/arch/arm/boot/dts/hi3568v100.dts new file mode 100644 -index 000000000000..28a321393809 +index 000000000..28a321393 --- /dev/null +++ b/arch/arm/boot/dts/hi3568v100.dts @@ -0,0 +1,284 @@ @@ -18710,7 +18710,7 @@ index 000000000000..28a321393809 +}; diff --git a/arch/arm/boot/dts/hi3568v100.dtsi b/arch/arm/boot/dts/hi3568v100.dtsi new file mode 100644 -index 000000000000..210774ebb476 +index 000000000..210774ebb --- /dev/null +++ b/arch/arm/boot/dts/hi3568v100.dtsi @@ -0,0 +1,1081 @@ @@ -19797,7 +19797,7 @@ index 000000000000..210774ebb476 +}; diff --git a/arch/arm/configs/hi3516a_full_defconfig b/arch/arm/configs/hi3516a_full_defconfig new file mode 100644 -index 000000000000..39b904068e17 +index 000000000..39b904068 --- /dev/null +++ b/arch/arm/configs/hi3516a_full_defconfig @@ -0,0 +1,2737 @@ @@ -22540,7 +22540,7 @@ index 000000000000..39b904068e17 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3516a_mini_defconfig b/arch/arm/configs/hi3516a_mini_defconfig new file mode 100644 -index 000000000000..7d24d93e4a33 +index 000000000..7d24d93e4 --- /dev/null +++ b/arch/arm/configs/hi3516a_mini_defconfig @@ -0,0 +1,2335 @@ @@ -24881,7 +24881,7 @@ index 000000000000..7d24d93e4a33 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3516a_spinand_defconfig b/arch/arm/configs/hi3516a_spinand_defconfig new file mode 100644 -index 000000000000..75bfcad999e3 +index 000000000..75bfcad99 --- /dev/null +++ b/arch/arm/configs/hi3516a_spinand_defconfig @@ -0,0 +1,2733 @@ @@ -27620,7 +27620,7 @@ index 000000000000..75bfcad999e3 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3516a_spinand_mini_defconfig b/arch/arm/configs/hi3516a_spinand_mini_defconfig new file mode 100644 -index 000000000000..762167f67fc9 +index 000000000..762167f67 --- /dev/null +++ b/arch/arm/configs/hi3516a_spinand_mini_defconfig @@ -0,0 +1,2331 @@ @@ -29957,7 +29957,7 @@ index 000000000000..762167f67fc9 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3516av300_emmc_smp_defconfig b/arch/arm/configs/hi3516av300_emmc_smp_defconfig new file mode 100644 -index 000000000000..daeb1fa651cd +index 000000000..daeb1fa65 --- /dev/null +++ b/arch/arm/configs/hi3516av300_emmc_smp_defconfig @@ -0,0 +1,3070 @@ @@ -33033,7 +33033,7 @@ index 000000000000..daeb1fa651cd +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516av300_smp_defconfig b/arch/arm/configs/hi3516av300_smp_defconfig new file mode 100644 -index 000000000000..109c06652395 +index 000000000..109c06652 --- /dev/null +++ b/arch/arm/configs/hi3516av300_smp_defconfig @@ -0,0 +1,3189 @@ @@ -36228,7 +36228,7 @@ index 000000000000..109c06652395 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516cv200_full_defconfig b/arch/arm/configs/hi3516cv200_full_defconfig new file mode 100644 -index 000000000000..8b998a214087 +index 000000000..8b998a214 --- /dev/null +++ b/arch/arm/configs/hi3516cv200_full_defconfig @@ -0,0 +1,2641 @@ @@ -38875,7 +38875,7 @@ index 000000000000..8b998a214087 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3516cv500_emmc_smp_defconfig b/arch/arm/configs/hi3516cv500_emmc_smp_defconfig new file mode 100644 -index 000000000000..9c851e104c4e +index 000000000..9c851e104 --- /dev/null +++ b/arch/arm/configs/hi3516cv500_emmc_smp_defconfig @@ -0,0 +1,3070 @@ @@ -41951,7 +41951,7 @@ index 000000000000..9c851e104c4e +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516cv500_smp_defconfig b/arch/arm/configs/hi3516cv500_smp_defconfig new file mode 100644 -index 000000000000..231e33712c84 +index 000000000..231e33712 --- /dev/null +++ b/arch/arm/configs/hi3516cv500_smp_defconfig @@ -0,0 +1,3189 @@ @@ -45146,7 +45146,7 @@ index 000000000000..231e33712c84 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516dv200_emmc_defconfig b/arch/arm/configs/hi3516dv200_emmc_defconfig new file mode 100644 -index 000000000000..a3646aacbc49 +index 000000000..a3646aacb --- /dev/null +++ b/arch/arm/configs/hi3516dv200_emmc_defconfig @@ -0,0 +1,3006 @@ @@ -48158,7 +48158,7 @@ index 000000000000..a3646aacbc49 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516dv200_full_defconfig b/arch/arm/configs/hi3516dv200_full_defconfig new file mode 100644 -index 000000000000..a3646aacbc49 +index 000000000..a3646aacb --- /dev/null +++ b/arch/arm/configs/hi3516dv200_full_defconfig @@ -0,0 +1,3006 @@ @@ -51170,7 +51170,7 @@ index 000000000000..a3646aacbc49 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516dv300_emmc_smp_defconfig b/arch/arm/configs/hi3516dv300_emmc_smp_defconfig new file mode 100644 -index 000000000000..daeb1fa651cd +index 000000000..daeb1fa65 --- /dev/null +++ b/arch/arm/configs/hi3516dv300_emmc_smp_defconfig @@ -0,0 +1,3070 @@ @@ -54246,7 +54246,7 @@ index 000000000000..daeb1fa651cd +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516dv300_emmc_smp_hos_l2_defconfig b/arch/arm/configs/hi3516dv300_emmc_smp_hos_l2_defconfig new file mode 100644 -index 000000000000..016d763899fd +index 000000000..016d76389 --- /dev/null +++ b/arch/arm/configs/hi3516dv300_emmc_smp_hos_l2_defconfig @@ -0,0 +1,3135 @@ @@ -57387,7 +57387,7 @@ index 000000000000..016d763899fd +# CONFIG_TEST_STATIC_KEYS is not set diff --git a/arch/arm/configs/hi3516dv300_smp_defconfig b/arch/arm/configs/hi3516dv300_smp_defconfig new file mode 100644 -index 000000000000..109c06652395 +index 000000000..109c06652 --- /dev/null +++ b/arch/arm/configs/hi3516dv300_smp_defconfig @@ -0,0 +1,3189 @@ @@ -60582,7 +60582,7 @@ index 000000000000..109c06652395 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516ev200_emmc_defconfig b/arch/arm/configs/hi3516ev200_emmc_defconfig new file mode 100644 -index 000000000000..709408fa2f11 +index 000000000..709408fa2 --- /dev/null +++ b/arch/arm/configs/hi3516ev200_emmc_defconfig @@ -0,0 +1,3006 @@ @@ -63594,7 +63594,7 @@ index 000000000000..709408fa2f11 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516ev200_full_defconfig b/arch/arm/configs/hi3516ev200_full_defconfig new file mode 100644 -index 000000000000..709408fa2f11 +index 000000000..709408fa2 --- /dev/null +++ b/arch/arm/configs/hi3516ev200_full_defconfig @@ -0,0 +1,3006 @@ @@ -66606,7 +66606,7 @@ index 000000000000..709408fa2f11 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516ev200_mini_defconfig b/arch/arm/configs/hi3516ev200_mini_defconfig new file mode 100644 -index 000000000000..469c19817ff3 +index 000000000..469c19817 --- /dev/null +++ b/arch/arm/configs/hi3516ev200_mini_defconfig @@ -0,0 +1,2067 @@ @@ -68679,7 +68679,7 @@ index 000000000000..469c19817ff3 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516ev300_emmc_defconfig b/arch/arm/configs/hi3516ev300_emmc_defconfig new file mode 100644 -index 000000000000..903476f7c7a7 +index 000000000..903476f7c --- /dev/null +++ b/arch/arm/configs/hi3516ev300_emmc_defconfig @@ -0,0 +1,3006 @@ @@ -71691,7 +71691,7 @@ index 000000000000..903476f7c7a7 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516ev300_full_defconfig b/arch/arm/configs/hi3516ev300_full_defconfig new file mode 100644 -index 000000000000..903476f7c7a7 +index 000000000..903476f7c --- /dev/null +++ b/arch/arm/configs/hi3516ev300_full_defconfig @@ -0,0 +1,3006 @@ @@ -74703,7 +74703,7 @@ index 000000000000..903476f7c7a7 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3518ev200_full_defconfig b/arch/arm/configs/hi3518ev200_full_defconfig new file mode 100644 -index 000000000000..8b998a214087 +index 000000000..8b998a214 --- /dev/null +++ b/arch/arm/configs/hi3518ev200_full_defconfig @@ -0,0 +1,2641 @@ @@ -77350,7 +77350,7 @@ index 000000000000..8b998a214087 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3518ev201_full_defconfig b/arch/arm/configs/hi3518ev201_full_defconfig new file mode 100644 -index 000000000000..ba46b5b9b814 +index 000000000..ba46b5b9b --- /dev/null +++ b/arch/arm/configs/hi3518ev201_full_defconfig @@ -0,0 +1,2318 @@ @@ -79674,7 +79674,7 @@ index 000000000000..ba46b5b9b814 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3518ev300_emmc_defconfig b/arch/arm/configs/hi3518ev300_emmc_defconfig new file mode 100644 -index 000000000000..a563294bfc02 +index 000000000..a563294bf --- /dev/null +++ b/arch/arm/configs/hi3518ev300_emmc_defconfig @@ -0,0 +1,3006 @@ @@ -82686,7 +82686,7 @@ index 000000000000..a563294bfc02 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3518ev300_full_defconfig b/arch/arm/configs/hi3518ev300_full_defconfig new file mode 100644 -index 000000000000..a563294bfc02 +index 000000000..a563294bf --- /dev/null +++ b/arch/arm/configs/hi3518ev300_full_defconfig @@ -0,0 +1,3006 @@ @@ -85698,7 +85698,7 @@ index 000000000000..a563294bfc02 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3518ev300_mini_defconfig b/arch/arm/configs/hi3518ev300_mini_defconfig new file mode 100644 -index 000000000000..c9c4e31c86e6 +index 000000000..c9c4e31c8 --- /dev/null +++ b/arch/arm/configs/hi3518ev300_mini_defconfig @@ -0,0 +1,1776 @@ @@ -87480,7 +87480,7 @@ index 000000000000..c9c4e31c86e6 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3519av100_amp_defconfig b/arch/arm/configs/hi3519av100_amp_defconfig new file mode 100644 -index 000000000000..b9b44f37b9ad +index 000000000..b9b44f37b --- /dev/null +++ b/arch/arm/configs/hi3519av100_amp_defconfig @@ -0,0 +1,3048 @@ @@ -90534,7 +90534,7 @@ index 000000000000..b9b44f37b9ad +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3519av100_amp_emmc_defconfig b/arch/arm/configs/hi3519av100_amp_emmc_defconfig new file mode 100644 -index 000000000000..e9bf3c8d39f9 +index 000000000..e9bf3c8d3 --- /dev/null +++ b/arch/arm/configs/hi3519av100_amp_emmc_defconfig @@ -0,0 +1,3015 @@ @@ -93555,7 +93555,7 @@ index 000000000000..e9bf3c8d39f9 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3519av100_amp_nand_defconfig b/arch/arm/configs/hi3519av100_amp_nand_defconfig new file mode 100644 -index 000000000000..ea00e83f95ac +index 000000000..ea00e83f9 --- /dev/null +++ b/arch/arm/configs/hi3519av100_amp_nand_defconfig @@ -0,0 +1,3038 @@ @@ -96599,7 +96599,7 @@ index 000000000000..ea00e83f95ac +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3519av100_smp_defconfig b/arch/arm/configs/hi3519av100_smp_defconfig new file mode 100644 -index 000000000000..8d151c94949e +index 000000000..8d151c949 --- /dev/null +++ b/arch/arm/configs/hi3519av100_smp_defconfig @@ -0,0 +1,3500 @@ @@ -100105,7 +100105,7 @@ index 000000000000..8d151c94949e +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3519av100_smp_emmc_defconfig b/arch/arm/configs/hi3519av100_smp_emmc_defconfig new file mode 100644 -index 000000000000..78ec2b38d13f +index 000000000..78ec2b38d --- /dev/null +++ b/arch/arm/configs/hi3519av100_smp_emmc_defconfig @@ -0,0 +1,3465 @@ @@ -103576,7 +103576,7 @@ index 000000000000..78ec2b38d13f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3519av100_smp_nand_defconfig b/arch/arm/configs/hi3519av100_smp_nand_defconfig new file mode 100644 -index 000000000000..17718161b59d +index 000000000..17718161b --- /dev/null +++ b/arch/arm/configs/hi3519av100_smp_nand_defconfig @@ -0,0 +1,3493 @@ @@ -107075,7 +107075,7 @@ index 000000000000..17718161b59d +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3520dv300_full_defconfig b/arch/arm/configs/hi3520dv300_full_defconfig new file mode 100644 -index 000000000000..4c35ef5a2d9c +index 000000000..4c35ef5a2 --- /dev/null +++ b/arch/arm/configs/hi3520dv300_full_defconfig @@ -0,0 +1,2628 @@ @@ -109709,7 +109709,7 @@ index 000000000000..4c35ef5a2d9c +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3520dv500_defconfig b/arch/arm/configs/hi3520dv500_defconfig new file mode 100644 -index 000000000000..cbff89ff724c +index 000000000..cbff89ff7 --- /dev/null +++ b/arch/arm/configs/hi3520dv500_defconfig @@ -0,0 +1,3201 @@ @@ -112916,7 +112916,7 @@ index 000000000000..cbff89ff724c +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3520dv500_emmc_defconfig b/arch/arm/configs/hi3520dv500_emmc_defconfig new file mode 100644 -index 000000000000..0de65f21ff9c +index 000000000..0de65f21f --- /dev/null +++ b/arch/arm/configs/hi3520dv500_emmc_defconfig @@ -0,0 +1,3085 @@ @@ -116007,7 +116007,7 @@ index 000000000000..0de65f21ff9c +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3521a_full_defconfig b/arch/arm/configs/hi3521a_full_defconfig new file mode 100644 -index 000000000000..4c35ef5a2d9c +index 000000000..4c35ef5a2 --- /dev/null +++ b/arch/arm/configs/hi3521a_full_defconfig @@ -0,0 +1,2628 @@ @@ -118641,7 +118641,7 @@ index 000000000000..4c35ef5a2d9c +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3521dv200_defconfig b/arch/arm/configs/hi3521dv200_defconfig new file mode 100644 -index 000000000000..3b36d9a1db22 +index 000000000..3b36d9a1d --- /dev/null +++ b/arch/arm/configs/hi3521dv200_defconfig @@ -0,0 +1,3201 @@ @@ -121848,7 +121848,7 @@ index 000000000000..3b36d9a1db22 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3521dv200_emmc_defconfig b/arch/arm/configs/hi3521dv200_emmc_defconfig new file mode 100644 -index 000000000000..bdde3a5aeab7 +index 000000000..bdde3a5ae --- /dev/null +++ b/arch/arm/configs/hi3521dv200_emmc_defconfig @@ -0,0 +1,3085 @@ @@ -124939,7 +124939,7 @@ index 000000000000..bdde3a5aeab7 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3531a_full_defconfig b/arch/arm/configs/hi3531a_full_defconfig new file mode 100644 -index 000000000000..8a0921f72778 +index 000000000..8a0921f72 --- /dev/null +++ b/arch/arm/configs/hi3531a_full_defconfig @@ -0,0 +1,2873 @@ @@ -127818,7 +127818,7 @@ index 000000000000..8a0921f72778 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3531a_full_slave_defconfig b/arch/arm/configs/hi3531a_full_slave_defconfig new file mode 100644 -index 000000000000..9c4bc3619891 +index 000000000..9c4bc3619 --- /dev/null +++ b/arch/arm/configs/hi3531a_full_slave_defconfig @@ -0,0 +1,2920 @@ @@ -130744,7 +130744,7 @@ index 000000000000..9c4bc3619891 +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3531a_spinand_defconfig b/arch/arm/configs/hi3531a_spinand_defconfig new file mode 100644 -index 000000000000..596ea7e7d5fe +index 000000000..596ea7e7d --- /dev/null +++ b/arch/arm/configs/hi3531a_spinand_defconfig @@ -0,0 +1,2868 @@ @@ -133618,7 +133618,7 @@ index 000000000000..596ea7e7d5fe +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3531a_spinand_slave_defconfig b/arch/arm/configs/hi3531a_spinand_slave_defconfig new file mode 100644 -index 000000000000..4df80f7ed27c +index 000000000..4df80f7ed --- /dev/null +++ b/arch/arm/configs/hi3531a_spinand_slave_defconfig @@ -0,0 +1,2915 @@ @@ -136539,7 +136539,7 @@ index 000000000000..4df80f7ed27c +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3536dv100_full_defconfig b/arch/arm/configs/hi3536dv100_full_defconfig new file mode 100644 -index 000000000000..79f0e200ce7d +index 000000000..79f0e200c --- /dev/null +++ b/arch/arm/configs/hi3536dv100_full_defconfig @@ -0,0 +1,2746 @@ @@ -139291,7 +139291,7 @@ index 000000000000..79f0e200ce7d +# CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm/configs/hi3556av100_amp_defconfig b/arch/arm/configs/hi3556av100_amp_defconfig new file mode 100644 -index 000000000000..3fffb5a66a6c +index 000000000..3fffb5a66 --- /dev/null +++ b/arch/arm/configs/hi3556av100_amp_defconfig @@ -0,0 +1,3145 @@ @@ -142442,7 +142442,7 @@ index 000000000000..3fffb5a66a6c +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556av100_amp_emmc_defconfig b/arch/arm/configs/hi3556av100_amp_emmc_defconfig new file mode 100644 -index 000000000000..ef8c32e0d679 +index 000000000..ef8c32e0d --- /dev/null +++ b/arch/arm/configs/hi3556av100_amp_emmc_defconfig @@ -0,0 +1,2986 @@ @@ -145434,7 +145434,7 @@ index 000000000000..ef8c32e0d679 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556av100_amp_nand_defconfig b/arch/arm/configs/hi3556av100_amp_nand_defconfig new file mode 100644 -index 000000000000..f6e628c80d08 +index 000000000..f6e628c80 --- /dev/null +++ b/arch/arm/configs/hi3556av100_amp_nand_defconfig @@ -0,0 +1,3014 @@ @@ -148454,7 +148454,7 @@ index 000000000000..f6e628c80d08 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556av100_amp_spi_defconfig b/arch/arm/configs/hi3556av100_amp_spi_defconfig new file mode 100644 -index 000000000000..463a776a0993 +index 000000000..463a776a0 --- /dev/null +++ b/arch/arm/configs/hi3556av100_amp_spi_defconfig @@ -0,0 +1,3042 @@ @@ -151502,7 +151502,7 @@ index 000000000000..463a776a0993 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556v200_amp_defconfig b/arch/arm/configs/hi3556v200_amp_defconfig new file mode 100644 -index 000000000000..73923617cacc +index 000000000..73923617c --- /dev/null +++ b/arch/arm/configs/hi3556v200_amp_defconfig @@ -0,0 +1,2899 @@ @@ -154407,7 +154407,7 @@ index 000000000000..73923617cacc +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556v200_amp_emmc_defconfig b/arch/arm/configs/hi3556v200_amp_emmc_defconfig new file mode 100644 -index 000000000000..39f5e7d6e511 +index 000000000..39f5e7d6e --- /dev/null +++ b/arch/arm/configs/hi3556v200_amp_emmc_defconfig @@ -0,0 +1,2805 @@ @@ -157218,7 +157218,7 @@ index 000000000000..39f5e7d6e511 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556v200_amp_spinand_defconfig b/arch/arm/configs/hi3556v200_amp_spinand_defconfig new file mode 100644 -index 000000000000..d2ecb640ead4 +index 000000000..d2ecb640e --- /dev/null +++ b/arch/arm/configs/hi3556v200_amp_spinand_defconfig @@ -0,0 +1,2902 @@ @@ -160126,7 +160126,7 @@ index 000000000000..d2ecb640ead4 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556v200_emmc_smp_defconfig b/arch/arm/configs/hi3556v200_emmc_smp_defconfig new file mode 100644 -index 000000000000..a4f48ecfafee +index 000000000..a4f48ecfa --- /dev/null +++ b/arch/arm/configs/hi3556v200_emmc_smp_defconfig @@ -0,0 +1,2866 @@ @@ -162998,7 +162998,7 @@ index 000000000000..a4f48ecfafee +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3556v200_smp_defconfig b/arch/arm/configs/hi3556v200_smp_defconfig new file mode 100644 -index 000000000000..ebf7562e4a29 +index 000000000..ebf7562e4 --- /dev/null +++ b/arch/arm/configs/hi3556v200_smp_defconfig @@ -0,0 +1,2985 @@ @@ -165989,7 +165989,7 @@ index 000000000000..ebf7562e4a29 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3559v200_amp_defconfig b/arch/arm/configs/hi3559v200_amp_defconfig new file mode 100644 -index 000000000000..bf1676143178 +index 000000000..bf1676143 --- /dev/null +++ b/arch/arm/configs/hi3559v200_amp_defconfig @@ -0,0 +1,2917 @@ @@ -168912,7 +168912,7 @@ index 000000000000..bf1676143178 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3559v200_amp_emmc_defconfig b/arch/arm/configs/hi3559v200_amp_emmc_defconfig new file mode 100644 -index 000000000000..6f4e165592d2 +index 000000000..6f4e16559 --- /dev/null +++ b/arch/arm/configs/hi3559v200_amp_emmc_defconfig @@ -0,0 +1,2823 @@ @@ -171741,7 +171741,7 @@ index 000000000000..6f4e165592d2 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3559v200_amp_spinand_defconfig b/arch/arm/configs/hi3559v200_amp_spinand_defconfig new file mode 100644 -index 000000000000..2c35074fe545 +index 000000000..2c35074fe --- /dev/null +++ b/arch/arm/configs/hi3559v200_amp_spinand_defconfig @@ -0,0 +1,2920 @@ @@ -174667,7 +174667,7 @@ index 000000000000..2c35074fe545 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3559v200_emmc_smp_defconfig b/arch/arm/configs/hi3559v200_emmc_smp_defconfig new file mode 100644 -index 000000000000..c2897255523e +index 000000000..c28972555 --- /dev/null +++ b/arch/arm/configs/hi3559v200_emmc_smp_defconfig @@ -0,0 +1,2866 @@ @@ -177539,7 +177539,7 @@ index 000000000000..c2897255523e +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3559v200_smp_defconfig b/arch/arm/configs/hi3559v200_smp_defconfig new file mode 100644 -index 000000000000..6298b2f7906b +index 000000000..6298b2f79 --- /dev/null +++ b/arch/arm/configs/hi3559v200_smp_defconfig @@ -0,0 +1,2985 @@ @@ -180530,7 +180530,7 @@ index 000000000000..6298b2f7906b +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3562v100_amp_defconfig b/arch/arm/configs/hi3562v100_amp_defconfig new file mode 100644 -index 000000000000..5bafed82b5fb +index 000000000..5bafed82b --- /dev/null +++ b/arch/arm/configs/hi3562v100_amp_defconfig @@ -0,0 +1,2875 @@ @@ -183411,7 +183411,7 @@ index 000000000000..5bafed82b5fb +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3562v100_amp_emmc_defconfig b/arch/arm/configs/hi3562v100_amp_emmc_defconfig new file mode 100644 -index 000000000000..fd690e104002 +index 000000000..fd690e104 --- /dev/null +++ b/arch/arm/configs/hi3562v100_amp_emmc_defconfig @@ -0,0 +1,2881 @@ @@ -186298,7 +186298,7 @@ index 000000000000..fd690e104002 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3562v100_amp_spinand_defconfig b/arch/arm/configs/hi3562v100_amp_spinand_defconfig new file mode 100644 -index 000000000000..bd8e49004b1f +index 000000000..bd8e49004 --- /dev/null +++ b/arch/arm/configs/hi3562v100_amp_spinand_defconfig @@ -0,0 +1,2978 @@ @@ -189282,7 +189282,7 @@ index 000000000000..bd8e49004b1f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3566v100_amp_defconfig b/arch/arm/configs/hi3566v100_amp_defconfig new file mode 100644 -index 000000000000..721d4284dcec +index 000000000..721d4284d --- /dev/null +++ b/arch/arm/configs/hi3566v100_amp_defconfig @@ -0,0 +1,2975 @@ @@ -192263,7 +192263,7 @@ index 000000000000..721d4284dcec +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3566v100_amp_emmc_defconfig b/arch/arm/configs/hi3566v100_amp_emmc_defconfig new file mode 100644 -index 000000000000..fd690e104002 +index 000000000..fd690e104 --- /dev/null +++ b/arch/arm/configs/hi3566v100_amp_emmc_defconfig @@ -0,0 +1,2881 @@ @@ -195150,7 +195150,7 @@ index 000000000000..fd690e104002 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3566v100_amp_spinand_defconfig b/arch/arm/configs/hi3566v100_amp_spinand_defconfig new file mode 100644 -index 000000000000..bd8e49004b1f +index 000000000..bd8e49004 --- /dev/null +++ b/arch/arm/configs/hi3566v100_amp_spinand_defconfig @@ -0,0 +1,2978 @@ @@ -198134,7 +198134,7 @@ index 000000000000..bd8e49004b1f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3568v100_amp_defconfig b/arch/arm/configs/hi3568v100_amp_defconfig new file mode 100644 -index 000000000000..c9c6a64831e6 +index 000000000..c9c6a6483 --- /dev/null +++ b/arch/arm/configs/hi3568v100_amp_defconfig @@ -0,0 +1,3048 @@ @@ -201188,7 +201188,7 @@ index 000000000000..c9c6a64831e6 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3568v100_amp_emmc_defconfig b/arch/arm/configs/hi3568v100_amp_emmc_defconfig new file mode 100644 -index 000000000000..dce88a80472f +index 000000000..dce88a804 --- /dev/null +++ b/arch/arm/configs/hi3568v100_amp_emmc_defconfig @@ -0,0 +1,3015 @@ @@ -204209,7 +204209,7 @@ index 000000000000..dce88a80472f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3568v100_amp_nand_defconfig b/arch/arm/configs/hi3568v100_amp_nand_defconfig new file mode 100644 -index 000000000000..7afe0ab123ec +index 000000000..7afe0ab12 --- /dev/null +++ b/arch/arm/configs/hi3568v100_amp_nand_defconfig @@ -0,0 +1,3038 @@ @@ -207252,7 +207252,7 @@ index 000000000000..7afe0ab123ec +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h -index 233b4b50eff3..986e3363e8c9 100644 +index 233b4b50e..986e3363e 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -12,6 +12,7 @@ @@ -207309,7 +207309,7 @@ index 233b4b50eff3..986e3363e8c9 100644 u64 mem_offset; /* bus->cpu memory mapping offset */ diff --git a/arch/arm/mach-hibvt/Kconfig b/arch/arm/mach-hibvt/Kconfig new file mode 100644 -index 000000000000..9c8c76981bea +index 000000000..9c8c76981 --- /dev/null +++ b/arch/arm/mach-hibvt/Kconfig @@ -0,0 +1,258 @@ @@ -207573,7 +207573,7 @@ index 000000000000..9c8c76981bea +endif diff --git a/arch/arm/mach-hibvt/Makefile b/arch/arm/mach-hibvt/Makefile new file mode 100644 -index 000000000000..ec3243ec975a +index 000000000..ec3243ec9 --- /dev/null +++ b/arch/arm/mach-hibvt/Makefile @@ -0,0 +1,27 @@ @@ -207606,7 +207606,7 @@ index 000000000000..ec3243ec975a +obj-$(CONFIG_SMP) += platsmp.o diff --git a/arch/arm/mach-hibvt/Makefile.boot b/arch/arm/mach-hibvt/Makefile.boot new file mode 100644 -index 000000000000..8c8b30077e37 +index 000000000..8c8b30077 --- /dev/null +++ b/arch/arm/mach-hibvt/Makefile.boot @@ -0,0 +1,7 @@ @@ -207619,7 +207619,7 @@ index 000000000000..8c8b30077e37 +initrd_phys-$(CONFIG_ARCH_HISI_BVT) := $(CONFIG_HI_INITRD_PHYS) diff --git a/arch/arm/mach-hibvt/include/mach/hi3516a_io.h b/arch/arm/mach-hibvt/include/mach/hi3516a_io.h new file mode 100644 -index 000000000000..150bab4cb233 +index 000000000..150bab4cb --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3516a_io.h @@ -0,0 +1,23 @@ @@ -207648,7 +207648,7 @@ index 000000000000..150bab4cb233 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3516cv500_io.h b/arch/arm/mach-hibvt/include/mach/hi3516cv500_io.h new file mode 100644 -index 000000000000..6c8d5862465b +index 000000000..6c8d58624 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3516cv500_io.h @@ -0,0 +1,26 @@ @@ -207680,7 +207680,7 @@ index 000000000000..6c8d5862465b +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3516cv500_platform.h b/arch/arm/mach-hibvt/include/mach/hi3516cv500_platform.h new file mode 100644 -index 000000000000..790981e68604 +index 000000000..790981e68 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3516cv500_platform.h @@ -0,0 +1,4 @@ @@ -207690,7 +207690,7 @@ index 000000000000..790981e68604 +#endif /* End of __HI3516CV500_CHIP_REGS_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/hi3516dv300_io.h b/arch/arm/mach-hibvt/include/mach/hi3516dv300_io.h new file mode 100644 -index 000000000000..72ab47e83d19 +index 000000000..72ab47e83 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3516dv300_io.h @@ -0,0 +1,26 @@ @@ -207722,7 +207722,7 @@ index 000000000000..72ab47e83d19 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3516dv300_platform.h b/arch/arm/mach-hibvt/include/mach/hi3516dv300_platform.h new file mode 100644 -index 000000000000..94c48064b311 +index 000000000..94c48064b --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3516dv300_platform.h @@ -0,0 +1,4 @@ @@ -207732,7 +207732,7 @@ index 000000000000..94c48064b311 +#endif /* End of __HI3516DV300_CHIP_REGS_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/hi3518ev20x_io.h b/arch/arm/mach-hibvt/include/mach/hi3518ev20x_io.h new file mode 100644 -index 000000000000..0984166c22b7 +index 000000000..0984166c2 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3518ev20x_io.h @@ -0,0 +1,26 @@ @@ -207764,7 +207764,7 @@ index 000000000000..0984166c22b7 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3519av100_io.h b/arch/arm/mach-hibvt/include/mach/hi3519av100_io.h new file mode 100644 -index 000000000000..60a07ad1334c +index 000000000..60a07ad13 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3519av100_io.h @@ -0,0 +1,11 @@ @@ -207781,7 +207781,7 @@ index 000000000000..60a07ad1334c +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3519av100_platform.h b/arch/arm/mach-hibvt/include/mach/hi3519av100_platform.h new file mode 100644 -index 000000000000..35e0295d863b +index 000000000..35e0295d8 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3519av100_platform.h @@ -0,0 +1,94 @@ @@ -207881,7 +207881,7 @@ index 000000000000..35e0295d863b + diff --git a/arch/arm/mach-hibvt/include/mach/hi3521a_io.h b/arch/arm/mach-hibvt/include/mach/hi3521a_io.h new file mode 100644 -index 000000000000..8a3a356576a9 +index 000000000..8a3a35657 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3521a_io.h @@ -0,0 +1,40 @@ @@ -207927,7 +207927,7 @@ index 000000000000..8a3a356576a9 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3521a_platform.h b/arch/arm/mach-hibvt/include/mach/hi3521a_platform.h new file mode 100644 -index 000000000000..bd9d50df6d84 +index 000000000..bd9d50df6 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3521a_platform.h @@ -0,0 +1,27 @@ @@ -207960,7 +207960,7 @@ index 000000000000..bd9d50df6d84 +#endif /* End of __HI3521A_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/hi3531a_io.h b/arch/arm/mach-hibvt/include/mach/hi3531a_io.h new file mode 100644 -index 000000000000..afcbdbcbe36a +index 000000000..afcbdbcbe --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3531a_io.h @@ -0,0 +1,63 @@ @@ -208029,7 +208029,7 @@ index 000000000000..afcbdbcbe36a +#endif /* __HI3531A_IO_H */ diff --git a/arch/arm/mach-hibvt/include/mach/hi3531a_platform.h b/arch/arm/mach-hibvt/include/mach/hi3531a_platform.h new file mode 100644 -index 000000000000..b80d0982fd85 +index 000000000..b80d0982f --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3531a_platform.h @@ -0,0 +1,65 @@ @@ -208100,7 +208100,7 @@ index 000000000000..b80d0982fd85 +#endif /* End of __HI3531A_CHIP_REGS_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/hi3536dv100_io.h b/arch/arm/mach-hibvt/include/mach/hi3536dv100_io.h new file mode 100644 -index 000000000000..c8f7c2d09f78 +index 000000000..c8f7c2d09 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3536dv100_io.h @@ -0,0 +1,44 @@ @@ -208150,7 +208150,7 @@ index 000000000000..c8f7c2d09f78 + diff --git a/arch/arm/mach-hibvt/include/mach/hi3536dv100_platform.h b/arch/arm/mach-hibvt/include/mach/hi3536dv100_platform.h new file mode 100644 -index 000000000000..551e628601bb +index 000000000..551e62860 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3536dv100_platform.h @@ -0,0 +1,14 @@ @@ -208170,7 +208170,7 @@ index 000000000000..551e628601bb +#endif /* End of __HISI_CHIP_REGS_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/hi3556av100_platform.h b/arch/arm/mach-hibvt/include/mach/hi3556av100_platform.h new file mode 100644 -index 000000000000..35e0295d863b +index 000000000..35e0295d8 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3556av100_platform.h @@ -0,0 +1,94 @@ @@ -208270,7 +208270,7 @@ index 000000000000..35e0295d863b + diff --git a/arch/arm/mach-hibvt/include/mach/hi3556v200_io.h b/arch/arm/mach-hibvt/include/mach/hi3556v200_io.h new file mode 100644 -index 000000000000..7ec9ecdf6153 +index 000000000..7ec9ecdf6 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3556v200_io.h @@ -0,0 +1,26 @@ @@ -208302,7 +208302,7 @@ index 000000000000..7ec9ecdf6153 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3556v200_platform.h b/arch/arm/mach-hibvt/include/mach/hi3556v200_platform.h new file mode 100644 -index 000000000000..790981e68604 +index 000000000..790981e68 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3556v200_platform.h @@ -0,0 +1,4 @@ @@ -208312,7 +208312,7 @@ index 000000000000..790981e68604 +#endif /* End of __HI3516CV500_CHIP_REGS_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/hi3559v200_io.h b/arch/arm/mach-hibvt/include/mach/hi3559v200_io.h new file mode 100644 -index 000000000000..8b55dfc93607 +index 000000000..8b55dfc93 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3559v200_io.h @@ -0,0 +1,26 @@ @@ -208344,7 +208344,7 @@ index 000000000000..8b55dfc93607 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3559v200_platform.h b/arch/arm/mach-hibvt/include/mach/hi3559v200_platform.h new file mode 100644 -index 000000000000..790981e68604 +index 000000000..790981e68 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3559v200_platform.h @@ -0,0 +1,4 @@ @@ -208354,7 +208354,7 @@ index 000000000000..790981e68604 +#endif /* End of __HI3516CV500_CHIP_REGS_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/io.h b/arch/arm/mach-hibvt/include/mach/io.h new file mode 100644 -index 000000000000..b5fd58c7bfe6 +index 000000000..b5fd58c7b --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/io.h @@ -0,0 +1,52 @@ @@ -208412,7 +208412,7 @@ index 000000000000..b5fd58c7bfe6 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/platform.h b/arch/arm/mach-hibvt/include/mach/platform.h new file mode 100644 -index 000000000000..5e41d2696954 +index 000000000..5e41d2696 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/platform.h @@ -0,0 +1,52 @@ @@ -208470,7 +208470,7 @@ index 000000000000..5e41d2696954 +#endif /* End of __HISI_PLATFORM_H__ */ diff --git a/arch/arm/mach-hibvt/mach-common.h b/arch/arm/mach-hibvt/mach-common.h new file mode 100644 -index 000000000000..f5edadb0f0a8 +index 000000000..f5edadb0f --- /dev/null +++ b/arch/arm/mach-hibvt/mach-common.h @@ -0,0 +1,9 @@ @@ -208485,7 +208485,7 @@ index 000000000000..f5edadb0f0a8 +#endif /* __SMP_COMMON_H */ diff --git a/arch/arm/mach-hibvt/mach-hi3516a.c b/arch/arm/mach-hibvt/mach-hi3516a.c new file mode 100644 -index 000000000000..492a4b1e5fea +index 000000000..492a4b1e5 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3516a.c @@ -0,0 +1,64 @@ @@ -208555,7 +208555,7 @@ index 000000000000..492a4b1e5fea +MACHINE_END diff --git a/arch/arm/mach-hibvt/mach-hi3516cv500.c b/arch/arm/mach-hibvt/mach-hi3516cv500.c new file mode 100644 -index 000000000000..a81a83543d3c +index 000000000..a81a83543 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3516cv500.c @@ -0,0 +1,68 @@ @@ -208629,7 +208629,7 @@ index 000000000000..a81a83543d3c +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3516dv200.c b/arch/arm/mach-hibvt/mach-hi3516dv200.c new file mode 100644 -index 000000000000..c87531c7f369 +index 000000000..c87531c7f --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3516dv200.c @@ -0,0 +1,67 @@ @@ -208702,7 +208702,7 @@ index 000000000000..c87531c7f369 +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3516dv300.c b/arch/arm/mach-hibvt/mach-hi3516dv300.c new file mode 100644 -index 000000000000..3061683bb711 +index 000000000..3061683bb --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3516dv300.c @@ -0,0 +1,68 @@ @@ -208776,7 +208776,7 @@ index 000000000000..3061683bb711 +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3516ev200.c b/arch/arm/mach-hibvt/mach-hi3516ev200.c new file mode 100644 -index 000000000000..c7647206aa09 +index 000000000..c7647206a --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3516ev200.c @@ -0,0 +1,67 @@ @@ -208849,7 +208849,7 @@ index 000000000000..c7647206aa09 +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3516ev300.c b/arch/arm/mach-hibvt/mach-hi3516ev300.c new file mode 100644 -index 000000000000..f30708b36993 +index 000000000..f30708b36 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3516ev300.c @@ -0,0 +1,67 @@ @@ -208922,7 +208922,7 @@ index 000000000000..f30708b36993 +#endif diff --git a/arch/arm/mach-hibvt/mach-hi3518ev20x.c b/arch/arm/mach-hibvt/mach-hi3518ev20x.c new file mode 100644 -index 000000000000..d04966470ba4 +index 000000000..d04966470 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3518ev20x.c @@ -0,0 +1,64 @@ @@ -208992,7 +208992,7 @@ index 000000000000..d04966470ba4 +MACHINE_END diff --git a/arch/arm/mach-hibvt/mach-hi3518ev300.c b/arch/arm/mach-hibvt/mach-hi3518ev300.c new file mode 100644 -index 000000000000..9355f06f30e2 +index 000000000..9355f06f3 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3518ev300.c @@ -0,0 +1,67 @@ @@ -209065,7 +209065,7 @@ index 000000000000..9355f06f30e2 +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3519av100.c b/arch/arm/mach-hibvt/mach-hi3519av100.c new file mode 100644 -index 000000000000..ee11697670d2 +index 000000000..ee1169767 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3519av100.c @@ -0,0 +1,88 @@ @@ -209159,7 +209159,7 @@ index 000000000000..ee11697670d2 +#endif diff --git a/arch/arm/mach-hibvt/mach-hi3521a.c b/arch/arm/mach-hibvt/mach-hi3521a.c new file mode 100644 -index 000000000000..eb416c7aa75b +index 000000000..eb416c7aa --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3521a.c @@ -0,0 +1,68 @@ @@ -209233,7 +209233,7 @@ index 000000000000..eb416c7aa75b +MACHINE_END diff --git a/arch/arm/mach-hibvt/mach-hi3521dv200.c b/arch/arm/mach-hibvt/mach-hi3521dv200.c new file mode 100644 -index 000000000000..b2403ca7225a +index 000000000..b2403ca72 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3521dv200.c @@ -0,0 +1,110 @@ @@ -209349,7 +209349,7 @@ index 000000000000..b2403ca7225a +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3531a.c b/arch/arm/mach-hibvt/mach-hi3531a.c new file mode 100644 -index 000000000000..4ec4cf059252 +index 000000000..4ec4cf059 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3531a.c @@ -0,0 +1,185 @@ @@ -209540,7 +209540,7 @@ index 000000000000..4ec4cf059252 +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3536dv100.c b/arch/arm/mach-hibvt/mach-hi3536dv100.c new file mode 100644 -index 000000000000..84db82aa4f10 +index 000000000..84db82aa4 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3536dv100.c @@ -0,0 +1,71 @@ @@ -209617,7 +209617,7 @@ index 000000000000..84db82aa4f10 +MACHINE_END diff --git a/arch/arm/mach-hibvt/mach-hi3556av100.c b/arch/arm/mach-hibvt/mach-hi3556av100.c new file mode 100644 -index 000000000000..d33dea89364b +index 000000000..d33dea893 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3556av100.c @@ -0,0 +1,91 @@ @@ -209714,7 +209714,7 @@ index 000000000000..d33dea89364b +#endif diff --git a/arch/arm/mach-hibvt/mach-hi3556v200.c b/arch/arm/mach-hibvt/mach-hi3556v200.c new file mode 100644 -index 000000000000..f1d42c548e2c +index 000000000..f1d42c548 --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3556v200.c @@ -0,0 +1,67 @@ @@ -209787,7 +209787,7 @@ index 000000000000..f1d42c548e2c +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/mach-hi3559v200.c b/arch/arm/mach-hibvt/mach-hi3559v200.c new file mode 100644 -index 000000000000..36209e53e0e5 +index 000000000..36209e53e --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3559v200.c @@ -0,0 +1,67 @@ @@ -209860,7 +209860,7 @@ index 000000000000..36209e53e0e5 +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/platsmp.c b/arch/arm/mach-hibvt/platsmp.c new file mode 100644 -index 000000000000..a73be20b133c +index 000000000..a73be20b1 --- /dev/null +++ b/arch/arm/mach-hibvt/platsmp.c @@ -0,0 +1,62 @@ @@ -209927,7 +209927,7 @@ index 000000000000..a73be20b133c +} + diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c -index 8211cf45ece1..3560d0406b05 100644 +index 8211cf45e..3560d0406 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -284,7 +284,7 @@ static u64 get_coherent_dma_mask(struct device *dev) @@ -209973,7 +209973,7 @@ index 8211cf45ece1..3560d0406b05 100644 +EXPORT_SYMBOL(hi_dmac_map_area); diff --git a/arch/arm/plat-hi3519av100/Makefile b/arch/arm/plat-hi3519av100/Makefile new file mode 100644 -index 000000000000..d7c2d1217578 +index 000000000..d7c2d1217 --- /dev/null +++ b/arch/arm/plat-hi3519av100/Makefile @@ -0,0 +1,7 @@ @@ -209986,7 +209986,7 @@ index 000000000000..d7c2d1217578 + diff --git a/arch/arm/plat-hi3519av100/pll-trainning.c b/arch/arm/plat-hi3519av100/pll-trainning.c new file mode 100644 -index 000000000000..8e9228d957e6 +index 000000000..8e9228d95 --- /dev/null +++ b/arch/arm/plat-hi3519av100/pll-trainning.c @@ -0,0 +1,1187 @@ @@ -211179,7 +211179,7 @@ index 000000000000..8e9228d957e6 +MODULE_LICENSE("GPL"); diff --git a/arch/arm/plat-hi3556av100/Makefile b/arch/arm/plat-hi3556av100/Makefile new file mode 100644 -index 000000000000..8c659c85d197 +index 000000000..8c659c85d --- /dev/null +++ b/arch/arm/plat-hi3556av100/Makefile @@ -0,0 +1,7 @@ @@ -211192,7 +211192,7 @@ index 000000000000..8c659c85d197 + diff --git a/arch/arm/plat-hi3556av100/pll-trainning.c b/arch/arm/plat-hi3556av100/pll-trainning.c new file mode 100644 -index 000000000000..6f8973dc5cbb +index 000000000..6f8973dc5 --- /dev/null +++ b/arch/arm/plat-hi3556av100/pll-trainning.c @@ -0,0 +1,1179 @@ @@ -212377,7 +212377,7 @@ index 000000000000..6f8973dc5cbb +MODULE_LICENSE("GPL"); diff --git a/arch/arm/plat-hi3568v100/Makefile b/arch/arm/plat-hi3568v100/Makefile new file mode 100644 -index 000000000000..be5587ddf061 +index 000000000..be5587ddf --- /dev/null +++ b/arch/arm/plat-hi3568v100/Makefile @@ -0,0 +1,7 @@ @@ -212390,7 +212390,7 @@ index 000000000000..be5587ddf061 + diff --git a/arch/arm/plat-hi3568v100/pll-trainning.c b/arch/arm/plat-hi3568v100/pll-trainning.c new file mode 100644 -index 000000000000..13f7a71f64d5 +index 000000000..13f7a71f6 --- /dev/null +++ b/arch/arm/plat-hi3568v100/pll-trainning.c @@ -0,0 +1,1187 @@ @@ -213584,7 +213584,7 @@ index 000000000000..13f7a71f64d5 diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c old mode 100644 new mode 100755 -index 7bdbf5d5c47d..8b69a6167d4a +index 7bdbf5d5c..f7a195420 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -115,7 +115,7 @@ static notrace int do_monotonic_coarse(struct timespec *ts, @@ -213597,7 +213597,7 @@ index 7bdbf5d5c47d..8b69a6167d4a static notrace u64 get_ns(struct vdso_data *vdata) { diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index dc54a883513a..2085a7cc03fc 100644 +index dc54a8835..2085a7cc0 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -12,6 +12,7 @@ @@ -213609,7 +213609,7 @@ index dc54a883513a..2085a7cc03fc 100644 ifeq ($(CONFIG_RELOCATABLE), y) diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile -index cd3414898d10..f3e98628b10f 100644 +index cd3414898..f3e98628b 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -18,12 +18,28 @@ OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S @@ -213680,7 +213680,7 @@ index cd3414898d10..f3e98628b10f 100644 $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image.gz System.map "$(INSTALL_PATH)" diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile -index 4690364d584b..234e0f466041 100644 +index 4690364d5..234e0f466 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -26,3 +26,7 @@ subdir-y += synaptics @@ -213692,7 +213692,7 @@ index 4690364d584b..234e0f466041 100644 + +clean-files := dts/*.dtb *.dtb diff --git a/arch/arm64/boot/dts/hisilicon/Makefile b/arch/arm64/boot/dts/hisilicon/Makefile -index 03d93f8ef8a9..57659e396200 100644 +index 03d93f8ef..57659e396 100644 --- a/arch/arm64/boot/dts/hisilicon/Makefile +++ b/arch/arm64/boot/dts/hisilicon/Makefile @@ -5,3 +5,11 @@ dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb @@ -213709,7 +213709,7 @@ index 03d93f8ef8a9..57659e396200 100644 +dtb-$(CONFIG_ARCH_HI3569V100) += hi3569v100-demb-ufs.dtb diff --git a/arch/arm64/boot/dts/hisilicon/hi3531dv200-demb.dts b/arch/arm64/boot/dts/hisilicon/hi3531dv200-demb.dts new file mode 100644 -index 000000000000..c27623be2b33 +index 000000000..c27623be2 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3531dv200-demb.dts @@ -0,0 +1,338 @@ @@ -214053,7 +214053,7 @@ index 000000000000..c27623be2b33 +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3531dv200.dtsi b/arch/arm64/boot/dts/hisilicon/hi3531dv200.dtsi new file mode 100644 -index 000000000000..7ff39a299708 +index 000000000..7ff39a299 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3531dv200.dtsi @@ -0,0 +1,918 @@ @@ -214977,7 +214977,7 @@ index 000000000000..7ff39a299708 +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3535av100-demb.dts b/arch/arm64/boot/dts/hisilicon/hi3535av100-demb.dts new file mode 100644 -index 000000000000..77cda3194e3a +index 000000000..77cda3194 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3535av100-demb.dts @@ -0,0 +1,334 @@ @@ -215317,7 +215317,7 @@ index 000000000000..77cda3194e3a +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3535av100.dtsi b/arch/arm64/boot/dts/hisilicon/hi3535av100.dtsi new file mode 100644 -index 000000000000..65912b32a04a +index 000000000..65912b32a --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3535av100.dtsi @@ -0,0 +1,856 @@ @@ -216179,7 +216179,7 @@ index 000000000000..65912b32a04a +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-amp.dts b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-amp.dts new file mode 100644 -index 000000000000..c37e189c3982 +index 000000000..c37e189c3 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-amp.dts @@ -0,0 +1,596 @@ @@ -216781,7 +216781,7 @@ index 000000000000..c37e189c3982 +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-emmc.dts b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-emmc.dts new file mode 100644 -index 000000000000..a1c28949e6db +index 000000000..a1c28949e --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-emmc.dts @@ -0,0 +1,32 @@ @@ -216819,7 +216819,7 @@ index 000000000000..a1c28949e6db + diff --git a/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-flash.dts b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-flash.dts new file mode 100644 -index 000000000000..fe9cf86e1200 +index 000000000..fe9cf86e1 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-flash.dts @@ -0,0 +1,32 @@ @@ -216857,7 +216857,7 @@ index 000000000000..fe9cf86e1200 + diff --git a/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-ufs.dts b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-ufs.dts new file mode 100644 -index 000000000000..a7c67d45fec3 +index 000000000..a7c67d45f --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb-ufs.dts @@ -0,0 +1,32 @@ @@ -216895,7 +216895,7 @@ index 000000000000..a7c67d45fec3 + diff --git a/arch/arm64/boot/dts/hisilicon/hi3559av100-demb.dts b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb.dts new file mode 100644 -index 000000000000..3b906bee5e34 +index 000000000..3b906bee5 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3559av100-demb.dts @@ -0,0 +1,655 @@ @@ -217556,7 +217556,7 @@ index 000000000000..3b906bee5e34 +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3559av100.dtsi b/arch/arm64/boot/dts/hisilicon/hi3559av100.dtsi new file mode 100644 -index 000000000000..d79d12eedf46 +index 000000000..d79d12eed --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3559av100.dtsi @@ -0,0 +1,1374 @@ @@ -218937,7 +218937,7 @@ index 000000000000..d79d12eedf46 \ No newline at end of file diff --git a/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-amp.dts b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-amp.dts new file mode 100644 -index 000000000000..bbcd6a932a66 +index 000000000..bbcd6a932 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-amp.dts @@ -0,0 +1,596 @@ @@ -219539,7 +219539,7 @@ index 000000000000..bbcd6a932a66 +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-emmc.dts b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-emmc.dts new file mode 100644 -index 000000000000..7fbf66e5773d +index 000000000..7fbf66e57 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-emmc.dts @@ -0,0 +1,32 @@ @@ -219577,7 +219577,7 @@ index 000000000000..7fbf66e5773d + diff --git a/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-flash.dts b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-flash.dts new file mode 100644 -index 000000000000..b69edfa835e6 +index 000000000..b69edfa83 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-flash.dts @@ -0,0 +1,32 @@ @@ -219615,7 +219615,7 @@ index 000000000000..b69edfa835e6 + diff --git a/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-ufs.dts b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-ufs.dts new file mode 100644 -index 000000000000..fae1572b7402 +index 000000000..fae1572b7 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb-ufs.dts @@ -0,0 +1,32 @@ @@ -219653,7 +219653,7 @@ index 000000000000..fae1572b7402 + diff --git a/arch/arm64/boot/dts/hisilicon/hi3569v100-demb.dts b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb.dts new file mode 100644 -index 000000000000..7cb8b3876992 +index 000000000..7cb8b3876 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3569v100-demb.dts @@ -0,0 +1,655 @@ @@ -220314,7 +220314,7 @@ index 000000000000..7cb8b3876992 +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3569v100.dtsi b/arch/arm64/boot/dts/hisilicon/hi3569v100.dtsi new file mode 100644 -index 000000000000..fe205d05c644 +index 000000000..fe205d05c --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hi3569v100.dtsi @@ -0,0 +1,1364 @@ @@ -221684,7 +221684,7 @@ index 000000000000..fe205d05c644 +}; diff --git a/arch/arm64/configs/hi3531dv200_defconfig b/arch/arm64/configs/hi3531dv200_defconfig new file mode 100644 -index 000000000000..1d9b33ee520b +index 000000000..1d9b33ee5 --- /dev/null +++ b/arch/arm64/configs/hi3531dv200_defconfig @@ -0,0 +1,3458 @@ @@ -225148,7 +225148,7 @@ index 000000000000..1d9b33ee520b +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3531dv200_emmc_defconfig b/arch/arm64/configs/hi3531dv200_emmc_defconfig new file mode 100644 -index 000000000000..d5dd3309d039 +index 000000000..d5dd3309d --- /dev/null +++ b/arch/arm64/configs/hi3531dv200_emmc_defconfig @@ -0,0 +1,3491 @@ @@ -228645,7 +228645,7 @@ index 000000000000..d5dd3309d039 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3535av100_defconfig b/arch/arm64/configs/hi3535av100_defconfig new file mode 100644 -index 000000000000..f177e3b177bc +index 000000000..f177e3b17 --- /dev/null +++ b/arch/arm64/configs/hi3535av100_defconfig @@ -0,0 +1,3458 @@ @@ -232109,7 +232109,7 @@ index 000000000000..f177e3b177bc +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3535av100_emmc_defconfig b/arch/arm64/configs/hi3535av100_emmc_defconfig new file mode 100644 -index 000000000000..401bdc0e9b1e +index 000000000..401bdc0e9 --- /dev/null +++ b/arch/arm64/configs/hi3535av100_emmc_defconfig @@ -0,0 +1,3491 @@ @@ -235606,7 +235606,7 @@ index 000000000000..401bdc0e9b1e +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_amp_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_amp_defconfig new file mode 100644 -index 000000000000..b6ae24793904 +index 000000000..b6ae24793 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_amp_defconfig @@ -0,0 +1,3530 @@ @@ -239142,7 +239142,7 @@ index 000000000000..b6ae24793904 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_defconfig new file mode 100644 -index 000000000000..96e6ae51aab3 +index 000000000..96e6ae51a --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_defconfig @@ -0,0 +1,3530 @@ @@ -242678,7 +242678,7 @@ index 000000000000..96e6ae51aab3 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_amp_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_amp_defconfig new file mode 100644 -index 000000000000..5802f91f865c +index 000000000..5802f91f8 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_amp_defconfig @@ -0,0 +1,3530 @@ @@ -246214,7 +246214,7 @@ index 000000000000..5802f91f865c +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_defconfig new file mode 100644 -index 000000000000..8215cc0e964f +index 000000000..8215cc0e9 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_defconfig @@ -0,0 +1,3530 @@ @@ -249750,7 +249750,7 @@ index 000000000000..8215cc0e964f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_hos_l2_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_hos_l2_defconfig new file mode 100644 -index 000000000000..b3a805a54b78 +index 000000000..b3a805a54 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_emmc_hos_l2_defconfig @@ -0,0 +1,3643 @@ @@ -253399,7 +253399,7 @@ index 000000000000..b3a805a54b78 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_nand_amp_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_nand_amp_defconfig new file mode 100644 -index 000000000000..910b14930a34 +index 000000000..910b14930 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_nand_amp_defconfig @@ -0,0 +1,3526 @@ @@ -256931,7 +256931,7 @@ index 000000000000..910b14930a34 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_nand_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_nand_defconfig new file mode 100644 -index 000000000000..e7be7fdb490d +index 000000000..e7be7fdb4 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_nand_defconfig @@ -0,0 +1,3526 @@ @@ -260463,7 +260463,7 @@ index 000000000000..e7be7fdb490d +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_ufs_amp_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_ufs_amp_defconfig new file mode 100644 -index 000000000000..d8a134b73623 +index 000000000..d8a134b73 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_ufs_amp_defconfig @@ -0,0 +1,3497 @@ @@ -263966,7 +263966,7 @@ index 000000000000..d8a134b73623 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3559av100_arm64_big_little_ufs_defconfig b/arch/arm64/configs/hi3559av100_arm64_big_little_ufs_defconfig new file mode 100644 -index 000000000000..c0a4f00f6e6f +index 000000000..c0a4f00f6 --- /dev/null +++ b/arch/arm64/configs/hi3559av100_arm64_big_little_ufs_defconfig @@ -0,0 +1,3497 @@ @@ -267469,7 +267469,7 @@ index 000000000000..c0a4f00f6e6f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3569v100_arm64_big_little_amp_defconfig b/arch/arm64/configs/hi3569v100_arm64_big_little_amp_defconfig new file mode 100644 -index 000000000000..3a080a1965f5 +index 000000000..3a080a196 --- /dev/null +++ b/arch/arm64/configs/hi3569v100_arm64_big_little_amp_defconfig @@ -0,0 +1,3530 @@ @@ -271005,7 +271005,7 @@ index 000000000000..3a080a1965f5 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3569v100_arm64_big_little_defconfig b/arch/arm64/configs/hi3569v100_arm64_big_little_defconfig new file mode 100644 -index 000000000000..92ded32a586f +index 000000000..92ded32a5 --- /dev/null +++ b/arch/arm64/configs/hi3569v100_arm64_big_little_defconfig @@ -0,0 +1,3530 @@ @@ -274541,7 +274541,7 @@ index 000000000000..92ded32a586f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3569v100_arm64_big_little_emmc_amp_defconfig b/arch/arm64/configs/hi3569v100_arm64_big_little_emmc_amp_defconfig new file mode 100644 -index 000000000000..8bc1bda535bb +index 000000000..8bc1bda53 --- /dev/null +++ b/arch/arm64/configs/hi3569v100_arm64_big_little_emmc_amp_defconfig @@ -0,0 +1,3530 @@ @@ -278077,7 +278077,7 @@ index 000000000000..8bc1bda535bb +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3569v100_arm64_big_little_emmc_defconfig b/arch/arm64/configs/hi3569v100_arm64_big_little_emmc_defconfig new file mode 100644 -index 000000000000..43df23c518ce +index 000000000..43df23c51 --- /dev/null +++ b/arch/arm64/configs/hi3569v100_arm64_big_little_emmc_defconfig @@ -0,0 +1,3530 @@ @@ -281613,7 +281613,7 @@ index 000000000000..43df23c518ce +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3569v100_arm64_big_little_nand_amp_defconfig b/arch/arm64/configs/hi3569v100_arm64_big_little_nand_amp_defconfig new file mode 100644 -index 000000000000..347300beb66f +index 000000000..347300beb --- /dev/null +++ b/arch/arm64/configs/hi3569v100_arm64_big_little_nand_amp_defconfig @@ -0,0 +1,3526 @@ @@ -285145,7 +285145,7 @@ index 000000000000..347300beb66f +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/hi3569v100_arm64_big_little_nand_defconfig b/arch/arm64/configs/hi3569v100_arm64_big_little_nand_defconfig new file mode 100644 -index 000000000000..43cafc219559 +index 000000000..43cafc219 --- /dev/null +++ b/arch/arm64/configs/hi3569v100_arm64_big_little_nand_defconfig @@ -0,0 +1,3526 @@ @@ -288677,7 +288677,7 @@ index 000000000000..43cafc219559 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/include/mach/platform-hi3559av100.h b/arch/arm64/include/mach/platform-hi3559av100.h new file mode 100644 -index 000000000000..20ef1f0f0afa +index 000000000..20ef1f0f0 --- /dev/null +++ b/arch/arm64/include/mach/platform-hi3559av100.h @@ -0,0 +1,24 @@ @@ -288707,7 +288707,7 @@ index 000000000000..20ef1f0f0afa +#endif /* End of __HI_CHIP_REGS_H__ */ diff --git a/arch/arm64/include/mach/platform.h b/arch/arm64/include/mach/platform.h new file mode 100644 -index 000000000000..7cd8dd2bd597 +index 000000000..7cd8dd2bd --- /dev/null +++ b/arch/arm64/include/mach/platform.h @@ -0,0 +1,25 @@ @@ -288737,7 +288737,7 @@ index 000000000000..7cd8dd2bd597 + +#endif /* End of __PLATFORM_H__ */ diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c -index 0e2ea1c78542..a078a4b0ea24 100644 +index 0e2ea1c78..a078a4b0e 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -33,6 +33,18 @@ int pcibios_alloc_irq(struct pci_dev *dev) @@ -288760,7 +288760,7 @@ index 0e2ea1c78542..a078a4b0ea24 100644 /* diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 29d2f425806e..7753f639e704 100644 +index 29d2f4258..7753f639e 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -223,8 +223,18 @@ static void __init reserve_elfcorehdr(void) @@ -288783,10 +288783,10 @@ index 29d2f425806e..7753f639e704 100644 #ifdef CONFIG_NUMA diff --git a/drivers/Kconfig b/drivers/Kconfig -index 9a869a2af74e..374196a2cbad 100644 +index 70fade369..606378825 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig -@@ -219,6 +219,14 @@ source "drivers/siox/Kconfig" +@@ -221,4 +221,12 @@ source "drivers/hdf/khdf/Kconfig" source "drivers/slimbus/Kconfig" @@ -288798,23 +288798,21 @@ index 9a869a2af74e..374196a2cbad 100644 + +source "drivers/hi_vdmav100/Kconfig" + - source "drivers/hdf/khdf/Kconfig" - endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index 7d6c6beb40ad..6476a6490cb8 100644 +index f4aae6a3a..77fa96634 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -187,3 +187,7 @@ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/ obj-$(CONFIG_SIOX) += siox/ - obj-$(CONFIG_GNSS) += gnss/ obj-$(CONFIG_DRIVERS_HDF) += hdf/ + obj-$(CONFIG_GNSS) += gnss/ +obj-$(CONFIG_HI_DMAC) += hidmac/ +obj-$(CONFIG_HIEDMAC) += hiedmac/ +obj-$(CONFIG_ARCH_HISI_BVT) += hisilicon/ +obj-$(CONFIG_HI_VDMA_V100) += hi_vdmav100/ diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c -index b58850389094..ecdcbf1445f7 100644 +index b58850389..ecdcbf144 100644 --- a/drivers/acpi/acpi_configfs.c +++ b/drivers/acpi/acpi_configfs.c @@ -14,6 +14,7 @@ @@ -288838,7 +288836,7 @@ index b58850389094..ecdcbf1445f7 100644 table = container_of(cfg, struct acpi_table, cfg); diff --git a/drivers/android/binder.c b/drivers/android/binder.c -index cda4f7eb58ea..5da11aa4c554 100644 +index cda4f7eb5..5da11aa4c 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2829,7 +2829,7 @@ static void binder_transaction(struct binder_proc *proc, @@ -288851,7 +288849,7 @@ index cda4f7eb58ea..5da11aa4c554 100644 } if (!target_node) { diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig -index 99698d7fe585..b28d3e90fa20 100644 +index 99698d7fe..b28d3e90f 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -2,6 +2,7 @@ @@ -288864,7 +288862,7 @@ index 99698d7fe585..b28d3e90fa20 100644 bool diff --git a/drivers/ata/Kconfig.hiahci b/drivers/ata/Kconfig.hiahci new file mode 100644 -index 000000000000..030de3fc9d0a +index 000000000..030de3fc9 --- /dev/null +++ b/drivers/ata/Kconfig.hiahci @@ -0,0 +1,44 @@ @@ -288913,7 +288911,7 @@ index 000000000000..030de3fc9d0a +endif + diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile -index d21cdd83f7ab..1ce4e9f1734a 100644 +index d21cdd83f..1ce4e9f17 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -1,6 +1,7 @@ @@ -288925,7 +288923,7 @@ index d21cdd83f7ab..1ce4e9f1734a 100644 # non-SFF interface obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index 9290e787abdc..030da4d80cdd 100644 +index 9290e787a..030da4d80 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -240,6 +240,9 @@ enum { @@ -288953,7 +288951,7 @@ index 9290e787abdc..030da4d80cdd 100644 * If platform uses PHYs. There is a 1:1 relation between the port number and * the PHY position in this array. diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index cf1e0e18a7a9..8b8c183e7d1c 100644 +index cf1e0e18a..8b8c183e7 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -26,6 +26,16 @@ @@ -288997,7 +288995,7 @@ index cf1e0e18a7a9..8b8c183e7d1c 100644 if (!port) diff --git a/drivers/ata/hisi_sata_dbg.c b/drivers/ata/hisi_sata_dbg.c new file mode 100644 -index 000000000000..935c7168905e +index 000000000..935c71689 --- /dev/null +++ b/drivers/ata/hisi_sata_dbg.c @@ -0,0 +1,174 @@ @@ -289177,7 +289175,7 @@ index 000000000000..935c7168905e + diff --git a/drivers/ata/hisi_sata_dbg.h b/drivers/ata/hisi_sata_dbg.h new file mode 100644 -index 000000000000..5103658a4f05 +index 000000000..5103658a4 --- /dev/null +++ b/drivers/ata/hisi_sata_dbg.h @@ -0,0 +1,58 @@ @@ -289240,7 +289238,7 @@ index 000000000000..5103658a4f05 +#endif +#endif /* _HISI_SATA_DBG_H */ diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index f1153e7ba3b3..fd73432f5c67 100644 +index f1153e7ba..fd73432f5 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -47,6 +47,7 @@ @@ -289533,7 +289531,7 @@ index f1153e7ba3b3..fd73432f5c67 100644 return ahci_port_resume(ap); } diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c -index a026211afb51..9d5f5a7a1d19 100644 +index a026211af..9d5f5a7a1 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -983,8 +983,14 @@ static int __init pcd_init(void) @@ -289563,7 +289561,7 @@ index a026211afb51..9d5f5a7a1d19 100644 del_gendisk(cd->disk); pi_release(cd->pi); diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c -index eef7a91f667d..127e990b8d17 100644 +index eef7a91f6..127e990b8 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c @@ -998,8 +998,13 @@ static int __init pf_init(void) @@ -289582,7 +289580,7 @@ index eef7a91f667d..127e990b8d17 100644 } diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index ed344eb717cc..501fb86a0b40 100644 +index ed344eb71..501fb86a0 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -70,6 +70,7 @@ obj-$(CONFIG_ARCH_BERLIN) += berlin/ @@ -289594,7 +289592,7 @@ index ed344eb717cc..501fb86a0b40 100644 obj-$(CONFIG_ARCH_MXC) += imx/ obj-$(CONFIG_MACH_INGENIC) += ingenic/ diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig -index becdb1dd21b5..e05f5e80ed7a 100644 +index becdb1dd2..e05f5e80e 100644 --- a/drivers/clk/hisilicon/Kconfig +++ b/drivers/clk/hisilicon/Kconfig @@ -21,6 +21,38 @@ config COMMON_CLK_HI3660 @@ -289813,7 +289811,7 @@ index becdb1dd21b5..e05f5e80ed7a 100644 help Build reset controller driver for HiSilicon device chipsets. diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile -index 2a714c0f9657..e722f29e9d5c 100644 +index 2a714c0f9..e722f29e9 100644 --- a/drivers/clk/hisilicon/Makefile +++ b/drivers/clk/hisilicon/Makefile @@ -13,6 +13,30 @@ obj-$(CONFIG_COMMON_CLK_HI3519) += clk-hi3519.o @@ -289849,7 +289847,7 @@ index 2a714c0f9657..e722f29e9d5c 100644 obj-$(CONFIG_STUB_CLK_HI3660) += clk-hi3660-stub.o diff --git a/drivers/clk/hisilicon/clk-hi3516a.c b/drivers/clk/hisilicon/clk-hi3516a.c new file mode 100644 -index 000000000000..9da04b60371b +index 000000000..9da04b603 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516a.c @@ -0,0 +1,525 @@ @@ -290380,7 +290378,7 @@ index 000000000000..9da04b60371b + diff --git a/drivers/clk/hisilicon/clk-hi3516cv500.c b/drivers/clk/hisilicon/clk-hi3516cv500.c new file mode 100644 -index 000000000000..eba146dbc638 +index 000000000..eba146dbc --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516cv500.c @@ -0,0 +1,261 @@ @@ -290647,7 +290645,7 @@ index 000000000000..eba146dbc638 + diff --git a/drivers/clk/hisilicon/clk-hi3516dv200.c b/drivers/clk/hisilicon/clk-hi3516dv200.c new file mode 100644 -index 000000000000..14e6e2da66a1 +index 000000000..14e6e2da6 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516dv200.c @@ -0,0 +1,251 @@ @@ -290904,7 +290902,7 @@ index 000000000000..14e6e2da66a1 + diff --git a/drivers/clk/hisilicon/clk-hi3516dv300.c b/drivers/clk/hisilicon/clk-hi3516dv300.c new file mode 100644 -index 000000000000..1a2ab99758cf +index 000000000..1a2ab9975 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516dv300.c @@ -0,0 +1,271 @@ @@ -291181,7 +291179,7 @@ index 000000000000..1a2ab99758cf + diff --git a/drivers/clk/hisilicon/clk-hi3516ev200.c b/drivers/clk/hisilicon/clk-hi3516ev200.c new file mode 100644 -index 000000000000..b24f89c02099 +index 000000000..b24f89c02 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516ev200.c @@ -0,0 +1,244 @@ @@ -291431,7 +291429,7 @@ index 000000000000..b24f89c02099 + hi3516ev200_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3516ev300.c b/drivers/clk/hisilicon/clk-hi3516ev300.c new file mode 100644 -index 000000000000..deccfa94c530 +index 000000000..deccfa94c --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516ev300.c @@ -0,0 +1,241 @@ @@ -291678,7 +291676,7 @@ index 000000000000..deccfa94c530 + diff --git a/drivers/clk/hisilicon/clk-hi3518ev20x.c b/drivers/clk/hisilicon/clk-hi3518ev20x.c new file mode 100644 -index 000000000000..9b5320604328 +index 000000000..9b5320604 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3518ev20x.c @@ -0,0 +1,291 @@ @@ -291975,7 +291973,7 @@ index 000000000000..9b5320604328 + hi3518ev20x_sc_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3518ev300.c b/drivers/clk/hisilicon/clk-hi3518ev300.c new file mode 100644 -index 000000000000..f926a909761a +index 000000000..f926a9097 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3518ev300.c @@ -0,0 +1,240 @@ @@ -292221,7 +292219,7 @@ index 000000000000..f926a909761a + hi3518ev300_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3519av100.c b/drivers/clk/hisilicon/clk-hi3519av100.c new file mode 100644 -index 000000000000..657767941652 +index 000000000..657767941 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3519av100.c @@ -0,0 +1,559 @@ @@ -292786,7 +292784,7 @@ index 000000000000..657767941652 + hi3519av100_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3521a.c b/drivers/clk/hisilicon/clk-hi3521a.c new file mode 100644 -index 000000000000..85f5636c3116 +index 000000000..85f5636c3 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3521a.c @@ -0,0 +1,288 @@ @@ -293080,7 +293078,7 @@ index 000000000000..85f5636c3116 + hi3521a_sc_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3521dv200.c b/drivers/clk/hisilicon/clk-hi3521dv200.c new file mode 100644 -index 000000000000..bf94fe661661 +index 000000000..bf94fe661 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3521dv200.c @@ -0,0 +1,255 @@ @@ -293341,7 +293339,7 @@ index 000000000000..bf94fe661661 + diff --git a/drivers/clk/hisilicon/clk-hi3531a.c b/drivers/clk/hisilicon/clk-hi3531a.c new file mode 100644 -index 000000000000..edccb9ac69bc +index 000000000..edccb9ac6 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3531a.c @@ -0,0 +1,323 @@ @@ -293670,7 +293668,7 @@ index 000000000000..edccb9ac69bc + hi3531a_sc_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3531dv200.c b/drivers/clk/hisilicon/clk-hi3531dv200.c new file mode 100644 -index 000000000000..0b5b4dfeb6bc +index 000000000..0b5b4dfeb --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3531dv200.c @@ -0,0 +1,578 @@ @@ -294254,7 +294252,7 @@ index 000000000000..0b5b4dfeb6bc +MODULE_DESCRIPTION("HiSilicon Hi3531DV200 CRG Driver"); diff --git a/drivers/clk/hisilicon/clk-hi3535av100.c b/drivers/clk/hisilicon/clk-hi3535av100.c new file mode 100644 -index 000000000000..36c786dd577b +index 000000000..36c786dd5 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3535av100.c @@ -0,0 +1,570 @@ @@ -294830,7 +294828,7 @@ index 000000000000..36c786dd577b + diff --git a/drivers/clk/hisilicon/clk-hi3536dv100.c b/drivers/clk/hisilicon/clk-hi3536dv100.c new file mode 100644 -index 000000000000..db881cec780b +index 000000000..db881cec7 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3536dv100.c @@ -0,0 +1,270 @@ @@ -295106,7 +295104,7 @@ index 000000000000..db881cec780b + hi3536dv100_sc_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3556av100.c b/drivers/clk/hisilicon/clk-hi3556av100.c new file mode 100644 -index 000000000000..66a270540ec7 +index 000000000..66a270540 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3556av100.c @@ -0,0 +1,566 @@ @@ -295678,7 +295676,7 @@ index 000000000000..66a270540ec7 + hi3556av100_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3556v200.c b/drivers/clk/hisilicon/clk-hi3556v200.c new file mode 100644 -index 000000000000..addc8186a919 +index 000000000..addc8186a --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3556v200.c @@ -0,0 +1,274 @@ @@ -295958,7 +295956,7 @@ index 000000000000..addc8186a919 + hi3556v200_clk_init); diff --git a/drivers/clk/hisilicon/clk-hi3559av100.c b/drivers/clk/hisilicon/clk-hi3559av100.c new file mode 100644 -index 000000000000..20509aace629 +index 000000000..20509aace --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3559av100.c @@ -0,0 +1,882 @@ @@ -296846,7 +296844,7 @@ index 000000000000..20509aace629 +MODULE_DESCRIPTION("HiSilicon Hi3559AV100 CRG Driver"); diff --git a/drivers/clk/hisilicon/clk-hi3559v200.c b/drivers/clk/hisilicon/clk-hi3559v200.c new file mode 100644 -index 000000000000..564e5d0c6cd4 +index 000000000..564e5d0c6 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3559v200.c @@ -0,0 +1,271 @@ @@ -297122,7 +297120,7 @@ index 000000000000..564e5d0c6cd4 +CLK_OF_DECLARE(hi3559v200_clk, "hisilicon,hi3559v200-clock", + hi3559v200_clk_init); diff --git a/drivers/clk/hisilicon/clk-hisi-phase.c b/drivers/clk/hisilicon/clk-hisi-phase.c -index 5bce9297b78b..5c345267d937 100644 +index 5bce9297b..5c345267d 100644 --- a/drivers/clk/hisilicon/clk-hisi-phase.c +++ b/drivers/clk/hisilicon/clk-hisi-phase.c @@ -77,7 +77,7 @@ static int hisi_clk_set_phase(struct clk_hw *hw, int degrees) @@ -297135,7 +297133,7 @@ index 5bce9297b78b..5c345267d937 100644 spin_unlock_irqrestore(phase->lock, flags); diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c -index 953c8dacef8b..806bb73c845d 100644 +index 953c8dace..806bb73c8 100644 --- a/drivers/clk/hisilicon/clk.c +++ b/drivers/clk/hisilicon/clk.c @@ -96,6 +96,10 @@ struct hisi_clock_data *hisi_clk_init(struct device_node *np, @@ -297150,7 +297148,7 @@ index 953c8dacef8b..806bb73c845d 100644 err: return NULL; diff --git a/drivers/clk/hisilicon/crg.h b/drivers/clk/hisilicon/crg.h -index e0739717de9a..435bceee095b 100644 +index e0739717d..435bceee0 100644 --- a/drivers/clk/hisilicon/crg.h +++ b/drivers/clk/hisilicon/crg.h @@ -22,7 +22,7 @@ struct hisi_reset_controller; @@ -297163,7 +297161,7 @@ index e0739717de9a..435bceee095b 100644 struct hisi_crg_dev { diff --git a/drivers/clk/hisilicon/reset.c b/drivers/clk/hisilicon/reset.c -index 43e82fa64422..491daecb2c97 100644 +index 43e82fa64..491daecb2 100644 --- a/drivers/clk/hisilicon/reset.c +++ b/drivers/clk/hisilicon/reset.c @@ -99,6 +99,36 @@ static const struct reset_control_ops hisi_reset_ops = { @@ -297204,7 +297202,7 @@ index 43e82fa64422..491daecb2c97 100644 { struct hisi_reset_controller *rstc; diff --git a/drivers/clk/hisilicon/reset.h b/drivers/clk/hisilicon/reset.h -index 9a69374a0b32..d6faba76141b 100644 +index 9a69374a0..d6faba761 100644 --- a/drivers/clk/hisilicon/reset.h +++ b/drivers/clk/hisilicon/reset.h @@ -23,6 +23,9 @@ struct hisi_reset_controller; @@ -297218,7 +297216,7 @@ index 9a69374a0b32..d6faba76141b 100644 #else static inline diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index 4d37f018d846..1f09043bfe3c 100644 +index 4d37f018d..1f09043bf 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -334,6 +334,14 @@ config ARM_ARCH_TIMER_EVTSTREAM @@ -297250,7 +297248,7 @@ index 4d37f018d846..1f09043bfe3c 100644 bool depends on ARM_GLOBAL_TIMER diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile -index db51b2427e8a..5607f973f6a3 100644 +index db51b2427..5607f973f 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o @@ -297262,7 +297260,7 @@ index db51b2427e8a..5607f973f6a3 100644 obj-$(CONFIG_KEYSTONE_TIMER) += timer-keystone.o obj-$(CONFIG_INTEGRATOR_AP_TIMER) += timer-integrator-ap.o diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c -index 0445ad7e559e..e0b7ee3ab8c8 100644 +index 0445ad7e5..e0b7ee3ab 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -628,7 +628,8 @@ static bool arch_timer_this_cpu_has_cntvct_wa(void) @@ -297277,7 +297275,7 @@ index 0445ad7e559e..e0b7ee3ab8c8 100644 static __always_inline irqreturn_t timer_handler(const int access, diff --git a/drivers/clocksource/timer-hisp804.c b/drivers/clocksource/timer-hisp804.c new file mode 100644 -index 000000000000..b2c857a418a5 +index 000000000..b2c857a41 --- /dev/null +++ b/drivers/clocksource/timer-hisp804.c @@ -0,0 +1,356 @@ @@ -297639,7 +297637,7 @@ index 000000000000..b2c857a418a5 +CLOCKSOURCE_OF_DECLARE(hisp804, "hisilicon,hisp804", hisp804_timer_init); \ No newline at end of file diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index a4f95574eb9a..fbc7d68d53f9 100644 +index a4f95574e..fbc7d68d5 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -312,6 +312,20 @@ config K3_DMA @@ -297672,7 +297670,7 @@ index a4f95574eb9a..fbc7d68d53f9 100644 source "drivers/dma/bestcomm/Kconfig" diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index c91702d88b95..5bf64ecbe58c 100644 +index c91702d88..5bf64ecbe 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_TIMB_DMA) += timb_dma.o @@ -297686,7 +297684,7 @@ index c91702d88b95..5bf64ecbe58c 100644 obj-y += ti/ diff --git a/drivers/dma/hiedmacv310.c b/drivers/dma/hiedmacv310.c new file mode 100644 -index 000000000000..a198c92241e6 +index 000000000..a198c9224 --- /dev/null +++ b/drivers/dma/hiedmacv310.c @@ -0,0 +1,1443 @@ @@ -299135,7 +299133,7 @@ index 000000000000..a198c92241e6 +MODULE_AUTHOR("Hisilicon"); diff --git a/drivers/dma/hiedmacv310.h b/drivers/dma/hiedmacv310.h new file mode 100644 -index 000000000000..1fc093945d50 +index 000000000..1fc093945 --- /dev/null +++ b/drivers/dma/hiedmacv310.h @@ -0,0 +1,153 @@ @@ -299293,7 +299291,7 @@ index 000000000000..1fc093945d50 +#define HIEDMAC_CONTROL_DST_WIDTH_MASK GENMASK(14, 12) +#endif diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index a8180f9090fa..a0c7d1d27d21 100644 +index a8180f909..a0c7d1d27 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -299317,7 +299315,7 @@ index a8180f9090fa..a0c7d1d27d21 100644 memcpy(efivar_ssdt, str, strlen(str)); else diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c -index dc42571e6fdc..f73dd3c32aad 100644 +index dc42571e6..f73dd3c32 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -209,6 +209,25 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) @@ -299408,7 +299406,7 @@ index dc42571e6fdc..f73dd3c32aad 100644 amba_set_drvdata(adev, pl061); dev_info(&adev->dev, "PL061 GPIO chip @%pa registered\n", diff --git a/drivers/gpu/drm/hisilicon/Kconfig b/drivers/gpu/drm/hisilicon/Kconfig -index 2fd2724b7a7d..b1eebd8e2acb 100644 +index 2fd2724b7..b1eebd8e2 100644 --- a/drivers/gpu/drm/hisilicon/Kconfig +++ b/drivers/gpu/drm/hisilicon/Kconfig @@ -4,3 +4,4 @@ @@ -299417,7 +299415,7 @@ index 2fd2724b7a7d..b1eebd8e2acb 100644 source "drivers/gpu/drm/hisilicon/kirin/Kconfig" +source "drivers/gpu/drm/hisilicon/hismart/Kconfig" diff --git a/drivers/gpu/drm/hisilicon/Makefile b/drivers/gpu/drm/hisilicon/Makefile -index c8155bfb1ff1..02ef5313f206 100644 +index c8155bfb1..02ef5313f 100644 --- a/drivers/gpu/drm/hisilicon/Makefile +++ b/drivers/gpu/drm/hisilicon/Makefile @@ -4,3 +4,4 @@ @@ -299427,7 +299425,7 @@ index c8155bfb1ff1..02ef5313f206 100644 +obj-$(CONFIG_DRM_HISI_HISMART) += hismart/ diff --git a/drivers/gpu/drm/hisilicon/hismart/Kconfig b/drivers/gpu/drm/hisilicon/hismart/Kconfig new file mode 100644 -index 000000000000..ffc8564a8deb +index 000000000..ffc8564a8 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/Kconfig @@ -0,0 +1,8 @@ @@ -299441,7 +299439,7 @@ index 000000000000..ffc8564a8deb + diff --git a/drivers/gpu/drm/hisilicon/hismart/Makefile b/drivers/gpu/drm/hisilicon/hismart/Makefile new file mode 100644 -index 000000000000..7fc5deec9425 +index 000000000..7e611dd84 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/Makefile @@ -0,0 +1,27 @@ @@ -299474,7 +299472,7 @@ index 000000000000..7fc5deec9425 + diff --git a/drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h b/drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h new file mode 100644 -index 000000000000..88192d01f0e0 +index 000000000..88192d01f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h @@ -0,0 +1,91 @@ @@ -299571,7 +299569,7 @@ index 000000000000..88192d01f0e0 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c new file mode 100644 -index 000000000000..120972b9da8b +index 000000000..120972b9d --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c @@ -0,0 +1,775 @@ @@ -300352,7 +300350,7 @@ index 000000000000..120972b9da8b +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h new file mode 100644 -index 000000000000..31f13ff5fb76 +index 000000000..31f13ff5f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h @@ -0,0 +1,69 @@ @@ -300427,7 +300425,7 @@ index 000000000000..31f13ff5fb76 +#endif /* __HI_ADP_CRTC_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c new file mode 100644 -index 000000000000..4a58b1acdf48 +index 000000000..4a58b1acd --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c @@ -0,0 +1,345 @@ @@ -300778,7 +300776,7 @@ index 000000000000..4a58b1acdf48 +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h new file mode 100644 -index 000000000000..4c7f08883850 +index 000000000..4c7f08883 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h @@ -0,0 +1,28 @@ @@ -300812,7 +300810,7 @@ index 000000000000..4c7f08883850 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c new file mode 100644 -index 000000000000..22ae4d9fcbbb +index 000000000..22ae4d9fc --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c @@ -0,0 +1,223 @@ @@ -301041,7 +301039,7 @@ index 000000000000..22ae4d9fcbbb + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h new file mode 100644 -index 000000000000..d7f3767dcb40 +index 000000000..d7f3767dc --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h @@ -0,0 +1,24 @@ @@ -301071,7 +301069,7 @@ index 000000000000..d7f3767dcb40 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c new file mode 100644 -index 000000000000..a3078636da6d +index 000000000..a3078636d --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c @@ -0,0 +1,388 @@ @@ -301465,7 +301463,7 @@ index 000000000000..a3078636da6d +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h new file mode 100644 -index 000000000000..ebe7aac6fe89 +index 000000000..ebe7aac6f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h @@ -0,0 +1,17 @@ @@ -301488,7 +301486,7 @@ index 000000000000..ebe7aac6fe89 +#endif /* __HI_DRM_CTRC_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c new file mode 100644 -index 000000000000..123a61f44d1c +index 000000000..779737722 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c @@ -0,0 +1,376 @@ @@ -301870,7 +301868,7 @@ index 000000000000..123a61f44d1c + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h new file mode 100644 -index 000000000000..0fcfdaecc0ea +index 000000000..0fcfdaecc --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h @@ -0,0 +1,29 @@ @@ -301905,7 +301903,7 @@ index 000000000000..0fcfdaecc0ea +#endif /* __HI_DRM_DRV_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c new file mode 100644 -index 000000000000..f29e7f99821e +index 000000000..f29e7f998 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c @@ -0,0 +1,43 @@ @@ -301955,7 +301953,7 @@ index 000000000000..f29e7f99821e \ No newline at end of file diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h new file mode 100644 -index 000000000000..83a96b22b662 +index 000000000..83a96b22b --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h @@ -0,0 +1,27 @@ @@ -301988,7 +301986,7 @@ index 000000000000..83a96b22b662 +#endif /* __HI_DRM_FUNC_EXT_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c new file mode 100644 -index 000000000000..6f04e7399009 +index 000000000..6f04e7399 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c @@ -0,0 +1,232 @@ @@ -302226,7 +302224,7 @@ index 000000000000..6f04e7399009 +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h new file mode 100644 -index 000000000000..22285a50ed94 +index 000000000..22285a50e --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h @@ -0,0 +1,16 @@ @@ -302248,7 +302246,7 @@ index 000000000000..22285a50ed94 +#endif /* __HI_DRM_HDMITX_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c new file mode 100644 -index 000000000000..4b85178e23e3 +index 000000000..4b85178e2 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c @@ -0,0 +1,180 @@ @@ -302434,7 +302432,7 @@ index 000000000000..4b85178e23e3 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h new file mode 100644 -index 000000000000..34d2f0a37201 +index 000000000..34d2f0a37 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h @@ -0,0 +1,17 @@ @@ -302457,7 +302455,7 @@ index 000000000000..34d2f0a37201 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h b/drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h new file mode 100644 -index 000000000000..5f247a1a942a +index 000000000..5f247a1a9 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h @@ -0,0 +1,31 @@ @@ -302494,7 +302492,7 @@ index 000000000000..5f247a1a942a +#endif /* HISILICON_DRM_H */ diff --git a/drivers/hi_vdmav100/Kconfig b/drivers/hi_vdmav100/Kconfig new file mode 100644 -index 000000000000..ecaa952b9798 +index 000000000..ecaa952b9 --- /dev/null +++ b/drivers/hi_vdmav100/Kconfig @@ -0,0 +1,26 @@ @@ -302526,7 +302524,7 @@ index 000000000000..ecaa952b9798 +endif diff --git a/drivers/hi_vdmav100/Makefile b/drivers/hi_vdmav100/Makefile new file mode 100644 -index 000000000000..ccac799b500d +index 000000000..ccac799b5 --- /dev/null +++ b/drivers/hi_vdmav100/Makefile @@ -0,0 +1,2 @@ @@ -302534,7 +302532,7 @@ index 000000000000..ccac799b500d +obj-$(CONFIG_HI_VDMA_MISC_DEV) += hi_vdmav100_misc.o diff --git a/drivers/hi_vdmav100/hi_vdma.h b/drivers/hi_vdmav100/hi_vdma.h new file mode 100644 -index 000000000000..3644fe6212cd +index 000000000..3644fe621 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdma.h @@ -0,0 +1,41 @@ @@ -302581,7 +302579,7 @@ index 000000000000..3644fe6212cd +#endif diff --git a/drivers/hi_vdmav100/hi_vdmav100.c b/drivers/hi_vdmav100/hi_vdmav100.c new file mode 100644 -index 000000000000..0199ddd231f7 +index 000000000..0199ddd23 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100.c @@ -0,0 +1,534 @@ @@ -303121,7 +303119,7 @@ index 000000000000..0199ddd231f7 +MODULE_AUTHOR("BVT_OSDRV"); diff --git a/drivers/hi_vdmav100/hi_vdmav100.h b/drivers/hi_vdmav100/hi_vdmav100.h new file mode 100644 -index 000000000000..8b8d3e6c0026 +index 000000000..8b8d3e6c0 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100.h @@ -0,0 +1,122 @@ @@ -303249,7 +303247,7 @@ index 000000000000..8b8d3e6c0026 +#endif diff --git a/drivers/hi_vdmav100/hi_vdmav100_misc.c b/drivers/hi_vdmav100/hi_vdmav100_misc.c new file mode 100644 -index 000000000000..777a7c47cd53 +index 000000000..777a7c47c --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100_misc.c @@ -0,0 +1,109 @@ @@ -303364,7 +303362,7 @@ index 000000000000..777a7c47cd53 +MODULE_DESCRIPTION("Hisilicon VDMA MISC Driver"); diff --git a/drivers/hidmac/Kconfig b/drivers/hidmac/Kconfig new file mode 100644 -index 000000000000..dcb3e08bf5d2 +index 000000000..dcb3e08bf --- /dev/null +++ b/drivers/hidmac/Kconfig @@ -0,0 +1,21 @@ @@ -303391,7 +303389,7 @@ index 000000000000..dcb3e08bf5d2 +endif diff --git a/drivers/hidmac/Makefile b/drivers/hidmac/Makefile new file mode 100644 -index 000000000000..7e41f4c37ffd +index 000000000..7e41f4c37 --- /dev/null +++ b/drivers/hidmac/Makefile @@ -0,0 +1,6 @@ @@ -303403,7 +303401,7 @@ index 000000000000..7e41f4c37ffd + diff --git a/drivers/hidmac/hi_pl08x.c b/drivers/hidmac/hi_pl08x.c new file mode 100644 -index 000000000000..4281caf7eb10 +index 000000000..4281caf7e --- /dev/null +++ b/drivers/hidmac/hi_pl08x.c @@ -0,0 +1,1303 @@ @@ -304712,7 +304710,7 @@ index 000000000000..4281caf7eb10 +MODULE_DESCRIPTION("HiSilicon DMA Controller driver"); diff --git a/drivers/hidmac/hi_pl08x.h b/drivers/hidmac/hi_pl08x.h new file mode 100644 -index 000000000000..1c3babf22e43 +index 000000000..1c3babf22 --- /dev/null +++ b/drivers/hidmac/hi_pl08x.h @@ -0,0 +1,90 @@ @@ -304808,7 +304806,7 @@ index 000000000000..1c3babf22e43 +#endif /* End of #ifndef __HI_INC_ECSDMACC_H__ */ diff --git a/drivers/hidmac/hidmac_hi3516a.h b/drivers/hidmac/hidmac_hi3516a.h new file mode 100644 -index 000000000000..aa634518a480 +index 000000000..aa634518a --- /dev/null +++ b/drivers/hidmac/hidmac_hi3516a.h @@ -0,0 +1,176 @@ @@ -304990,7 +304988,7 @@ index 000000000000..aa634518a480 +#endif diff --git a/drivers/hidmac/hidmac_hi3518ev20x.h b/drivers/hidmac/hidmac_hi3518ev20x.h new file mode 100644 -index 000000000000..e14d30c8e843 +index 000000000..e14d30c8e --- /dev/null +++ b/drivers/hidmac/hidmac_hi3518ev20x.h @@ -0,0 +1,168 @@ @@ -305164,7 +305162,7 @@ index 000000000000..e14d30c8e843 +#endif diff --git a/drivers/hidmac/hidmac_hi3521a.h b/drivers/hidmac/hidmac_hi3521a.h new file mode 100644 -index 000000000000..812f820c547d +index 000000000..812f820c5 --- /dev/null +++ b/drivers/hidmac/hidmac_hi3521a.h @@ -0,0 +1,151 @@ @@ -305321,7 +305319,7 @@ index 000000000000..812f820c547d +#endif diff --git a/drivers/hidmac/hidmac_hi3531a.h b/drivers/hidmac/hidmac_hi3531a.h new file mode 100644 -index 000000000000..a74b9f2bb03b +index 000000000..a74b9f2bb --- /dev/null +++ b/drivers/hidmac/hidmac_hi3531a.h @@ -0,0 +1,166 @@ @@ -305493,7 +305491,7 @@ index 000000000000..a74b9f2bb03b +#endif diff --git a/drivers/hidmac/hidmac_hi3536dv100.h b/drivers/hidmac/hidmac_hi3536dv100.h new file mode 100644 -index 000000000000..71bae26667fb +index 000000000..71bae2666 --- /dev/null +++ b/drivers/hidmac/hidmac_hi3536dv100.h @@ -0,0 +1,131 @@ @@ -305630,7 +305628,7 @@ index 000000000000..71bae26667fb +#endif diff --git a/drivers/hiedmac/Kconfig b/drivers/hiedmac/Kconfig new file mode 100644 -index 000000000000..183747be82fb +index 000000000..183747be8 --- /dev/null +++ b/drivers/hiedmac/Kconfig @@ -0,0 +1,29 @@ @@ -305665,7 +305663,7 @@ index 000000000000..183747be82fb +endif diff --git a/drivers/hiedmac/Makefile b/drivers/hiedmac/Makefile new file mode 100644 -index 000000000000..a1b4b8b767b4 +index 000000000..a1b4b8b76 --- /dev/null +++ b/drivers/hiedmac/Makefile @@ -0,0 +1,4 @@ @@ -305675,7 +305673,7 @@ index 000000000000..a1b4b8b767b4 +obj-$(CONFIG_HIEDMAC) += hiedmacv310.o diff --git a/drivers/hiedmac/hiedma_hi3516cv500.h b/drivers/hiedmac/hiedma_hi3516cv500.h new file mode 100644 -index 000000000000..75963267c94f +index 000000000..75963267c --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3516cv500.h @@ -0,0 +1,107 @@ @@ -305788,7 +305786,7 @@ index 000000000000..75963267c94f +#endif diff --git a/drivers/hiedmac/hiedma_hi3516ev200.h b/drivers/hiedmac/hiedma_hi3516ev200.h new file mode 100644 -index 000000000000..b0ccb6b7051e +index 000000000..b0ccb6b70 --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3516ev200.h @@ -0,0 +1,83 @@ @@ -305877,7 +305875,7 @@ index 000000000000..b0ccb6b7051e +#endif diff --git a/drivers/hiedmac/hiedma_hi3519av100.h b/drivers/hiedmac/hiedma_hi3519av100.h new file mode 100644 -index 000000000000..0b3028bae985 +index 000000000..0b3028bae --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3519av100.h @@ -0,0 +1,156 @@ @@ -306039,7 +306037,7 @@ index 000000000000..0b3028bae985 +#endif diff --git a/drivers/hiedmac/hiedma_hi3521dv200.h b/drivers/hiedmac/hiedma_hi3521dv200.h new file mode 100644 -index 000000000000..441d061688dc +index 000000000..441d06168 --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3521dv200.h @@ -0,0 +1,140 @@ @@ -306185,7 +306183,7 @@ index 000000000000..441d061688dc +#endif diff --git a/drivers/hiedmac/hiedma_hi3531dv200.h b/drivers/hiedmac/hiedma_hi3531dv200.h new file mode 100644 -index 000000000000..240c1d522dc6 +index 000000000..240c1d522 --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3531dv200.h @@ -0,0 +1,90 @@ @@ -306281,7 +306279,7 @@ index 000000000000..240c1d522dc6 +#endif diff --git a/drivers/hiedmac/hiedma_hi3559av100.h b/drivers/hiedmac/hiedma_hi3559av100.h new file mode 100644 -index 000000000000..ae63fe24cc43 +index 000000000..ae63fe24c --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3559av100.h @@ -0,0 +1,140 @@ @@ -306427,7 +306425,7 @@ index 000000000000..ae63fe24cc43 +#endif diff --git a/drivers/hiedmac/hiedmacv310.c b/drivers/hiedmac/hiedmacv310.c new file mode 100644 -index 000000000000..282ac3eaac98 +index 000000000..282ac3eaa --- /dev/null +++ b/drivers/hiedmac/hiedmacv310.c @@ -0,0 +1,946 @@ @@ -307379,7 +307377,7 @@ index 000000000000..282ac3eaac98 +MODULE_AUTHOR("Hisilicon"); diff --git a/drivers/hiedmac/hiedmacv310.h b/drivers/hiedmac/hiedmacv310.h new file mode 100644 -index 000000000000..4344d8940d61 +index 000000000..4344d8940 --- /dev/null +++ b/drivers/hiedmac/hiedmacv310.h @@ -0,0 +1,184 @@ @@ -307569,7 +307567,7 @@ index 000000000000..4344d8940d61 +#endif diff --git a/drivers/hisilicon/Kconfig b/drivers/hisilicon/Kconfig new file mode 100644 -index 000000000000..ab5884c08df9 +index 000000000..ab5884c08 --- /dev/null +++ b/drivers/hisilicon/Kconfig @@ -0,0 +1,4 @@ @@ -307579,14 +307577,14 @@ index 000000000000..ab5884c08df9 +endmenu diff --git a/drivers/hisilicon/Makefile b/drivers/hisilicon/Makefile new file mode 100644 -index 000000000000..0ba50a756682 +index 000000000..0ba50a756 --- /dev/null +++ b/drivers/hisilicon/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_CMA) += cma/ diff --git a/drivers/hisilicon/cma/Kconfig b/drivers/hisilicon/cma/Kconfig new file mode 100644 -index 000000000000..7472dccd8952 +index 000000000..7472dccd8 --- /dev/null +++ b/drivers/hisilicon/cma/Kconfig @@ -0,0 +1,16 @@ @@ -307608,7 +307606,7 @@ index 000000000000..7472dccd8952 + CMA Multiplex Ratio will be improved when this macro defined. diff --git a/drivers/hisilicon/cma/Makefile b/drivers/hisilicon/cma/Makefile new file mode 100644 -index 000000000000..eefda7f57298 +index 000000000..eefda7f57 --- /dev/null +++ b/drivers/hisilicon/cma/Makefile @@ -0,0 +1,2 @@ @@ -307616,7 +307614,7 @@ index 000000000000..eefda7f57298 +obj-$(CONFIG_CMA) += hi_cma.o diff --git a/drivers/hisilicon/cma/hi_cma.c b/drivers/hisilicon/cma/hi_cma.c new file mode 100644 -index 000000000000..7fa3620ba6e0 +index 000000000..7fa3620ba --- /dev/null +++ b/drivers/hisilicon/cma/hi_cma.c @@ -0,0 +1,199 @@ @@ -307820,7 +307818,7 @@ index 000000000000..7fa3620ba6e0 +RESERVEDMEM_OF_DECLARE(cma, "hisi-mmz", hisi_mmz_setup); + diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 017aec34a238..0972261907b1 100644 +index 017aec34a..097226190 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -593,6 +593,16 @@ config I2C_GPIO_FAULT_INJECTOR @@ -307862,7 +307860,7 @@ index 017aec34a238..0972261907b1 100644 + because DMA for 0xFFC one-time largest data transfers; endmenu diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 18b26af82b1c..08a90a9c7674 100644 +index 18b26af82..08a90a9c7 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -58,6 +58,7 @@ obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o @@ -307875,7 +307873,7 @@ index 18b26af82b1c..08a90a9c7674 100644 obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o diff --git a/drivers/i2c/busses/i2c-hibvt.c b/drivers/i2c/busses/i2c-hibvt.c new file mode 100644 -index 000000000000..4c7cd494ac40 +index 000000000..4c7cd494a --- /dev/null +++ b/drivers/i2c/busses/i2c-hibvt.c @@ -0,0 +1,1451 @@ @@ -309331,7 +309329,7 @@ index 000000000000..4c7cd494ac40 +MODULE_DESCRIPTION("HISILICON BVT I2C Bus driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c -index cbda91a0cb5f..503370220741 100644 +index cbda91a0c..503370220 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -239,7 +239,42 @@ static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr) @@ -309403,7 +309401,7 @@ index cbda91a0cb5f..503370220741 100644 /* NOTE: returning a fault code here could cause trouble * in buggy userspace code. Some old kernel bugs returned diff --git a/drivers/infiniband/hw/hfi1/mmu_rb.c b/drivers/infiniband/hw/hfi1/mmu_rb.c -index e1c7996c018e..b608f5519db6 100644 +index e1c7996c0..b608f5519 100644 --- a/drivers/infiniband/hw/hfi1/mmu_rb.c +++ b/drivers/infiniband/hw/hfi1/mmu_rb.c @@ -1,4 +1,5 @@ @@ -309552,7 +309550,7 @@ index e1c7996c018e..b608f5519db6 100644 trace_hfi1_mmu_rb_remove(node->addr, node->len); spin_lock_irqsave(&handler->lock, flags); diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c -index 412fa71245af..8580631907a6 100644 +index 412fa7124..858063190 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -872,7 +872,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, @@ -309565,7 +309563,7 @@ index 412fa71245af..8580631907a6 100644 mousedev->close_device = mixdev_close_devices; } else { diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c -index b5417012afc8..608bd6fe5eaa 100644 +index b5417012a..608bd6fe5 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -122,6 +122,24 @@ static DEFINE_RAW_SPINLOCK(cpu_map_lock); @@ -309719,7 +309717,7 @@ index b5417012afc8..608bd6fe5eaa 100644 goto error; diff --git a/drivers/irqchip/irq-map-hi3559av100.h b/drivers/irqchip/irq-map-hi3559av100.h new file mode 100644 -index 000000000000..5c7bec926617 +index 000000000..5c7bec926 --- /dev/null +++ b/drivers/irqchip/irq-map-hi3559av100.h @@ -0,0 +1,115 @@ @@ -309839,7 +309837,7 @@ index 000000000000..5c7bec926617 +#error "should not include irq-map-hi3559av100.h twice" +#endif diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c -index 1e9835dc24d4..68bfd615e8ef 100644 +index 1e9835dc2..68bfd615e 100644 --- a/drivers/media/usb/gspca/ov519.c +++ b/drivers/media/usb/gspca/ov519.c @@ -3492,6 +3492,11 @@ static void ov511_mode_init_regs(struct sd *sd) @@ -309867,7 +309865,7 @@ index 1e9835dc24d4..68bfd615e8ef 100644 ov518_reg_w32(sd, R51x_FIFO_PSIZE, packet_size & ~7, 2); diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index dd938a5d0409..22780b28fc88 100644 +index dd938a5d0..22780b28f 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -457,6 +457,17 @@ config MFD_HI655X_PMIC @@ -309889,7 +309887,7 @@ index dd938a5d0409..22780b28fc88 100644 tristate "HTC PASIC3 LED/DS1WM chip support" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index 5856a9489cbd..bb4d2ab213c0 100644 +index 5856a9489..bb4d2ab21 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -199,6 +199,7 @@ obj-$(CONFIG_MFD_AAT2870_CORE) += aat2870-core.o @@ -309902,7 +309900,7 @@ index 5856a9489cbd..bb4d2ab213c0 100644 obj-$(CONFIG_MFD_INTEL_LPSS_ACPI) += intel-lpss-acpi.o diff --git a/drivers/mfd/hisi_fmc.c b/drivers/mfd/hisi_fmc.c new file mode 100644 -index 000000000000..7aa23e56d0c3 +index 000000000..7aa23e56d --- /dev/null +++ b/drivers/mfd/hisi_fmc.c @@ -0,0 +1,134 @@ @@ -310041,7 +310039,7 @@ index 000000000000..7aa23e56d0c3 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("HiSilicon Flash Memory Controller Driver"); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index c723a1e54b18..8d055b1a066c 100644 +index c723a1e54..8d055b1a0 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -492,7 +492,7 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, @@ -310074,7 +310072,7 @@ index c723a1e54b18..8d055b1a066c 100644 if ((MMC_EXTRACT_INDEX_FROM_ARG(cmd.arg) == EXT_CSD_SANITIZE_START) && diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 56f7f3600469..0ae99386db61 100644 +index 56f7f3600..0ae99386d 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1701,6 +1701,9 @@ void mmc_power_off(struct mmc_host *host) @@ -310117,7 +310115,7 @@ index 56f7f3600469..0ae99386db61 100644 break; } diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index 4b18034537f5..48309caf528b 100644 +index 4b1803453..48309caf5 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1401,7 +1401,9 @@ static int mmc_select_hs400es(struct mmc_card *card) @@ -310150,7 +310148,7 @@ index 4b18034537f5..48309caf528b 100644 if (host->ocr_avail_mmc) host->ocr_avail = host->ocr_avail_mmc; diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c -index 04738359ec02..230ac785a012 100644 +index 04738359e..230ac785a 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1262,6 +1262,7 @@ int mmc_attach_sd(struct mmc_host *host) @@ -310162,7 +310160,7 @@ index 04738359ec02..230ac785a012 100644 if (host->ocr_avail_sd) host->ocr_avail = host->ocr_avail_sd; diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c -index 4e72ad24322f..d4310465cdff 100644 +index 4e72ad243..d4310465c 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -31,6 +31,10 @@ @@ -310249,7 +310247,7 @@ index 4e72ad24322f..d4310465cdff 100644 +#endif + diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index b7f809aa40c2..42f7320a06a5 100644 +index b7f809aa4..42f7320a0 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -209,6 +209,21 @@ config MMC_SDHCI_CNS3XXX @@ -310295,7 +310293,7 @@ index b7f809aa40c2..42f7320a06a5 100644 +source "drivers/mmc/host/himci/Kconfig" \ No newline at end of file diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index ce8398e6f2c0..39191b17e571 100644 +index ce8398e6f..39191b17e 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -84,6 +84,21 @@ obj-$(CONFIG_MMC_SDHCI_OF_AT91) += sdhci-of-at91.o @@ -310327,7 +310325,7 @@ index ce8398e6f2c0..39191b17e571 100644 + +obj-$(CONFIG_HIMCI) += himci/ diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c -index 2c5a6e7aadc0..fe1ab3a454b4 100644 +index 2c5a6e7aa..fe1ab3a45 100644 --- a/drivers/mmc/host/cqhci.c +++ b/drivers/mmc/host/cqhci.c @@ -54,6 +54,11 @@ static inline u8 *get_link_desc(struct cqhci_host *cq_host, u8 tag) @@ -310477,7 +310475,7 @@ index 2c5a6e7aadc0..fe1ab3a454b4 100644 static int cqhci_error_from_flags(unsigned int flags) diff --git a/drivers/mmc/host/cqhci.h b/drivers/mmc/host/cqhci.h -index 9e68286a07b4..3231af725dcc 100644 +index 9e68286a0..3231af725 100644 --- a/drivers/mmc/host/cqhci.h +++ b/drivers/mmc/host/cqhci.h @@ -88,6 +88,12 @@ @@ -310524,7 +310522,7 @@ index 9e68286a07b4..3231af725dcc 100644 #endif diff --git a/drivers/mmc/host/himci/Kconfig b/drivers/mmc/host/himci/Kconfig new file mode 100644 -index 000000000000..f3331c86279e +index 000000000..f3331c862 --- /dev/null +++ b/drivers/mmc/host/himci/Kconfig @@ -0,0 +1,23 @@ @@ -310553,7 +310551,7 @@ index 000000000000..f3331c86279e + diff --git a/drivers/mmc/host/himci/Makefile b/drivers/mmc/host/himci/Makefile new file mode 100644 -index 000000000000..6858bfcef463 +index 000000000..6858bfcef --- /dev/null +++ b/drivers/mmc/host/himci/Makefile @@ -0,0 +1,2 @@ @@ -310561,7 +310559,7 @@ index 000000000000..6858bfcef463 +hisi_mci-y := himci.o himci_proc.o diff --git a/drivers/mmc/host/himci/himci.c b/drivers/mmc/host/himci/himci.c new file mode 100644 -index 000000000000..e2fc160490a5 +index 000000000..e2fc16049 --- /dev/null +++ b/drivers/mmc/host/himci/himci.c @@ -0,0 +1,2582 @@ @@ -313149,7 +313147,7 @@ index 000000000000..e2fc160490a5 +#endif diff --git a/drivers/mmc/host/himci/himci.h b/drivers/mmc/host/himci/himci.h new file mode 100644 -index 000000000000..d882e847f539 +index 000000000..d882e847f --- /dev/null +++ b/drivers/mmc/host/himci/himci.h @@ -0,0 +1,156 @@ @@ -313311,7 +313309,7 @@ index 000000000000..d882e847f539 +#endif diff --git a/drivers/mmc/host/himci/himci_hi3516a.c b/drivers/mmc/host/himci/himci_hi3516a.c new file mode 100644 -index 000000000000..d9c707d8d87f +index 000000000..d9c707d8d --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3516a.c @@ -0,0 +1,94 @@ @@ -313411,7 +313409,7 @@ index 000000000000..d9c707d8d87f +} diff --git a/drivers/mmc/host/himci/himci_hi3516cv500.c b/drivers/mmc/host/himci/himci_hi3516cv500.c new file mode 100644 -index 000000000000..c06e87fb06a9 +index 000000000..c06e87fb0 --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3516cv500.c @@ -0,0 +1,162 @@ @@ -313579,7 +313577,7 @@ index 000000000000..c06e87fb06a9 +} diff --git a/drivers/mmc/host/himci/himci_hi3516dv300.c b/drivers/mmc/host/himci/himci_hi3516dv300.c new file mode 100644 -index 000000000000..bb312d6013f0 +index 000000000..bb312d601 --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3516dv300.c @@ -0,0 +1,160 @@ @@ -313745,7 +313743,7 @@ index 000000000000..bb312d6013f0 +} diff --git a/drivers/mmc/host/himci/himci_hi3518ev20x.c b/drivers/mmc/host/himci/himci_hi3518ev20x.c new file mode 100644 -index 000000000000..cf7e30bf8895 +index 000000000..cf7e30bf8 --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3518ev20x.c @@ -0,0 +1,152 @@ @@ -313903,7 +313901,7 @@ index 000000000000..cf7e30bf8895 +} diff --git a/drivers/mmc/host/himci/himci_hi3556v200.c b/drivers/mmc/host/himci/himci_hi3556v200.c new file mode 100644 -index 000000000000..a6aba8f0357f +index 000000000..a6aba8f03 --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3556v200.c @@ -0,0 +1,162 @@ @@ -314071,7 +314069,7 @@ index 000000000000..a6aba8f0357f +} diff --git a/drivers/mmc/host/himci/himci_hi3559v200.c b/drivers/mmc/host/himci/himci_hi3559v200.c new file mode 100644 -index 000000000000..2a942cb205ec +index 000000000..2a942cb20 --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3559v200.c @@ -0,0 +1,164 @@ @@ -314241,7 +314239,7 @@ index 000000000000..2a942cb205ec + diff --git a/drivers/mmc/host/himci/himci_proc.c b/drivers/mmc/host/himci/himci_proc.c new file mode 100644 -index 000000000000..ac339c4da288 +index 000000000..ac339c4da --- /dev/null +++ b/drivers/mmc/host/himci/himci_proc.c @@ -0,0 +1,246 @@ @@ -314493,7 +314491,7 @@ index 000000000000..ac339c4da288 +} diff --git a/drivers/mmc/host/himci/himci_proc.h b/drivers/mmc/host/himci/himci_proc.h new file mode 100644 -index 000000000000..e6ea9a137bbb +index 000000000..e6ea9a137 --- /dev/null +++ b/drivers/mmc/host/himci/himci_proc.h @@ -0,0 +1,36 @@ @@ -314535,7 +314533,7 @@ index 000000000000..e6ea9a137bbb +#endif /* __MCI_PROC_H__ */ diff --git a/drivers/mmc/host/himci/himci_reg.h b/drivers/mmc/host/himci/himci_reg.h new file mode 100644 -index 000000000000..d1d8f9f9ded5 +index 000000000..d1d8f9f9d --- /dev/null +++ b/drivers/mmc/host/himci/himci_reg.h @@ -0,0 +1,241 @@ @@ -314782,7 +314780,7 @@ index 000000000000..d1d8f9f9ded5 +#endif diff --git a/drivers/mmc/host/mci_proc.c b/drivers/mmc/host/mci_proc.c new file mode 100644 -index 000000000000..9465ad3feb44 +index 000000000..9465ad3fe --- /dev/null +++ b/drivers/mmc/host/mci_proc.c @@ -0,0 +1,301 @@ @@ -315089,7 +315087,7 @@ index 000000000000..9465ad3feb44 +} diff --git a/drivers/mmc/host/mci_proc.h b/drivers/mmc/host/mci_proc.h new file mode 100644 -index 000000000000..459c5d767086 +index 000000000..459c5d767 --- /dev/null +++ b/drivers/mmc/host/mci_proc.h @@ -0,0 +1,50 @@ @@ -315145,7 +315143,7 @@ index 000000000000..459c5d767086 +#endif /* __MCI_PROC_H__ */ diff --git a/drivers/mmc/host/sdhci-hi3516dv200.c b/drivers/mmc/host/sdhci-hi3516dv200.c new file mode 100644 -index 000000000000..c149a0d28a96 +index 000000000..c149a0d28 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3516dv200.c @@ -0,0 +1,674 @@ @@ -315825,7 +315823,7 @@ index 000000000000..c149a0d28a96 +} diff --git a/drivers/mmc/host/sdhci-hi3516ev200.c b/drivers/mmc/host/sdhci-hi3516ev200.c new file mode 100644 -index 000000000000..9ba447306c47 +index 000000000..9ba447306 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3516ev200.c @@ -0,0 +1,669 @@ @@ -316500,7 +316498,7 @@ index 000000000000..9ba447306c47 +} diff --git a/drivers/mmc/host/sdhci-hi3516ev300.c b/drivers/mmc/host/sdhci-hi3516ev300.c new file mode 100644 -index 000000000000..c149a0d28a96 +index 000000000..c149a0d28 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3516ev300.c @@ -0,0 +1,674 @@ @@ -317180,7 +317178,7 @@ index 000000000000..c149a0d28a96 +} diff --git a/drivers/mmc/host/sdhci-hi3518ev300.c b/drivers/mmc/host/sdhci-hi3518ev300.c new file mode 100644 -index 000000000000..b241807904ff +index 000000000..b24180790 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3518ev300.c @@ -0,0 +1,669 @@ @@ -317855,7 +317853,7 @@ index 000000000000..b241807904ff +} diff --git a/drivers/mmc/host/sdhci-hi3519av100.c b/drivers/mmc/host/sdhci-hi3519av100.c new file mode 100644 -index 000000000000..1b7063a87860 +index 000000000..1b7063a87 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3519av100.c @@ -0,0 +1,19 @@ @@ -317880,7 +317878,7 @@ index 000000000000..1b7063a87860 +#include "sdhci-hi3556av100.c" diff --git a/drivers/mmc/host/sdhci-hi3521dv200.c b/drivers/mmc/host/sdhci-hi3521dv200.c new file mode 100644 -index 000000000000..db8a76bf42df +index 000000000..db8a76bf4 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3521dv200.c @@ -0,0 +1,573 @@ @@ -318459,7 +318457,7 @@ index 000000000000..db8a76bf42df +} diff --git a/drivers/mmc/host/sdhci-hi3531dv200.c b/drivers/mmc/host/sdhci-hi3531dv200.c new file mode 100644 -index 000000000000..1ddec9b8384f +index 000000000..1ddec9b83 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3531dv200.c @@ -0,0 +1,548 @@ @@ -319013,7 +319011,7 @@ index 000000000000..1ddec9b8384f +} diff --git a/drivers/mmc/host/sdhci-hi3556av100.c b/drivers/mmc/host/sdhci-hi3556av100.c new file mode 100644 -index 000000000000..e679b6a703a1 +index 000000000..e679b6a70 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3556av100.c @@ -0,0 +1,627 @@ @@ -319646,7 +319644,7 @@ index 000000000000..e679b6a703a1 +} diff --git a/drivers/mmc/host/sdhci-hi3559av100.c b/drivers/mmc/host/sdhci-hi3559av100.c new file mode 100644 -index 000000000000..69fe6ee5b8e3 +index 000000000..69fe6ee5b --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3559av100.c @@ -0,0 +1,630 @@ @@ -320282,7 +320280,7 @@ index 000000000000..69fe6ee5b8e3 +} diff --git a/drivers/mmc/host/sdhci-hisi.c b/drivers/mmc/host/sdhci-hisi.c new file mode 100644 -index 000000000000..be2a903acf78 +index 000000000..be2a903ac --- /dev/null +++ b/drivers/mmc/host/sdhci-hisi.c @@ -0,0 +1,783 @@ @@ -321071,7 +321069,7 @@ index 000000000000..be2a903acf78 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mmc/host/sdhci-hisi.h b/drivers/mmc/host/sdhci-hisi.h new file mode 100644 -index 000000000000..19cea6dc594c +index 000000000..19cea6dc5 --- /dev/null +++ b/drivers/mmc/host/sdhci-hisi.h @@ -0,0 +1,126 @@ @@ -321202,7 +321200,7 @@ index 000000000000..19cea6dc594c + +#endif /* _DRIVERS_MMC_SDHCI_HISI_H */ diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index 499a3d2a8e31..c05a44d5ed0f 100644 +index 499a3d2a8..c05a44d5e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -237,7 +237,7 @@ static void sdhci_set_default_irqs(struct sdhci_host *host) @@ -321781,7 +321779,7 @@ index 499a3d2a8e31..c05a44d5ed0f 100644 EXPORT_SYMBOL_GPL(sdhci_remove_host); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h -index c0372e3443fd..6ee02602681c 100644 +index c0372e344..6ee026026 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -86,6 +86,7 @@ @@ -321988,7 +321986,7 @@ index c0372e3443fd..6ee02602681c 100644 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile -index 93473d215a38..d08c65353fee 100644 +index 93473d215..d08c65353 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -32,7 +32,8 @@ obj-$(CONFIG_MTD_SWAP) += mtdswap.o @@ -322002,7 +322000,7 @@ index 93473d215a38..d08c65353fee 100644 + obj-$(CONFIG_MTD_UBI) += ubi/ diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 9033215e62ea..16b91f1f1070 100644 +index 9033215e6..16b91f1f1 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -3,5 +3,29 @@ config MTD_NAND_CORE @@ -322036,7 +322034,7 @@ index 9033215e62ea..16b91f1f1070 100644 +source "drivers/mtd/nand/hifmc100_nand/Kconfig" source "drivers/mtd/nand/spi/Kconfig" diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile -index 7ecd80c0a66e..547443b5c425 100644 +index 7ecd80c0a..547443b5c 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -1,6 +1,8 @@ @@ -322050,7 +322048,7 @@ index 7ecd80c0a66e..547443b5c425 100644 obj-y += onenand/ diff --git a/drivers/mtd/nand/hifmc100/Kconfig b/drivers/mtd/nand/hifmc100/Kconfig new file mode 100644 -index 000000000000..5b15bc8b994d +index 000000000..5b15bc8b9 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/Kconfig @@ -0,0 +1,17 @@ @@ -322073,7 +322071,7 @@ index 000000000000..5b15bc8b994d + while reading or writing the SPI nand flash. diff --git a/drivers/mtd/nand/hifmc100/Makefile b/drivers/mtd/nand/hifmc100/Makefile new file mode 100644 -index 000000000000..b1fda5de8ff0 +index 000000000..b1fda5de8 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/Makefile @@ -0,0 +1,26 @@ @@ -322105,7 +322103,7 @@ index 000000000000..b1fda5de8ff0 +obj-y += hifmc100.o hifmc100_os.o diff --git a/drivers/mtd/nand/hifmc100/hifmc100.c b/drivers/mtd/nand/hifmc100/hifmc100.c new file mode 100644 -index 000000000000..6cb12d3b6985 +index 000000000..6cb12d3b6 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100.c @@ -0,0 +1,1218 @@ @@ -323329,7 +323327,7 @@ index 000000000000..6cb12d3b6985 +#endif diff --git a/drivers/mtd/nand/hifmc100/hifmc100.h b/drivers/mtd/nand/hifmc100/hifmc100.h new file mode 100644 -index 000000000000..9f169f3d5966 +index 000000000..9f169f3d5 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100.h @@ -0,0 +1,354 @@ @@ -323689,7 +323687,7 @@ index 000000000000..9f169f3d5966 +#endif /* End of __HIFMC100_H__ */ diff --git a/drivers/mtd/nand/hifmc100/hifmc100_os.c b/drivers/mtd/nand/hifmc100/hifmc100_os.c new file mode 100644 -index 000000000000..980bfb8f6055 +index 000000000..980bfb8f6 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100_os.c @@ -0,0 +1,247 @@ @@ -323942,7 +323940,7 @@ index 000000000000..980bfb8f6055 +MODULE_DESCRIPTION("Hisilicon Flash Memory Controller V100 SPI Nand Driver"); diff --git a/drivers/mtd/nand/hifmc100/hifmc100_spi_general.c b/drivers/mtd/nand/hifmc100/hifmc100_spi_general.c new file mode 100644 -index 000000000000..3b46205f353b +index 000000000..3b46205f3 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100_spi_general.c @@ -0,0 +1,313 @@ @@ -324261,7 +324259,7 @@ index 000000000000..3b46205f353b +} diff --git a/drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c b/drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c new file mode 100644 -index 000000000000..bf963d146cd0 +index 000000000..bf963d146 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c @@ -0,0 +1,2457 @@ @@ -326724,7 +326722,7 @@ index 000000000000..bf963d146cd0 +#endif /* CONFIG_PM */ diff --git a/drivers/mtd/nand/hifmc100_nand/Kconfig b/drivers/mtd/nand/hifmc100_nand/Kconfig new file mode 100644 -index 000000000000..188c9a77a651 +index 000000000..188c9a77a --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/Kconfig @@ -0,0 +1,50 @@ @@ -326780,7 +326778,7 @@ index 000000000000..188c9a77a651 +endif # End of MTD_NAND_HIFMC100 diff --git a/drivers/mtd/nand/hifmc100_nand/Makefile b/drivers/mtd/nand/hifmc100_nand/Makefile new file mode 100644 -index 000000000000..623363cfc084 +index 000000000..623363cfc --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/Makefile @@ -0,0 +1,26 @@ @@ -326812,7 +326810,7 @@ index 000000000000..623363cfc084 +obj-y += hifmc100_nand.o hifmc100_nand_os.o diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c new file mode 100644 -index 000000000000..5c08d4beb807 +index 000000000..5c08d4beb --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c @@ -0,0 +1,1170 @@ @@ -327988,7 +327986,7 @@ index 000000000000..5c08d4beb807 +#endif /* CONFIG_PM */ diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h new file mode 100644 -index 000000000000..fba2f43ba0d4 +index 000000000..fba2f43ba --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h @@ -0,0 +1,151 @@ @@ -328145,7 +328143,7 @@ index 000000000000..fba2f43ba0d4 +#endif /* End of __HIFMC100_NAND_H__ */ diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c new file mode 100644 -index 000000000000..0849cd3cbd95 +index 000000000..0849cd3cb --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c @@ -0,0 +1,180 @@ @@ -328331,7 +328329,7 @@ index 000000000000..0849cd3cbd95 +MODULE_DESCRIPTION("Hisilicon Flash Memory Controller V100 Nand Driver"); diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h new file mode 100644 -index 000000000000..a27813530277 +index 000000000..a27813530 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h @@ -0,0 +1,72 @@ @@ -328409,7 +328407,7 @@ index 000000000000..a27813530277 +#endif /* End of __HIFMC100_NAND_OS_H__ */ diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c b/drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c new file mode 100644 -index 000000000000..b03510a449ec +index 000000000..b03510a44 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c @@ -0,0 +1,982 @@ @@ -329396,7 +329394,7 @@ index 000000000000..b03510a449ec + get_spi_nand_flash_type_hook = hifmc_get_spl_flash_type; +} diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile -index d5a5f9832b88..5e5a48cace7a 100644 +index d5a5f9832..5e5a48cac 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -58,7 +58,7 @@ obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o @@ -329410,7 +329408,7 @@ index d5a5f9832b88..5e5a48cace7a 100644 nand-objs += nand_macronix.o diff --git a/drivers/mtd/nand/raw/hinfc_gen.c b/drivers/mtd/nand/raw/hinfc_gen.c new file mode 100644 -index 000000000000..127edd6b4a7d +index 000000000..127edd6b4 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_gen.c @@ -0,0 +1,237 @@ @@ -329654,7 +329652,7 @@ index 000000000000..127edd6b4a7d \ No newline at end of file diff --git a/drivers/mtd/nand/raw/hinfc_gen.h b/drivers/mtd/nand/raw/hinfc_gen.h new file mode 100644 -index 000000000000..673ab83610c9 +index 000000000..673ab8361 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_gen.h @@ -0,0 +1,281 @@ @@ -329942,7 +329940,7 @@ index 000000000000..673ab83610c9 \ No newline at end of file diff --git a/drivers/mtd/nand/raw/hinfc_spl_ids.c b/drivers/mtd/nand/raw/hinfc_spl_ids.c new file mode 100644 -index 000000000000..0fd7db974368 +index 000000000..0fd7db974 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_spl_ids.c @@ -0,0 +1,970 @@ @@ -330918,7 +330916,7 @@ index 000000000000..0fd7db974368 +} diff --git a/drivers/mtd/nand/raw/match_table.c b/drivers/mtd/nand/raw/match_table.c new file mode 100644 -index 000000000000..6bad75f979ce +index 000000000..6bad75f97 --- /dev/null +++ b/drivers/mtd/nand/raw/match_table.c @@ -0,0 +1,102 @@ @@ -331026,7 +331024,7 @@ index 000000000000..6bad75f979ce +} diff --git a/drivers/mtd/nand/raw/match_table.h b/drivers/mtd/nand/raw/match_table.h new file mode 100644 -index 000000000000..9c5f0af094b4 +index 000000000..9c5f0af09 --- /dev/null +++ b/drivers/mtd/nand/raw/match_table.h @@ -0,0 +1,51 @@ @@ -331082,7 +331080,7 @@ index 000000000000..9c5f0af094b4 + +#endif /* End of __MATCH_TABLE_H__ */ diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c -index de3926eaec13..887101d919f9 100644 +index de3926eae..887101d91 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -47,6 +47,7 @@ @@ -331174,7 +331172,7 @@ index de3926eaec13..887101d919f9 100644 free_detect_allocation: diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c -index 5423c3bb388e..4ec2c852a3ea 100644 +index 5423c3bb3..4ec2c852a 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -181,10 +181,18 @@ static const struct nand_manufacturer nand_manufacturers[] = { @@ -331198,7 +331196,7 @@ index 5423c3bb388e..4ec2c852a3ea 100644 /** diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig -index 37775fc09e09..7e9bd9ec19eb 100644 +index 37775fc09..7e9bd9ec1 100644 --- a/drivers/mtd/spi-nor/Kconfig +++ b/drivers/mtd/spi-nor/Kconfig @@ -69,11 +69,12 @@ config SPI_FSL_QUADSPI @@ -331252,7 +331250,7 @@ index 37775fc09e09..7e9bd9ec19eb 100644 + endif # MTD_SPI_NOR diff --git a/drivers/mtd/spi-nor/hisi-sfc.c b/drivers/mtd/spi-nor/hisi-sfc.c -index dea7b0c4b339..ebe41994d194 100644 +index dea7b0c4b..ebe41994d 100644 --- a/drivers/mtd/spi-nor/hisi-sfc.c +++ b/drivers/mtd/spi-nor/hisi-sfc.c @@ -27,6 +27,13 @@ @@ -331856,7 +331854,7 @@ index dea7b0c4b339..ebe41994d194 100644 module_platform_driver(hisi_spi_nor_driver); diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c -index ff641c06003a..9cdc47053c41 100644 +index ff641c060..9cdc47053 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -41,6 +41,73 @@ @@ -333310,7 +333308,7 @@ index ff641c06003a..9cdc47053c41 100644 dev_err(dev, "address width is too large: %u\n", nor->addr_width); diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig -index 25152715396b..c8a6291e8f79 100644 +index 251527153..c8a6291e8 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig @@ -125,4 +125,6 @@ config HNS3_ENET @@ -333321,7 +333319,7 @@ index 25152715396b..c8a6291e8f79 100644 + endif # NET_VENDOR_HISILICON diff --git a/drivers/net/ethernet/hisilicon/Makefile b/drivers/net/ethernet/hisilicon/Makefile -index 7f76d412047a..95598fffc874 100644 +index 7f76d4120..95598fffc 100644 --- a/drivers/net/ethernet/hisilicon/Makefile +++ b/drivers/net/ethernet/hisilicon/Makefile @@ -8,4 +8,5 @@ obj-$(CONFIG_HIP04_ETH) += hip04_eth.o @@ -333333,7 +333331,7 @@ index 7f76d412047a..95598fffc874 100644 +obj-$(CONFIG_HIETH_GMAC) += higmac/ diff --git a/drivers/net/ethernet/hisilicon/higmac/Kconfig b/drivers/net/ethernet/hisilicon/higmac/Kconfig new file mode 100644 -index 000000000000..97b173e0073e +index 000000000..97b173e00 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/Kconfig @@ -0,0 +1,106 @@ @@ -333445,7 +333443,7 @@ index 000000000000..97b173e0073e +endif # HIETH_GMAC diff --git a/drivers/net/ethernet/hisilicon/higmac/Makefile b/drivers/net/ethernet/hisilicon/higmac/Makefile new file mode 100644 -index 000000000000..b19e27d42c73 +index 000000000..b19e27d42 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/Makefile @@ -0,0 +1,2 @@ @@ -333453,7 +333451,7 @@ index 000000000000..b19e27d42c73 +hieth-gmac-objs := board.o higmac.o pm.o util.o autoeee/autoeee.o autoeee/phy_id_table.o diff --git a/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c new file mode 100644 -index 000000000000..05c2b6205beb +index 000000000..05c2b6205 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c @@ -0,0 +1,162 @@ @@ -333621,7 +333619,7 @@ index 000000000000..05c2b6205beb +} diff --git a/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h new file mode 100644 -index 000000000000..30cbb9799a9e +index 000000000..30cbb9799 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h @@ -0,0 +1,52 @@ @@ -333679,7 +333677,7 @@ index 000000000000..30cbb9799a9e +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c b/drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c new file mode 100644 -index 000000000000..d98bbf1f0758 +index 000000000..d98bbf1f0 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c @@ -0,0 +1,184 @@ @@ -333869,7 +333867,7 @@ index 000000000000..d98bbf1f0758 +}; diff --git a/drivers/net/ethernet/hisilicon/higmac/board.c b/drivers/net/ethernet/hisilicon/higmac/board.c new file mode 100644 -index 000000000000..b7a1d879df03 +index 000000000..b7a1d879d --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/board.c @@ -0,0 +1,118 @@ @@ -333993,7 +333991,7 @@ index 000000000000..b7a1d879df03 +} diff --git a/drivers/net/ethernet/hisilicon/higmac/higmac.c b/drivers/net/ethernet/hisilicon/higmac/higmac.c new file mode 100644 -index 000000000000..e777123440c4 +index 000000000..e77712344 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/higmac.c @@ -0,0 +1,2645 @@ @@ -336644,7 +336642,7 @@ index 000000000000..e777123440c4 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/ethernet/hisilicon/higmac/higmac.h b/drivers/net/ethernet/hisilicon/higmac/higmac.h new file mode 100644 -index 000000000000..2e26d8064dbd +index 000000000..2e26d8064 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/higmac.h @@ -0,0 +1,603 @@ @@ -337253,7 +337251,7 @@ index 000000000000..2e26d8064dbd +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/pm.c b/drivers/net/ethernet/hisilicon/higmac/pm.c new file mode 100644 -index 000000000000..4ad8e7c0c15d +index 000000000..4ad8e7c0c --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/pm.c @@ -0,0 +1,341 @@ @@ -337600,7 +337598,7 @@ index 000000000000..4ad8e7c0c15d +} diff --git a/drivers/net/ethernet/hisilicon/higmac/pm.h b/drivers/net/ethernet/hisilicon/higmac/pm.h new file mode 100644 -index 000000000000..e54ced46c903 +index 000000000..e54ced46c --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/pm.h @@ -0,0 +1,59 @@ @@ -337666,7 +337664,7 @@ index 000000000000..e54ced46c903 \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/higmac/proc_dev.c b/drivers/net/ethernet/hisilicon/higmac/proc_dev.c new file mode 100644 -index 000000000000..efb654fb4851 +index 000000000..efb654fb4 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/proc_dev.c @@ -0,0 +1,119 @@ @@ -337791,7 +337789,7 @@ index 000000000000..efb654fb4851 +} diff --git a/drivers/net/ethernet/hisilicon/higmac/sockioctl.h b/drivers/net/ethernet/hisilicon/higmac/sockioctl.h new file mode 100644 -index 000000000000..349f0f215506 +index 000000000..349f0f215 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/sockioctl.h @@ -0,0 +1,19 @@ @@ -337816,7 +337814,7 @@ index 000000000000..349f0f215506 +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/tso.h b/drivers/net/ethernet/hisilicon/higmac/tso.h new file mode 100644 -index 000000000000..6c78d1d45e2e +index 000000000..6c78d1d45 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/tso.h @@ -0,0 +1,59 @@ @@ -337881,7 +337879,7 @@ index 000000000000..6c78d1d45e2e +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/util.c b/drivers/net/ethernet/hisilicon/higmac/util.c new file mode 100644 -index 000000000000..eae79af525a5 +index 000000000..eae79af52 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/util.c @@ -0,0 +1,975 @@ @@ -338862,7 +338860,7 @@ index 000000000000..eae79af525a5 +} diff --git a/drivers/net/ethernet/hisilicon/higmac/util.h b/drivers/net/ethernet/hisilicon/higmac/util.h new file mode 100644 -index 000000000000..ca1c99bb55e2 +index 000000000..ca1c99bb5 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/util.h @@ -0,0 +1,102 @@ @@ -338970,7 +338968,7 @@ index 000000000000..ca1c99bb55e2 +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/Makefile b/drivers/net/ethernet/hisilicon/hisi-femac/Makefile new file mode 100644 -index 000000000000..bfad94751c3a +index 000000000..bfad94751 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/Makefile @@ -0,0 +1,6 @@ @@ -338982,7 +338980,7 @@ index 000000000000..bfad94751c3a +hisi-femac-objs := hisi_femac.o phy_fix.o util.o diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h new file mode 100644 -index 000000000000..8b9a11d8cac2 +index 000000000..8b9a11d8c --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h @@ -0,0 +1,191 @@ @@ -339180,7 +339178,7 @@ index 000000000000..8b9a11d8cac2 \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h new file mode 100644 -index 000000000000..758d7968874b +index 000000000..758d79688 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h @@ -0,0 +1,84 @@ @@ -339270,7 +339268,7 @@ index 000000000000..758d7968874b +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h b/drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h new file mode 100644 -index 000000000000..edb9d53bb7f9 +index 000000000..edb9d53bb --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h @@ -0,0 +1,44 @@ @@ -339321,7 +339319,7 @@ index 000000000000..edb9d53bb7f9 \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c new file mode 100644 -index 000000000000..caa38efc129f +index 000000000..caa38efc1 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c @@ -0,0 +1,1581 @@ @@ -340908,7 +340906,7 @@ index 000000000000..caa38efc129f +MODULE_ALIAS("platform:hisi-femac"); diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h new file mode 100644 -index 000000000000..5e260ad18169 +index 000000000..5e260ad18 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h @@ -0,0 +1,269 @@ @@ -341183,7 +341181,7 @@ index 000000000000..5e260ad18169 +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c new file mode 100644 -index 000000000000..e7a3989b82ce +index 000000000..e7a3989b8 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c @@ -0,0 +1,109 @@ @@ -341298,7 +341296,7 @@ index 000000000000..e7a3989b82ce +} diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h new file mode 100644 -index 000000000000..b7a725090dab +index 000000000..b7a725090 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h @@ -0,0 +1,22 @@ @@ -341326,7 +341324,7 @@ index 000000000000..b7a725090dab +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/util.c b/drivers/net/ethernet/hisilicon/hisi-femac/util.c new file mode 100644 -index 000000000000..3617a3ba49ac +index 000000000..3617a3ba4 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/util.c @@ -0,0 +1,318 @@ @@ -341650,7 +341648,7 @@ index 000000000000..3617a3ba49ac +} diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/util.h b/drivers/net/ethernet/hisilicon/hisi-femac/util.h new file mode 100644 -index 000000000000..0094248570a1 +index 000000000..009424857 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/util.h @@ -0,0 +1,25 @@ @@ -341681,7 +341679,7 @@ index 000000000000..0094248570a1 +#endif \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c -index 2c2808830e95..82d9552b0c58 100644 +index 2c2808830..82d9552b0 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -98,7 +98,7 @@ @@ -341702,7 +341700,7 @@ index 2c2808830e95..82d9552b0c58 100644 MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:hisi-femac"); diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c -index aa2c25d7a61d..655a1083c709 100644 +index aa2c25d7a..655a1083c 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c @@ -706,7 +706,7 @@ static void hns_gmac_get_strings(u32 stringset, u8 *data) @@ -341715,7 +341713,7 @@ index aa2c25d7a61d..655a1083c709 100644 return 0; diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c -index 0942e4916d9d..5ff78b4f3cf9 100644 +index 0942e4916..5ff78b4f3 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c @@ -446,7 +446,7 @@ void hns_ppe_update_stats(struct hns_ppe_cb *ppe_cb) @@ -341728,7 +341726,7 @@ index 0942e4916d9d..5ff78b4f3cf9 100644 return 0; } diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c -index 5d64519b9b1d..8995301544f1 100644 +index 5d64519b9..899530154 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c @@ -899,7 +899,7 @@ void hns_rcb_get_stats(struct hnae_queue *queue, u64 *data) @@ -341741,7 +341739,7 @@ index 5d64519b9b1d..8995301544f1 100644 return 0; diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c -index e639a365ac2d..6b1db3bb8f19 100644 +index e639a365a..6b1db3bb8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -2078,14 +2078,17 @@ static int mlx4_en_get_module_eeprom(struct net_device *dev, @@ -341765,7 +341763,7 @@ index e639a365ac2d..6b1db3bb8f19 100644 i += ret; diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig -index 2386871e1294..2772d9304405 100644 +index 2386871e1..2772d9304 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -107,6 +107,13 @@ config MDIO_HISI_FEMAC @@ -341783,7 +341781,7 @@ index 2386871e1294..2772d9304405 100644 tristate depends on I2C diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile -index f21cda9d865e..43af039159e4 100644 +index f21cda9d8..43af03915 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -31,7 +31,10 @@ obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o @@ -341800,7 +341798,7 @@ index f21cda9d865e..43af039159e4 100644 obj-$(CONFIG_MDIO_MSCC_MIIM) += mdio-mscc-miim.o diff --git a/drivers/net/phy/mdio-hisi-femac.c b/drivers/net/phy/mdio-hisi-femac.c deleted file mode 100644 -index b03fedd6c1d8..000000000000 +index b03fedd6c..000000000 --- a/drivers/net/phy/mdio-hisi-femac.c +++ /dev/null @@ -1,166 +0,0 @@ @@ -341972,7 +341970,7 @@ index b03fedd6c1d8..000000000000 -MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/phy/mdio_hi3531dv200_gemac.c b/drivers/net/phy/mdio_hi3531dv200_gemac.c new file mode 100644 -index 000000000000..56a7ba2a14e9 +index 000000000..56a7ba2a1 --- /dev/null +++ b/drivers/net/phy/mdio_hi3531dv200_gemac.c @@ -0,0 +1,280 @@ @@ -342258,7 +342256,7 @@ index 000000000000..56a7ba2a14e9 +} diff --git a/drivers/net/phy/mdio_hi3535av100_gemac.c b/drivers/net/phy/mdio_hi3535av100_gemac.c new file mode 100644 -index 000000000000..9b82256d7b3e +index 000000000..9b82256d7 --- /dev/null +++ b/drivers/net/phy/mdio_hi3535av100_gemac.c @@ -0,0 +1,280 @@ @@ -342544,7 +342542,7 @@ index 000000000000..9b82256d7b3e +} diff --git a/drivers/net/phy/mdio_hisi_femac.c b/drivers/net/phy/mdio_hisi_femac.c new file mode 100644 -index 000000000000..25f187574ab9 +index 000000000..25f187574 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_femac.c @@ -0,0 +1,489 @@ @@ -343039,7 +343037,7 @@ index 000000000000..25f187574ab9 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/phy/mdio_hisi_gemac.c b/drivers/net/phy/mdio_hisi_gemac.c new file mode 100644 -index 000000000000..79ebfa400c09 +index 000000000..79ebfa400 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_gemac.c @@ -0,0 +1,256 @@ @@ -343301,7 +343299,7 @@ index 000000000000..79ebfa400c09 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/phy/mdio_hisi_gemac.h b/drivers/net/phy/mdio_hisi_gemac.h new file mode 100644 -index 000000000000..5eefc01e526f +index 000000000..5eefc01e5 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_gemac.h @@ -0,0 +1,32 @@ @@ -343338,7 +343336,7 @@ index 000000000000..5eefc01e526f + +#endif /* __MDIO_HISI_GEMAC_H__ */ diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c -index cc454b8c032c..2284c9bdf1ce 100644 +index cc454b8c0..2284c9bdf 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -355,6 +355,28 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, @@ -343371,7 +343369,7 @@ index cc454b8c032c..2284c9bdf1ce 100644 struct ethtool_link_ksettings *cmd) { diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c -index 271e8adc39f1..d113f4e2d69d 100644 +index 271e8adc3..d113f4e2d 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -32,6 +32,12 @@ @@ -343399,7 +343397,7 @@ index 271e8adc39f1..d113f4e2d69d 100644 if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c -index 0362acd5cdca..28321aca48fe 100644 +index 0362acd5c..28321aca4 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -23,6 +23,7 @@ @@ -343411,7 +343409,7 @@ index 0362acd5cdca..28321aca48fe 100644 /* alternative VLAN for IP session 0 if not untagged */ #define MBIM_IPS0_VID 4094 diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c -index b80cff96dea1..70597824c901 100644 +index b80cff96d..70597824c 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -5453,6 +5453,7 @@ static int rtl8xxxu_submit_int_urb(struct ieee80211_hw *hw) @@ -343423,7 +343421,7 @@ index b80cff96dea1..70597824c901 100644 } diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig -index 56ff8f6d31fc..2b92852df087 100644 +index 56ff8f6d3..2b92852df 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -148,3 +148,4 @@ source "drivers/pci/hotplug/Kconfig" @@ -343432,7 +343430,7 @@ index 56ff8f6d31fc..2b92852df087 100644 source "drivers/pci/switch/Kconfig" +source "drivers/pci/hipcie/Kconfig" diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile -index 1b2cfe51e8d7..94874ccec235 100644 +index 1b2cfe51e..94874ccec 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -33,5 +33,6 @@ obj-$(CONFIG_PCI_ENDPOINT) += endpoint/ @@ -343444,7 +343442,7 @@ index 1b2cfe51e8d7..94874ccec235 100644 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG diff --git a/drivers/pci/hipcie/Kconfig b/drivers/pci/hipcie/Kconfig new file mode 100644 -index 000000000000..c8d88ef66a08 +index 000000000..c8d88ef66 --- /dev/null +++ b/drivers/pci/hipcie/Kconfig @@ -0,0 +1,27 @@ @@ -343477,7 +343475,7 @@ index 000000000000..c8d88ef66a08 +endif diff --git a/drivers/pci/hipcie/Makefile b/drivers/pci/hipcie/Makefile new file mode 100644 -index 000000000000..04554201e991 +index 000000000..04554201e --- /dev/null +++ b/drivers/pci/hipcie/Makefile @@ -0,0 +1,8 @@ @@ -343491,7 +343489,7 @@ index 000000000000..04554201e991 +endif diff --git a/drivers/pci/hipcie/pci.h b/drivers/pci/hipcie/pci.h new file mode 100644 -index 000000000000..daefc0fafa2d +index 000000000..daefc0faf --- /dev/null +++ b/drivers/pci/hipcie/pci.h @@ -0,0 +1,96 @@ @@ -343593,7 +343591,7 @@ index 000000000000..daefc0fafa2d +#endif /* __ASM_MACH_PCI_H */ diff --git a/drivers/pci/hipcie/pcie.c b/drivers/pci/hipcie/pcie.c new file mode 100644 -index 000000000000..4c44b6b44aaa +index 000000000..4c44b6b44 --- /dev/null +++ b/drivers/pci/hipcie/pcie.c @@ -0,0 +1,985 @@ @@ -344584,7 +344582,7 @@ index 000000000000..4c44b6b44aaa +MODULE_LICENSE("GPL"); diff --git a/drivers/pci/hipcie/pcie_hi3519av100.c b/drivers/pci/hipcie/pcie_hi3519av100.c new file mode 100644 -index 000000000000..25e70cef233b +index 000000000..25e70cef2 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3519av100.c @@ -0,0 +1,281 @@ @@ -344871,7 +344869,7 @@ index 000000000000..25e70cef233b +} diff --git a/drivers/pci/hipcie/pcie_hi3519av100.h b/drivers/pci/hipcie/pcie_hi3519av100.h new file mode 100644 -index 000000000000..2803f45c2672 +index 000000000..2803f45c2 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3519av100.h @@ -0,0 +1,64 @@ @@ -344941,7 +344939,7 @@ index 000000000000..2803f45c2672 +#endif diff --git a/drivers/pci/hipcie/pcie_hi3531dv200.c b/drivers/pci/hipcie/pcie_hi3531dv200.c new file mode 100644 -index 000000000000..3b15e221897d +index 000000000..3b15e2218 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3531dv200.c @@ -0,0 +1,611 @@ @@ -345558,7 +345556,7 @@ index 000000000000..3b15e221897d +} diff --git a/drivers/pci/hipcie/pcie_hi3531dv200.h b/drivers/pci/hipcie/pcie_hi3531dv200.h new file mode 100644 -index 000000000000..9b1c3dbf3c85 +index 000000000..9b1c3dbf3 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3531dv200.h @@ -0,0 +1,69 @@ @@ -345633,7 +345631,7 @@ index 000000000000..9b1c3dbf3c85 +#endif diff --git a/drivers/pci/hipcie/pcie_hi3535av100.c b/drivers/pci/hipcie/pcie_hi3535av100.c new file mode 100644 -index 000000000000..a601e5458baa +index 000000000..a601e5458 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3535av100.c @@ -0,0 +1,479 @@ @@ -346118,7 +346116,7 @@ index 000000000000..a601e5458baa +} diff --git a/drivers/pci/hipcie/pcie_hi3559av100.c b/drivers/pci/hipcie/pcie_hi3559av100.c new file mode 100644 -index 000000000000..fd91603ebb4e +index 000000000..fd91603eb --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3559av100.c @@ -0,0 +1,389 @@ @@ -346513,7 +346511,7 @@ index 000000000000..fd91603ebb4e +} diff --git a/drivers/pci/hipcie/pcie_hi3559av100.h b/drivers/pci/hipcie/pcie_hi3559av100.h new file mode 100644 -index 000000000000..dd91a3076acd +index 000000000..dd91a3076 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3559av100.h @@ -0,0 +1,79 @@ @@ -346597,7 +346595,7 @@ index 000000000000..dd91a3076acd +#define MISC_CTRL5 0x14 +#endif diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index 78ae1cab9af7..9226e235bf8a 100644 +index 78ae1cab9..9226e235b 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -18,6 +18,7 @@ @@ -346619,7 +346617,7 @@ index 78ae1cab9af7..9226e235bf8a 100644 } diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig -index 5c8d452e35e2..29ec33e7c6ff 100644 +index 5c8d452e3..29ec33e7c 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -56,5 +56,6 @@ source "drivers/phy/samsung/Kconfig" @@ -346630,7 +346628,7 @@ index 5c8d452e35e2..29ec33e7c6ff 100644 endmenu diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile -index 84e3bd9c5665..aa1eaf173661 100644 +index 84e3bd9c5..aa1eaf173 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ @@ -346643,7 +346641,7 @@ index 84e3bd9c5665..aa1eaf173661 100644 marvell/ \ diff --git a/drivers/phy/hibvt/Kconfig b/drivers/phy/hibvt/Kconfig new file mode 100644 -index 000000000000..9fcb56c1c4ed +index 000000000..9fcb56c1c --- /dev/null +++ b/drivers/phy/hibvt/Kconfig @@ -0,0 +1,23 @@ @@ -346672,7 +346670,7 @@ index 000000000000..9fcb56c1c4ed +endif # HI_USB_PHY diff --git a/drivers/phy/hibvt/Makefile b/drivers/phy/hibvt/Makefile new file mode 100644 -index 000000000000..7b038f48e38f +index 000000000..7b038f48e --- /dev/null +++ b/drivers/phy/hibvt/Makefile @@ -0,0 +1,5 @@ @@ -346683,7 +346681,7 @@ index 000000000000..7b038f48e38f +obj-y += usb/ diff --git a/drivers/phy/hibvt/phy-hi3521dv200-sata.c b/drivers/phy/hibvt/phy-hi3521dv200-sata.c new file mode 100644 -index 000000000000..68d94992d3ad +index 000000000..68d94992d --- /dev/null +++ b/drivers/phy/hibvt/phy-hi3521dv200-sata.c @@ -0,0 +1,681 @@ @@ -347370,7 +347368,7 @@ index 000000000000..68d94992d3ad +} diff --git a/drivers/phy/hibvt/phy-hi3531dv200-sata.c b/drivers/phy/hibvt/phy-hi3531dv200-sata.c new file mode 100644 -index 000000000000..cbeb0ae1861d +index 000000000..cbeb0ae18 --- /dev/null +++ b/drivers/phy/hibvt/phy-hi3531dv200-sata.c @@ -0,0 +1,1081 @@ @@ -348457,7 +348455,7 @@ index 000000000000..cbeb0ae1861d +} diff --git a/drivers/phy/hibvt/phy-hi3535av100-sata.c b/drivers/phy/hibvt/phy-hi3535av100-sata.c new file mode 100644 -index 000000000000..7a546a85bd7f +index 000000000..7a546a85b --- /dev/null +++ b/drivers/phy/hibvt/phy-hi3535av100-sata.c @@ -0,0 +1,730 @@ @@ -349193,7 +349191,7 @@ index 000000000000..7a546a85bd7f +} diff --git a/drivers/phy/hibvt/phy-hisi-sata.c b/drivers/phy/hibvt/phy-hisi-sata.c new file mode 100644 -index 000000000000..d7384fec3bcb +index 000000000..d7384fec3 --- /dev/null +++ b/drivers/phy/hibvt/phy-hisi-sata.c @@ -0,0 +1,175 @@ @@ -349374,7 +349372,7 @@ index 000000000000..d7384fec3bcb +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/hibvt/phy-hisi-sata.h b/drivers/phy/hibvt/phy-hisi-sata.h new file mode 100644 -index 000000000000..44730c519a2b +index 000000000..44730c519 --- /dev/null +++ b/drivers/phy/hibvt/phy-hisi-sata.h @@ -0,0 +1,39 @@ @@ -349419,7 +349417,7 @@ index 000000000000..44730c519a2b +}; diff --git a/drivers/phy/hibvt/usb/Kconfig b/drivers/phy/hibvt/usb/Kconfig new file mode 100644 -index 000000000000..c7b5ab6e77d5 +index 000000000..c7b5ab6e7 --- /dev/null +++ b/drivers/phy/hibvt/usb/Kconfig @@ -0,0 +1,85 @@ @@ -349510,7 +349508,7 @@ index 000000000000..c7b5ab6e77d5 +endif # USB_MODE_OPTION diff --git a/drivers/phy/hibvt/usb/Makefile b/drivers/phy/hibvt/usb/Makefile new file mode 100644 -index 000000000000..dc9e8d71f93b +index 000000000..dc9e8d71f --- /dev/null +++ b/drivers/phy/hibvt/usb/Makefile @@ -0,0 +1,17 @@ @@ -349533,7 +349531,7 @@ index 000000000000..dc9e8d71f93b +obj-$(CONFIG_PHY_HISI_XVP_USB2) += phy-hixvp-hisi-usb.o diff --git a/drivers/phy/hibvt/usb/phy-hi3516cv500-usb.c b/drivers/phy/hibvt/usb/phy-hi3516cv500-usb.c new file mode 100644 -index 000000000000..1de2d18ecb0e +index 000000000..1de2d18ec --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3516cv500-usb.c @@ -0,0 +1,310 @@ @@ -349849,7 +349847,7 @@ index 000000000000..1de2d18ecb0e +EXPORT_SYMBOL(hisi_usb_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c b/drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c new file mode 100644 -index 000000000000..36abc425524a +index 000000000..36abc4255 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c @@ -0,0 +1,310 @@ @@ -350165,7 +350163,7 @@ index 000000000000..36abc425524a +EXPORT_SYMBOL(hisi_usb_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3519av100-usb.c b/drivers/phy/hibvt/usb/phy-hi3519av100-usb.c new file mode 100644 -index 000000000000..b46b858de243 +index 000000000..b46b858de --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3519av100-usb.c @@ -0,0 +1,431 @@ @@ -350602,7 +350600,7 @@ index 000000000000..b46b858de243 +EXPORT_SYMBOL(hisi_usb3_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3521dv200-usb.c b/drivers/phy/hibvt/usb/phy-hi3521dv200-usb.c new file mode 100644 -index 000000000000..347d571ae5b2 +index 000000000..347d571ae --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3521dv200-usb.c @@ -0,0 +1,446 @@ @@ -351054,7 +351052,7 @@ index 000000000000..347d571ae5b2 +EXPORT_SYMBOL(hisi_usb_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3531dv200-usb.c b/drivers/phy/hibvt/usb/phy-hi3531dv200-usb.c new file mode 100644 -index 000000000000..8d17cb6477b2 +index 000000000..8d17cb647 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3531dv200-usb.c @@ -0,0 +1,526 @@ @@ -351586,7 +351584,7 @@ index 000000000000..8d17cb6477b2 +EXPORT_SYMBOL(hisi_usb3_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3556av100-usb.c b/drivers/phy/hibvt/usb/phy-hi3556av100-usb.c new file mode 100644 -index 000000000000..b511636bcc14 +index 000000000..b511636bc --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3556av100-usb.c @@ -0,0 +1,429 @@ @@ -352021,7 +352019,7 @@ index 000000000000..b511636bcc14 +EXPORT_SYMBOL(hisi_usb3_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3556v200-usb.c b/drivers/phy/hibvt/usb/phy-hi3556v200-usb.c new file mode 100644 -index 000000000000..b1a2ceca0c7c +index 000000000..b1a2ceca0 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3556v200-usb.c @@ -0,0 +1,310 @@ @@ -352337,7 +352335,7 @@ index 000000000000..b1a2ceca0c7c +EXPORT_SYMBOL(hisi_usb_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3559av100-usb.c b/drivers/phy/hibvt/usb/phy-hi3559av100-usb.c new file mode 100644 -index 000000000000..e892c3118b08 +index 000000000..e892c3118 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3559av100-usb.c @@ -0,0 +1,372 @@ @@ -352715,7 +352713,7 @@ index 000000000000..e892c3118b08 +EXPORT_SYMBOL(hisi_usb3_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hi3559v200-usb.c b/drivers/phy/hibvt/usb/phy-hi3559v200-usb.c new file mode 100644 -index 000000000000..614e8485bad1 +index 000000000..614e8485b --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3559v200-usb.c @@ -0,0 +1,310 @@ @@ -353031,7 +353029,7 @@ index 000000000000..614e8485bad1 +EXPORT_SYMBOL(hisi_usb_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hisi-usb.c b/drivers/phy/hibvt/usb/phy-hisi-usb.c new file mode 100644 -index 000000000000..da83abdf9b45 +index 000000000..da83abdf9 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hisi-usb.c @@ -0,0 +1,149 @@ @@ -353186,7 +353184,7 @@ index 000000000000..da83abdf9b45 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/hibvt/usb/phy-hisi-usb.h b/drivers/phy/hibvt/usb/phy-hisi-usb.h new file mode 100644 -index 000000000000..5e20e6e4a767 +index 000000000..5e20e6e4a --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hisi-usb.h @@ -0,0 +1,72 @@ @@ -353264,7 +353262,7 @@ index 000000000000..5e20e6e4a767 +#endif /* USB2_INCLUDE_PHY_H */ diff --git a/drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c b/drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c new file mode 100644 -index 000000000000..be68319470cd +index 000000000..be6831947 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c @@ -0,0 +1,803 @@ @@ -354072,7 +354070,7 @@ index 000000000000..be68319470cd +MODULE_ALIAS("platform:hisi-usb-hixvp-phy"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig -index 6533aa560aa1..0b14869c8891 100644 +index 6533aa560..0b14869c8 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -94,7 +94,7 @@ config POWER_RESET_GPIO_RESTART @@ -354085,7 +354083,7 @@ index 6533aa560aa1..0b14869c8891 100644 Reboot support for Hisilicon boards. diff --git a/drivers/ras/Kconfig b/drivers/ras/Kconfig -index 4c3c67d13254..0e94b42845be 100644 +index 4c3c67d13..0e94b4284 100644 --- a/drivers/ras/Kconfig +++ b/drivers/ras/Kconfig @@ -28,8 +28,8 @@ menuconfig RAS @@ -354101,7 +354099,7 @@ index 4c3c67d13254..0e94b42845be 100644 -endif +#endif diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig -index 28a4505a1bc8..d5a1e7f86ff5 100644 +index 28a4505a1..d5a1e7f86 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -868,6 +868,14 @@ comment "Platform RTC drivers" @@ -354120,7 +354118,7 @@ index 28a4505a1bc8..d5a1e7f86ff5 100644 tristate "PC-style 'CMOS'" depends on X86 || ARM || PPC || MIPS || SPARC64 diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile -index 5ff2fc0c361a..51ae605b47a3 100644 +index 5ff2fc0c3..51ae605b4 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -23,6 +23,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o @@ -354133,7 +354131,7 @@ index 5ff2fc0c361a..51ae605b47a3 100644 obj-$(CONFIG_RTC_DRV_AB3100) += rtc-ab3100.o diff --git a/drivers/rtc/rtc-hibvt.c b/drivers/rtc/rtc-hibvt.c new file mode 100644 -index 000000000000..31b9ffe9ae5b +index 000000000..31b9ffe9a --- /dev/null +++ b/drivers/rtc/rtc-hibvt.c @@ -0,0 +1,663 @@ @@ -354801,7 +354799,7 @@ index 000000000000..31b9ffe9ae5b +MODULE_LICENSE("GPL v2"); +MODULE_VERSION("HI_VERSION=" OSDRV_MODULE_VERSION_STRING); diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig -index e09fe6ab3572..adbb4c5382bf 100644 +index e09fe6ab3..adbb4c538 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -109,3 +109,12 @@ config SCSI_UFS_HISI @@ -354818,7 +354816,7 @@ index e09fe6ab3572..adbb4c5382bf 100644 + Select this if you have UFS controller on Hi3751v810 chipset. + If unsure, say N. diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile -index 2c50f03d8c4a..d1859e3abeee 100644 +index 2c50f03d8..d1859e3ab 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -8,3 +8,4 @@ ufshcd-core-objs := ufshcd.o ufs-sysfs.o @@ -354828,7 +354826,7 @@ index 2c50f03d8c4a..d1859e3abeee 100644 +obj-$(CONFIG_SCSI_UFS_HI3559AV100) += hi3559av100.o diff --git a/drivers/scsi/ufs/hi3559av100.c b/drivers/scsi/ufs/hi3559av100.c new file mode 100644 -index 000000000000..e253dc398810 +index 000000000..e253dc398 --- /dev/null +++ b/drivers/scsi/ufs/hi3559av100.c @@ -0,0 +1,659 @@ @@ -355493,7 +355491,7 @@ index 000000000000..e253dc398810 +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/scsi/ufs/hi3559av100.h b/drivers/scsi/ufs/hi3559av100.h new file mode 100644 -index 000000000000..fe309a5d7184 +index 000000000..fe309a5d7 --- /dev/null +++ b/drivers/scsi/ufs/hi3559av100.h @@ -0,0 +1,111 @@ @@ -355609,7 +355607,7 @@ index 000000000000..fe309a5d7184 +#define DWC_UFS_REG_HCLKDIV 0xFC +#endif diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c -index 30c22e16b1e3..626bd84c6112 100644 +index 30c22e16b..626bd84c6 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -41,6 +41,9 @@ @@ -355704,7 +355702,7 @@ index 30c22e16b1e3..626bd84c6112 100644 err = ufshcd_init(hba, mmio_base, irq); diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c -index b2cbdd01ab10..6e0be9701878 100644 +index b2cbdd01a..6e0be9701 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -5636,6 +5636,40 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) @@ -355990,7 +355988,7 @@ index b2cbdd01ab10..6e0be9701878 100644 return 0; diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h -index 4554a4b725b5..5436fab362c8 100644 +index 4554a4b72..5436fab36 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -71,6 +71,7 @@ @@ -356079,7 +356077,7 @@ index 4554a4b725b5..5436fab362c8 100644 +} #endif /* End of Header */ diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c -index 19687da23774..3dd616f31fe2 100644 +index 19687da23..3dd616f31 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -417,8 +417,10 @@ static int spi_gpio_probe(struct platform_device *pdev) @@ -356095,7 +356093,7 @@ index 19687da23774..3dd616f31fe2 100644 master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32); master->mode_bits = SPI_3WIRE | SPI_CPHA | SPI_CPOL | SPI_CS_HIGH; diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c -index 1af8c96b940e..1c4128dc95bd 100644 +index 1af8c96b9..1c4128dc9 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -43,6 +43,7 @@ @@ -356464,7 +356462,7 @@ index 1af8c96b940e..1c4128dc95bd 100644 }; diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c -index 34a0e529cb5a..93b9212ea357 100644 +index 34a0e529c..93b9212ea 100644 --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c @@ -207,6 +207,7 @@ static int __set_selection(const struct tiocl_selection __user *sel, struct tty_ @@ -356518,7 +356516,7 @@ index 34a0e529cb5a..93b9212ea357 100644 } diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c -index 2fb509d57e88..e86464ffa3a3 100644 +index 2fb509d57..e86464ffa 100644 --- a/drivers/tty/vt/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c @@ -234,6 +234,9 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) @@ -356532,7 +356530,7 @@ index 2fb509d57e88..e86464ffa3a3 100644 if (!con_buf) return -ENOMEM; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index fa28f23a4a33..8d443a343f44 100644 +index fa28f23a4..8d443a343 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1382,6 +1382,10 @@ static int hub_configure(struct usb_hub *hub, @@ -356547,7 +356545,7 @@ index fa28f23a4a33..8d443a343f44 100644 ret = -ENODEV; goto fail; diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile -index 6e3ef6144e5d..22e0bdc550e1 100644 +index 6e3ef6144..22e0bdc55 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -2,10 +2,9 @@ @@ -356564,7 +356562,7 @@ index 6e3ef6144e5d..22e0bdc550e1 100644 dwc3-y += trace.o endif diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c -index 86b1cfbe48a0..93cad2e47606 100644 +index 86b1cfbe4..93cad2e47 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -37,9 +37,25 @@ @@ -356662,7 +356660,7 @@ index 86b1cfbe48a0..93cad2e47606 100644 } diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -index d6968b90ee6b..f8ffc521e376 100644 +index d6968b90e..f8ffc521e 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -30,6 +30,8 @@ @@ -356771,7 +356769,7 @@ index d6968b90ee6b..f8ffc521e376 100644 int dwc3_gadget_suspend(struct dwc3 *dwc); diff --git a/drivers/usb/dwc3/dwc3-hisi.c b/drivers/usb/dwc3/dwc3-hisi.c new file mode 100644 -index 000000000000..d8d3e83775ce +index 000000000..d8d3e8377 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-hisi.c @@ -0,0 +1,446 @@ @@ -357223,7 +357221,7 @@ index 000000000000..d8d3e83775ce +MODULE_AUTHOR("Hisilicon Technologies Co., Ltd..>"); diff --git a/drivers/usb/dwc3/dwc3-hisi.h b/drivers/usb/dwc3/dwc3-hisi.h new file mode 100644 -index 000000000000..606cf0507f6d +index 000000000..606cf0507 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-hisi.h @@ -0,0 +1,54 @@ @@ -357282,7 +357280,7 @@ index 000000000000..606cf0507f6d + +#endif diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c -index 0d95ca804c1e..e89f7bcc99d3 100644 +index 0d95ca804..e89f7bcc9 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -281,6 +281,24 @@ void dwc3_ep0_out_start(struct dwc3 *dwc) @@ -357358,7 +357356,7 @@ index 0d95ca804c1e..e89f7bcc99d3 100644 } break; diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -index f0d2f0a4e990..470b13687312 100644 +index f0d2f0a4e..470b13687 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -27,6 +27,8 @@ @@ -357673,7 +357671,7 @@ index f0d2f0a4e990..470b13687312 100644 if (ret) { dev_err(dwc->dev, "failed to register udc\n"); diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c -index 1a3878a3be78..f55947294f7c 100644 +index 1a3878a3b..f55947294 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -46,7 +46,7 @@ static int dwc3_host_get_irq(struct dwc3 *dwc) @@ -357697,7 +357695,7 @@ index 1a3878a3be78..f55947294f7c 100644 * where Port Disable command doesn't work. diff --git a/drivers/usb/dwc3/proc.c b/drivers/usb/dwc3/proc.c new file mode 100644 -index 000000000000..1d874e4b04dc +index 000000000..1d874e4b0 --- /dev/null +++ b/drivers/usb/dwc3/proc.c @@ -0,0 +1,139 @@ @@ -357841,7 +357839,7 @@ index 000000000000..1d874e4b04dc + return 0; +} diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c -index 40b3ed93596a..52da0f0b3711 100644 +index 40b3ed935..52da0f0b3 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -675,7 +675,7 @@ static int bos_desc(struct usb_composite_dev *cdev) @@ -357854,7 +357852,7 @@ index 40b3ed93596a..52da0f0b3711 100644 /* * The Superspeed USB Capability descriptor shall be implemented by all diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c -index 71b15c65b90f..380cef6b00ff 100644 +index 71b15c65b..380cef6b0 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -78,9 +78,16 @@ struct usb_ep *usb_ep_autoconfig_ss( @@ -357878,7 +357876,7 @@ index 71b15c65b90f..380cef6b00ff 100644 /* Fail */ diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 0b7b4d09785b..8075593d5af3 100644 +index 0b7b4d097..8075593d5 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -306,6 +306,7 @@ struct fsg_common { @@ -357925,7 +357923,7 @@ index 0b7b4d09785b..8075593d5af3 100644 for (i = 0; i < ARRAY_SIZE(common->luns); ++i) if (common->luns[i]) diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c -index 2746a926a8d9..b4593987fcf8 100644 +index 2746a926a..b4593987f 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -48,6 +48,16 @@ static inline struct f_uac1 *func_to_uac1(struct usb_function *f) @@ -358052,7 +358050,7 @@ index 2746a926a8d9..b4593987fcf8 100644 goto fail; diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c -index d8ce7868fe22..db41c9f7b27a 100644 +index d8ce7868f..db41c9f7b 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -649,7 +649,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) @@ -358129,7 +358127,7 @@ index d8ce7868fe22..db41c9f7b27a 100644 uvcg_attach_configfs(opts); return &opts->func_inst; diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h -index 2ed292e94fbc..32e62c2ac589 100644 +index 2ed292e94..32e62c2ac 100644 --- a/drivers/usb/gadget/function/u_uvc.h +++ b/drivers/usb/gadget/function/u_uvc.h @@ -49,6 +49,7 @@ struct f_uvc_opts { @@ -358152,7 +358150,7 @@ index 2ed292e94fbc..32e62c2ac589 100644 /* * Streaming descriptors for full-speed, high-speed and super-speed. diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h -index 93cf78b420fe..1b8ac8f1100b 100644 +index 93cf78b42..1b8ac8f11 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -63,8 +63,11 @@ extern unsigned int uvc_gadget_trace_param; @@ -358180,7 +358178,7 @@ index 93cf78b420fe..1b8ac8f1100b 100644 unsigned int req_size; struct usb_request *req[UVC_NUM_REQUESTS]; diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c -index 2e4c0391b583..080b12d9c78b 100644 +index 2e4c0391b..080b12d9c 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -266,7 +266,49 @@ static ssize_t uvcg_default_processing_bm_controls_show( @@ -359026,7 +359024,7 @@ index 2e4c0391b583..080b12d9c78b 100644 &uvcg_streaming_grp.group); configfs_add_default_group(&uvcg_streaming_class_grp.group, diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c -index 7f1ca3b57823..21dae27cf98c 100644 +index 7f1ca3b57..21dae27cf 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -56,8 +56,13 @@ struct uvc_format { @@ -359044,7 +359042,7 @@ index 7f1ca3b57823..21dae27cf98c 100644 static int diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c -index 2c9821ec836e..68b67755f676 100644 +index 2c9821ec8..68b67755f 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -12,13 +12,15 @@ @@ -359257,7 +359255,7 @@ index 2c9821ec836e..68b67755f676 100644 /* Initialize the video buffers queue. */ uvcg_queue_init(&video->queue, V4L2_BUF_TYPE_VIDEO_OUTPUT, diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c -index c773db129bf9..723e40e3e215 100644 +index c773db129..723e40e3e 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -97,6 +97,10 @@ static void option_instat_callback(struct urb *urb); @@ -359280,7 +359278,7 @@ index c773db129bf9..723e40e3e215 100644 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) }, diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c -index c989f777bf77..0bcb9027b59e 100644 +index c989f777b..0bcb9027b 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -645,6 +645,8 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev, uint32_t flags, @@ -359314,7 +359312,7 @@ index c989f777bf77..0bcb9027b59e 100644 + return ret; } diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c -index ec53310f1613..2a9cf43e7701 100644 +index ec53310f1..2a9cf43e7 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -23,9 +23,9 @@ @@ -359331,7 +359329,7 @@ index ec53310f1613..2a9cf43e7701 100644 #define DRIVER_VERSION "0.1" #define DRIVER_AUTHOR "aik@ozlabs.ru" diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c -index 95ce167a8ad9..36ab53053190 100644 +index 95ce167a8..36ab53053 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -30,6 +30,7 @@ @@ -359366,7 +359364,7 @@ index 95ce167a8ad9..36ab53053190 100644 /* diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c -index 72b779bc0942..8625625e03a5 100644 +index 72b779bc0..8625625e0 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -1074,6 +1074,7 @@ v9fs_vfs_getattr(const struct path *path, struct kstat *stat, @@ -359400,7 +359398,7 @@ index 72b779bc0942..8625625e03a5 100644 p9stat_free(st); kfree(st); diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c -index a950a927a626..f8763ab5b553 100644 +index a950a927a..f8763ab5b 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c @@ -474,6 +474,7 @@ v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat, @@ -359434,7 +359432,7 @@ index a950a927a626..f8763ab5b553 100644 stat->blksize = st->st_blksize; diff --git a/fs/aio.c b/fs/aio.c -index 413ec289bfa1..8bb72b644049 100644 +index 413ec289b..8bb72b644 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1759,6 +1759,12 @@ static ssize_t aio_poll(struct aio_kiocb *aiocb, const struct iocb *iocb) @@ -359460,7 +359458,7 @@ index 413ec289bfa1..8bb72b644049 100644 } diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c -index 94cfcbeaac6d..f03861b1b589 100644 +index 94cfcbeaa..f03861b1b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -9870,6 +9870,40 @@ btrfs_create_block_group_cache(struct btrfs_fs_info *fs_info, @@ -359546,7 +359544,7 @@ index 94cfcbeaac6d..f03861b1b589 100644 cache->flags = btrfs_block_group_flags(&cache->item); if (!mixed && diff --git a/fs/fat/dir.c b/fs/fat/dir.c -index de60c05c0ca1..cf1ef04b6406 100644 +index de60c05c0..cf1ef04b6 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -564,7 +564,8 @@ static int __fat_readdir(struct inode *inode, struct file *file, @@ -360042,7 +360040,7 @@ index de60c05c0ca1..cf1ef04b6406 100644 slots += copy; size -= copy; diff --git a/fs/fat/fat.h b/fs/fat/fat.h -index 9d7d2d5da28b..bf113a767a35 100644 +index 9d7d2d5da..bf113a767 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -416,6 +416,10 @@ extern void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec64 *ts, @@ -360057,7 +360055,7 @@ index 9d7d2d5da28b..bf113a767a35 100644 int fat_cache_init(void); diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c -index 4c6c635bc8aa..d9a7d69c56f1 100644 +index 4c6c635bc..d9a7d69c5 100644 --- a/fs/fat/fatent.c +++ b/fs/fat/fatent.c @@ -381,6 +381,9 @@ static int fat_mirror_bhs(struct super_block *sb, struct buffer_head **bhs, @@ -360087,7 +360085,7 @@ index 4c6c635bc8aa..d9a7d69c56f1 100644 if (sb->s_flags & SB_SYNCHRONOUS) err = sync_dirty_buffer(c_bh); diff --git a/fs/fat/file.c b/fs/fat/file.c -index f86ea08bd6ce..8919fa79e44d 100644 +index f86ea08bd..8919fa79e 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -205,8 +205,17 @@ int fat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync) @@ -360161,7 +360159,7 @@ index f86ea08bd6ce..8919fa79e44d 100644 up_write(&MSDOS_I(inode)->truncate_lock); } diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 607e1d124062..b40e15218848 100644 +index 607e1d124..b40e15218 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -622,8 +622,9 @@ static void fat_free_eofblocks(struct inode *inode) @@ -360267,7 +360265,7 @@ index 607e1d124062..b40e15218848 100644 return err; } diff --git a/fs/fat/misc.c b/fs/fat/misc.c -index 573836dcaefc..99fef1c89c6b 100644 +index 573836dca..99fef1c89 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -189,7 +189,8 @@ static long days_in_year[] = { @@ -360316,7 +360314,7 @@ index 573836dcaefc..99fef1c89c6b 100644 int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs) { diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h -index 5e91d578f4ed..01116b8eafdf 100644 +index 5e91d578f..01116b8ea 100644 --- a/fs/jffs2/compr.h +++ b/fs/jffs2/compr.h @@ -29,9 +29,15 @@ @@ -360337,7 +360335,7 @@ index 5e91d578f4ed..01116b8eafdf 100644 #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */ #define JFFS2_DYNRUBIN_DISABLED /* for decompression */ diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c -index d7d2fdda4bbd..54334fc0a310 100644 +index d7d2fdda4..54334fc0a 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1507,6 +1507,9 @@ static int ubifs_releasepage(struct page *page, gfp_t unused_gfp_flags) @@ -360352,7 +360350,7 @@ index d7d2fdda4bbd..54334fc0a310 100644 ClearPagePrivate(page); diff --git a/include/dt-bindings/clock/hi3516a-clock.h b/include/dt-bindings/clock/hi3516a-clock.h new file mode 100644 -index 000000000000..c889d561bebe +index 000000000..c889d561b --- /dev/null +++ b/include/dt-bindings/clock/hi3516a-clock.h @@ -0,0 +1,105 @@ @@ -360463,7 +360461,7 @@ index 000000000000..c889d561bebe +#endif /* __DTS_HI3516A_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3516cv500-clock.h b/include/dt-bindings/clock/hi3516cv500-clock.h new file mode 100644 -index 000000000000..f937680b9833 +index 000000000..f937680b9 --- /dev/null +++ b/include/dt-bindings/clock/hi3516cv500-clock.h @@ -0,0 +1,98 @@ @@ -360567,7 +360565,7 @@ index 000000000000..f937680b9833 +#endif /* __DTS_HI3516CV500_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3516dv200-clock.h b/include/dt-bindings/clock/hi3516dv200-clock.h new file mode 100644 -index 000000000000..7cf2cc3d79ef +index 000000000..7cf2cc3d7 --- /dev/null +++ b/include/dt-bindings/clock/hi3516dv200-clock.h @@ -0,0 +1,89 @@ @@ -360662,7 +360660,7 @@ index 000000000000..7cf2cc3d79ef +#endif diff --git a/include/dt-bindings/clock/hi3516dv300-clock.h b/include/dt-bindings/clock/hi3516dv300-clock.h new file mode 100644 -index 000000000000..408c9b09df9c +index 000000000..408c9b09d --- /dev/null +++ b/include/dt-bindings/clock/hi3516dv300-clock.h @@ -0,0 +1,100 @@ @@ -360768,7 +360766,7 @@ index 000000000000..408c9b09df9c +#endif /* __DTS_HI3516DV300_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3516ev200-clock.h b/include/dt-bindings/clock/hi3516ev200-clock.h new file mode 100644 -index 000000000000..78fd310d05c7 +index 000000000..78fd310d0 --- /dev/null +++ b/include/dt-bindings/clock/hi3516ev200-clock.h @@ -0,0 +1,89 @@ @@ -360863,7 +360861,7 @@ index 000000000000..78fd310d05c7 +#endif diff --git a/include/dt-bindings/clock/hi3516ev300-clock.h b/include/dt-bindings/clock/hi3516ev300-clock.h new file mode 100644 -index 000000000000..9a99dbe38895 +index 000000000..9a99dbe38 --- /dev/null +++ b/include/dt-bindings/clock/hi3516ev300-clock.h @@ -0,0 +1,89 @@ @@ -360958,7 +360956,7 @@ index 000000000000..9a99dbe38895 +#endif diff --git a/include/dt-bindings/clock/hi3518ev20x-clock.h b/include/dt-bindings/clock/hi3518ev20x-clock.h new file mode 100644 -index 000000000000..9d26d022b30d +index 000000000..9d26d022b --- /dev/null +++ b/include/dt-bindings/clock/hi3518ev20x-clock.h @@ -0,0 +1,86 @@ @@ -361050,7 +361048,7 @@ index 000000000000..9d26d022b30d +#endif /* __DTS_HI3518EV20X_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3518ev300-clock.h b/include/dt-bindings/clock/hi3518ev300-clock.h new file mode 100644 -index 000000000000..9c420a805b72 +index 000000000..9c420a805 --- /dev/null +++ b/include/dt-bindings/clock/hi3518ev300-clock.h @@ -0,0 +1,89 @@ @@ -361145,7 +361143,7 @@ index 000000000000..9c420a805b72 +#endif diff --git a/include/dt-bindings/clock/hi3519av100-clock.h b/include/dt-bindings/clock/hi3519av100-clock.h new file mode 100644 -index 000000000000..79abf3204a0f +index 000000000..79abf3204 --- /dev/null +++ b/include/dt-bindings/clock/hi3519av100-clock.h @@ -0,0 +1,127 @@ @@ -361278,7 +361276,7 @@ index 000000000000..79abf3204a0f +#endif diff --git a/include/dt-bindings/clock/hi3521a-clock.h b/include/dt-bindings/clock/hi3521a-clock.h new file mode 100644 -index 000000000000..7d1463fb9a03 +index 000000000..7d1463fb9 --- /dev/null +++ b/include/dt-bindings/clock/hi3521a-clock.h @@ -0,0 +1,97 @@ @@ -361381,7 +361379,7 @@ index 000000000000..7d1463fb9a03 +#endif /* __DTS_HI3521A_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3521dv200-clock.h b/include/dt-bindings/clock/hi3521dv200-clock.h new file mode 100644 -index 000000000000..70d332a3f9ab +index 000000000..70d332a3f --- /dev/null +++ b/include/dt-bindings/clock/hi3521dv200-clock.h @@ -0,0 +1,94 @@ @@ -361481,7 +361479,7 @@ index 000000000000..70d332a3f9ab +#endif /* __DTS_HI3521DV200_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3531a-clock.h b/include/dt-bindings/clock/hi3531a-clock.h new file mode 100644 -index 000000000000..f9c035afa1ef +index 000000000..f9c035afa --- /dev/null +++ b/include/dt-bindings/clock/hi3531a-clock.h @@ -0,0 +1,105 @@ @@ -361592,7 +361590,7 @@ index 000000000000..f9c035afa1ef +#endif /* __DTS_HI3531A_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3531dv200-clock.h b/include/dt-bindings/clock/hi3531dv200-clock.h new file mode 100644 -index 000000000000..928ff8443687 +index 000000000..928ff8443 --- /dev/null +++ b/include/dt-bindings/clock/hi3531dv200-clock.h @@ -0,0 +1,132 @@ @@ -361730,7 +361728,7 @@ index 000000000000..928ff8443687 +#endif diff --git a/include/dt-bindings/clock/hi3535av100-clock.h b/include/dt-bindings/clock/hi3535av100-clock.h new file mode 100644 -index 000000000000..a7debff38ec1 +index 000000000..a7debff38 --- /dev/null +++ b/include/dt-bindings/clock/hi3535av100-clock.h @@ -0,0 +1,132 @@ @@ -361868,7 +361866,7 @@ index 000000000000..a7debff38ec1 +#endif diff --git a/include/dt-bindings/clock/hi3536dv100-clock.h b/include/dt-bindings/clock/hi3536dv100-clock.h new file mode 100644 -index 000000000000..b3de226bfc34 +index 000000000..b3de226bf --- /dev/null +++ b/include/dt-bindings/clock/hi3536dv100-clock.h @@ -0,0 +1,82 @@ @@ -361956,7 +361954,7 @@ index 000000000000..b3de226bfc34 +#endif /* __DTS_HI3536DV100_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3556av100-clock.h b/include/dt-bindings/clock/hi3556av100-clock.h new file mode 100644 -index 000000000000..02717db13b51 +index 000000000..02717db13 --- /dev/null +++ b/include/dt-bindings/clock/hi3556av100-clock.h @@ -0,0 +1,121 @@ @@ -362083,7 +362081,7 @@ index 000000000000..02717db13b51 +#endif diff --git a/include/dt-bindings/clock/hi3556v200-clock.h b/include/dt-bindings/clock/hi3556v200-clock.h new file mode 100644 -index 000000000000..3249447f4cdd +index 000000000..3249447f4 --- /dev/null +++ b/include/dt-bindings/clock/hi3556v200-clock.h @@ -0,0 +1,98 @@ @@ -362187,7 +362185,7 @@ index 000000000000..3249447f4cdd +#endif /* __DTS_HI3556V200_CLOCK_H */ diff --git a/include/dt-bindings/clock/hi3559av100-clock.h b/include/dt-bindings/clock/hi3559av100-clock.h new file mode 100644 -index 000000000000..0608eee495fd +index 000000000..0608eee49 --- /dev/null +++ b/include/dt-bindings/clock/hi3559av100-clock.h @@ -0,0 +1,176 @@ @@ -362369,7 +362367,7 @@ index 000000000000..0608eee495fd + diff --git a/include/dt-bindings/clock/hi3559v200-clock.h b/include/dt-bindings/clock/hi3559v200-clock.h new file mode 100644 -index 000000000000..5313e5bb827b +index 000000000..5313e5bb8 --- /dev/null +++ b/include/dt-bindings/clock/hi3559v200-clock.h @@ -0,0 +1,98 @@ @@ -362472,7 +362470,7 @@ index 000000000000..5313e5bb827b +#define HI3559V200_NR_RSTS 256 +#endif /* __DTS_HI3559V200_CLOCK_H */ diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h -index 745b2d0dcf78..4179254ecc85 100644 +index 745b2d0dc..4179254ec 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1433,7 +1433,11 @@ extern int blk_verify_command(unsigned char *cmd, fmode_t mode); @@ -362488,7 +362486,7 @@ index 745b2d0dcf78..4179254ecc85 100644 BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL, }; diff --git a/include/linux/cpu.h b/include/linux/cpu.h -index aab4273810e3..b631bd6a7e84 100644 +index aab427381..b631bd6a7 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -41,6 +41,7 @@ extern bool arch_match_cpu_phys_id(int cpu, u64 phys_id); @@ -362500,7 +362498,7 @@ index aab4273810e3..b631bd6a7e84 100644 extern void cpu_remove_dev_attr(struct device_attribute *attr); diff --git a/include/linux/fb.h b/include/linux/fb.h -index 7bfed8460c78..d39bc880b92d 100644 +index 7bfed8460..d39bc880b 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -321,6 +321,12 @@ struct fb_ops { @@ -362518,7 +362516,7 @@ index 7bfed8460c78..d39bc880b92d 100644 #ifdef CONFIG_FB_TILEBLITTING diff --git a/include/linux/hi_cma.h b/include/linux/hi_cma.h new file mode 100644 -index 000000000000..3a7fad239b09 +index 000000000..3a7fad239 --- /dev/null +++ b/include/linux/hi_cma.h @@ -0,0 +1,54 @@ @@ -362578,7 +362576,7 @@ index 000000000000..3a7fad239b09 +#endif diff --git a/include/linux/hiedmac.h b/include/linux/hiedmac.h new file mode 100644 -index 000000000000..26157899aec8 +index 000000000..26157899a --- /dev/null +++ b/include/linux/hiedmac.h @@ -0,0 +1,65 @@ @@ -362648,7 +362646,7 @@ index 000000000000..26157899aec8 +} dmac_lli; +#endif diff --git a/include/linux/i2c.h b/include/linux/i2c.h -index 7e748648c7d3..c0e50d78551f 100644 +index 7e748648c..c0e50d785 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -131,6 +131,23 @@ static inline int i2c_master_send_dmasafe(const struct i2c_client *client, @@ -362677,7 +362675,7 @@ index 7e748648c7d3..c0e50d78551f 100644 int num); diff --git a/include/linux/mfd/hisi_fmc.h b/include/linux/mfd/hisi_fmc.h new file mode 100644 -index 000000000000..28ce459085a5 +index 000000000..28ce45908 --- /dev/null +++ b/include/linux/mfd/hisi_fmc.h @@ -0,0 +1,477 @@ @@ -363159,7 +363157,7 @@ index 000000000000..28ce459085a5 + +#endif /* __HISI_FMC_H */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 7e8e5b20e82b..e918d093758c 100644 +index 7e8e5b20e..e918d0937 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -168,6 +168,7 @@ struct mmc_host_ops { @@ -363196,7 +363194,7 @@ index 7e8e5b20e82b..e918d093758c 100644 const struct mmc_bus_ops *bus_ops; /* current bus driver */ diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h -index 035d641e8847..2810918707a4 100644 +index 035d641e8..281091870 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -30,6 +30,12 @@ @@ -363329,7 +363327,7 @@ index 035d641e8847..2810918707a4 100644 return err == -EUCLEAN; } diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h -index a4be6b2bcc35..974abc0121c7 100644 +index a4be6b2bc..974abc012 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1435,10 +1435,18 @@ static inline void *nand_get_manufacturer_data(struct nand_chip *chip) @@ -363361,7 +363359,7 @@ index a4be6b2bcc35..974abc0121c7 100644 extern const struct nand_manufacturer_ops samsung_nand_manuf_ops; extern const struct nand_manufacturer_ops hynix_nand_manuf_ops; diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h -index c922e97f205a..890785a01c8f 100644 +index c922e97f2..890785a01 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -29,6 +29,43 @@ @@ -363481,7 +363479,7 @@ index c922e97f205a..890785a01c8f 100644 const struct spi_nor_hwcaps *hwcaps); diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h -index 4c76fe2c8488..da24ed5cac06 100644 +index 4c76fe2c8..da24ed5ca 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -35,6 +35,7 @@ enum { @@ -363510,7 +363508,7 @@ index 4c76fe2c8488..da24ed5cac06 100644 /* diff --git a/include/linux/phy.h b/include/linux/phy.h -index 42766e7179d3..4002db144a0e 100644 +index 42766e717..4002db144 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1043,6 +1043,7 @@ void phy_start_machine(struct phy_device *phydev); @@ -363522,7 +363520,7 @@ index 42766e7179d3..4002db144a0e 100644 struct ethtool_link_ksettings *cmd); int phy_ethtool_ksettings_set(struct phy_device *phydev, diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 703ce71caeac..07058ad05b9c 100644 +index 703ce71ca..07058ad05 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -502,6 +502,7 @@ struct skb_shared_info { @@ -363534,7 +363532,7 @@ index 703ce71caeac..07058ad05b9c 100644 /* * Warning : all fields before dataref are cleared in __alloc_skb() diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h -index e7bbd82908b1..ff87f55402a0 100644 +index e7bbd8290..ff87f5540 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -149,6 +149,7 @@ struct rpc_xprt_ops { @@ -363546,7 +363544,7 @@ index e7bbd82908b1..ff87f55402a0 100644 void (*bc_free_rqst)(struct rpc_rqst *rqst); void (*bc_destroy)(struct rpc_xprt *xprt, diff --git a/include/linux/types.h b/include/linux/types.h -index 9834e90aa010..8490ebd8f0fe 100644 +index 9834e90aa..8490ebd8f 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -230,5 +230,8 @@ struct callback_head { @@ -363559,7 +363557,7 @@ index 9834e90aa010..8490ebd8f0fe 100644 #endif /* __ASSEMBLY__ */ #endif /* _LINUX_TYPES_H */ diff --git a/include/net/addrconf.h b/include/net/addrconf.h -index db2a87981dd4..3484c733d377 100644 +index db2a87981..3484c733d 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -227,49 +227,6 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group, @@ -363614,7 +363612,7 @@ index db2a87981dd4..3484c733d377 100644 */ diff --git a/include/net/ipv6_stubs.h b/include/net/ipv6_stubs.h new file mode 100644 -index 000000000000..065d004f5257 +index 000000000..065d004f5 --- /dev/null +++ b/include/net/ipv6_stubs.h @@ -0,0 +1,60 @@ @@ -363679,7 +363677,7 @@ index 000000000000..065d004f5257 + +#endif diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h -index fe680ab6b15a..859876827acf 100644 +index fe680ab6b..859876827 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -7,7 +7,7 @@ @@ -363692,7 +363690,7 @@ index fe680ab6b15a..859876827acf 100644 struct udp_port_cfg { diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h -index 85f8047afcf2..3f50287f3289 100644 +index 85f8047af..3f50287f3 100644 --- a/include/uapi/linux/i2c-dev.h +++ b/include/uapi/linux/i2c-dev.h @@ -52,6 +52,8 @@ @@ -363705,7 +363703,7 @@ index 85f8047afcf2..3f50287f3289 100644 /* This is the structure as used in the I2C_SMBUS ioctl call */ struct i2c_smbus_ioctl_data { diff --git a/include/uapi/linux/i2c.h b/include/uapi/linux/i2c.h -index f71a1751cacf..f85deb485513 100644 +index f71a1751c..f85deb485 100644 --- a/include/uapi/linux/i2c.h +++ b/include/uapi/linux/i2c.h @@ -22,7 +22,7 @@ @@ -363733,7 +363731,7 @@ index f71a1751cacf..f85deb485513 100644 /* To determine what functionality is present */ diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h -index fde753735aba..cc303c477ebd 100644 +index fde753735..cc303c477 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h @@ -98,7 +98,23 @@ struct __fat_dirent { @@ -363772,7 +363770,7 @@ index fde753735aba..cc303c477ebd 100644 __u8 ignored[3]; /* Boot strap short or near jump */ __u8 system_id[8]; /* Name - can be used to special case diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h -index 3c9ee3020cbb..ed7ce8efd227 100644 +index 3c9ee3020..ed7ce8efd 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -12,6 +12,7 @@ @@ -363784,7 +363782,7 @@ index 3c9ee3020cbb..ed7ce8efd227 100644 #define UVC_EVENT_CONNECT (V4L2_EVENT_PRIVATE_START + 0) #define UVC_EVENT_DISCONNECT (V4L2_EVENT_PRIVATE_START + 1) diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h -index ff6cc6cb4227..1a1542f94215 100644 +index ff6cc6cb4..1a1542f94 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -304,7 +304,7 @@ struct uvc_processing_unit_descriptor { @@ -363871,7 +363869,7 @@ index ff6cc6cb4227..1a1542f94215 100644 #endif /* __LINUX_USB_VIDEO_H */ diff --git a/init/main.c b/init/main.c -index fdfef08da0c4..dafe6e4b1a37 100644 +index fdfef08da..dafe6e4b1 100644 --- a/init/main.c +++ b/init/main.c @@ -526,7 +526,33 @@ static void __init mm_init(void) @@ -363919,7 +363917,7 @@ index fdfef08da0c4..dafe6e4b1a37 100644 * These use large bootmem allocations and must precede * kmem_cache_init() diff --git a/kernel/cpu.c b/kernel/cpu.c -index 08b9d6ba0807..672838306d2e 100644 +index 08b9d6ba0..672838306 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -325,6 +325,19 @@ void lockdep_assert_cpus_held(void) @@ -363943,7 +363941,7 @@ index 08b9d6ba0807..672838306d2e 100644 /* * Wait for currently running CPU hotplug operations to complete (if any) and diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c -index b2a87905846d..7d883ef25b57 100644 +index b2a879058..7d883ef25 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -104,6 +104,11 @@ static inline __maybe_unused phys_addr_t cma_early_percent_memory(void) @@ -363992,7 +363990,7 @@ index b2a87905846d..7d883ef25b57 100644 /* * Support for reserved memory regions defined in device tree diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index cf272aba362b..3675ccb8fbc7 100644 +index cf272aba3..3675ccb8f 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1397,7 +1397,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) @@ -364005,7 +364003,7 @@ index cf272aba362b..3675ccb8fbc7 100644 return -ENOMEM; diff --git a/kernel/relay.c b/kernel/relay.c -index 735cb208f023..51dbdb32f5f0 100644 +index 735cb208f..51dbdb32f 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -581,7 +581,8 @@ struct rchan *relay_open(const char *base_filename, @@ -364019,7 +364017,7 @@ index 735cb208f023..51dbdb32f5f0 100644 kfree(chan); return NULL; diff --git a/mm/init-mm.c b/mm/init-mm.c -index a787a319211e..6ae73bdf6ed3 100644 +index a787a3192..6ae73bdf6 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -38,3 +38,4 @@ struct mm_struct init_mm = { @@ -364028,7 +364026,7 @@ index a787a319211e..6ae73bdf6ed3 100644 }; +EXPORT_SYMBOL(init_mm); diff --git a/mm/madvise.c b/mm/madvise.c -index 71d21df2a3f3..28aa0af2dc84 100644 +index 71d21df2a..28aa0af2d 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -24,6 +24,7 @@ @@ -364064,7 +364062,7 @@ index 71d21df2a3f3..28aa0af2dc84 100644 down_read(¤t->mm->mmap_sem); } diff --git a/mm/mincore.c b/mm/mincore.c -index 2732c8c0764c..f270550b06eb 100644 +index 2732c8c07..f270550b0 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -42,72 +42,14 @@ static int mincore_hugetlb(pte_t *pte, unsigned long hmask, unsigned long addr, @@ -364192,7 +364190,7 @@ index 2732c8c0764c..f270550b06eb 100644 vec++; } diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index 9fae584a9f8d..60eb06d60252 100644 +index 9fae584a9..60eb06d60 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5261,7 +5261,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, @@ -364206,7 +364204,7 @@ index 9fae584a9f8d..60eb06d60252 100644 rssi, flags, data, len); return; diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c -index eb44ae05abaa..846a5761c4e6 100644 +index eb44ae05a..846a5761c 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -21,6 +21,7 @@ @@ -364218,7 +364216,7 @@ index eb44ae05abaa..846a5761c4e6 100644 #include #endif diff --git a/net/core/ethtool.c b/net/core/ethtool.c -index 1011625a0ca4..0ff0389e2d01 100644 +index 1011625a0..0ff0389e2 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -78,6 +78,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] @@ -364256,7 +364254,7 @@ index 1011625a0ca4..0ff0389e2d01 100644 case ETHTOOL_SGRO: rc = ethtool_set_one_feature(dev, useraddr, ethcmd); diff --git a/net/core/filter.c b/net/core/filter.c -index 557bd5cc8f94..64f2dd4b7998 100644 +index 557bd5cc8..64f2dd4b7 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -68,6 +68,7 @@ @@ -364268,7 +364266,7 @@ index 557bd5cc8f94..64f2dd4b7998 100644 /** * sk_filter_trim_cap - run a packet through a socket filter diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c -index a648568c5e8f..6198fb51c09f 100644 +index a648568c5..6198fb51c 100644 --- a/net/core/lwt_bpf.c +++ b/net/core/lwt_bpf.c @@ -16,6 +16,7 @@ @@ -364280,7 +364278,7 @@ index a648568c5e8f..6198fb51c09f 100644 struct bpf_lwt_prog { struct bpf_prog *prog; diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c -index 74fb211e0ea6..24b22cfcc29b 100644 +index 74fb211e0..24b22cfcc 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1303,6 +1303,11 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, @@ -364296,7 +364294,7 @@ index 74fb211e0ea6..24b22cfcc29b 100644 return -ENOMEM; diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c -index 66a1a0eb2ed0..2f927423bca2 100644 +index 66a1a0eb2..2f927423b 100644 --- a/net/ipv6/addrconf_core.c +++ b/net/ipv6/addrconf_core.c @@ -5,7 +5,7 @@ @@ -364309,7 +364307,7 @@ index 66a1a0eb2ed0..2f927423bca2 100644 /* if ipv6 module registers this function is used by xfrm to force all diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c -index 5c2351deedc8..234340c3c050 100644 +index 5c2351dee..234340c3c 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -56,6 +56,7 @@ @@ -364321,7 +364319,7 @@ index 5c2351deedc8..234340c3c050 100644 #ifdef CONFIG_IPV6_TUNNEL #include diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c -index f590446595d8..93a2decb8f5f 100644 +index f59044659..93a2decb8 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -287,7 +287,8 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg @@ -364335,7 +364333,7 @@ index f590446595d8..93a2decb8f5f 100644 } diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c -index c7d88f979c56..946a1125dabc 100644 +index c7d88f979..946a1125d 100644 --- a/net/sunrpc/auth_gss/gss_mech_switch.c +++ b/net/sunrpc/auth_gss/gss_mech_switch.c @@ -58,11 +58,14 @@ gss_mech_free(struct gss_api_mech *gm) @@ -364356,7 +364354,7 @@ index c7d88f979c56..946a1125dabc 100644 pf->auth_domain_name = NULL; } diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c -index d65f8d35de87..bdd91f5a7203 100644 +index d65f8d35d..bdd91f5a7 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1453,15 +1453,22 @@ int @@ -364413,7 +364411,7 @@ index d65f8d35de87..bdd91f5a7203 100644 EXPORT_SYMBOL_GPL(bc_svc_process); #endif /* CONFIG_SUNRPC_BACKCHANNEL */ diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c -index 90adeff4c06b..1c8eb218e506 100644 +index 90adeff4c..1c8eb218e 100644 --- a/net/sunrpc/xprtrdma/backchannel.c +++ b/net/sunrpc/xprtrdma/backchannel.c @@ -134,6 +134,11 @@ int xprt_rdma_bc_up(struct svc_serv *serv, struct net *net) @@ -364429,7 +364427,7 @@ index 90adeff4c06b..1c8eb218e506 100644 * xprt_rdma_bc_maxpayload - Return maximum backchannel message size * @xprt: transport diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c -index f56f36b4d742..274c68c90360 100644 +index f56f36b4d..274c68c90 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c @@ -842,6 +842,7 @@ static const struct rpc_xprt_ops xprt_rdma_procs = { @@ -364441,7 +364439,7 @@ index f56f36b4d742..274c68c90360 100644 .bc_free_rqst = xprt_rdma_bc_free_rqst, .bc_destroy = xprt_rdma_bc_destroy, diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h -index 2ca14f7c2d51..aa45c256081a 100644 +index 2ca14f7c2..aa45c2560 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -662,6 +662,7 @@ void xprt_rdma_cleanup(void); @@ -364453,7 +364451,7 @@ index 2ca14f7c2d51..aa45c256081a 100644 int rpcrdma_bc_post_recv(struct rpcrdma_xprt *, unsigned int); void rpcrdma_bc_receive_call(struct rpcrdma_xprt *, struct rpcrdma_rep *); diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c -index 9dc059dea689..c56f1f58b426 100644 +index 9dc059dea..c56f1f58b 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1431,6 +1431,12 @@ static int xs_tcp_bc_up(struct svc_serv *serv, struct net *net) @@ -364478,7 +364476,7 @@ index 9dc059dea689..c56f1f58b426 100644 .bc_free_rqst = xprt_free_bc_rqst, .bc_destroy = xprt_destroy_bc, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c -index fbc8875502c3..8dd594dba2de 100644 +index fbc887550..8dd594dba 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1649,7 +1649,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, @@ -364491,7 +364489,7 @@ index fbc8875502c3..8dd594dba2de 100644 if (WARN_ON(!state)) return -EINVAL; diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c -index 73fd0eae08ca..3fd2cc7fc36a 100644 +index 73fd0eae0..3fd2cc7fc 100644 --- a/net/wireless/wext-sme.c +++ b/net/wireless/wext-sme.c @@ -201,8 +201,8 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev, @@ -364505,7 +364503,7 @@ index 73fd0eae08ca..3fd2cc7fc36a 100644 /* call only for station! */ if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION)) diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c -index a2cc1036c915..eb858652d218 100644 +index a2cc1036c..eb858652d 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c @@ -790,8 +790,8 @@ static void check_pci_bridge(struct check *c, struct dt_info *dti, struct node * @@ -364520,7 +364518,7 @@ index a2cc1036c915..eb858652d218 100644 prop = get_property(node, "ranges"); diff --git a/sound/core/control.c b/sound/core/control.c -index d1312f14d78f..e0b3fcef9efd 100644 +index d1312f14d..e0b3fcef9 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1288,7 +1288,7 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, @@ -364533,7 +364531,7 @@ index d1312f14d78f..e0b3fcef9efd 100644 count = 1; diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh -index 67048f922ff2..e950f32243b6 100755 +index 67048f922..e950f3224 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -9,7 +9,7 @@ ret=0 @@ -364574,4 +364572,6 @@ index 67048f922ff2..e950f32243b6 100755 ipv6_route_test|ipv6_rt) ipv6_route_test;; ipv4_route_test|ipv4_rt) ipv4_route_test;; ipv6_addr_metric) ipv6_addr_metric_test;; +-- +2.25.1 diff --git a/linux-5.10/hi3516dv300_patch/hdf.patch b/linux-5.10/hi3516dv300_patch/hdf.patch index 589a014..5cd5280 100644 --- a/linux-5.10/hi3516dv300_patch/hdf.patch +++ b/linux-5.10/hi3516dv300_patch/hdf.patch @@ -1,8 +1,8 @@ diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S -index f7f4620d59c3..fb0257db63dc 100644 +index 8af654bd1..1e9ff41d6 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S -@@ -121,6 +121,14 @@ SECTIONS +@@ -131,6 +131,14 @@ SECTIONS __pv_table_end = .; } @@ -18,59 +18,35 @@ index f7f4620d59c3..fb0257db63dc 100644 .exit.data : { diff --git a/drivers/Kconfig b/drivers/Kconfig -index dcecc9f6e33f..3963568e6eea 100644 +index dcecc9f6e..8eddfc2cd 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig -@@ -235,4 +235,7 @@ source "drivers/interconnect/Kconfig" +@@ -234,5 +234,7 @@ source "drivers/interconnect/Kconfig" + source "drivers/counter/Kconfig" - source "drivers/most/Kconfig" -+ +source "drivers/hdf/khdf/Kconfig" + + source "drivers/most/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index 576228037718..4cff090d6239 100644 +index 576228037..025b92b1f 100644 --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -189,3 +189,4 @@ obj-$(CONFIG_GNSS) += gnss/ +@@ -188,4 +188,5 @@ obj-$(CONFIG_SIOX) += siox/ + obj-$(CONFIG_GNSS) += gnss/ obj-$(CONFIG_INTERCONNECT) += interconnect/ obj-$(CONFIG_COUNTER) += counter/ - obj-$(CONFIG_MOST) += most/ +obj-$(CONFIG_DRIVERS_HDF) += hdf/ + obj-$(CONFIG_MOST) += most/ diff --git a/drivers/hdf/Makefile b/drivers/hdf/Makefile new file mode 100644 -index 000000000000..819768c96092 +index 000000000..5c5e1911c --- /dev/null +++ b/drivers/hdf/Makefile -@@ -0,0 +1,3 @@ -+export HDF_RELATIVE_PATH := drivers/huawei_platform/hdf +@@ -0,0 +1,2 @@ +export PROJECT_ROOT := ../../../../../ +obj-$(CONFIG_DRIVERS_HDF) += khdf/ -diff --git a/drivers/hdf/framework b/drivers/hdf/framework -new file mode 120000 -index 000000000000..1fdb7cbb9f34 ---- /dev/null -+++ b/drivers/hdf/framework -@@ -0,0 +1 @@ -+../../../../../../../drivers/framework -\ No newline at end of file -diff --git a/drivers/hdf/khdf b/drivers/hdf/khdf -new file mode 120000 -index 000000000000..0cc53cd109c0 ---- /dev/null -+++ b/drivers/hdf/khdf -@@ -0,0 +1 @@ -+../../../../../../../drivers/adapter/khdf/linux -\ No newline at end of file -diff --git a/include/hdf b/include/hdf -new file mode 120000 -index 000000000000..c85d8ced0400 ---- /dev/null -+++ b/include/hdf -@@ -0,0 +1 @@ -+../../../../../../drivers/framework/include -\ No newline at end of file -- 2.25.1 diff --git a/linux-5.10/hi3516dv300_patch/hi3516dv300.patch b/linux-5.10/hi3516dv300_patch/hi3516dv300.patch index 86ae49e..4c1e78c 100644 --- a/linux-5.10/hi3516dv300_patch/hi3516dv300.patch +++ b/linux-5.10/hi3516dv300_patch/hi3516dv300.patch @@ -1,474 +1,5 @@ -From f9ab3fd7343141c1cd6e35e876f3efcf3359f64a Mon Sep 17 00:00:00 2001 -From: "dongyang.liu@hisilicon.com" -Date: Fri, 20 Aug 2021 07:10:47 +0000 -Subject: [PATCH] hi3516dv300 - ---- - arch/arm/Kconfig | 4 +- - arch/arm/Makefile | 5 + - arch/arm/boot/Makefile | 12 +- - arch/arm/boot/dts/Makefile | 5 + - arch/arm/boot/dts/hi3516dv300-demb.dts | 270 ++ - arch/arm/boot/dts/hi3516dv300.dtsi | 906 +++++ - arch/arm/boot/dts/skeleton.dtsi | 18 + - .../configs/hi3516dv300_emmc_smp_defconfig | 3070 ++++++++++++++++ - .../hi3516dv300_emmc_smp_hos_l2_defconfig | 3135 ++++++++++++++++ - arch/arm/configs/hi3516dv300_smp_defconfig | 3189 +++++++++++++++++ - arch/arm/include/asm/mach/pci.h | 24 + - arch/arm/include/asm/vdso/gettimeofday.h | 4 +- - arch/arm/mach-hibvt/Kconfig | 258 ++ - arch/arm/mach-hibvt/Makefile | 27 + - arch/arm/mach-hibvt/Makefile.boot | 7 + - .../mach-hibvt/include/mach/hi3516dv300_io.h | 26 + - .../include/mach/hi3516dv300_platform.h | 4 + - arch/arm/mach-hibvt/include/mach/io.h | 52 + - arch/arm/mach-hibvt/include/mach/platform.h | 52 + - arch/arm/mach-hibvt/mach-common.h | 9 + - arch/arm/mach-hibvt/mach-hi3516dv300.c | 68 + - arch/arm/mach-hibvt/platsmp.c | 62 + - arch/arm/mm/dma-mapping.c | 16 +- - arch/arm/vdso/vgettimeofday.c | 0 - arch/arm64/Makefile | 1 + - arch/arm64/boot/Makefile | 45 +- - arch/arm64/boot/dts/Makefile | 2 + - arch/arm64/kernel/pci.c | 12 + - arch/arm64/mm/init.c | 9 + - drivers/Kconfig | 8 + - drivers/Makefile | 4 + - drivers/android/binder.c | 2 +- - drivers/ata/Kconfig | 1 + - drivers/ata/Kconfig.hiahci | 44 + - drivers/ata/Makefile | 1 + - drivers/ata/ahci.h | 9 + - drivers/ata/ahci_platform.c | 23 + - drivers/ata/hisi_sata_dbg.c | 174 + - drivers/ata/hisi_sata_dbg.h | 58 + - drivers/ata/libahci.c | 181 + - drivers/block/paride/pcd.c | 3 + - drivers/clk/Makefile | 1 + - drivers/clk/hisilicon/Kconfig | 194 +- - drivers/clk/hisilicon/Makefile | 1 + - drivers/clk/hisilicon/clk-hi3516dv300.c | 271 ++ - drivers/clk/hisilicon/clk-hi3519av100.c | 559 +++ - drivers/clk/hisilicon/clk-hisi-phase.c | 2 +- - drivers/clk/hisilicon/clk.c | 4 + - drivers/clk/hisilicon/crg.h | 2 +- - drivers/clk/hisilicon/reset.c | 30 + - drivers/clk/hisilicon/reset.h | 3 + - drivers/clocksource/Kconfig | 14 + - drivers/clocksource/Makefile | 1 + - drivers/clocksource/arm_arch_timer.c | 3 +- - drivers/clocksource/timer-hisp804.c | 356 ++ - drivers/dma/Kconfig | 15 +- - drivers/dma/Makefile | 2 +- - drivers/dma/hiedmacv310.c | 1443 ++++++++ - drivers/dma/hiedmacv310.h | 153 + - drivers/gpio/gpio-pl061.c | 16 + - drivers/gpu/drm/hisilicon/Kconfig | 1 + - drivers/gpu/drm/hisilicon/Makefile | 1 + - drivers/gpu/drm/hisilicon/hismart/Kconfig | 8 + - drivers/gpu/drm/hisilicon/hismart/Makefile | 27 + - .../drm/hisilicon/hismart/drm_hal_mipitx.h | 91 + - .../gpu/drm/hisilicon/hismart/hi_adp_crtc.c | 777 ++++ - .../gpu/drm/hisilicon/hismart/hi_adp_crtc.h | 69 + - .../gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c | 345 ++ - .../gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h | 28 + - .../gpu/drm/hisilicon/hismart/hi_adp_mipitx.c | 223 ++ - .../gpu/drm/hisilicon/hismart/hi_adp_mipitx.h | 24 + - .../gpu/drm/hisilicon/hismart/hi_drm_crtc.c | 389 ++ - .../gpu/drm/hisilicon/hismart/hi_drm_crtc.h | 17 + - .../gpu/drm/hisilicon/hismart/hi_drm_drv.c | 369 ++ - .../gpu/drm/hisilicon/hismart/hi_drm_drv.h | 29 + - .../drm/hisilicon/hismart/hi_drm_func_ext.c | 43 + - .../drm/hisilicon/hismart/hi_drm_func_ext.h | 27 + - .../gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c | 233 ++ - .../gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h | 16 + - .../gpu/drm/hisilicon/hismart/hi_drm_mipitx.c | 181 + - .../gpu/drm/hisilicon/hismart/hi_drm_mipitx.h | 17 + - .../gpu/drm/hisilicon/hismart/hisilicon_drm.h | 31 + - drivers/hi_vdmav100/Kconfig | 26 + - drivers/hi_vdmav100/Makefile | 2 + - drivers/hi_vdmav100/hi_vdma.h | 41 + - drivers/hi_vdmav100/hi_vdmav100.c | 534 +++ - drivers/hi_vdmav100/hi_vdmav100.h | 122 + - drivers/hi_vdmav100/hi_vdmav100_misc.c | 109 + - drivers/hid/Makefile | 9 + - drivers/hidmac/Kconfig | 21 + - drivers/hidmac/Makefile | 6 + - drivers/hidmac/hi_pl08x.c | 1303 +++++++ - drivers/hidmac/hi_pl08x.h | 90 + - drivers/hiedmac/Kconfig | 29 + - drivers/hiedmac/Makefile | 4 + - drivers/hiedmac/hiedmacv310.c | 946 +++++ - drivers/hiedmac/hiedmacv310.h | 184 + - drivers/hisilicon/Kconfig | 4 + - drivers/hisilicon/Makefile | 1 + - drivers/hisilicon/cma/Kconfig | 16 + - drivers/hisilicon/cma/Makefile | 2 + - drivers/hisilicon/cma/hi_cma.c | 203 ++ - drivers/i2c/busses/Kconfig | 26 + - drivers/i2c/busses/Makefile | 1 + - drivers/i2c/busses/i2c-hibvt.c | 1451 ++++++++ - drivers/i2c/i2c-dev.c | 53 + - drivers/input/mousedev.c | 2 +- - drivers/irqchip/irq-gic.c | 89 +- - drivers/media/usb/gspca/ov519.c | 10 + - drivers/mfd/Kconfig | 11 + - drivers/mfd/Makefile | 1 + - drivers/mfd/hisi_fmc.c | 134 + - drivers/mmc/core/block.c | 20 +- - drivers/mmc/core/core.c | 17 +- - drivers/mmc/core/mmc.c | 8 +- - drivers/mmc/core/sd.c | 1 + - drivers/mmc/core/sdio.c | 38 + - drivers/mmc/host/Kconfig | 30 + - drivers/mmc/host/Makefile | 17 + - drivers/mmc/host/cqhci.c | 50 +- - drivers/mmc/host/cqhci.h | 8 + - drivers/mmc/host/himci/Kconfig | 23 + - drivers/mmc/host/himci/Makefile | 2 + - drivers/mmc/host/himci/himci.c | 2580 +++++++++++++ - drivers/mmc/host/himci/himci.h | 156 + - drivers/mmc/host/himci/himci_hi3516dv300.c | 160 + - drivers/mmc/host/himci/himci_proc.c | 246 ++ - drivers/mmc/host/himci/himci_proc.h | 36 + - drivers/mmc/host/himci/himci_reg.h | 241 ++ - drivers/mmc/host/mci_proc.c | 301 ++ - drivers/mmc/host/mci_proc.h | 50 + - drivers/mmc/host/sdhci-hisi.c | 783 ++++ - drivers/mmc/host/sdhci-hisi.h | 126 + - drivers/mmc/host/sdhci.c | 300 +- - drivers/mmc/host/sdhci.h | 52 +- - drivers/mtd/Makefile | 3 +- - drivers/mtd/nand/Kconfig | 25 + - drivers/mtd/nand/Makefile | 2 + - drivers/mtd/nand/hifmc100/Kconfig | 17 + - drivers/mtd/nand/hifmc100/Makefile | 26 + - drivers/mtd/nand/hifmc100/hifmc100.c | 1218 +++++++ - drivers/mtd/nand/hifmc100/hifmc100.h | 354 ++ - drivers/mtd/nand/hifmc100/hifmc100_os.c | 247 ++ - .../mtd/nand/hifmc100/hifmc100_spi_general.c | 313 ++ - .../mtd/nand/hifmc100/hifmc_spi_nand_ids.c | 2457 +++++++++++++ - drivers/mtd/nand/hifmc100_nand/Kconfig | 50 + - drivers/mtd/nand/hifmc100_nand/Makefile | 26 + - .../mtd/nand/hifmc100_nand/hifmc100_nand.c | 1170 ++++++ - .../mtd/nand/hifmc100_nand/hifmc100_nand.h | 151 + - .../mtd/nand/hifmc100_nand/hifmc100_nand_os.c | 180 + - .../mtd/nand/hifmc100_nand/hifmc100_nand_os.h | 72 + - .../nand/hifmc100_nand/hifmc_nand_spl_ids.c | 982 +++++ - drivers/mtd/nand/raw/Makefile | 2 +- - drivers/mtd/nand/raw/hinfc_gen.c | 237 ++ - drivers/mtd/nand/raw/hinfc_gen.h | 281 ++ - drivers/mtd/nand/raw/hinfc_spl_ids.c | 970 +++++ - drivers/mtd/nand/raw/internals.h | 11 +- - drivers/mtd/nand/raw/match_table.c | 102 + - drivers/mtd/nand/raw/match_table.h | 51 + - drivers/mtd/nand/raw/nand_base.c | 40 +- - drivers/mtd/nand/raw/nand_ids.c | 10 +- - drivers/mtd/spi-nor/controllers/Kconfig | 37 +- - drivers/net/ethernet/hisilicon/Kconfig | 2 + - drivers/net/ethernet/hisilicon/Makefile | 3 +- - drivers/net/ethernet/hisilicon/higmac/Kconfig | 106 + - .../net/ethernet/hisilicon/higmac/Makefile | 2 + - .../hisilicon/higmac/autoeee/autoeee.c | 162 + - .../hisilicon/higmac/autoeee/autoeee.h | 52 + - .../hisilicon/higmac/autoeee/phy_id_table.c | 184 + - drivers/net/ethernet/hisilicon/higmac/board.c | 118 + - .../net/ethernet/hisilicon/higmac/higmac.c | 2645 ++++++++++++++ - .../net/ethernet/hisilicon/higmac/higmac.h | 603 ++++ - drivers/net/ethernet/hisilicon/higmac/pm.c | 341 ++ - drivers/net/ethernet/hisilicon/higmac/pm.h | 59 + - .../net/ethernet/hisilicon/higmac/proc_dev.c | 119 + - .../net/ethernet/hisilicon/higmac/sockioctl.h | 19 + - drivers/net/ethernet/hisilicon/higmac/tso.h | 59 + - drivers/net/ethernet/hisilicon/higmac/util.c | 975 +++++ - drivers/net/ethernet/hisilicon/higmac/util.h | 102 + - .../ethernet/hisilicon/hisi-femac/Makefile | 6 + - .../hisilicon/hisi-femac/festa_s28v115_2c02.h | 191 + - .../hisilicon/hisi-femac/festa_s28v202_2e01.h | 84 + - .../hisilicon/hisi-femac/festa_v272_2723.h | 44 + - .../hisilicon/hisi-femac/hisi_femac.c | 1588 ++++++++ - .../hisilicon/hisi-femac/hisi_femac.h | 269 ++ - .../ethernet/hisilicon/hisi-femac/phy_fix.c | 109 + - .../ethernet/hisilicon/hisi-femac/phy_fix.h | 22 + - .../net/ethernet/hisilicon/hisi-femac/util.c | 318 ++ - .../net/ethernet/hisilicon/hisi-femac/util.h | 25 + - drivers/net/ethernet/hisilicon/hisi_femac.c | 4 +- - .../ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- - .../net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- - .../net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +- - .../net/ethernet/mellanox/mlx4/en_ethtool.c | 7 +- - drivers/net/mdio/Kconfig | 7 + - drivers/net/mdio/Makefile | 3 + - drivers/net/phy/mdio_hisi_femac.c | 489 +++ - drivers/net/phy/mdio_hisi_gemac.c | 256 ++ - drivers/net/phy/mdio_hisi_gemac.h | 32 + - drivers/net/phy/phy.c | 22 + - drivers/net/phy/realtek.c | 10 + - .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + - drivers/pci/Kconfig | 1 + - drivers/pci/Makefile | 1 + - drivers/pci/hipcie/Kconfig | 27 + - drivers/pci/hipcie/Makefile | 8 + - drivers/pci/hipcie/pci.h | 96 + - drivers/pci/hipcie/pcie.c | 985 +++++ - drivers/pci/pci-driver.c | 4 + - drivers/phy/Kconfig | 1 + - drivers/phy/Makefile | 1 + - drivers/phy/hibvt/Kconfig | 23 + - drivers/phy/hibvt/Makefile | 5 + - drivers/phy/hibvt/phy-hisi-sata.c | 175 + - drivers/phy/hibvt/phy-hisi-sata.h | 39 + - drivers/phy/hibvt/usb/Kconfig | 85 + - drivers/phy/hibvt/usb/Makefile | 17 + - drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c | 310 ++ - drivers/phy/hibvt/usb/phy-hisi-usb.c | 149 + - drivers/phy/hibvt/usb/phy-hisi-usb.h | 72 + - drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c | 803 +++++ - drivers/power/reset/Kconfig | 2 +- - drivers/ras/Kconfig | 6 +- - drivers/rtc/Kconfig | 8 + - drivers/rtc/Makefile | 1 + - drivers/rtc/rtc-hibvt.c | 663 ++++ - drivers/scsi/ufs/Kconfig | 9 + - drivers/scsi/ufs/Makefile | 1 + - drivers/scsi/ufs/ufshcd-pltfrm.c | 49 + - drivers/scsi/ufs/ufshcd.c | 218 ++ - drivers/scsi/ufs/ufshcd.h | 39 + - drivers/spi/spi-gpio.c | 4 +- - drivers/spi/spi-pl022.c | 205 +- - drivers/tty/vt/vc_screen.c | 3 + - drivers/usb/core/hub.c | 4 + - drivers/usb/dwc3/Makefile | 5 +- - drivers/usb/dwc3/core.c | 42 +- - drivers/usb/dwc3/core.h | 33 +- - drivers/usb/dwc3/dwc3-hisi.c | 446 +++ - drivers/usb/dwc3/dwc3-hisi.h | 54 + - drivers/usb/dwc3/ep0.c | 36 +- - drivers/usb/dwc3/gadget.c | 150 +- - drivers/usb/dwc3/proc.c | 138 + - drivers/usb/gadget/composite.c | 3 +- - drivers/usb/gadget/epautoconf.c | 16 +- - drivers/usb/gadget/function/f_mass_storage.c | 8 +- - drivers/usb/gadget/function/f_uac1.c | 57 +- - drivers/usb/gadget/function/f_uvc.c | 29 +- - drivers/usb/gadget/function/u_uvc.h | 5 +- - drivers/usb/gadget/function/uvc.h | 10 +- - drivers/usb/gadget/function/uvc_configfs.c | 706 +++- - drivers/usb/gadget/function/uvc_v4l2.c | 5 + - drivers/usb/gadget/function/uvc_video.c | 115 +- - drivers/vfio/pci/vfio_pci_intrs.c | 18 +- - drivers/vfio/vfio_iommu_spapr_tce.c | 6 +- - drivers/vfio/vfio_iommu_type1.c | 10 + - fs/9p/vfs_inode.c | 9 +- - fs/9p/vfs_inode_dotl.c | 9 +- - fs/aio.c | 8 + - fs/btrfs/block-group.c | 38 + - fs/fat/dir.c | 412 ++- - fs/fat/fat.h | 4 + - fs/fat/fatent.c | 7 + - fs/fat/file.c | 28 +- - fs/fat/inode.c | 79 +- - fs/fat/misc.c | 32 +- - fs/jffs2/compr.h | 8 +- - fs/ubifs/file.c | 3 + - include/dt-bindings/clock/hi3516dv300-clock.h | 100 + - include/linux/blkdev.h | 4 + - include/linux/cpu.h | 1 + - include/linux/fb.h | 6 + - include/linux/hi_cma.h | 54 + - include/linux/hid.h | 1 + - include/linux/hiedmac.h | 65 + - include/linux/i2c.h | 17 + - include/linux/mfd/hisi_fmc.h | 477 +++ - include/linux/mmc/host.h | 12 + - include/linux/mtd/mtd.h | 66 +- - include/linux/mtd/spi-nor.h | 82 + - include/linux/netdev_features.h | 4 +- - include/linux/phy.h | 1 + - include/linux/skbuff.h | 1 + - include/linux/sunrpc/xprt.h | 1 + - include/linux/types.h | 3 + - include/uapi/linux/android/binder.h | 1 + - include/uapi/linux/i2c-dev.h | 2 + - include/uapi/linux/i2c.h | 8 +- - include/uapi/linux/msdos_fs.h | 20 +- - include/uapi/linux/usb/g_uvc.h | 1 + - include/uapi/linux/usb/video.h | 60 + - init/main.c | 32 + - kernel/cpu.c | 13 + - kernel/dma/contiguous.c | 17 + - kernel/printk/printk.c | 2 +- - kernel/relay.c | 3 +- - lib/vdso/gettimeofday.c | 3 +- - mm/init-mm.c | 1 + - mm/madvise.c | 1 + - mm/mincore.c | 78 +- - mm/vmalloc.c | 2 + - net/bluetooth/hci_event.c | 3 +- - net/ipv4/tcp_output.c | 5 + - net/sunrpc/auth_gss/gss_mech_switch.c | 7 +- - net/sunrpc/svc.c | 13 + - net/sunrpc/xprtrdma/backchannel.c | 5 + - net/wireless/nl80211.c | 2 +- - net/wireless/wext-sme.c | 2 +- - scripts/dtc/checks.c | 4 +- - sound/core/control.c | 2 +- - tools/testing/selftests/net/fib_tests.sh | 14 + - 311 files changed, 54034 insertions(+), 274 deletions(-) - create mode 100644 arch/arm/boot/dts/hi3516dv300-demb.dts - create mode 100644 arch/arm/boot/dts/hi3516dv300.dtsi - create mode 100644 arch/arm/boot/dts/skeleton.dtsi - create mode 100644 arch/arm/configs/hi3516dv300_emmc_smp_defconfig - create mode 100644 arch/arm/configs/hi3516dv300_emmc_smp_hos_l2_defconfig - create mode 100644 arch/arm/configs/hi3516dv300_smp_defconfig - create mode 100644 arch/arm/mach-hibvt/Kconfig - create mode 100644 arch/arm/mach-hibvt/Makefile - create mode 100644 arch/arm/mach-hibvt/Makefile.boot - create mode 100644 arch/arm/mach-hibvt/include/mach/hi3516dv300_io.h - create mode 100644 arch/arm/mach-hibvt/include/mach/hi3516dv300_platform.h - create mode 100644 arch/arm/mach-hibvt/include/mach/io.h - create mode 100644 arch/arm/mach-hibvt/include/mach/platform.h - create mode 100644 arch/arm/mach-hibvt/mach-common.h - create mode 100644 arch/arm/mach-hibvt/mach-hi3516dv300.c - create mode 100644 arch/arm/mach-hibvt/platsmp.c - mode change 100644 => 100755 arch/arm/vdso/vgettimeofday.c - create mode 100644 drivers/ata/Kconfig.hiahci - create mode 100644 drivers/ata/hisi_sata_dbg.c - create mode 100644 drivers/ata/hisi_sata_dbg.h - create mode 100644 drivers/clk/hisilicon/clk-hi3516dv300.c - create mode 100644 drivers/clk/hisilicon/clk-hi3519av100.c - create mode 100644 drivers/clocksource/timer-hisp804.c - create mode 100644 drivers/dma/hiedmacv310.c - create mode 100644 drivers/dma/hiedmacv310.h - create mode 100644 drivers/gpu/drm/hisilicon/hismart/Kconfig - create mode 100644 drivers/gpu/drm/hisilicon/hismart/Makefile - create mode 100644 drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h - create mode 100755 drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h - create mode 100755 drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h - create mode 100755 drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h - create mode 100755 drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c - create mode 100755 drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h - create mode 100755 drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h - create mode 100755 drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h - create mode 100644 drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h - create mode 100644 drivers/hi_vdmav100/Kconfig - create mode 100644 drivers/hi_vdmav100/Makefile - create mode 100644 drivers/hi_vdmav100/hi_vdma.h - create mode 100644 drivers/hi_vdmav100/hi_vdmav100.c - create mode 100644 drivers/hi_vdmav100/hi_vdmav100.h - create mode 100644 drivers/hi_vdmav100/hi_vdmav100_misc.c - create mode 100644 drivers/hidmac/Kconfig - create mode 100644 drivers/hidmac/Makefile - create mode 100644 drivers/hidmac/hi_pl08x.c - create mode 100644 drivers/hidmac/hi_pl08x.h - create mode 100644 drivers/hiedmac/Kconfig - create mode 100644 drivers/hiedmac/Makefile - create mode 100644 drivers/hiedmac/hiedmacv310.c - create mode 100644 drivers/hiedmac/hiedmacv310.h - create mode 100644 drivers/hisilicon/Kconfig - create mode 100644 drivers/hisilicon/Makefile - create mode 100644 drivers/hisilicon/cma/Kconfig - create mode 100644 drivers/hisilicon/cma/Makefile - create mode 100644 drivers/hisilicon/cma/hi_cma.c - create mode 100644 drivers/i2c/busses/i2c-hibvt.c - create mode 100644 drivers/mfd/hisi_fmc.c - create mode 100644 drivers/mmc/host/himci/Kconfig - create mode 100644 drivers/mmc/host/himci/Makefile - create mode 100644 drivers/mmc/host/himci/himci.c - create mode 100644 drivers/mmc/host/himci/himci.h - create mode 100644 drivers/mmc/host/himci/himci_hi3516dv300.c - create mode 100644 drivers/mmc/host/himci/himci_proc.c - create mode 100644 drivers/mmc/host/himci/himci_proc.h - create mode 100644 drivers/mmc/host/himci/himci_reg.h - create mode 100644 drivers/mmc/host/mci_proc.c - create mode 100644 drivers/mmc/host/mci_proc.h - create mode 100644 drivers/mmc/host/sdhci-hisi.c - create mode 100644 drivers/mmc/host/sdhci-hisi.h - create mode 100644 drivers/mtd/nand/hifmc100/Kconfig - create mode 100644 drivers/mtd/nand/hifmc100/Makefile - create mode 100644 drivers/mtd/nand/hifmc100/hifmc100.c - create mode 100644 drivers/mtd/nand/hifmc100/hifmc100.h - create mode 100644 drivers/mtd/nand/hifmc100/hifmc100_os.c - create mode 100644 drivers/mtd/nand/hifmc100/hifmc100_spi_general.c - create mode 100644 drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c - create mode 100644 drivers/mtd/nand/hifmc100_nand/Kconfig - create mode 100644 drivers/mtd/nand/hifmc100_nand/Makefile - create mode 100644 drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c - create mode 100644 drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h - create mode 100644 drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c - create mode 100644 drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h - create mode 100644 drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c - create mode 100644 drivers/mtd/nand/raw/hinfc_gen.c - create mode 100644 drivers/mtd/nand/raw/hinfc_gen.h - create mode 100644 drivers/mtd/nand/raw/hinfc_spl_ids.c - create mode 100644 drivers/mtd/nand/raw/match_table.c - create mode 100644 drivers/mtd/nand/raw/match_table.h - create mode 100644 drivers/net/ethernet/hisilicon/higmac/Kconfig - create mode 100644 drivers/net/ethernet/hisilicon/higmac/Makefile - create mode 100644 drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c - create mode 100644 drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h - create mode 100644 drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c - create mode 100644 drivers/net/ethernet/hisilicon/higmac/board.c - create mode 100644 drivers/net/ethernet/hisilicon/higmac/higmac.c - create mode 100644 drivers/net/ethernet/hisilicon/higmac/higmac.h - create mode 100644 drivers/net/ethernet/hisilicon/higmac/pm.c - create mode 100644 drivers/net/ethernet/hisilicon/higmac/pm.h - create mode 100644 drivers/net/ethernet/hisilicon/higmac/proc_dev.c - create mode 100644 drivers/net/ethernet/hisilicon/higmac/sockioctl.h - create mode 100644 drivers/net/ethernet/hisilicon/higmac/tso.h - create mode 100644 drivers/net/ethernet/hisilicon/higmac/util.c - create mode 100644 drivers/net/ethernet/hisilicon/higmac/util.h - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/Makefile - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/util.c - create mode 100644 drivers/net/ethernet/hisilicon/hisi-femac/util.h - create mode 100644 drivers/net/phy/mdio_hisi_femac.c - create mode 100644 drivers/net/phy/mdio_hisi_gemac.c - create mode 100644 drivers/net/phy/mdio_hisi_gemac.h - create mode 100644 drivers/pci/hipcie/Kconfig - create mode 100644 drivers/pci/hipcie/Makefile - create mode 100644 drivers/pci/hipcie/pci.h - create mode 100644 drivers/pci/hipcie/pcie.c - create mode 100644 drivers/phy/hibvt/Kconfig - create mode 100644 drivers/phy/hibvt/Makefile - create mode 100644 drivers/phy/hibvt/phy-hisi-sata.c - create mode 100644 drivers/phy/hibvt/phy-hisi-sata.h - create mode 100644 drivers/phy/hibvt/usb/Kconfig - create mode 100644 drivers/phy/hibvt/usb/Makefile - create mode 100644 drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c - create mode 100644 drivers/phy/hibvt/usb/phy-hisi-usb.c - create mode 100644 drivers/phy/hibvt/usb/phy-hisi-usb.h - create mode 100644 drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c - create mode 100644 drivers/rtc/rtc-hibvt.c - create mode 100644 drivers/usb/dwc3/dwc3-hisi.c - create mode 100644 drivers/usb/dwc3/dwc3-hisi.h - mode change 100644 => 100755 drivers/usb/dwc3/gadget.c - create mode 100755 drivers/usb/dwc3/proc.c - mode change 100644 => 100755 drivers/usb/gadget/epautoconf.c - mode change 100644 => 100755 drivers/usb/gadget/function/uvc_configfs.c - create mode 100644 include/dt-bindings/clock/hi3516dv300-clock.h - create mode 100644 include/linux/hi_cma.h - create mode 100644 include/linux/hiedmac.h - create mode 100644 include/linux/mfd/hisi_fmc.h - diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 2f7a32b77282..b055611ab0a0 100644 +index 2f7a32b77..b055611ab 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -321,7 +321,7 @@ config ARCH_MULTIPLATFORM @@ -490,7 +21,7 @@ index 2f7a32b77282..b055611ab0a0 100644 source "arch/arm/mach-integrator/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile -index cb7c6b02fede..b79b0d689a73 100644 +index cb7c6b02f..b79b0d689 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -182,6 +182,7 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge @@ -513,7 +44,7 @@ index cb7c6b02fede..b79b0d689a73 100644 core-y += arch/arm/ diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile -index 0b3cd7a33a26..763d37e86f64 100644 +index 0b3cd7a33..763d37e86 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -16,6 +16,8 @@ OBJCOPYFLAGS :=-O binary -R .comment -S @@ -560,7 +91,7 @@ index 0b3cd7a33a26..763d37e86f64 100644 $(call if_changed,uimage) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index ce66ffd5a1bb..a84efd2d6c11 100644 +index ce66ffd5a..a84efd2d6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -239,6 +239,10 @@ dtb-$(CONFIG_ARCH_HISI) += \ @@ -581,7 +112,7 @@ index ce66ffd5a1bb..a84efd2d6c11 100644 + diff --git a/arch/arm/boot/dts/hi3516dv300-demb.dts b/arch/arm/boot/dts/hi3516dv300-demb.dts new file mode 100644 -index 000000000000..8e6c6abc33f7 +index 000000000..8e6c6abc3 --- /dev/null +++ b/arch/arm/boot/dts/hi3516dv300-demb.dts @@ -0,0 +1,270 @@ @@ -857,7 +388,7 @@ index 000000000000..8e6c6abc33f7 +}; diff --git a/arch/arm/boot/dts/hi3516dv300.dtsi b/arch/arm/boot/dts/hi3516dv300.dtsi new file mode 100644 -index 000000000000..a8ea89e91fa4 +index 000000000..a8ea89e91 --- /dev/null +++ b/arch/arm/boot/dts/hi3516dv300.dtsi @@ -0,0 +1,906 @@ @@ -1769,7 +1300,7 @@ index 000000000000..a8ea89e91fa4 +}; diff --git a/arch/arm/boot/dts/skeleton.dtsi b/arch/arm/boot/dts/skeleton.dtsi new file mode 100644 -index 000000000000..34eda68d9ea2 +index 000000000..34eda68d9 --- /dev/null +++ b/arch/arm/boot/dts/skeleton.dtsi @@ -0,0 +1,18 @@ @@ -1793,7 +1324,7 @@ index 000000000000..34eda68d9ea2 +}; diff --git a/arch/arm/configs/hi3516dv300_emmc_smp_defconfig b/arch/arm/configs/hi3516dv300_emmc_smp_defconfig new file mode 100644 -index 000000000000..daeb1fa651cd +index 000000000..daeb1fa65 --- /dev/null +++ b/arch/arm/configs/hi3516dv300_emmc_smp_defconfig @@ -0,0 +1,3070 @@ @@ -4869,7 +4400,7 @@ index 000000000000..daeb1fa651cd +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/configs/hi3516dv300_emmc_smp_hos_l2_defconfig b/arch/arm/configs/hi3516dv300_emmc_smp_hos_l2_defconfig new file mode 100644 -index 000000000000..016d763899fd +index 000000000..016d76389 --- /dev/null +++ b/arch/arm/configs/hi3516dv300_emmc_smp_hos_l2_defconfig @@ -0,0 +1,3135 @@ @@ -8010,7 +7541,7 @@ index 000000000000..016d763899fd +# CONFIG_TEST_STATIC_KEYS is not set diff --git a/arch/arm/configs/hi3516dv300_smp_defconfig b/arch/arm/configs/hi3516dv300_smp_defconfig new file mode 100644 -index 000000000000..109c06652395 +index 000000000..109c06652 --- /dev/null +++ b/arch/arm/configs/hi3516dv300_smp_defconfig @@ -0,0 +1,3189 @@ @@ -11204,7 +10735,7 @@ index 000000000000..109c06652395 +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_CORESIGHT is not set diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h -index ea9bd08895b7..dbe96664ba94 100644 +index ea9bd0889..dbe96664b 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -9,6 +9,7 @@ @@ -11260,7 +10791,7 @@ index ea9bd08895b7..dbe96664ba94 100644 int busnr; /* primary bus number */ u64 mem_offset; /* bus->cpu memory mapping offset */ diff --git a/arch/arm/include/asm/vdso/gettimeofday.h b/arch/arm/include/asm/vdso/gettimeofday.h -index 2134cbd5469f..6f078fedb0cb 100644 +index 2134cbd54..6f078fedb 100644 --- a/arch/arm/include/asm/vdso/gettimeofday.h +++ b/arch/arm/include/asm/vdso/gettimeofday.h @@ -109,14 +109,14 @@ static __always_inline int clock_getres32_fallback( @@ -11282,7 +10813,7 @@ index 2134cbd5469f..6f078fedb0cb 100644 /* diff --git a/arch/arm/mach-hibvt/Kconfig b/arch/arm/mach-hibvt/Kconfig new file mode 100644 -index 000000000000..9c8c76981bea +index 000000000..9c8c76981 --- /dev/null +++ b/arch/arm/mach-hibvt/Kconfig @@ -0,0 +1,258 @@ @@ -11546,7 +11077,7 @@ index 000000000000..9c8c76981bea +endif diff --git a/arch/arm/mach-hibvt/Makefile b/arch/arm/mach-hibvt/Makefile new file mode 100644 -index 000000000000..ec3243ec975a +index 000000000..ec3243ec9 --- /dev/null +++ b/arch/arm/mach-hibvt/Makefile @@ -0,0 +1,27 @@ @@ -11579,7 +11110,7 @@ index 000000000000..ec3243ec975a +obj-$(CONFIG_SMP) += platsmp.o diff --git a/arch/arm/mach-hibvt/Makefile.boot b/arch/arm/mach-hibvt/Makefile.boot new file mode 100644 -index 000000000000..8c8b30077e37 +index 000000000..8c8b30077 --- /dev/null +++ b/arch/arm/mach-hibvt/Makefile.boot @@ -0,0 +1,7 @@ @@ -11592,7 +11123,7 @@ index 000000000000..8c8b30077e37 +initrd_phys-$(CONFIG_ARCH_HISI_BVT) := $(CONFIG_HI_INITRD_PHYS) diff --git a/arch/arm/mach-hibvt/include/mach/hi3516dv300_io.h b/arch/arm/mach-hibvt/include/mach/hi3516dv300_io.h new file mode 100644 -index 000000000000..72ab47e83d19 +index 000000000..72ab47e83 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3516dv300_io.h @@ -0,0 +1,26 @@ @@ -11624,7 +11155,7 @@ index 000000000000..72ab47e83d19 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/hi3516dv300_platform.h b/arch/arm/mach-hibvt/include/mach/hi3516dv300_platform.h new file mode 100644 -index 000000000000..94c48064b311 +index 000000000..94c48064b --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/hi3516dv300_platform.h @@ -0,0 +1,4 @@ @@ -11634,7 +11165,7 @@ index 000000000000..94c48064b311 +#endif /* End of __HI3516DV300_CHIP_REGS_H__ */ diff --git a/arch/arm/mach-hibvt/include/mach/io.h b/arch/arm/mach-hibvt/include/mach/io.h new file mode 100644 -index 000000000000..b5fd58c7bfe6 +index 000000000..b5fd58c7b --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/io.h @@ -0,0 +1,52 @@ @@ -11692,7 +11223,7 @@ index 000000000000..b5fd58c7bfe6 +#endif diff --git a/arch/arm/mach-hibvt/include/mach/platform.h b/arch/arm/mach-hibvt/include/mach/platform.h new file mode 100644 -index 000000000000..5e41d2696954 +index 000000000..5e41d2696 --- /dev/null +++ b/arch/arm/mach-hibvt/include/mach/platform.h @@ -0,0 +1,52 @@ @@ -11750,7 +11281,7 @@ index 000000000000..5e41d2696954 +#endif /* End of __HISI_PLATFORM_H__ */ diff --git a/arch/arm/mach-hibvt/mach-common.h b/arch/arm/mach-hibvt/mach-common.h new file mode 100644 -index 000000000000..f5edadb0f0a8 +index 000000000..f5edadb0f --- /dev/null +++ b/arch/arm/mach-hibvt/mach-common.h @@ -0,0 +1,9 @@ @@ -11765,7 +11296,7 @@ index 000000000000..f5edadb0f0a8 +#endif /* __SMP_COMMON_H */ diff --git a/arch/arm/mach-hibvt/mach-hi3516dv300.c b/arch/arm/mach-hibvt/mach-hi3516dv300.c new file mode 100644 -index 000000000000..3061683bb711 +index 000000000..3061683bb --- /dev/null +++ b/arch/arm/mach-hibvt/mach-hi3516dv300.c @@ -0,0 +1,68 @@ @@ -11839,7 +11370,7 @@ index 000000000000..3061683bb711 +#endif /* CONFIG_SMP */ diff --git a/arch/arm/mach-hibvt/platsmp.c b/arch/arm/mach-hibvt/platsmp.c new file mode 100644 -index 000000000000..a73be20b133c +index 000000000..a73be20b1 --- /dev/null +++ b/arch/arm/mach-hibvt/platsmp.c @@ -0,0 +1,62 @@ @@ -11906,7 +11437,7 @@ index 000000000000..a73be20b133c +} + diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c -index c4b8df2ad328..374737bd59a6 100644 +index c4b8df2ad..374737bd5 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -237,7 +237,7 @@ const struct dma_map_ops arm_coherent_dma_ops = { @@ -11957,7 +11488,7 @@ diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c old mode 100644 new mode 100755 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 485b7dbd4f9e..65b9f45c8d8d 100644 +index 485b7dbd4..65b9f45c8 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -11,6 +11,7 @@ @@ -11969,7 +11500,7 @@ index 485b7dbd4f9e..65b9f45c8d8d 100644 ifeq ($(CONFIG_RELOCATABLE), y) # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile -index cd3414898d10..f3e98628b10f 100644 +index cd3414898..f3e98628b 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -18,12 +18,28 @@ OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S @@ -12040,7 +11571,7 @@ index cd3414898d10..f3e98628b10f 100644 $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image.gz System.map "$(INSTALL_PATH)" diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile -index 9b1170658d60..9520bb2444f4 100644 +index 9b1170658..9520bb244 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -30,3 +30,5 @@ subdir-y += ti @@ -12050,7 +11581,7 @@ index 9b1170658d60..9520bb2444f4 100644 +dtbs: $(addprefix $(obj)/, $(DTB_LIST)) +clean-files := dts/*.dtb *.dtb diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c -index 1006ed2d7c60..aa1d2f2b9377 100644 +index 1006ed2d7..aa1d2f2b9 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -29,6 +29,18 @@ int pcibios_alloc_irq(struct pci_dev *dev) @@ -12073,7 +11604,7 @@ index 1006ed2d7c60..aa1d2f2b9377 100644 /* diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index c0a7f0d90b39..a5ca33ad826e 100644 +index c0a7f0d90..a5ca33ad8 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -180,6 +180,10 @@ static void __init reserve_elfcorehdr(void) @@ -12101,13 +11632,14 @@ index c0a7f0d90b39..a5ca33ad826e 100644 static void __init zone_sizes_init(unsigned long min, unsigned long max) diff --git a/drivers/Kconfig b/drivers/Kconfig -index 3963568e6eea..5adf342a30cc 100644 +index 8eddfc2cd..d93fd59e8 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig -@@ -238,4 +238,12 @@ source "drivers/most/Kconfig" - +@@ -237,4 +237,12 @@ source "drivers/counter/Kconfig" source "drivers/hdf/khdf/Kconfig" + source "drivers/most/Kconfig" ++ +source "drivers/hidmac/Kconfig" + +source "drivers/hiedmac/Kconfig" @@ -12115,22 +11647,21 @@ index 3963568e6eea..5adf342a30cc 100644 +source "drivers/hisilicon/Kconfig" + +source "drivers/hi_vdmav100/Kconfig" -+ endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index 4cff090d6239..60c0725bea20 100644 +index 025b92b1f..e4d348361 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -190,3 +190,7 @@ obj-$(CONFIG_INTERCONNECT) += interconnect/ obj-$(CONFIG_COUNTER) += counter/ - obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_DRIVERS_HDF) += hdf/ -+obj-$(CONFIG_HI_DMAC) += hidmac/ -+obj-$(CONFIG_HIEDMAC) += hiedmac/ -+obj-$(CONFIG_ARCH_HISI_BVT) += hisilicon/ -+obj-$(CONFIG_HI_VDMA_V100) += hi_vdmav100/ + obj-$(CONFIG_MOST) += most/ ++obj-$(CONFIG_HI_DMAC) += hidmac/ ++obj-$(CONFIG_HIEDMAC) += hiedmac/ ++obj-$(CONFIG_ARCH_HISI_BVT) += hisilicon/ ++obj-$(CONFIG_HI_VDMA_V100) += hi_vdmav100/ diff --git a/drivers/android/binder.c b/drivers/android/binder.c -index 2a3952925855..a324b85ee9a8 100644 +index 2a3952925..a324b85ee 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2945,7 +2945,7 @@ static void binder_transaction(struct binder_proc *proc, @@ -12143,7 +11674,7 @@ index 2a3952925855..a324b85ee9a8 100644 } if (!target_node) { diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig -index 030cb32da980..97d530d3e18c 100644 +index 030cb32da..97d530d3e 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -2,6 +2,7 @@ @@ -12156,7 +11687,7 @@ index 030cb32da980..97d530d3e18c 100644 bool diff --git a/drivers/ata/Kconfig.hiahci b/drivers/ata/Kconfig.hiahci new file mode 100644 -index 000000000000..030de3fc9d0a +index 000000000..030de3fc9 --- /dev/null +++ b/drivers/ata/Kconfig.hiahci @@ -0,0 +1,44 @@ @@ -12205,7 +11736,7 @@ index 000000000000..030de3fc9d0a +endif + diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile -index b8aebfb14e82..f81f2d66b969 100644 +index b8aebfb14..f81f2d66b 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -1,6 +1,7 @@ @@ -12217,7 +11748,7 @@ index b8aebfb14e82..f81f2d66b969 100644 # non-SFF interface obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index d1f284f0c83d..af7963b12532 100644 +index d1f284f0c..af7963b12 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -224,6 +224,9 @@ enum { @@ -12244,7 +11775,7 @@ index d1f284f0c83d..af7963b12532 100644 * If platform uses PHYs. There is a 1:1 relation between the port number and * the PHY position in this array. diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 3aab2e3d57f3..385d3d7d51bb 100644 +index 3aab2e3d5..385d3d7d5 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -22,6 +22,16 @@ @@ -12288,7 +11819,7 @@ index 3aab2e3d57f3..385d3d7d51bb 100644 if (!port) diff --git a/drivers/ata/hisi_sata_dbg.c b/drivers/ata/hisi_sata_dbg.c new file mode 100644 -index 000000000000..935c7168905e +index 000000000..935c71689 --- /dev/null +++ b/drivers/ata/hisi_sata_dbg.c @@ -0,0 +1,174 @@ @@ -12468,7 +11999,7 @@ index 000000000000..935c7168905e + diff --git a/drivers/ata/hisi_sata_dbg.h b/drivers/ata/hisi_sata_dbg.h new file mode 100644 -index 000000000000..5103658a4f05 +index 000000000..5103658a4 --- /dev/null +++ b/drivers/ata/hisi_sata_dbg.h @@ -0,0 +1,58 @@ @@ -12531,7 +12062,7 @@ index 000000000000..5103658a4f05 +#endif +#endif /* _HISI_SATA_DBG_H */ diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index fec2e9754aed..68c87b25cf90 100644 +index fec2e9754..68c87b25c 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -31,6 +31,7 @@ @@ -12824,7 +12355,7 @@ index fec2e9754aed..68c87b25cf90 100644 return ahci_port_resume(ap); } diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c -index 70da8b86ce58..5725b026b727 100644 +index 70da8b86c..5725b026b 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -1031,6 +1031,9 @@ static int __init pcd_init(void) @@ -12838,7 +12369,7 @@ index 70da8b86ce58..5725b026b727 100644 register_cdrom(cd->disk, &cd->info); cd->disk->private_data = cd; diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index da8fcf147eb1..04bbcd945e62 100644 +index da8fcf147..04bbcd945 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_ARCH_BERLIN) += berlin/ @@ -12850,7 +12381,7 @@ index da8fcf147eb1..04bbcd945e62 100644 obj-y += imx/ obj-y += ingenic/ diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig -index 6a9e93a0bb95..4d212e5a193a 100644 +index 6a9e93a0b..4d212e5a1 100644 --- a/drivers/clk/hisilicon/Kconfig +++ b/drivers/clk/hisilicon/Kconfig @@ -22,6 +22,38 @@ config COMMON_CLK_HI3660 @@ -13069,7 +12600,7 @@ index 6a9e93a0bb95..4d212e5a193a 100644 help Build reset controller driver for HiSilicon device chipsets. diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile -index b2441b99f3d5..91dc23fdb9c3 100644 +index b2441b99f..91dc23fdb 100644 --- a/drivers/clk/hisilicon/Makefile +++ b/drivers/clk/hisilicon/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_COMMON_CLK_HI3660) += clk-hi3660.o @@ -13082,7 +12613,7 @@ index b2441b99f3d5..91dc23fdb9c3 100644 obj-$(CONFIG_STUB_CLK_HI3660) += clk-hi3660-stub.o diff --git a/drivers/clk/hisilicon/clk-hi3516dv300.c b/drivers/clk/hisilicon/clk-hi3516dv300.c new file mode 100644 -index 000000000000..1a2ab99758cf +index 000000000..1a2ab9975 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516dv300.c @@ -0,0 +1,271 @@ @@ -13359,7 +12890,7 @@ index 000000000000..1a2ab99758cf + diff --git a/drivers/clk/hisilicon/clk-hi3519av100.c b/drivers/clk/hisilicon/clk-hi3519av100.c new file mode 100644 -index 000000000000..657767941652 +index 000000000..657767941 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3519av100.c @@ -0,0 +1,559 @@ @@ -13923,7 +13454,7 @@ index 000000000000..657767941652 +CLK_OF_DECLARE(hi3519av100_clk, "hisilicon,hi3519av100-clock", + hi3519av100_clk_init); diff --git a/drivers/clk/hisilicon/clk-hisi-phase.c b/drivers/clk/hisilicon/clk-hisi-phase.c -index ba6afad66a2b..b13b916097fe 100644 +index ba6afad66..b13b91609 100644 --- a/drivers/clk/hisilicon/clk-hisi-phase.c +++ b/drivers/clk/hisilicon/clk-hisi-phase.c @@ -77,7 +77,7 @@ static int hisi_clk_set_phase(struct clk_hw *hw, int degrees) @@ -13936,7 +13467,7 @@ index ba6afad66a2b..b13b916097fe 100644 spin_unlock_irqrestore(phase->lock, flags); diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c -index 54d9fdc93599..9ca4fc05fa57 100644 +index 54d9fdc93..9ca4fc05f 100644 --- a/drivers/clk/hisilicon/clk.c +++ b/drivers/clk/hisilicon/clk.c @@ -82,6 +82,10 @@ struct hisi_clock_data *hisi_clk_init(struct device_node *np, @@ -13951,7 +13482,7 @@ index 54d9fdc93599..9ca4fc05fa57 100644 err: return NULL; diff --git a/drivers/clk/hisilicon/crg.h b/drivers/clk/hisilicon/crg.h -index 803f6ba6d7a2..a847586605b7 100644 +index 803f6ba6d..a84758660 100644 --- a/drivers/clk/hisilicon/crg.h +++ b/drivers/clk/hisilicon/crg.h @@ -13,7 +13,7 @@ struct hisi_reset_controller; @@ -13964,7 +13495,7 @@ index 803f6ba6d7a2..a847586605b7 100644 struct hisi_crg_dev { diff --git a/drivers/clk/hisilicon/reset.c b/drivers/clk/hisilicon/reset.c -index 93cee17db8b1..e9a03d924912 100644 +index 93cee17db..e9a03d924 100644 --- a/drivers/clk/hisilicon/reset.c +++ b/drivers/clk/hisilicon/reset.c @@ -87,6 +87,36 @@ static const struct reset_control_ops hisi_reset_ops = { @@ -14005,7 +13536,7 @@ index 93cee17db8b1..e9a03d924912 100644 { struct hisi_reset_controller *rstc; diff --git a/drivers/clk/hisilicon/reset.h b/drivers/clk/hisilicon/reset.h -index 81ff9e9e3678..5954bdf911e9 100644 +index 81ff9e9e3..5954bdf91 100644 --- a/drivers/clk/hisilicon/reset.h +++ b/drivers/clk/hisilicon/reset.h @@ -11,6 +11,9 @@ struct hisi_reset_controller; @@ -14019,7 +13550,7 @@ index 81ff9e9e3678..5954bdf911e9 100644 #else static inline diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index 39f4d8866200..ddf6f7373b90 100644 +index 39f4d8866..ddf6f7373 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -347,6 +347,14 @@ config ARM_ARCH_TIMER_EVTSTREAM @@ -14051,7 +13582,7 @@ index 39f4d8866200..ddf6f7373b90 100644 bool depends on ARM_GLOBAL_TIMER diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile -index 1c444cc3bb44..1a184f6ba796 100644 +index 1c444cc3b..1a184f6ba 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -69,6 +69,7 @@ obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o @@ -14063,7 +13594,7 @@ index 1c444cc3bb44..1a184f6ba796 100644 obj-$(CONFIG_KEYSTONE_TIMER) += timer-keystone.o obj-$(CONFIG_INTEGRATOR_AP_TIMER) += timer-integrator-ap.o diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c -index f4881764bf8f..d435d12664fa 100644 +index f4881764b..d435d1266 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -631,7 +631,8 @@ static bool arch_timer_counter_has_wa(void) @@ -14078,7 +13609,7 @@ index f4881764bf8f..d435d12664fa 100644 diff --git a/drivers/clocksource/timer-hisp804.c b/drivers/clocksource/timer-hisp804.c new file mode 100644 -index 000000000000..b2c857a418a5 +index 000000000..b2c857a41 --- /dev/null +++ b/drivers/clocksource/timer-hisp804.c @@ -0,0 +1,356 @@ @@ -14440,7 +13971,7 @@ index 000000000000..b2c857a418a5 +CLOCKSOURCE_OF_DECLARE(hisp804, "hisilicon,hisp804", hisp804_timer_init); \ No newline at end of file diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index f28bb2334e74..fbdc52bac0b0 100644 +index f28bb2334..fbdc52bac 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -328,6 +328,20 @@ config K3_DMA @@ -14473,7 +14004,7 @@ index f28bb2334e74..fbdc52bac0b0 100644 source "drivers/dma/bestcomm/Kconfig" diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index 948a8da05f8b..c5f89432d49b 100644 +index 948a8da05..c5f89432d 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -82,7 +82,7 @@ obj-$(CONFIG_XGENE_DMA) += xgene-dma.o @@ -14487,7 +14018,7 @@ index 948a8da05f8b..c5f89432d49b 100644 obj-y += ti/ diff --git a/drivers/dma/hiedmacv310.c b/drivers/dma/hiedmacv310.c new file mode 100644 -index 000000000000..a198c92241e6 +index 000000000..a198c9224 --- /dev/null +++ b/drivers/dma/hiedmacv310.c @@ -0,0 +1,1443 @@ @@ -15936,7 +15467,7 @@ index 000000000000..a198c92241e6 +MODULE_AUTHOR("Hisilicon"); diff --git a/drivers/dma/hiedmacv310.h b/drivers/dma/hiedmacv310.h new file mode 100644 -index 000000000000..1fc093945d50 +index 000000000..1fc093945 --- /dev/null +++ b/drivers/dma/hiedmacv310.h @@ -0,0 +1,153 @@ @@ -16094,7 +15625,7 @@ index 000000000000..1fc093945d50 +#define HIEDMAC_CONTROL_DST_WIDTH_MASK GENMASK(14, 12) +#endif diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c -index f1b53dd1df1a..0825ad601d8b 100644 +index f1b53dd1d..0825ad601 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -289,6 +289,9 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) @@ -16129,7 +15660,7 @@ index f1b53dd1df1a..0825ad601d8b 100644 pl061->gc.direction_input = pl061_direction_input; pl061->gc.direction_output = pl061_direction_output; diff --git a/drivers/gpu/drm/hisilicon/Kconfig b/drivers/gpu/drm/hisilicon/Kconfig -index cc5a244db252..d69de65db208 100644 +index cc5a244db..d69de65db 100644 --- a/drivers/gpu/drm/hisilicon/Kconfig +++ b/drivers/gpu/drm/hisilicon/Kconfig @@ -5,3 +5,4 @@ @@ -16138,7 +15669,7 @@ index cc5a244db252..d69de65db208 100644 source "drivers/gpu/drm/hisilicon/kirin/Kconfig" +source "drivers/gpu/drm/hisilicon/hismart/Kconfig" diff --git a/drivers/gpu/drm/hisilicon/Makefile b/drivers/gpu/drm/hisilicon/Makefile -index 69dec6084b04..4d4968e65b2a 100644 +index 69dec6084..4d4968e65 100644 --- a/drivers/gpu/drm/hisilicon/Makefile +++ b/drivers/gpu/drm/hisilicon/Makefile @@ -5,3 +5,4 @@ @@ -16148,7 +15679,7 @@ index 69dec6084b04..4d4968e65b2a 100644 +obj-$(CONFIG_DRM_HISI_HISMART) += hismart/ diff --git a/drivers/gpu/drm/hisilicon/hismart/Kconfig b/drivers/gpu/drm/hisilicon/hismart/Kconfig new file mode 100644 -index 000000000000..ffc8564a8deb +index 000000000..ffc8564a8 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/Kconfig @@ -0,0 +1,8 @@ @@ -16162,7 +15693,7 @@ index 000000000000..ffc8564a8deb + diff --git a/drivers/gpu/drm/hisilicon/hismart/Makefile b/drivers/gpu/drm/hisilicon/hismart/Makefile new file mode 100644 -index 000000000000..7e611dd84b5f +index 000000000..7e611dd84 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/Makefile @@ -0,0 +1,27 @@ @@ -16195,7 +15726,7 @@ index 000000000000..7e611dd84b5f + diff --git a/drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h b/drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h new file mode 100644 -index 000000000000..88192d01f0e0 +index 000000000..88192d01f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h @@ -0,0 +1,91 @@ @@ -16292,7 +15823,7 @@ index 000000000000..88192d01f0e0 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c new file mode 100755 -index 000000000000..897f7838fb6c +index 000000000..897f7838f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c @@ -0,0 +1,777 @@ @@ -17075,7 +16606,7 @@ index 000000000000..897f7838fb6c +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h new file mode 100644 -index 000000000000..31f13ff5fb76 +index 000000000..31f13ff5f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h @@ -0,0 +1,69 @@ @@ -17150,7 +16681,7 @@ index 000000000000..31f13ff5fb76 +#endif /* __HI_ADP_CRTC_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c new file mode 100644 -index 000000000000..7b72a0639a16 +index 000000000..7b72a0639 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c @@ -0,0 +1,345 @@ @@ -17501,7 +17032,7 @@ index 000000000000..7b72a0639a16 +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h new file mode 100644 -index 000000000000..4c7f08883850 +index 000000000..4c7f08883 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h @@ -0,0 +1,28 @@ @@ -17535,7 +17066,7 @@ index 000000000000..4c7f08883850 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c new file mode 100755 -index 000000000000..b58fafb7cc69 +index 000000000..a70f77e0a --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c @@ -0,0 +1,223 @@ @@ -17764,7 +17295,7 @@ index 000000000000..b58fafb7cc69 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h new file mode 100644 -index 000000000000..d7f3767dcb40 +index 000000000..d7f3767dc --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h @@ -0,0 +1,24 @@ @@ -17794,7 +17325,7 @@ index 000000000000..d7f3767dcb40 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c new file mode 100755 -index 000000000000..ee41abf3b4b0 +index 000000000..ee41abf3b --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c @@ -0,0 +1,389 @@ @@ -18189,7 +17720,7 @@ index 000000000000..ee41abf3b4b0 +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h new file mode 100644 -index 000000000000..ebe7aac6fe89 +index 000000000..ebe7aac6f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h @@ -0,0 +1,17 @@ @@ -18212,7 +17743,7 @@ index 000000000000..ebe7aac6fe89 +#endif /* __HI_DRM_CTRC_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c new file mode 100755 -index 000000000000..166496e813cb +index 000000000..166496e81 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c @@ -0,0 +1,369 @@ @@ -18587,7 +18118,7 @@ index 000000000000..166496e813cb + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h new file mode 100755 -index 000000000000..c399f78b6f17 +index 000000000..c399f78b6 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h @@ -0,0 +1,29 @@ @@ -18622,7 +18153,7 @@ index 000000000000..c399f78b6f17 +#endif /* __HI_DRM_DRV_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c new file mode 100644 -index 000000000000..f29e7f99821e +index 000000000..f29e7f998 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c @@ -0,0 +1,43 @@ @@ -18672,7 +18203,7 @@ index 000000000000..f29e7f99821e \ No newline at end of file diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h new file mode 100644 -index 000000000000..83a96b22b662 +index 000000000..83a96b22b --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h @@ -0,0 +1,27 @@ @@ -18705,7 +18236,7 @@ index 000000000000..83a96b22b662 +#endif /* __HI_DRM_FUNC_EXT_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c new file mode 100755 -index 000000000000..1d11d98a2820 +index 000000000..1d11d98a2 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c @@ -0,0 +1,233 @@ @@ -18944,7 +18475,7 @@ index 000000000000..1d11d98a2820 +} diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h new file mode 100644 -index 000000000000..22285a50ed94 +index 000000000..22285a50e --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h @@ -0,0 +1,16 @@ @@ -18966,7 +18497,7 @@ index 000000000000..22285a50ed94 +#endif /* __HI_DRM_HDMITX_H__ */ diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c new file mode 100755 -index 000000000000..b5007d5ffcd3 +index 000000000..b5007d5ff --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c @@ -0,0 +1,181 @@ @@ -19153,7 +18684,7 @@ index 000000000000..b5007d5ffcd3 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h new file mode 100644 -index 000000000000..34d2f0a37201 +index 000000000..34d2f0a37 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h @@ -0,0 +1,17 @@ @@ -19176,7 +18707,7 @@ index 000000000000..34d2f0a37201 + diff --git a/drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h b/drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h new file mode 100644 -index 000000000000..5f247a1a942a +index 000000000..5f247a1a9 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h @@ -0,0 +1,31 @@ @@ -19213,7 +18744,7 @@ index 000000000000..5f247a1a942a +#endif /* HISILICON_DRM_H */ diff --git a/drivers/hi_vdmav100/Kconfig b/drivers/hi_vdmav100/Kconfig new file mode 100644 -index 000000000000..ecaa952b9798 +index 000000000..ecaa952b9 --- /dev/null +++ b/drivers/hi_vdmav100/Kconfig @@ -0,0 +1,26 @@ @@ -19245,7 +18776,7 @@ index 000000000000..ecaa952b9798 +endif diff --git a/drivers/hi_vdmav100/Makefile b/drivers/hi_vdmav100/Makefile new file mode 100644 -index 000000000000..ccac799b500d +index 000000000..ccac799b5 --- /dev/null +++ b/drivers/hi_vdmav100/Makefile @@ -0,0 +1,2 @@ @@ -19253,7 +18784,7 @@ index 000000000000..ccac799b500d +obj-$(CONFIG_HI_VDMA_MISC_DEV) += hi_vdmav100_misc.o diff --git a/drivers/hi_vdmav100/hi_vdma.h b/drivers/hi_vdmav100/hi_vdma.h new file mode 100644 -index 000000000000..3644fe6212cd +index 000000000..3644fe621 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdma.h @@ -0,0 +1,41 @@ @@ -19300,7 +18831,7 @@ index 000000000000..3644fe6212cd +#endif diff --git a/drivers/hi_vdmav100/hi_vdmav100.c b/drivers/hi_vdmav100/hi_vdmav100.c new file mode 100644 -index 000000000000..0199ddd231f7 +index 000000000..0199ddd23 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100.c @@ -0,0 +1,534 @@ @@ -19840,7 +19371,7 @@ index 000000000000..0199ddd231f7 +MODULE_AUTHOR("BVT_OSDRV"); diff --git a/drivers/hi_vdmav100/hi_vdmav100.h b/drivers/hi_vdmav100/hi_vdmav100.h new file mode 100644 -index 000000000000..8b8d3e6c0026 +index 000000000..8b8d3e6c0 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100.h @@ -0,0 +1,122 @@ @@ -19968,7 +19499,7 @@ index 000000000000..8b8d3e6c0026 +#endif diff --git a/drivers/hi_vdmav100/hi_vdmav100_misc.c b/drivers/hi_vdmav100/hi_vdmav100_misc.c new file mode 100644 -index 000000000000..777a7c47cd53 +index 000000000..777a7c47c --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100_misc.c @@ -0,0 +1,109 @@ @@ -20082,7 +19613,7 @@ index 000000000000..777a7c47cd53 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Hisilicon VDMA MISC Driver"); diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile -index 4acb583c92a6..01350ca69d96 100644 +index 4acb583c9..01350ca69 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -2,6 +2,15 @@ @@ -20103,7 +19634,7 @@ index 4acb583c92a6..01350ca69d96 100644 diff --git a/drivers/hidmac/Kconfig b/drivers/hidmac/Kconfig new file mode 100644 -index 000000000000..dcb3e08bf5d2 +index 000000000..dcb3e08bf --- /dev/null +++ b/drivers/hidmac/Kconfig @@ -0,0 +1,21 @@ @@ -20130,7 +19661,7 @@ index 000000000000..dcb3e08bf5d2 +endif diff --git a/drivers/hidmac/Makefile b/drivers/hidmac/Makefile new file mode 100644 -index 000000000000..7e41f4c37ffd +index 000000000..7e41f4c37 --- /dev/null +++ b/drivers/hidmac/Makefile @@ -0,0 +1,6 @@ @@ -20142,7 +19673,7 @@ index 000000000000..7e41f4c37ffd + diff --git a/drivers/hidmac/hi_pl08x.c b/drivers/hidmac/hi_pl08x.c new file mode 100644 -index 000000000000..4281caf7eb10 +index 000000000..4281caf7e --- /dev/null +++ b/drivers/hidmac/hi_pl08x.c @@ -0,0 +1,1303 @@ @@ -21451,7 +20982,7 @@ index 000000000000..4281caf7eb10 +MODULE_DESCRIPTION("HiSilicon DMA Controller driver"); diff --git a/drivers/hidmac/hi_pl08x.h b/drivers/hidmac/hi_pl08x.h new file mode 100644 -index 000000000000..1c3babf22e43 +index 000000000..1c3babf22 --- /dev/null +++ b/drivers/hidmac/hi_pl08x.h @@ -0,0 +1,90 @@ @@ -21547,7 +21078,7 @@ index 000000000000..1c3babf22e43 +#endif /* End of #ifndef __HI_INC_ECSDMACC_H__ */ diff --git a/drivers/hiedmac/Kconfig b/drivers/hiedmac/Kconfig new file mode 100644 -index 000000000000..183747be82fb +index 000000000..183747be8 --- /dev/null +++ b/drivers/hiedmac/Kconfig @@ -0,0 +1,29 @@ @@ -21582,7 +21113,7 @@ index 000000000000..183747be82fb +endif diff --git a/drivers/hiedmac/Makefile b/drivers/hiedmac/Makefile new file mode 100644 -index 000000000000..a1b4b8b767b4 +index 000000000..a1b4b8b76 --- /dev/null +++ b/drivers/hiedmac/Makefile @@ -0,0 +1,4 @@ @@ -21592,7 +21123,7 @@ index 000000000000..a1b4b8b767b4 +obj-$(CONFIG_HIEDMAC) += hiedmacv310.o diff --git a/drivers/hiedmac/hiedmacv310.c b/drivers/hiedmac/hiedmacv310.c new file mode 100644 -index 000000000000..282ac3eaac98 +index 000000000..282ac3eaa --- /dev/null +++ b/drivers/hiedmac/hiedmacv310.c @@ -0,0 +1,946 @@ @@ -22544,7 +22075,7 @@ index 000000000000..282ac3eaac98 +MODULE_AUTHOR("Hisilicon"); diff --git a/drivers/hiedmac/hiedmacv310.h b/drivers/hiedmac/hiedmacv310.h new file mode 100644 -index 000000000000..4344d8940d61 +index 000000000..4344d8940 --- /dev/null +++ b/drivers/hiedmac/hiedmacv310.h @@ -0,0 +1,184 @@ @@ -22734,7 +22265,7 @@ index 000000000000..4344d8940d61 +#endif diff --git a/drivers/hisilicon/Kconfig b/drivers/hisilicon/Kconfig new file mode 100644 -index 000000000000..ab5884c08df9 +index 000000000..ab5884c08 --- /dev/null +++ b/drivers/hisilicon/Kconfig @@ -0,0 +1,4 @@ @@ -22744,14 +22275,14 @@ index 000000000000..ab5884c08df9 +endmenu diff --git a/drivers/hisilicon/Makefile b/drivers/hisilicon/Makefile new file mode 100644 -index 000000000000..0ba50a756682 +index 000000000..0ba50a756 --- /dev/null +++ b/drivers/hisilicon/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_CMA) += cma/ diff --git a/drivers/hisilicon/cma/Kconfig b/drivers/hisilicon/cma/Kconfig new file mode 100644 -index 000000000000..7472dccd8952 +index 000000000..7472dccd8 --- /dev/null +++ b/drivers/hisilicon/cma/Kconfig @@ -0,0 +1,16 @@ @@ -22773,7 +22304,7 @@ index 000000000000..7472dccd8952 + CMA Multiplex Ratio will be improved when this macro defined. diff --git a/drivers/hisilicon/cma/Makefile b/drivers/hisilicon/cma/Makefile new file mode 100644 -index 000000000000..eefda7f57298 +index 000000000..eefda7f57 --- /dev/null +++ b/drivers/hisilicon/cma/Makefile @@ -0,0 +1,2 @@ @@ -22781,7 +22312,7 @@ index 000000000000..eefda7f57298 +obj-$(CONFIG_CMA) += hi_cma.o diff --git a/drivers/hisilicon/cma/hi_cma.c b/drivers/hisilicon/cma/hi_cma.c new file mode 100644 -index 000000000000..6ce2e2b45038 +index 000000000..6ce2e2b45 --- /dev/null +++ b/drivers/hisilicon/cma/hi_cma.c @@ -0,0 +1,203 @@ @@ -22989,7 +22520,7 @@ index 000000000000..6ce2e2b45038 +RESERVEDMEM_OF_DECLARE(cma, "hisi-mmz", hisi_mmz_setup); + diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 7e693dcbdd19..c428abba0f50 100644 +index 7e693dcbd..c428abba0 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -640,6 +640,16 @@ config I2C_GPIO_FAULT_INJECTOR @@ -23031,7 +22562,7 @@ index 7e693dcbdd19..c428abba0f50 100644 + because DMA for 0xFFC one-time largest data transfers; endmenu diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 683c49faca05..2c615a7c1654 100644 +index 683c49fac..2c615a7c1 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o @@ -23044,7 +22575,7 @@ index 683c49faca05..2c615a7c1654 100644 obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o diff --git a/drivers/i2c/busses/i2c-hibvt.c b/drivers/i2c/busses/i2c-hibvt.c new file mode 100644 -index 000000000000..4c7cd494ac40 +index 000000000..4c7cd494a --- /dev/null +++ b/drivers/i2c/busses/i2c-hibvt.c @@ -0,0 +1,1451 @@ @@ -24500,7 +24031,7 @@ index 000000000000..4c7cd494ac40 +MODULE_DESCRIPTION("HISILICON BVT I2C Bus driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c -index 6ef38a8ee95c..6d5ac0628e87 100644 +index 6ef38a8ee..6d5ac0628 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -231,7 +231,42 @@ static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr) @@ -24572,7 +24103,7 @@ index 6ef38a8ee95c..6d5ac0628e87 100644 /* NOTE: returning a fault code here could cause trouble * in buggy userspace code. Some old kernel bugs returned diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c -index 505c562a5daa..67d451beba08 100644 +index 505c562a5..67d451beb 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -869,7 +869,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, @@ -24585,7 +24116,7 @@ index 505c562a5daa..67d451beba08 100644 mousedev->close_device = mixdev_close_devices; } else { diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c -index 6053245a4754..7534882d0a01 100644 +index 6053245a4..7534882d0 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -116,6 +116,24 @@ static DEFINE_RAW_SPINLOCK(cpu_map_lock); @@ -24721,7 +24252,7 @@ index 6053245a4754..7534882d0a01 100644 if (ret) goto error; diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c -index cd6776c3163b..8d06332bb214 100644 +index cd6776c31..8d06332bb 100644 --- a/drivers/media/usb/gspca/ov519.c +++ b/drivers/media/usb/gspca/ov519.c @@ -3482,6 +3482,11 @@ static void ov511_mode_init_regs(struct sd *sd) @@ -24749,7 +24280,7 @@ index cd6776c3163b..8d06332bb214 100644 ov518_reg_w32(sd, R51x_FIFO_PSIZE, packet_size & ~7, 2); diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index b8847ae04d93..e6bf07fe16e5 100644 +index b8847ae04..e6bf07fe1 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -520,6 +520,17 @@ config MFD_HI655X_PMIC @@ -24771,7 +24302,7 @@ index b8847ae04d93..e6bf07fe16e5 100644 tristate "HTC PASIC3 LED/DS1WM chip support" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index 1780019d2474..992e1895fa41 100644 +index 1780019d2..992e1895f 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -211,6 +211,7 @@ obj-$(CONFIG_MFD_AT91_USART) += at91-usart.o @@ -24784,7 +24315,7 @@ index 1780019d2474..992e1895fa41 100644 obj-$(CONFIG_MFD_INTEL_LPSS_ACPI) += intel-lpss-acpi.o diff --git a/drivers/mfd/hisi_fmc.c b/drivers/mfd/hisi_fmc.c new file mode 100644 -index 000000000000..7aa23e56d0c3 +index 000000000..7aa23e56d --- /dev/null +++ b/drivers/mfd/hisi_fmc.c @@ -0,0 +1,134 @@ @@ -24923,7 +24454,7 @@ index 000000000000..7aa23e56d0c3 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("HiSilicon Flash Memory Controller Driver"); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 87bac9920702..bbf420a68c79 100644 +index 87bac9920..bbf420a68 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -448,7 +448,7 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, @@ -24961,7 +24492,7 @@ index 87bac9920702..bbf420a68c79 100644 if ((MMC_EXTRACT_INDEX_FROM_ARG(cmd.arg) == EXT_CSD_SANITIZE_START) && diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index b5f3f160c842..0b0e367bc33e 100644 +index b5f3f160c..0b0e367bc 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1371,6 +1371,9 @@ void mmc_power_off(struct mmc_host *host) @@ -25007,7 +24538,7 @@ index b5f3f160c842..0b0e367bc33e 100644 break; } diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index 7494d595035e..416fc67236e3 100644 +index 7494d5950..416fc6723 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1414,7 +1414,9 @@ static int mmc_select_hs400es(struct mmc_card *card) @@ -25040,7 +24571,7 @@ index 7494d595035e..416fc67236e3 100644 if (host->ocr_avail_mmc) host->ocr_avail = host->ocr_avail_mmc; diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c -index bac343a8d569..af8bf24cd0a2 100644 +index bac343a8d..af8bf24cd 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1349,6 +1349,7 @@ int mmc_attach_sd(struct mmc_host *host) @@ -25052,7 +24583,7 @@ index bac343a8d569..af8bf24cd0a2 100644 if (host->ocr_avail_sd) host->ocr_avail = host->ocr_avail_sd; diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c -index 1b0853a82189..3e452090d67c 100644 +index 1b0853a82..3e452090d 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1193,6 +1193,7 @@ int mmc_attach_sdio(struct mmc_host *host) @@ -25105,7 +24636,7 @@ index 1b0853a82189..3e452090d67c 100644 +#endif + diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 31481c9fcc2e..299758712390 100644 +index 31481c9fc..299758712 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -247,6 +247,21 @@ config MMC_SDHCI_CNS3XXX @@ -25153,7 +24684,7 @@ index 31481c9fcc2e..299758712390 100644 tristate "Support for the SDHCI Controller in TI's AM654 SOCs" depends on MMC_SDHCI_PLTFM && OF && REGMAP_MMIO diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 451c25fc2c69..e7ec6250ecda 100644 +index 451c25fc2..e7ec6250e 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -94,6 +94,21 @@ obj-$(CONFIG_MMC_SDHCI_OF_AT91) += sdhci-of-at91.o @@ -25185,7 +24716,7 @@ index 451c25fc2c69..e7ec6250ecda 100644 + +obj-$(CONFIG_HIMCI) += himci/ diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c -index 697fe40756bf..248fe7ea896d 100644 +index 697fe4075..248fe7ea8 100644 --- a/drivers/mmc/host/cqhci.c +++ b/drivers/mmc/host/cqhci.c @@ -46,6 +46,11 @@ static inline u8 *get_link_desc(struct cqhci_host *cq_host, u8 tag) @@ -25301,7 +24832,7 @@ index 697fe40756bf..248fe7ea896d 100644 static int cqhci_error_from_flags(unsigned int flags) diff --git a/drivers/mmc/host/cqhci.h b/drivers/mmc/host/cqhci.h -index 89bf6adbce8c..05571faf079a 100644 +index 89bf6adbc..05571faf0 100644 --- a/drivers/mmc/host/cqhci.h +++ b/drivers/mmc/host/cqhci.h @@ -80,6 +80,12 @@ @@ -25335,7 +24866,7 @@ index 89bf6adbce8c..05571faf079a 100644 bool halted; diff --git a/drivers/mmc/host/himci/Kconfig b/drivers/mmc/host/himci/Kconfig new file mode 100644 -index 000000000000..f3331c86279e +index 000000000..f3331c862 --- /dev/null +++ b/drivers/mmc/host/himci/Kconfig @@ -0,0 +1,23 @@ @@ -25364,7 +24895,7 @@ index 000000000000..f3331c86279e + diff --git a/drivers/mmc/host/himci/Makefile b/drivers/mmc/host/himci/Makefile new file mode 100644 -index 000000000000..6858bfcef463 +index 000000000..6858bfcef --- /dev/null +++ b/drivers/mmc/host/himci/Makefile @@ -0,0 +1,2 @@ @@ -25372,7 +24903,7 @@ index 000000000000..6858bfcef463 +hisi_mci-y := himci.o himci_proc.o diff --git a/drivers/mmc/host/himci/himci.c b/drivers/mmc/host/himci/himci.c new file mode 100644 -index 000000000000..65aa8d24ea9e +index 000000000..65aa8d24e --- /dev/null +++ b/drivers/mmc/host/himci/himci.c @@ -0,0 +1,2580 @@ @@ -27958,7 +27489,7 @@ index 000000000000..65aa8d24ea9e +#endif diff --git a/drivers/mmc/host/himci/himci.h b/drivers/mmc/host/himci/himci.h new file mode 100644 -index 000000000000..d882e847f539 +index 000000000..d882e847f --- /dev/null +++ b/drivers/mmc/host/himci/himci.h @@ -0,0 +1,156 @@ @@ -28120,7 +27651,7 @@ index 000000000000..d882e847f539 +#endif diff --git a/drivers/mmc/host/himci/himci_hi3516dv300.c b/drivers/mmc/host/himci/himci_hi3516dv300.c new file mode 100644 -index 000000000000..bb312d6013f0 +index 000000000..bb312d601 --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3516dv300.c @@ -0,0 +1,160 @@ @@ -28286,7 +27817,7 @@ index 000000000000..bb312d6013f0 +} diff --git a/drivers/mmc/host/himci/himci_proc.c b/drivers/mmc/host/himci/himci_proc.c new file mode 100644 -index 000000000000..ac339c4da288 +index 000000000..ac339c4da --- /dev/null +++ b/drivers/mmc/host/himci/himci_proc.c @@ -0,0 +1,246 @@ @@ -28538,7 +28069,7 @@ index 000000000000..ac339c4da288 +} diff --git a/drivers/mmc/host/himci/himci_proc.h b/drivers/mmc/host/himci/himci_proc.h new file mode 100644 -index 000000000000..e6ea9a137bbb +index 000000000..e6ea9a137 --- /dev/null +++ b/drivers/mmc/host/himci/himci_proc.h @@ -0,0 +1,36 @@ @@ -28580,7 +28111,7 @@ index 000000000000..e6ea9a137bbb +#endif /* __MCI_PROC_H__ */ diff --git a/drivers/mmc/host/himci/himci_reg.h b/drivers/mmc/host/himci/himci_reg.h new file mode 100644 -index 000000000000..d1d8f9f9ded5 +index 000000000..d1d8f9f9d --- /dev/null +++ b/drivers/mmc/host/himci/himci_reg.h @@ -0,0 +1,241 @@ @@ -28827,7 +28358,7 @@ index 000000000000..d1d8f9f9ded5 +#endif diff --git a/drivers/mmc/host/mci_proc.c b/drivers/mmc/host/mci_proc.c new file mode 100644 -index 000000000000..9465ad3feb44 +index 000000000..9465ad3fe --- /dev/null +++ b/drivers/mmc/host/mci_proc.c @@ -0,0 +1,301 @@ @@ -29134,7 +28665,7 @@ index 000000000000..9465ad3feb44 +} diff --git a/drivers/mmc/host/mci_proc.h b/drivers/mmc/host/mci_proc.h new file mode 100644 -index 000000000000..459c5d767086 +index 000000000..459c5d767 --- /dev/null +++ b/drivers/mmc/host/mci_proc.h @@ -0,0 +1,50 @@ @@ -29190,7 +28721,7 @@ index 000000000000..459c5d767086 +#endif /* __MCI_PROC_H__ */ diff --git a/drivers/mmc/host/sdhci-hisi.c b/drivers/mmc/host/sdhci-hisi.c new file mode 100644 -index 000000000000..be2a903acf78 +index 000000000..be2a903ac --- /dev/null +++ b/drivers/mmc/host/sdhci-hisi.c @@ -0,0 +1,783 @@ @@ -29979,7 +29510,7 @@ index 000000000000..be2a903acf78 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mmc/host/sdhci-hisi.h b/drivers/mmc/host/sdhci-hisi.h new file mode 100644 -index 000000000000..19cea6dc594c +index 000000000..19cea6dc5 --- /dev/null +++ b/drivers/mmc/host/sdhci-hisi.h @@ -0,0 +1,126 @@ @@ -30110,7 +29641,7 @@ index 000000000000..19cea6dc594c + +#endif /* _DRIVERS_MMC_SDHCI_HISI_H */ diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index 6cdadbb3accd..94311a91486c 100644 +index 6cdadbb3a..94311a914 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -261,7 +261,7 @@ static void sdhci_set_default_irqs(struct sdhci_host *host) @@ -30657,7 +30188,7 @@ index 6cdadbb3accd..94311a91486c 100644 EXPORT_SYMBOL_GPL(sdhci_remove_host); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h -index 960fed78529e..4688a612b698 100644 +index 960fed785..4688a612b 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -140,6 +140,7 @@ @@ -30830,7 +30361,7 @@ index 960fed78529e..4688a612b698 100644 dma_addr_t addr, int len, unsigned int cmd); void (*copy_to_bounce_buffer)(struct sdhci_host *host, diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile -index 593d0593a038..cdf3ff323c9f 100644 +index 593d0593a..cdf3ff323 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -26,8 +26,9 @@ obj-$(CONFIG_MTD_SWAP) += mtdswap.o @@ -30845,7 +30376,7 @@ index 593d0593a038..cdf3ff323c9f 100644 obj-$(CONFIG_MTD_UBI) += ubi/ obj-$(CONFIG_MTD_HYPERBUS) += hyperbus/ diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 4a9aed4f0104..5c3e95668fc8 100644 +index 4a9aed4f0..5c3e95668 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -6,7 +6,32 @@ config MTD_NAND_CORE @@ -30882,7 +30413,7 @@ index 4a9aed4f0104..5c3e95668fc8 100644 menu "ECC engine support" diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile -index 981372953b56..4fb87a5c3552 100644 +index 981372953..4fb87a5c3 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -1,6 +1,8 @@ @@ -30896,7 +30427,7 @@ index 981372953b56..4fb87a5c3552 100644 obj-y += onenand/ diff --git a/drivers/mtd/nand/hifmc100/Kconfig b/drivers/mtd/nand/hifmc100/Kconfig new file mode 100644 -index 000000000000..5b15bc8b994d +index 000000000..5b15bc8b9 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/Kconfig @@ -0,0 +1,17 @@ @@ -30919,7 +30450,7 @@ index 000000000000..5b15bc8b994d + while reading or writing the SPI nand flash. diff --git a/drivers/mtd/nand/hifmc100/Makefile b/drivers/mtd/nand/hifmc100/Makefile new file mode 100644 -index 000000000000..b1fda5de8ff0 +index 000000000..b1fda5de8 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/Makefile @@ -0,0 +1,26 @@ @@ -30951,7 +30482,7 @@ index 000000000000..b1fda5de8ff0 +obj-y += hifmc100.o hifmc100_os.o diff --git a/drivers/mtd/nand/hifmc100/hifmc100.c b/drivers/mtd/nand/hifmc100/hifmc100.c new file mode 100644 -index 000000000000..6cb12d3b6985 +index 000000000..6cb12d3b6 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100.c @@ -0,0 +1,1218 @@ @@ -32175,7 +31706,7 @@ index 000000000000..6cb12d3b6985 +#endif diff --git a/drivers/mtd/nand/hifmc100/hifmc100.h b/drivers/mtd/nand/hifmc100/hifmc100.h new file mode 100644 -index 000000000000..9f169f3d5966 +index 000000000..9f169f3d5 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100.h @@ -0,0 +1,354 @@ @@ -32535,7 +32066,7 @@ index 000000000000..9f169f3d5966 +#endif /* End of __HIFMC100_H__ */ diff --git a/drivers/mtd/nand/hifmc100/hifmc100_os.c b/drivers/mtd/nand/hifmc100/hifmc100_os.c new file mode 100644 -index 000000000000..980bfb8f6055 +index 000000000..980bfb8f6 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100_os.c @@ -0,0 +1,247 @@ @@ -32788,7 +32319,7 @@ index 000000000000..980bfb8f6055 +MODULE_DESCRIPTION("Hisilicon Flash Memory Controller V100 SPI Nand Driver"); diff --git a/drivers/mtd/nand/hifmc100/hifmc100_spi_general.c b/drivers/mtd/nand/hifmc100/hifmc100_spi_general.c new file mode 100644 -index 000000000000..3b46205f353b +index 000000000..3b46205f3 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100_spi_general.c @@ -0,0 +1,313 @@ @@ -33107,7 +32638,7 @@ index 000000000000..3b46205f353b +} diff --git a/drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c b/drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c new file mode 100644 -index 000000000000..bf963d146cd0 +index 000000000..bf963d146 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c @@ -0,0 +1,2457 @@ @@ -35570,7 +35101,7 @@ index 000000000000..bf963d146cd0 +#endif /* CONFIG_PM */ diff --git a/drivers/mtd/nand/hifmc100_nand/Kconfig b/drivers/mtd/nand/hifmc100_nand/Kconfig new file mode 100644 -index 000000000000..188c9a77a651 +index 000000000..188c9a77a --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/Kconfig @@ -0,0 +1,50 @@ @@ -35626,7 +35157,7 @@ index 000000000000..188c9a77a651 +endif # End of MTD_NAND_HIFMC100 diff --git a/drivers/mtd/nand/hifmc100_nand/Makefile b/drivers/mtd/nand/hifmc100_nand/Makefile new file mode 100644 -index 000000000000..623363cfc084 +index 000000000..623363cfc --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/Makefile @@ -0,0 +1,26 @@ @@ -35658,7 +35189,7 @@ index 000000000000..623363cfc084 +obj-y += hifmc100_nand.o hifmc100_nand_os.o diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c new file mode 100644 -index 000000000000..5c08d4beb807 +index 000000000..5c08d4beb --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c @@ -0,0 +1,1170 @@ @@ -36834,7 +36365,7 @@ index 000000000000..5c08d4beb807 +#endif /* CONFIG_PM */ diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h new file mode 100644 -index 000000000000..fba2f43ba0d4 +index 000000000..fba2f43ba --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h @@ -0,0 +1,151 @@ @@ -36991,7 +36522,7 @@ index 000000000000..fba2f43ba0d4 +#endif /* End of __HIFMC100_NAND_H__ */ diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c new file mode 100644 -index 000000000000..0849cd3cbd95 +index 000000000..0849cd3cb --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c @@ -0,0 +1,180 @@ @@ -37177,7 +36708,7 @@ index 000000000000..0849cd3cbd95 +MODULE_DESCRIPTION("Hisilicon Flash Memory Controller V100 Nand Driver"); diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h new file mode 100644 -index 000000000000..a27813530277 +index 000000000..a27813530 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h @@ -0,0 +1,72 @@ @@ -37255,7 +36786,7 @@ index 000000000000..a27813530277 +#endif /* End of __HIFMC100_NAND_OS_H__ */ diff --git a/drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c b/drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c new file mode 100644 -index 000000000000..b03510a449ec +index 000000000..b03510a44 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c @@ -0,0 +1,982 @@ @@ -38242,7 +37773,7 @@ index 000000000000..b03510a449ec + get_spi_nand_flash_type_hook = hifmc_get_spl_flash_type; +} diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile -index 2930f5b9015d..7817ec61d403 100644 +index 2930f5b90..7817ec61d 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -59,7 +59,7 @@ obj-$(CONFIG_MTD_NAND_MESON) += meson_nand.o @@ -38256,7 +37787,7 @@ index 2930f5b9015d..7817ec61d403 100644 nand-objs += nand_amd.o diff --git a/drivers/mtd/nand/raw/hinfc_gen.c b/drivers/mtd/nand/raw/hinfc_gen.c new file mode 100644 -index 000000000000..127edd6b4a7d +index 000000000..127edd6b4 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_gen.c @@ -0,0 +1,237 @@ @@ -38500,7 +38031,7 @@ index 000000000000..127edd6b4a7d \ No newline at end of file diff --git a/drivers/mtd/nand/raw/hinfc_gen.h b/drivers/mtd/nand/raw/hinfc_gen.h new file mode 100644 -index 000000000000..673ab83610c9 +index 000000000..673ab8361 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_gen.h @@ -0,0 +1,281 @@ @@ -38788,7 +38319,7 @@ index 000000000000..673ab83610c9 \ No newline at end of file diff --git a/drivers/mtd/nand/raw/hinfc_spl_ids.c b/drivers/mtd/nand/raw/hinfc_spl_ids.c new file mode 100644 -index 000000000000..0fd7db974368 +index 000000000..0fd7db974 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_spl_ids.c @@ -0,0 +1,970 @@ @@ -39763,7 +39294,7 @@ index 000000000000..0fd7db974368 +{ +} diff --git a/drivers/mtd/nand/raw/internals.h b/drivers/mtd/nand/raw/internals.h -index 012876e14317..be6bb9c30687 100644 +index 012876e14..be6bb9c30 100644 --- a/drivers/mtd/nand/raw/internals.h +++ b/drivers/mtd/nand/raw/internals.h @@ -17,8 +17,12 @@ @@ -39794,7 +39325,7 @@ index 012876e14317..be6bb9c30687 100644 * struct nand_manufacturer_ops - NAND Manufacturer operations diff --git a/drivers/mtd/nand/raw/match_table.c b/drivers/mtd/nand/raw/match_table.c new file mode 100644 -index 000000000000..6bad75f979ce +index 000000000..6bad75f97 --- /dev/null +++ b/drivers/mtd/nand/raw/match_table.c @@ -0,0 +1,102 @@ @@ -39902,7 +39433,7 @@ index 000000000000..6bad75f979ce +} diff --git a/drivers/mtd/nand/raw/match_table.h b/drivers/mtd/nand/raw/match_table.h new file mode 100644 -index 000000000000..9c5f0af094b4 +index 000000000..9c5f0af09 --- /dev/null +++ b/drivers/mtd/nand/raw/match_table.h @@ -0,0 +1,51 @@ @@ -39958,7 +39489,7 @@ index 000000000000..9c5f0af094b4 + +#endif /* End of __MATCH_TABLE_H__ */ diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c -index 1f0d542d5923..3ff778c71798 100644 +index 1f0d542d5..3ff778c71 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -44,6 +44,7 @@ @@ -40050,7 +39581,7 @@ index 1f0d542d5923..3ff778c71798 100644 free_detect_allocation: diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c -index b9945791a9d7..e59b4f017bd2 100644 +index b9945791a..e59b4f017 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -172,6 +172,11 @@ static const struct nand_manufacturer_desc nand_manufacturer_descs[] = { @@ -40078,7 +39609,7 @@ index b9945791a9d7..e59b4f017bd2 100644 /** diff --git a/drivers/mtd/spi-nor/controllers/Kconfig b/drivers/mtd/spi-nor/controllers/Kconfig -index 5c0e0ec2e6d1..bffa9c1a6893 100644 +index 5c0e0ec2e..bffa9c1a6 100644 --- a/drivers/mtd/spi-nor/controllers/Kconfig +++ b/drivers/mtd/spi-nor/controllers/Kconfig @@ -10,11 +10,12 @@ config SPI_ASPEED_SMC @@ -40131,7 +39662,7 @@ index 5c0e0ec2e6d1..bffa9c1a6893 100644 + BOTTOM/TOP bit is setted to BOTTOM, it means the lock area starts + from 0 address. diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig -index 44f9279cdde1..cf0b370d0862 100644 +index 44f9279cd..cf0b370d0 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig @@ -137,4 +137,6 @@ config HNS3_ENET @@ -40142,7 +39673,7 @@ index 44f9279cdde1..cf0b370d0862 100644 + endif # NET_VENDOR_HISILICON diff --git a/drivers/net/ethernet/hisilicon/Makefile b/drivers/net/ethernet/hisilicon/Makefile -index 7f76d412047a..95598fffc874 100644 +index 7f76d4120..95598fffc 100644 --- a/drivers/net/ethernet/hisilicon/Makefile +++ b/drivers/net/ethernet/hisilicon/Makefile @@ -8,4 +8,5 @@ obj-$(CONFIG_HIP04_ETH) += hip04_eth.o @@ -40154,7 +39685,7 @@ index 7f76d412047a..95598fffc874 100644 +obj-$(CONFIG_HIETH_GMAC) += higmac/ diff --git a/drivers/net/ethernet/hisilicon/higmac/Kconfig b/drivers/net/ethernet/hisilicon/higmac/Kconfig new file mode 100644 -index 000000000000..97b173e0073e +index 000000000..97b173e00 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/Kconfig @@ -0,0 +1,106 @@ @@ -40266,7 +39797,7 @@ index 000000000000..97b173e0073e +endif # HIETH_GMAC diff --git a/drivers/net/ethernet/hisilicon/higmac/Makefile b/drivers/net/ethernet/hisilicon/higmac/Makefile new file mode 100644 -index 000000000000..b19e27d42c73 +index 000000000..b19e27d42 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/Makefile @@ -0,0 +1,2 @@ @@ -40274,7 +39805,7 @@ index 000000000000..b19e27d42c73 +hieth-gmac-objs := board.o higmac.o pm.o util.o autoeee/autoeee.o autoeee/phy_id_table.o diff --git a/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c new file mode 100644 -index 000000000000..05c2b6205beb +index 000000000..05c2b6205 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c @@ -0,0 +1,162 @@ @@ -40442,7 +39973,7 @@ index 000000000000..05c2b6205beb +} diff --git a/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h new file mode 100644 -index 000000000000..30cbb9799a9e +index 000000000..30cbb9799 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h @@ -0,0 +1,52 @@ @@ -40500,7 +40031,7 @@ index 000000000000..30cbb9799a9e +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c b/drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c new file mode 100644 -index 000000000000..d98bbf1f0758 +index 000000000..d98bbf1f0 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c @@ -0,0 +1,184 @@ @@ -40690,7 +40221,7 @@ index 000000000000..d98bbf1f0758 +}; diff --git a/drivers/net/ethernet/hisilicon/higmac/board.c b/drivers/net/ethernet/hisilicon/higmac/board.c new file mode 100644 -index 000000000000..b7a1d879df03 +index 000000000..b7a1d879d --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/board.c @@ -0,0 +1,118 @@ @@ -40814,7 +40345,7 @@ index 000000000000..b7a1d879df03 +} diff --git a/drivers/net/ethernet/hisilicon/higmac/higmac.c b/drivers/net/ethernet/hisilicon/higmac/higmac.c new file mode 100644 -index 000000000000..e777123440c4 +index 000000000..e77712344 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/higmac.c @@ -0,0 +1,2645 @@ @@ -43465,7 +42996,7 @@ index 000000000000..e777123440c4 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/ethernet/hisilicon/higmac/higmac.h b/drivers/net/ethernet/hisilicon/higmac/higmac.h new file mode 100644 -index 000000000000..2e26d8064dbd +index 000000000..2e26d8064 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/higmac.h @@ -0,0 +1,603 @@ @@ -44074,7 +43605,7 @@ index 000000000000..2e26d8064dbd +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/pm.c b/drivers/net/ethernet/hisilicon/higmac/pm.c new file mode 100644 -index 000000000000..4ad8e7c0c15d +index 000000000..4ad8e7c0c --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/pm.c @@ -0,0 +1,341 @@ @@ -44421,7 +43952,7 @@ index 000000000000..4ad8e7c0c15d +} diff --git a/drivers/net/ethernet/hisilicon/higmac/pm.h b/drivers/net/ethernet/hisilicon/higmac/pm.h new file mode 100644 -index 000000000000..e54ced46c903 +index 000000000..e54ced46c --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/pm.h @@ -0,0 +1,59 @@ @@ -44487,7 +44018,7 @@ index 000000000000..e54ced46c903 \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/higmac/proc_dev.c b/drivers/net/ethernet/hisilicon/higmac/proc_dev.c new file mode 100644 -index 000000000000..efb654fb4851 +index 000000000..efb654fb4 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/proc_dev.c @@ -0,0 +1,119 @@ @@ -44612,7 +44143,7 @@ index 000000000000..efb654fb4851 +} diff --git a/drivers/net/ethernet/hisilicon/higmac/sockioctl.h b/drivers/net/ethernet/hisilicon/higmac/sockioctl.h new file mode 100644 -index 000000000000..349f0f215506 +index 000000000..349f0f215 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/sockioctl.h @@ -0,0 +1,19 @@ @@ -44637,7 +44168,7 @@ index 000000000000..349f0f215506 +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/tso.h b/drivers/net/ethernet/hisilicon/higmac/tso.h new file mode 100644 -index 000000000000..6c78d1d45e2e +index 000000000..6c78d1d45 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/tso.h @@ -0,0 +1,59 @@ @@ -44702,7 +44233,7 @@ index 000000000000..6c78d1d45e2e +#endif diff --git a/drivers/net/ethernet/hisilicon/higmac/util.c b/drivers/net/ethernet/hisilicon/higmac/util.c new file mode 100644 -index 000000000000..eae79af525a5 +index 000000000..eae79af52 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/util.c @@ -0,0 +1,975 @@ @@ -45683,7 +45214,7 @@ index 000000000000..eae79af525a5 +} diff --git a/drivers/net/ethernet/hisilicon/higmac/util.h b/drivers/net/ethernet/hisilicon/higmac/util.h new file mode 100644 -index 000000000000..ca1c99bb55e2 +index 000000000..ca1c99bb5 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/util.h @@ -0,0 +1,102 @@ @@ -45791,7 +45322,7 @@ index 000000000000..ca1c99bb55e2 +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/Makefile b/drivers/net/ethernet/hisilicon/hisi-femac/Makefile new file mode 100644 -index 000000000000..bfad94751c3a +index 000000000..bfad94751 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/Makefile @@ -0,0 +1,6 @@ @@ -45803,7 +45334,7 @@ index 000000000000..bfad94751c3a +hisi-femac-objs := hisi_femac.o phy_fix.o util.o diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h new file mode 100644 -index 000000000000..6c00c71a0014 +index 000000000..6c00c71a0 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h @@ -0,0 +1,191 @@ @@ -46001,7 +45532,7 @@ index 000000000000..6c00c71a0014 \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h new file mode 100644 -index 000000000000..758d7968874b +index 000000000..758d79688 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h @@ -0,0 +1,84 @@ @@ -46091,7 +45622,7 @@ index 000000000000..758d7968874b +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h b/drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h new file mode 100644 -index 000000000000..edb9d53bb7f9 +index 000000000..edb9d53bb --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h @@ -0,0 +1,44 @@ @@ -46142,7 +45673,7 @@ index 000000000000..edb9d53bb7f9 \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c new file mode 100644 -index 000000000000..48815a2d67be +index 000000000..48815a2d6 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c @@ -0,0 +1,1588 @@ @@ -47736,7 +47267,7 @@ index 000000000000..48815a2d67be +MODULE_ALIAS("platform:hisi-femac"); diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h new file mode 100644 -index 000000000000..5e260ad18169 +index 000000000..5e260ad18 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h @@ -0,0 +1,269 @@ @@ -48011,7 +47542,7 @@ index 000000000000..5e260ad18169 +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c new file mode 100644 -index 000000000000..e7a3989b82ce +index 000000000..e7a3989b8 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c @@ -0,0 +1,109 @@ @@ -48126,7 +47657,7 @@ index 000000000000..e7a3989b82ce +} diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h new file mode 100644 -index 000000000000..b7a725090dab +index 000000000..b7a725090 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h @@ -0,0 +1,22 @@ @@ -48154,7 +47685,7 @@ index 000000000000..b7a725090dab +#endif diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/util.c b/drivers/net/ethernet/hisilicon/hisi-femac/util.c new file mode 100644 -index 000000000000..4f803784e9ff +index 000000000..4f803784e --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/util.c @@ -0,0 +1,318 @@ @@ -48478,7 +48009,7 @@ index 000000000000..4f803784e9ff +} diff --git a/drivers/net/ethernet/hisilicon/hisi-femac/util.h b/drivers/net/ethernet/hisilicon/hisi-femac/util.h new file mode 100644 -index 000000000000..0094248570a1 +index 000000000..009424857 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/util.h @@ -0,0 +1,25 @@ @@ -48509,7 +48040,7 @@ index 000000000000..0094248570a1 +#endif \ No newline at end of file diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c -index 57c3bc4f7089..18080565612d 100644 +index 57c3bc4f7..180805656 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -86,7 +86,7 @@ @@ -48530,7 +48061,7 @@ index 57c3bc4f7089..18080565612d 100644 MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:hisi-femac"); diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c -index 7fb7a419607d..1a357516b027 100644 +index 7fb7a4196..1a357516b 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c @@ -702,7 +702,7 @@ static void hns_gmac_get_strings(u32 stringset, u8 *data) @@ -48543,7 +48074,7 @@ index 7fb7a419607d..1a357516b027 100644 return 0; diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c -index d0f8b1fff333..c5176565f783 100644 +index d0f8b1fff..c5176565f 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c @@ -444,7 +444,7 @@ void hns_ppe_update_stats(struct hns_ppe_cb *ppe_cb) @@ -48556,7 +48087,7 @@ index d0f8b1fff333..c5176565f783 100644 return 0; } diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c -index b6c8910cf7ba..4cda44494842 100644 +index b6c8910cf..4cda44494 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c @@ -897,7 +897,7 @@ void hns_rcb_get_stats(struct hnae_queue *queue, u64 *data) @@ -48569,7 +48100,7 @@ index b6c8910cf7ba..4cda44494842 100644 return 0; diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c -index 3616b77caa0a..883c5f5db15c 100644 +index 3616b77ca..883c5f5db 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -2092,14 +2092,17 @@ static int mlx4_en_get_module_eeprom(struct net_device *dev, @@ -48593,7 +48124,7 @@ index 3616b77caa0a..883c5f5db15c 100644 i += ret; diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig -index a10cc460d7cf..42603264ab35 100644 +index a10cc460d..42603264a 100644 --- a/drivers/net/mdio/Kconfig +++ b/drivers/net/mdio/Kconfig @@ -107,6 +107,13 @@ config MDIO_HISI_FEMAC @@ -48611,7 +48142,7 @@ index a10cc460d7cf..42603264ab35 100644 tristate depends on I2C diff --git a/drivers/net/mdio/Makefile b/drivers/net/mdio/Makefile -index 5c498dde463f..67b74ed9d0a3 100644 +index 5c498dde4..67b74ed9d 100644 --- a/drivers/net/mdio/Makefile +++ b/drivers/net/mdio/Makefile @@ -9,7 +9,10 @@ obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o @@ -48627,7 +48158,7 @@ index 5c498dde463f..67b74ed9d0a3 100644 obj-$(CONFIG_MDIO_IPQ8064) += mdio-ipq8064.o diff --git a/drivers/net/phy/mdio_hisi_femac.c b/drivers/net/phy/mdio_hisi_femac.c new file mode 100644 -index 000000000000..25f187574ab9 +index 000000000..25f187574 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_femac.c @@ -0,0 +1,489 @@ @@ -49122,7 +48653,7 @@ index 000000000000..25f187574ab9 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/phy/mdio_hisi_gemac.c b/drivers/net/phy/mdio_hisi_gemac.c new file mode 100644 -index 000000000000..79ebfa400c09 +index 000000000..79ebfa400 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_gemac.c @@ -0,0 +1,256 @@ @@ -49384,7 +48915,7 @@ index 000000000000..79ebfa400c09 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/phy/mdio_hisi_gemac.h b/drivers/net/phy/mdio_hisi_gemac.h new file mode 100644 -index 000000000000..5eefc01e526f +index 000000000..5eefc01e5 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_gemac.h @@ -0,0 +1,32 @@ @@ -49421,7 +48952,7 @@ index 000000000000..5eefc01e526f + +#endif /* __MDIO_HISI_GEMAC_H__ */ diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c -index 28ddaad721ed..0c53683fc3a8 100644 +index 28ddaad72..0c53683fc 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -313,6 +313,28 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, @@ -49454,7 +48985,7 @@ index 28ddaad721ed..0c53683fc3a8 100644 struct ethtool_link_ksettings *cmd) { diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c -index b4879306bb8a..cb7b1635cce6 100644 +index b4879306b..cb7b1635c 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -29,6 +29,12 @@ @@ -49482,7 +49013,7 @@ index b4879306bb8a..cb7b1635cce6 100644 phy_modify_paged_changed(phydev, 0xa43, RTL8211F_PHYCR1, val, val); diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c -index 5cd7ef3625c5..3213963444c4 100644 +index 5cd7ef362..321396344 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -5795,6 +5795,7 @@ static int rtl8xxxu_submit_int_urb(struct ieee80211_hw *hw) @@ -49494,7 +49025,7 @@ index 5cd7ef3625c5..3213963444c4 100644 } diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig -index 0c473d75e625..cb9f492fd683 100644 +index 0c473d75e..cb9f492fd 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -256,5 +256,6 @@ source "drivers/pci/hotplug/Kconfig" @@ -49505,7 +49036,7 @@ index 0c473d75e625..cb9f492fd683 100644 endif diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile -index 522d2b974e91..2b9167379284 100644 +index 522d2b974..2b9167379 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -36,5 +36,6 @@ obj-$(CONFIG_PCI_ENDPOINT) += endpoint/ @@ -49517,7 +49048,7 @@ index 522d2b974e91..2b9167379284 100644 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG diff --git a/drivers/pci/hipcie/Kconfig b/drivers/pci/hipcie/Kconfig new file mode 100644 -index 000000000000..c8d88ef66a08 +index 000000000..c8d88ef66 --- /dev/null +++ b/drivers/pci/hipcie/Kconfig @@ -0,0 +1,27 @@ @@ -49550,7 +49081,7 @@ index 000000000000..c8d88ef66a08 +endif diff --git a/drivers/pci/hipcie/Makefile b/drivers/pci/hipcie/Makefile new file mode 100644 -index 000000000000..04554201e991 +index 000000000..04554201e --- /dev/null +++ b/drivers/pci/hipcie/Makefile @@ -0,0 +1,8 @@ @@ -49564,7 +49095,7 @@ index 000000000000..04554201e991 +endif diff --git a/drivers/pci/hipcie/pci.h b/drivers/pci/hipcie/pci.h new file mode 100644 -index 000000000000..daefc0fafa2d +index 000000000..daefc0faf --- /dev/null +++ b/drivers/pci/hipcie/pci.h @@ -0,0 +1,96 @@ @@ -49666,7 +49197,7 @@ index 000000000000..daefc0fafa2d +#endif /* __ASM_MACH_PCI_H */ diff --git a/drivers/pci/hipcie/pcie.c b/drivers/pci/hipcie/pcie.c new file mode 100644 -index 000000000000..4c44b6b44aaa +index 000000000..4c44b6b44 --- /dev/null +++ b/drivers/pci/hipcie/pcie.c @@ -0,0 +1,985 @@ @@ -50656,7 +50187,7 @@ index 000000000000..4c44b6b44aaa +MODULE_DESCRIPTION("Hisilicon PCI-Express Root Complex driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index 8b587fc97f7b..07482a5096d4 100644 +index 8b587fc97..07482a509 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -19,6 +19,7 @@ @@ -50678,7 +50209,7 @@ index 8b587fc97f7b..07482a5096d4 100644 } diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig -index 9ed5f167a9f3..533d43e77503 100644 +index 9ed5f167a..533d43e77 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -83,5 +83,6 @@ source "drivers/phy/tegra/Kconfig" @@ -50689,7 +50220,7 @@ index 9ed5f167a9f3..533d43e77503 100644 endmenu diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile -index 6eb2916773c5..38a096b295b6 100644 +index 6eb291677..38a096b29 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o @@ -50702,7 +50233,7 @@ index 6eb2916773c5..38a096b295b6 100644 broadcom/ \ diff --git a/drivers/phy/hibvt/Kconfig b/drivers/phy/hibvt/Kconfig new file mode 100644 -index 000000000000..9fcb56c1c4ed +index 000000000..9fcb56c1c --- /dev/null +++ b/drivers/phy/hibvt/Kconfig @@ -0,0 +1,23 @@ @@ -50731,7 +50262,7 @@ index 000000000000..9fcb56c1c4ed +endif # HI_USB_PHY diff --git a/drivers/phy/hibvt/Makefile b/drivers/phy/hibvt/Makefile new file mode 100644 -index 000000000000..7b038f48e38f +index 000000000..7b038f48e --- /dev/null +++ b/drivers/phy/hibvt/Makefile @@ -0,0 +1,5 @@ @@ -50742,7 +50273,7 @@ index 000000000000..7b038f48e38f +obj-y += usb/ diff --git a/drivers/phy/hibvt/phy-hisi-sata.c b/drivers/phy/hibvt/phy-hisi-sata.c new file mode 100644 -index 000000000000..d7384fec3bcb +index 000000000..d7384fec3 --- /dev/null +++ b/drivers/phy/hibvt/phy-hisi-sata.c @@ -0,0 +1,175 @@ @@ -50923,7 +50454,7 @@ index 000000000000..d7384fec3bcb +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/hibvt/phy-hisi-sata.h b/drivers/phy/hibvt/phy-hisi-sata.h new file mode 100644 -index 000000000000..44730c519a2b +index 000000000..44730c519 --- /dev/null +++ b/drivers/phy/hibvt/phy-hisi-sata.h @@ -0,0 +1,39 @@ @@ -50968,7 +50499,7 @@ index 000000000000..44730c519a2b +}; diff --git a/drivers/phy/hibvt/usb/Kconfig b/drivers/phy/hibvt/usb/Kconfig new file mode 100644 -index 000000000000..c7b5ab6e77d5 +index 000000000..c7b5ab6e7 --- /dev/null +++ b/drivers/phy/hibvt/usb/Kconfig @@ -0,0 +1,85 @@ @@ -51059,7 +50590,7 @@ index 000000000000..c7b5ab6e77d5 +endif # USB_MODE_OPTION diff --git a/drivers/phy/hibvt/usb/Makefile b/drivers/phy/hibvt/usb/Makefile new file mode 100644 -index 000000000000..dc9e8d71f93b +index 000000000..dc9e8d71f --- /dev/null +++ b/drivers/phy/hibvt/usb/Makefile @@ -0,0 +1,17 @@ @@ -51082,7 +50613,7 @@ index 000000000000..dc9e8d71f93b +obj-$(CONFIG_PHY_HISI_XVP_USB2) += phy-hixvp-hisi-usb.o diff --git a/drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c b/drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c new file mode 100644 -index 000000000000..ba232b259122 +index 000000000..ba232b259 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c @@ -0,0 +1,310 @@ @@ -51398,7 +50929,7 @@ index 000000000000..ba232b259122 +EXPORT_SYMBOL(hisi_usb_phy_off); diff --git a/drivers/phy/hibvt/usb/phy-hisi-usb.c b/drivers/phy/hibvt/usb/phy-hisi-usb.c new file mode 100644 -index 000000000000..da83abdf9b45 +index 000000000..da83abdf9 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hisi-usb.c @@ -0,0 +1,149 @@ @@ -51553,7 +51084,7 @@ index 000000000000..da83abdf9b45 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/hibvt/usb/phy-hisi-usb.h b/drivers/phy/hibvt/usb/phy-hisi-usb.h new file mode 100644 -index 000000000000..5e20e6e4a767 +index 000000000..5e20e6e4a --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hisi-usb.h @@ -0,0 +1,72 @@ @@ -51631,7 +51162,7 @@ index 000000000000..5e20e6e4a767 +#endif /* USB2_INCLUDE_PHY_H */ diff --git a/drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c b/drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c new file mode 100644 -index 000000000000..be68319470cd +index 000000000..be6831947 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c @@ -0,0 +1,803 @@ @@ -52439,7 +51970,7 @@ index 000000000000..be68319470cd +MODULE_ALIAS("platform:hisi-usb-hixvp-phy"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig -index d55b3727e00e..6d73fab251b4 100644 +index d55b3727e..6d73fab25 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -95,7 +95,7 @@ config POWER_RESET_GPIO_RESTART @@ -52452,7 +51983,7 @@ index d55b3727e00e..6d73fab251b4 100644 Reboot support for Hisilicon boards. diff --git a/drivers/ras/Kconfig b/drivers/ras/Kconfig -index c2a236f2e846..fa3951a03e82 100644 +index c2a236f2e..fa3951a03 100644 --- a/drivers/ras/Kconfig +++ b/drivers/ras/Kconfig @@ -29,8 +29,8 @@ menuconfig RAS @@ -52468,7 +51999,7 @@ index c2a236f2e846..fa3951a03e82 100644 -endif +#endif diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig -index 33e4ecd6c665..8dd36dd187b0 100644 +index 33e4ecd6c..8dd36dd18 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -943,6 +943,14 @@ comment "Platform RTC drivers" @@ -52487,7 +52018,7 @@ index 33e4ecd6c665..8dd36dd187b0 100644 tristate "PC-style 'CMOS'" depends on X86 || ARM || PPC || MIPS || SPARC64 diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile -index bfb57464118d..41f5ad4f97fa 100644 +index bfb574641..41f5ad4f9 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -18,6 +18,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += sysfs.o @@ -52500,7 +52031,7 @@ index bfb57464118d..41f5ad4f97fa 100644 obj-$(CONFIG_RTC_DRV_AB3100) += rtc-ab3100.o diff --git a/drivers/rtc/rtc-hibvt.c b/drivers/rtc/rtc-hibvt.c new file mode 100644 -index 000000000000..2ad9e970ea02 +index 000000000..2ad9e970e --- /dev/null +++ b/drivers/rtc/rtc-hibvt.c @@ -0,0 +1,663 @@ @@ -53168,7 +52699,7 @@ index 000000000000..2ad9e970ea02 +MODULE_LICENSE("GPL v2"); +MODULE_VERSION("HI_VERSION=" OSDRV_MODULE_VERSION_STRING); diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig -index c339517b7a09..4ff8f3de5a8f 100644 +index c339517b7..4ff8f3de5 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -182,3 +182,12 @@ config SCSI_UFS_CRYPTO @@ -53185,7 +52716,7 @@ index c339517b7a09..4ff8f3de5a8f 100644 + Select this if you have UFS controller on Hi3751v810 chipset. + If unsure, say N. diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile -index 4679af1b564e..8042bf7c6876 100644 +index 4679af1b5..8042bf7c6 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -16,3 +16,4 @@ obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o @@ -53194,7 +52725,7 @@ index 4679af1b564e..8042bf7c6876 100644 obj-$(CONFIG_SCSI_UFS_TI_J721E) += ti-j721e-ufs.o +obj-$(CONFIG_SCSI_UFS_HI3559AV100) += hi3559av100.o diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c -index 24927cf485b4..ccf04e4f1bed 100644 +index 24927cf48..ccf04e4f1 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -17,6 +17,9 @@ @@ -53289,7 +52820,7 @@ index 24927cf485b4..ccf04e4f1bed 100644 err = ufshcd_init(hba, mmio_base, irq); diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c -index 854c96e63007..f590a52fc71f 100644 +index 854c96e63..f590a52fc 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6230,6 +6230,40 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) @@ -53575,7 +53106,7 @@ index 854c96e63007..f590a52fc71f 100644 return 0; diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h -index 812aa348751e..c2fe83d27f36 100644 +index 812aa3487..c2fe83d27 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -50,6 +50,7 @@ @@ -53665,7 +53196,7 @@ index 812aa348751e..c2fe83d27f36 100644 +} #endif /* End of Header */ diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c -index 0584f4d2fde2..d035d4995432 100644 +index 0584f4d2f..d035d4995 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -367,8 +367,10 @@ static int spi_gpio_probe(struct platform_device *pdev) @@ -53681,7 +53212,7 @@ index 0584f4d2fde2..d035d4995432 100644 spi_gpio = spi_master_get_devdata(master); diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c -index d1776fea287e..0534a53ab1e4 100644 +index d1776fea2..0534a53ab 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -34,6 +34,7 @@ @@ -54050,7 +53581,7 @@ index d1776fea287e..0534a53ab1e4 100644 }; diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c -index 1850bacdb5b0..d3934eb8fffe 100644 +index 1850bacdb..d3934eb8f 100644 --- a/drivers/tty/vt/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c @@ -373,6 +373,9 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) @@ -54064,7 +53595,7 @@ index 1850bacdb5b0..d3934eb8fffe 100644 if (!con_buf) return -ENOMEM; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 95a9bae72f13..ad951a1a1cf9 100644 +index 95a9bae72..ad951a1a1 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1419,6 +1419,10 @@ static int hub_configure(struct usb_hub *hub, @@ -54079,7 +53610,7 @@ index 95a9bae72f13..ad951a1a1cf9 100644 ret = -ENODEV; goto fail; diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile -index ae86da0dc5bd..9abca9a8a908 100644 +index ae86da0dc..9abca9a8a 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -2,10 +2,9 @@ @@ -54096,7 +53627,7 @@ index ae86da0dc5bd..9abca9a8a908 100644 dwc3-y += trace.o endif diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c -index bfb72902f3a6..f630a768f66f 100644 +index bfb72902f..f630a768f 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -37,9 +37,25 @@ @@ -54194,7 +53725,7 @@ index bfb72902f3a6..f630a768f66f 100644 } diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -index 79e1b82e5e05..ace408a7e71a 100644 +index 79e1b82e5..ace408a7e 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -32,6 +32,8 @@ @@ -54295,7 +53826,7 @@ index 79e1b82e5e05..ace408a7e71a 100644 int dwc3_gadget_suspend(struct dwc3 *dwc); diff --git a/drivers/usb/dwc3/dwc3-hisi.c b/drivers/usb/dwc3/dwc3-hisi.c new file mode 100644 -index 000000000000..d8d3e83775ce +index 000000000..d8d3e8377 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-hisi.c @@ -0,0 +1,446 @@ @@ -54747,7 +54278,7 @@ index 000000000000..d8d3e83775ce +MODULE_AUTHOR("Hisilicon Technologies Co., Ltd..>"); diff --git a/drivers/usb/dwc3/dwc3-hisi.h b/drivers/usb/dwc3/dwc3-hisi.h new file mode 100644 -index 000000000000..606cf0507f6d +index 000000000..606cf0507 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-hisi.h @@ -0,0 +1,54 @@ @@ -54806,7 +54337,7 @@ index 000000000000..606cf0507f6d + +#endif diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c -index 3cd294264372..edf3f9b5960f 100644 +index 3cd294264..edf3f9b59 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -281,6 +281,24 @@ void dwc3_ep0_out_start(struct dwc3 *dwc) @@ -54884,7 +54415,7 @@ index 3cd294264372..edf3f9b5960f 100644 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c old mode 100644 new mode 100755 -index 14a7c05abfe8..77b1a5236a6a +index 14a7c05ab..77b1a5236 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -27,6 +27,8 @@ @@ -55182,7 +54713,7 @@ index 14a7c05abfe8..77b1a5236a6a dev = &dwc->gadget->dev; diff --git a/drivers/usb/dwc3/proc.c b/drivers/usb/dwc3/proc.c new file mode 100755 -index 000000000000..7425e0eb9311 +index 000000000..7425e0eb9 --- /dev/null +++ b/drivers/usb/dwc3/proc.c @@ -0,0 +1,138 @@ @@ -55325,7 +54856,7 @@ index 000000000000..7425e0eb9311 + return 0; +} diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c -index 1a556a628971..f637b0cdc440 100644 +index 7f963bb1c..c8fd04657 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -705,8 +705,7 @@ static int bos_desc(struct usb_composite_dev *cdev) @@ -55341,7 +54872,7 @@ index 1a556a628971..f637b0cdc440 100644 diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c old mode 100644 new mode 100755 -index 1eb4fa2e623f..02be1969bac7 +index 1eb4fa2e6..02be1969b --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -67,6 +67,9 @@ struct usb_ep *usb_ep_autoconfig_ss( @@ -55375,7 +54906,7 @@ index 1eb4fa2e623f..02be1969bac7 /* Fail */ diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 950c9435beec..a92694ff6357 100644 +index 950c9435b..a92694ff6 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -307,6 +307,7 @@ struct fsg_common { @@ -55422,7 +54953,7 @@ index 950c9435beec..a92694ff6357 100644 for (i = 0; i < ARRAY_SIZE(common->luns); ++i) if (common->luns[i]) diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c -index e65f474ad7b3..5bb7ce3eb4c9 100644 +index e65f474ad..5bb7ce3eb 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -56,6 +56,16 @@ static inline struct f_uac1_opts *g_audio_to_uac1_opts(struct g_audio *audio) @@ -55533,7 +55064,7 @@ index e65f474ad7b3..5bb7ce3eb4c9 100644 goto fail; diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c -index f48a00e49794..b6b9a69c27ad 100644 +index f48a00e49..b6b9a69c2 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -642,7 +642,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) @@ -55601,7 +55132,7 @@ index f48a00e49794..b6b9a69c27ad 100644 ret = uvcg_attach_configfs(opts); if (ret < 0) { diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h -index 9a01a7d4f17f..392ae14dcb41 100644 +index 9a01a7d4f..392ae14dc 100644 --- a/drivers/usb/gadget/function/u_uvc.h +++ b/drivers/usb/gadget/function/u_uvc.h @@ -52,6 +52,7 @@ struct f_uvc_opts { @@ -55624,7 +55155,7 @@ index 9a01a7d4f17f..392ae14dcb41 100644 /* * Streaming descriptors for full-speed, high-speed and super-speed. diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h -index 23ee25383c1f..f2936f63738c 100644 +index 23ee25383..f2936f637 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -64,8 +64,11 @@ extern unsigned int uvc_gadget_trace_param; @@ -55654,7 +55185,7 @@ index 23ee25383c1f..f2936f63738c 100644 diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c old mode 100644 new mode 100755 -index 00fb58e50a15..604e8778821d +index 00fb58e50..604e87788 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -319,7 +319,49 @@ static ssize_t uvcg_default_processing_bm_controls_show( @@ -56470,7 +56001,7 @@ index 00fb58e50a15..604e8778821d memcpy(*dest, &frm->frame, sz); *dest += sz; diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c -index 4ca89eab6159..1272038be7d1 100644 +index 4ca89eab6..1272038be 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -56,8 +56,13 @@ struct uvc_format { @@ -56488,7 +56019,7 @@ index 4ca89eab6159..1272038be7d1 100644 static int diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c -index 633e23d58d86..835f5f048aae 100644 +index 633e23d58..835f5f048 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -12,13 +12,15 @@ @@ -56699,7 +56230,7 @@ index 633e23d58d86..835f5f048aae 100644 /* Initialize the video buffers queue. */ uvcg_queue_init(&video->queue, V4L2_BUF_TYPE_VIDEO_OUTPUT, diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c -index 869dce5f134d..3807bb16399c 100644 +index 869dce5f1..3807bb163 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -642,6 +642,8 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev, uint32_t flags, @@ -56733,7 +56264,7 @@ index 869dce5f134d..3807bb16399c 100644 + return ret; } diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c -index fe888b5dcc00..5a0791e56c8c 100644 +index fe888b5dc..5a0791e56 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -21,9 +21,9 @@ @@ -56750,7 +56281,7 @@ index fe888b5dcc00..5a0791e56c8c 100644 #define DRIVER_VERSION "0.1" #define DRIVER_AUTHOR "aik@ozlabs.ru" diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c -index fbd438e9b9b0..64431a1a970b 100644 +index fbd438e9b..64431a1a9 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -28,6 +28,7 @@ @@ -56785,7 +56316,7 @@ index fbd438e9b9b0..64431a1a970b 100644 struct vfio_iova { diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c -index ae0c38ad1fcb..bf3b0950ae93 100644 +index ae0c38ad1..bf3b0950a 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -999,6 +999,7 @@ v9fs_vfs_getattr(const struct path *path, struct kstat *stat, @@ -56819,7 +56350,7 @@ index ae0c38ad1fcb..bf3b0950ae93 100644 p9stat_free(st); kfree(st); diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c -index 0028eccb665a..a227a76d5ca3 100644 +index 0028eccb6..a227a76d5 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c @@ -459,6 +459,7 @@ v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat, @@ -56853,7 +56384,7 @@ index 0028eccb665a..a227a76d5ca3 100644 stat->blksize = st->st_blksize; diff --git a/fs/aio.c b/fs/aio.c -index bd182bcca23a..425db15b59d9 100644 +index bd182bcca..425db15b5 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1764,6 +1764,12 @@ static int aio_poll(struct aio_kiocb *aiocb, const struct iocb *iocb) @@ -56879,7 +56410,7 @@ index bd182bcca23a..425db15b59d9 100644 } diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c -index c99e293b50f5..9a28616040a1 100644 +index c99e293b5..9a2861604 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -1824,6 +1824,41 @@ static struct btrfs_block_group *btrfs_create_block_group_cache( @@ -56935,7 +56466,7 @@ index c99e293b50f5..9a28616040a1 100644 if (ret > 0) break; diff --git a/fs/fat/dir.c b/fs/fat/dir.c -index c4a274285858..5972b82ded95 100644 +index c4a274285..5972b82de 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -565,7 +565,8 @@ static int __fat_readdir(struct inode *inode, struct file *file, @@ -57431,7 +56962,7 @@ index c4a274285858..5972b82ded95 100644 slots += copy; size -= copy; diff --git a/fs/fat/fat.h b/fs/fat/fat.h -index 922a0c6ba46c..a84663246ffa 100644 +index 922a0c6ba..a84663246 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -444,6 +444,10 @@ extern void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec64 *ts, @@ -57446,7 +56977,7 @@ index 922a0c6ba46c..a84663246ffa 100644 int flags); extern int fat_update_time(struct inode *inode, struct timespec64 *now, diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c -index f7e3304b7802..4351eaa8bcf5 100644 +index f7e3304b7..4351eaa8b 100644 --- a/fs/fat/fatent.c +++ b/fs/fat/fatent.c @@ -379,6 +379,9 @@ static int fat_mirror_bhs(struct super_block *sb, struct buffer_head **bhs, @@ -57476,7 +57007,7 @@ index f7e3304b7802..4351eaa8bcf5 100644 if (sb->s_flags & SB_SYNCHRONOUS) err = sync_dirty_buffer(c_bh); diff --git a/fs/fat/file.c b/fs/fat/file.c -index f9ee27cf4d7c..f424520d7c65 100644 +index f9ee27cf4..f424520d7 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -198,6 +198,17 @@ int fat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync) @@ -57550,7 +57081,7 @@ index f9ee27cf4d7c..f424520d7c65 100644 up_write(&MSDOS_I(inode)->truncate_lock); } diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index bab9b202b496..769444c64833 100644 +index bab9b202b..769444c64 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -628,8 +628,9 @@ static void fat_free_eofblocks(struct inode *inode) @@ -57656,7 +57187,7 @@ index bab9b202b496..769444c64833 100644 return err; } diff --git a/fs/fat/misc.c b/fs/fat/misc.c -index f1b2a1fc2a6a..ddb5cf98a1d2 100644 +index f1b2a1fc2..ddb5cf98a 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -198,7 +198,8 @@ static inline int fat_tz_offset(struct msdos_sb_info *sbi) @@ -57706,7 +57237,7 @@ index f1b2a1fc2a6a..ddb5cf98a1d2 100644 { return (struct timespec64){ ts.tv_sec & ~1ULL, 0 }; diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h -index 5e91d578f4ed..01116b8eafdf 100644 +index 5e91d578f..01116b8ea 100644 --- a/fs/jffs2/compr.h +++ b/fs/jffs2/compr.h @@ -29,9 +29,15 @@ @@ -57727,7 +57258,7 @@ index 5e91d578f4ed..01116b8eafdf 100644 #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */ #define JFFS2_DYNRUBIN_DISABLED /* for decompression */ diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c -index b77d1637bbbc..413f11034aab 100644 +index b77d1637b..413f11034 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1493,6 +1493,9 @@ static int ubifs_releasepage(struct page *page, gfp_t unused_gfp_flags) @@ -57742,7 +57273,7 @@ index b77d1637bbbc..413f11034aab 100644 ClearPagePrivate(page); diff --git a/include/dt-bindings/clock/hi3516dv300-clock.h b/include/dt-bindings/clock/hi3516dv300-clock.h new file mode 100644 -index 000000000000..408c9b09df9c +index 000000000..408c9b09d --- /dev/null +++ b/include/dt-bindings/clock/hi3516dv300-clock.h @@ -0,0 +1,100 @@ @@ -57847,7 +57378,7 @@ index 000000000000..408c9b09df9c + +#endif /* __DTS_HI3516DV300_CLOCK_H */ diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h -index 542471b76f41..5a4c1cc8d067 100644 +index 542471b76..5a4c1cc8d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1381,7 +1381,11 @@ static inline bool bdev_is_partition(struct block_device *bdev) @@ -57863,7 +57394,7 @@ index 542471b76f41..5a4c1cc8d067 100644 BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL, }; diff --git a/include/linux/cpu.h b/include/linux/cpu.h -index d6428aaf67e7..a8d659c9a940 100644 +index d6428aaf6..a8d659c9a 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -41,6 +41,7 @@ extern bool arch_match_cpu_phys_id(int cpu, u64 phys_id); @@ -57875,7 +57406,7 @@ index d6428aaf67e7..a8d659c9a940 100644 extern void cpu_remove_dev_attr(struct device_attribute *attr); diff --git a/include/linux/fb.h b/include/linux/fb.h -index ecfbcc0553a5..b8567818b015 100644 +index ecfbcc055..b8567818b 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -293,6 +293,12 @@ struct fb_ops { @@ -57893,7 +57424,7 @@ index ecfbcc0553a5..b8567818b015 100644 #ifdef CONFIG_FB_TILEBLITTING diff --git a/include/linux/hi_cma.h b/include/linux/hi_cma.h new file mode 100644 -index 000000000000..38444524f392 +index 000000000..38444524f --- /dev/null +++ b/include/linux/hi_cma.h @@ -0,0 +1,54 @@ @@ -57952,7 +57483,7 @@ index 000000000000..38444524f392 + +#endif diff --git a/include/linux/hid.h b/include/linux/hid.h -index 6ed2a97eb55f..1d1445a23967 100644 +index 6ed2a97eb..1d1445a23 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -622,6 +622,7 @@ struct hid_device { /* device report descriptor */ @@ -57965,7 +57496,7 @@ index 6ed2a97eb55f..1d1445a23967 100644 #define to_hid_device(pdev) \ diff --git a/include/linux/hiedmac.h b/include/linux/hiedmac.h new file mode 100644 -index 000000000000..26157899aec8 +index 000000000..26157899a --- /dev/null +++ b/include/linux/hiedmac.h @@ -0,0 +1,65 @@ @@ -58035,7 +57566,7 @@ index 000000000000..26157899aec8 +} dmac_lli; +#endif diff --git a/include/linux/i2c.h b/include/linux/i2c.h -index a670ae129f4b..815f52046644 100644 +index a670ae129..815f52046 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -124,6 +124,23 @@ static inline int i2c_master_send_dmasafe(const struct i2c_client *client, @@ -58064,7 +57595,7 @@ index a670ae129f4b..815f52046644 100644 diff --git a/include/linux/mfd/hisi_fmc.h b/include/linux/mfd/hisi_fmc.h new file mode 100644 -index 000000000000..28ce459085a5 +index 000000000..28ce45908 --- /dev/null +++ b/include/linux/mfd/hisi_fmc.h @@ -0,0 +1,477 @@ @@ -58546,7 +58077,7 @@ index 000000000000..28ce459085a5 + +#endif /* __HISI_FMC_H */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 40d7e98fc990..5b77c8cda77f 100644 +index 40d7e98fc..5b77c8cda 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -173,6 +173,7 @@ struct mmc_host_ops { @@ -58583,7 +58114,7 @@ index 40d7e98fc990..5b77c8cda77f 100644 const struct mmc_bus_ops *bus_ops; /* current bus driver */ diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h -index 157357ec1441..3588dc165324 100644 +index 157357ec1..3588dc165 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -18,6 +18,12 @@ @@ -58716,7 +58247,7 @@ index 157357ec1441..3588dc165324 100644 return err == -EUCLEAN; } diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h -index 60bac2c0ec45..04e292e88d40 100644 +index 60bac2c0e..04e292e88 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -11,6 +11,44 @@ @@ -58837,7 +58368,7 @@ index 60bac2c0ec45..04e292e88d40 100644 const struct spi_nor_hwcaps *hwcaps); diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h -index f96b7f8d82e5..11911795d789 100644 +index f96b7f8d8..11911795d 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -30,6 +30,7 @@ enum { @@ -58866,7 +58397,7 @@ index f96b7f8d82e5..11911795d789 100644 /* diff --git a/include/linux/phy.h b/include/linux/phy.h -index 08725a262f32..45c717bc1f9e 100644 +index 08725a262..45c717bc1 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1547,6 +1547,7 @@ void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies); @@ -58878,7 +58409,7 @@ index 08725a262f32..45c717bc1f9e 100644 struct ethtool_link_ksettings *cmd); int phy_ethtool_ksettings_set(struct phy_device *phydev, diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 2d01b2bbb746..00dbb9429983 100644 +index 2d01b2bbb..00dbb9429 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -521,6 +521,7 @@ struct skb_shared_info { @@ -58890,7 +58421,7 @@ index 2d01b2bbb746..00dbb9429983 100644 /* * Warning : all fields before dataref are cleared in __alloc_skb() diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h -index cad1fa2b6baa..e936f167ae94 100644 +index cad1fa2b6..e936f167a 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -156,6 +156,7 @@ struct rpc_xprt_ops { @@ -58902,7 +58433,7 @@ index cad1fa2b6baa..e936f167ae94 100644 unsigned int (*bc_num_slots)(struct rpc_xprt *xprt); void (*bc_free_rqst)(struct rpc_rqst *rqst); diff --git a/include/linux/types.h b/include/linux/types.h -index a147977602b5..2c35430e2364 100644 +index a14797760..2c35430e2 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -227,5 +227,8 @@ typedef void (*swap_func_t)(void *a, void *b, int size); @@ -58915,7 +58446,7 @@ index a147977602b5..2c35430e2364 100644 #endif /* __ASSEMBLY__ */ #endif /* _LINUX_TYPES_H */ diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h -index 85f8047afcf2..3f50287f3289 100644 +index 85f8047af..3f50287f3 100644 --- a/include/uapi/linux/i2c-dev.h +++ b/include/uapi/linux/i2c-dev.h @@ -52,6 +52,8 @@ @@ -58928,7 +58459,7 @@ index 85f8047afcf2..3f50287f3289 100644 /* This is the structure as used in the I2C_SMBUS ioctl call */ struct i2c_smbus_ioctl_data { diff --git a/include/uapi/linux/i2c.h b/include/uapi/linux/i2c.h -index f71a1751cacf..f85deb485513 100644 +index f71a1751c..f85deb485 100644 --- a/include/uapi/linux/i2c.h +++ b/include/uapi/linux/i2c.h @@ -22,7 +22,7 @@ @@ -58956,7 +58487,7 @@ index f71a1751cacf..f85deb485513 100644 /* To determine what functionality is present */ diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h -index a5773899f4d9..89a461a27261 100644 +index a5773899f..89a461a27 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h @@ -93,7 +93,23 @@ struct __fat_dirent { @@ -58995,7 +58526,7 @@ index a5773899f4d9..89a461a27261 100644 __u8 ignored[3]; /* Boot strap short or near jump */ __u8 system_id[8]; /* Name - can be used to special case diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h -index 652f169a019e..8addd4f94779 100644 +index 652f169a0..8addd4f94 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -12,6 +12,7 @@ @@ -59007,7 +58538,7 @@ index 652f169a019e..8addd4f94779 100644 #define UVC_EVENT_CONNECT (V4L2_EVENT_PRIVATE_START + 0) #define UVC_EVENT_DISCONNECT (V4L2_EVENT_PRIVATE_START + 1) diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h -index bfdae12cdacf..2d33002e9510 100644 +index bfdae12cd..2d33002e9 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -342,6 +342,8 @@ struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) { \ @@ -59084,7 +58615,7 @@ index bfdae12cdacf..2d33002e9510 100644 #endif /* __LINUX_USB_VIDEO_H */ diff --git a/init/main.c b/init/main.c -index dd26a42e80a8..053b794d5f44 100644 +index dd26a42e8..053b794d5 100644 --- a/init/main.c +++ b/init/main.c @@ -840,6 +840,34 @@ static void __init mm_init(void) @@ -59134,7 +58665,7 @@ index dd26a42e80a8..053b794d5f44 100644 * These use large bootmem allocations and must precede * kmem_cache_init() diff --git a/kernel/cpu.c b/kernel/cpu.c -index 67c22941b5f2..dfbd3887e8cd 100644 +index 67c22941b..dfbd3887e 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -331,6 +331,19 @@ void lockdep_assert_cpus_held(void) @@ -59158,7 +58689,7 @@ index 67c22941b5f2..dfbd3887e8cd 100644 { rwsem_acquire(&cpu_hotplug_lock.dep_map, 0, 0, _THIS_IP_); diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c -index 16b95ff12e4d..90f379978592 100644 +index 16b95ff12..90f379978 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -164,6 +164,11 @@ void __init dma_pernuma_cma_reserve(void) @@ -59207,7 +58738,7 @@ index 16b95ff12e4d..90f379978592 100644 static struct page *cma_alloc_aligned(struct cma *cma, size_t size, gfp_t gfp) { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index d0df95346ab3..1a171eca55a1 100644 +index d0df95346..1a171eca5 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1475,7 +1475,7 @@ static int syslog_print(char __user *buf, int size) @@ -59220,7 +58751,7 @@ index d0df95346ab3..1a171eca55a1 100644 return -ENOMEM; diff --git a/kernel/relay.c b/kernel/relay.c -index b08d936d5fa7..1a62975c6a64 100644 +index b08d936d5..1a62975c6 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -581,7 +581,8 @@ struct rchan *relay_open(const char *base_filename, @@ -59234,7 +58765,7 @@ index b08d936d5fa7..1a62975c6a64 100644 kfree(chan); return NULL; diff --git a/mm/init-mm.c b/mm/init-mm.c -index 153162669f80..6382b3b6ba39 100644 +index 153162669..6382b3b6b 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -40,3 +40,4 @@ struct mm_struct init_mm = { @@ -59243,7 +58774,7 @@ index 153162669f80..6382b3b6ba39 100644 }; +EXPORT_SYMBOL(init_mm); diff --git a/mm/madvise.c b/mm/madvise.c -index 24abc79f8914..8a139fcbd0d6 100644 +index 24abc79f8..8a139fcbd 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -29,6 +29,7 @@ @@ -59255,7 +58786,7 @@ index 24abc79f8914..8a139fcbd0d6 100644 #include diff --git a/mm/mincore.c b/mm/mincore.c -index 02db1a834021..9a2c1208d10c 100644 +index 02db1a834..9a2c1208d 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -42,57 +42,15 @@ static int mincore_hugetlb(pte_t *pte, unsigned long hmask, unsigned long addr, @@ -59368,7 +58899,7 @@ index 02db1a834021..9a2c1208d10c 100644 vec++; } diff --git a/mm/vmalloc.c b/mm/vmalloc.c -index fff03a331314..ea2fae034bf4 100644 +index f98801428..1a565eaad 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -326,6 +326,7 @@ int map_kernel_range(unsigned long start, unsigned long size, pgprot_t prot, @@ -59388,7 +58919,7 @@ index fff03a331314..ea2fae034bf4 100644 /** * get_vm_area - reserve a contiguous kernel virtual area diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index e59ae24a8f17..5ec67b6302ec 100644 +index e59ae24a8..5ec67b630 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5547,7 +5547,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, @@ -59402,7 +58933,7 @@ index e59ae24a8f17..5ec67b6302ec 100644 rssi, flags, data, len); return; diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c -index 19ef4577b70d..bebc833f4c82 100644 +index 19ef4577b..bebc833f4 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1561,6 +1561,11 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, @@ -59418,7 +58949,7 @@ index 19ef4577b70d..bebc833f4c82 100644 return -ENOMEM; diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c -index fae632da1058..d6b8d6f61b96 100644 +index fae632da1..d6b8d6f61 100644 --- a/net/sunrpc/auth_gss/gss_mech_switch.c +++ b/net/sunrpc/auth_gss/gss_mech_switch.c @@ -34,11 +34,14 @@ gss_mech_free(struct gss_api_mech *gm) @@ -59439,7 +58970,7 @@ index fae632da1058..d6b8d6f61b96 100644 pf->auth_domain_name = NULL; } diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c -index d38788cd9433..f526b67d5759 100644 +index d38788cd9..f526b67d5 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1539,15 +1539,22 @@ int @@ -59479,7 +59010,7 @@ index d38788cd9433..f526b67d5759 100644 EXPORT_SYMBOL_GPL(bc_svc_process); #endif /* CONFIG_SUNRPC_BACKCHANNEL */ diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c -index c92c1aac270a..9d1a966bacc6 100644 +index c92c1aac2..9d1a966ba 100644 --- a/net/sunrpc/xprtrdma/backchannel.c +++ b/net/sunrpc/xprtrdma/backchannel.c @@ -35,6 +35,11 @@ int xprt_rdma_bc_setup(struct rpc_xprt *xprt, unsigned int reqs) @@ -59495,7 +59026,7 @@ index c92c1aac270a..9d1a966bacc6 100644 * xprt_rdma_bc_maxpayload - Return maximum backchannel message size * @xprt: transport diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c -index 8fb0478888fb..5ea56bc2af12 100644 +index 8fb047888..5ea56bc2a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2121,7 +2121,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, @@ -59508,7 +59039,7 @@ index 8fb0478888fb..5ea56bc2af12 100644 if (WARN_ON(!state)) return -EINVAL; diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c -index 73df23570d43..9f959d7b5f4a 100644 +index 73df23570..9f959d7b5 100644 --- a/net/wireless/wext-sme.c +++ b/net/wireless/wext-sme.c @@ -201,8 +201,8 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev, @@ -59522,7 +59053,7 @@ index 73df23570d43..9f959d7b5f4a 100644 /* call only for station! */ if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION)) diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c -index 17cb6890d45a..af3392da330e 100644 +index 17cb6890d..af3392da3 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c @@ -819,8 +819,8 @@ static void check_pci_bridge(struct check *c, struct dt_info *dti, struct node * @@ -59537,7 +59068,7 @@ index 17cb6890d45a..af3392da330e 100644 prop = get_property(node, "ranges"); diff --git a/sound/core/control.c b/sound/core/control.c -index 3b44378b9dec..b94592b46016 100644 +index 3b44378b9..b94592b46 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1443,7 +1443,7 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, @@ -59550,7 +59081,7 @@ index 3b44378b9dec..b94592b46016 100644 count = 1; diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh -index 6fad54c7ecb4..9d1302bb892b 100755 +index 6fad54c7e..9d1302bb8 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -636,6 +636,20 @@ fib_suppress_test() @@ -59575,5 +59106,5 @@ index 6fad54c7ecb4..9d1302bb892b 100755 # Tests on route add and replace -- -2.17.1 +2.25.1 -- Gitee