From b22be6ca40efaa1aa1f42d9a96149db7a941c69a Mon Sep 17 00:00:00 2001 From: stenvezhong Date: Wed, 30 Jun 2021 15:40:06 +0800 Subject: [PATCH] telephony modify driver usb serial Change-Id: Ic705b2acc6b407c9ddcaddd064c43d336af7657b Signed-off-by: stenvezhong --- .../hi3516dv300_small.patch | 1379 ++++++++--------- 1 file changed, 684 insertions(+), 695 deletions(-) diff --git a/linux-4.19/hi3516dv300_small_patch/hi3516dv300_small.patch b/linux-4.19/hi3516dv300_small_patch/hi3516dv300_small.patch index 299188b..dd25ae0 100644 --- a/linux-4.19/hi3516dv300_small_patch/hi3516dv300_small.patch +++ b/linux-4.19/hi3516dv300_small_patch/hi3516dv300_small.patch @@ -1,5 +1,5 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 1877da816f65..0b45060b73df 100644 +index 1877da8..0b45060 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 d1516f8..b27a577 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 a3af4dc..78fb2ac 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 b5bd3de..c9f4624 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 0000000..f7f5ff2 --- /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 0000000..12ef3ca --- /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 0000000..85eede3 --- /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 0000000..3438ed1 --- /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 0000000..cfb2670 --- /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 0000000..41c7820 --- /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 0000000..8e6c6ab --- /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 0000000..a8ea89e --- /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 0000000..a6433d7 --- /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 0000000..dd36cf2 --- /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 0000000..e3c6ee2 --- /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 0000000..cb93872 --- /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 0000000..6e8af68 --- /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 0000000..d8ee378 --- /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 0000000..555489f --- /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 0000000..c7b3cf7 --- /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 0000000..16dfa44 --- /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 0000000..25ac959 --- /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 0000000..3859b13 --- /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 0000000..fe2f6bb --- /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 0000000..c82d8c9 --- /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 0000000..eb5b4cc --- /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 0000000..b94f105 --- /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 0000000..4416d9e --- /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 0000000..e4527d3 --- /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 0000000..7189dc2 --- /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 0000000..502fd48 --- /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 0000000..ab06ef7 --- /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 0000000..e0a47d7 --- /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 0000000..d845b41 --- /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 0000000..cb6968f --- /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 0000000..ca1c88f --- /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 0000000..83247dd --- /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 0000000..5f4841e --- /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 0000000..24f4753 --- /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 0000000..d347e54 --- /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 0000000..2a5dcc1 --- /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 0000000..e91daaa --- /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 0000000..d7d0d1a --- /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 0000000..faad1be3 --- /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 0000000..cfb69e5 --- /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 0000000..b1aa847 --- /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 0000000..d4bb320 --- /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 0000000..b1aa847 --- /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 0000000..6b6d9ca --- /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 0000000..9ef23c7 --- /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 0000000..28a3213 --- /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 0000000..210774e --- /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 0000000..39b9040 --- /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 0000000..7d24d93 --- /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 0000000..75bfcad --- /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 0000000..762167f --- /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 0000000..daeb1fa --- /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 0000000..109c066 --- /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 0000000..8b998a2 --- /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 0000000..9c851e1 --- /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 0000000..231e337 --- /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 0000000..a3646aa --- /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 0000000..a3646aa --- /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 0000000..daeb1fa --- /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 0000000..016d763 --- /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 0000000..109c066 --- /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 0000000..709408f --- /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 0000000..709408f --- /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 0000000..469c1981 --- /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 0000000..903476f --- /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 0000000..903476f --- /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 0000000..8b998a2 --- /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 0000000..ba46b5b --- /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 0000000..a563294 --- /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 0000000..a563294 --- /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 0000000..c9c4e31 --- /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 0000000..b9b44f3 --- /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 0000000..e9bf3c8 --- /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 0000000..ea00e83 --- /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 0000000..8d151c9 --- /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 0000000..78ec2b3 --- /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 0000000..1771816 --- /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 0000000..4c35ef5 --- /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 0000000..cbff89f --- /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 0000000..0de65f2 --- /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 0000000..4c35ef5 --- /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 0000000..3b36d9a --- /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 0000000..bdde3a5 --- /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 0000000..8a0921f --- /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 0000000..9c4bc36 --- /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 0000000..596ea7e --- /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 0000000..4df80f7 --- /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 0000000..79f0e200 --- /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 0000000..3fffb5a --- /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 0000000..ef8c32e --- /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 0000000..f6e628c --- /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 0000000..463a776 --- /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 0000000..7392361 --- /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 0000000..39f5e7d --- /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 0000000..d2ecb64 --- /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 0000000..a4f48ec --- /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 0000000..ebf7562 --- /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 0000000..bf16761 --- /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 0000000..6f4e165 --- /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 0000000..2c35074 --- /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 0000000..c289725 --- /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 0000000..6298b2f --- /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 0000000..5bafed8 --- /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 0000000..fd690e1 --- /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 0000000..bd8e490 --- /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 0000000..721d428 --- /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 0000000..fd690e1 --- /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 0000000..bd8e490 --- /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 0000000..c9c6a64 --- /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 0000000..dce88a8 --- /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 0000000..7afe0ab --- /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 233b4b5..986e336 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 0000000..9c8c769 --- /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 0000000..ec3243e --- /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 0000000..8c8b300 --- /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 0000000..150bab4 --- /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 0000000..6c8d586 --- /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 0000000..790981e --- /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 0000000..72ab47e --- /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 0000000..94c4806 --- /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 0000000..0984166 --- /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 0000000..60a07ad --- /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 0000000..35e0295 --- /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 0000000..8a3a356 --- /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 0000000..bd9d50d --- /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 0000000..afcbdbc --- /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 0000000..b80d098 --- /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 0000000..c8f7c2d --- /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 0000000..551e628 --- /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 0000000..35e0295 --- /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 0000000..7ec9ecd --- /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 0000000..790981e --- /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 0000000..8b55dfc --- /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 0000000..790981e --- /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 0000000..b5fd58c --- /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 0000000..5e41d26 --- /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 0000000..f5edadb --- /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 0000000..492a4b1 --- /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 0000000..a81a835 --- /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 0000000..c87531c --- /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 0000000..3061683 --- /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 0000000..c764720 --- /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 0000000..f30708b --- /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 0000000..d049664 --- /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 0000000..9355f06 --- /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 0000000..ee11697 --- /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 0000000..eb416c7 --- /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 0000000..b2403ca --- /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 0000000..4ec4cf0 --- /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 0000000..84db82a --- /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 0000000..d33dea8 --- /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 0000000..f1d42c5 --- /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 0000000..36209e5 --- /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 0000000..a73be20 --- /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 8211cf4..3560d04 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 0000000..d7c2d12 --- /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 0000000..8e9228d --- /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 0000000..8c659c8 --- /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 0000000..6f8973d --- /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 0000000..be5587d --- /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 0000000..13f7a71 --- /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 7bdbf5d..f7a1954 --- 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 dc54a88..2085a7c 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 cd34148..f3e9862 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 4690364..234e0f4 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 03d93f8..57659e3 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 0000000..c27623b --- /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 0000000..7ff39a2 --- /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 0000000..77cda31 --- /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 0000000..65912b3 --- /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 0000000..c37e189 --- /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 0000000..a1c2894 --- /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 0000000..fe9cf86 --- /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 0000000..a7c67d4 --- /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 0000000..3b906be --- /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 0000000..d79d12e --- /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 0000000..bbcd6a9 --- /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 0000000..7fbf66e --- /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 0000000..b69edfa --- /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 0000000..fae1572 --- /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 0000000..7cb8b38 --- /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 0000000..fe205d0 --- /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 0000000..1d9b33e --- /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 0000000..d5dd330 --- /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 0000000..f177e3b --- /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 0000000..401bdc0 --- /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 0000000..b6ae247 --- /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 0000000..96e6ae5 --- /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 0000000..5802f91 --- /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 0000000..8215cc0 --- /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 0000000..b3a805a --- /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 0000000..910b149 --- /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 0000000..e7be7fd --- /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 0000000..d8a134b --- /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 0000000..c0a4f00 --- /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 0000000..3a080a1 --- /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 0000000..92ded32 --- /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 0000000..8bc1bda --- /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 0000000..43df23c --- /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 0000000..347300b --- /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 0000000..43cafc2 --- /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 0000000..20ef1f0 --- /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 0000000..7cd8dd2 --- /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 0e2ea1c..a078a4b 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 29d2f42..7753f63 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -223,8 +223,18 @@ static void __init reserve_elfcorehdr(void) @@ -288782,39 +288782,8 @@ index 29d2f425806e..7753f639e704 100644 } #ifdef CONFIG_NUMA -diff --git a/drivers/Kconfig b/drivers/Kconfig -index 9a869a2af74e..374196a2cbad 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -219,6 +219,14 @@ source "drivers/siox/Kconfig" - - source "drivers/slimbus/Kconfig" - -+source "drivers/hidmac/Kconfig" -+ -+source "drivers/hiedmac/Kconfig" -+ -+source "drivers/hisilicon/Kconfig" -+ -+source "drivers/hi_vdmav100/Kconfig" -+ - source "drivers/hdf/khdf/Kconfig" - - endmenu -diff --git a/drivers/Makefile b/drivers/Makefile -index 7d6c6beb40ad..6476a6490cb8 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_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 b588503..ecdcbf1 100644 --- a/drivers/acpi/acpi_configfs.c +++ b/drivers/acpi/acpi_configfs.c @@ -14,6 +14,7 @@ @@ -288838,7 +288807,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 cda4f7e..5da11aa 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 +288820,7 @@ index cda4f7eb58ea..5da11aa4c554 100644 } if (!target_node) { diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig -index 99698d7fe585..b28d3e90fa20 100644 +index 99698d7..b28d3e9 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -2,6 +2,7 @@ @@ -288864,7 +288833,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 0000000..030de3f --- /dev/null +++ b/drivers/ata/Kconfig.hiahci @@ -0,0 +1,44 @@ @@ -288913,7 +288882,7 @@ index 000000000000..030de3fc9d0a +endif + diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile -index d21cdd83f7ab..1ce4e9f1734a 100644 +index d21cdd8..1ce4e9f 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -1,6 +1,7 @@ @@ -288925,7 +288894,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 9290e78..030da4d 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -240,6 +240,9 @@ enum { @@ -288953,7 +288922,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 cf1e0e1..8b8c183 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -26,6 +26,16 @@ @@ -288997,7 +288966,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 0000000..935c716 --- /dev/null +++ b/drivers/ata/hisi_sata_dbg.c @@ -0,0 +1,174 @@ @@ -289177,7 +289146,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 0000000..5103658 --- /dev/null +++ b/drivers/ata/hisi_sata_dbg.h @@ -0,0 +1,58 @@ @@ -289240,7 +289209,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 f1153e7..fd73432 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -47,6 +47,7 @@ @@ -289533,7 +289502,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 a026211..9d5f5a7 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 +289532,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 eef7a91..127e990 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 +289551,7 @@ index eef7a91f667d..127e990b8d17 100644 } diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index ed344eb717cc..501fb86a0b40 100644 +index ed344eb..501fb86 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -70,6 +70,7 @@ obj-$(CONFIG_ARCH_BERLIN) += berlin/ @@ -289594,7 +289563,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 becdb1d..e05f5e8 100644 --- a/drivers/clk/hisilicon/Kconfig +++ b/drivers/clk/hisilicon/Kconfig @@ -21,6 +21,38 @@ config COMMON_CLK_HI3660 @@ -289813,7 +289782,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 2a714c0..e722f29 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 +289818,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 0000000..9da04b6 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516a.c @@ -0,0 +1,525 @@ @@ -290380,7 +290349,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 0000000..eba146d --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516cv500.c @@ -0,0 +1,261 @@ @@ -290647,7 +290616,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 0000000..14e6e2d --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516dv200.c @@ -0,0 +1,251 @@ @@ -290904,7 +290873,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 0000000..1a2ab99 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516dv300.c @@ -0,0 +1,271 @@ @@ -291181,7 +291150,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 0000000..b24f89c --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516ev200.c @@ -0,0 +1,244 @@ @@ -291431,7 +291400,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 0000000..deccfa9 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3516ev300.c @@ -0,0 +1,241 @@ @@ -291678,7 +291647,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 0000000..9b53206 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3518ev20x.c @@ -0,0 +1,291 @@ @@ -291975,7 +291944,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 0000000..f926a90 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3518ev300.c @@ -0,0 +1,240 @@ @@ -292221,7 +292190,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 0000000..65776794 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3519av100.c @@ -0,0 +1,559 @@ @@ -292786,7 +292755,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 0000000..85f5636 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3521a.c @@ -0,0 +1,288 @@ @@ -293080,7 +293049,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 0000000..bf94fe6 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3521dv200.c @@ -0,0 +1,255 @@ @@ -293341,7 +293310,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 0000000..edccb9a --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3531a.c @@ -0,0 +1,323 @@ @@ -293670,7 +293639,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 0000000..0b5b4df --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3531dv200.c @@ -0,0 +1,578 @@ @@ -294254,7 +294223,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 0000000..36c786d --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3535av100.c @@ -0,0 +1,570 @@ @@ -294830,7 +294799,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 0000000..db881ce --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3536dv100.c @@ -0,0 +1,270 @@ @@ -295106,7 +295075,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 0000000..66a2705 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3556av100.c @@ -0,0 +1,566 @@ @@ -295678,7 +295647,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 0000000..addc818 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3556v200.c @@ -0,0 +1,274 @@ @@ -295958,7 +295927,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 0000000..20509aa --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3559av100.c @@ -0,0 +1,882 @@ @@ -296846,7 +296815,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 0000000..564e5d0 --- /dev/null +++ b/drivers/clk/hisilicon/clk-hi3559v200.c @@ -0,0 +1,271 @@ @@ -297122,7 +297091,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 5bce929..5c345267 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 +297104,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 953c8da..806bb73 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 +297119,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 e073971..435bcee 100644 --- a/drivers/clk/hisilicon/crg.h +++ b/drivers/clk/hisilicon/crg.h @@ -22,7 +22,7 @@ struct hisi_reset_controller; @@ -297163,7 +297132,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 43e82fa..491daec 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 +297173,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 9a69374..d6faba7 100644 --- a/drivers/clk/hisilicon/reset.h +++ b/drivers/clk/hisilicon/reset.h @@ -23,6 +23,9 @@ struct hisi_reset_controller; @@ -297218,7 +297187,7 @@ index 9a69374a0b32..d6faba76141b 100644 #else static inline diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index 4d37f018d846..1f09043bfe3c 100644 +index 4d37f01..1f09043 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -334,6 +334,14 @@ config ARM_ARCH_TIMER_EVTSTREAM @@ -297250,7 +297219,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 db51b24..5607f97 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o @@ -297262,7 +297231,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 0445ad7..e0b7ee3 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 +297246,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 0000000..b2c857a --- /dev/null +++ b/drivers/clocksource/timer-hisp804.c @@ -0,0 +1,356 @@ @@ -297639,7 +297608,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 a4f9557..fbc7d68 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -312,6 +312,20 @@ config K3_DMA @@ -297672,7 +297641,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 c91702d..5bf64ec 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_TIMB_DMA) += timb_dma.o @@ -297686,7 +297655,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 0000000..a198c92 --- /dev/null +++ b/drivers/dma/hiedmacv310.c @@ -0,0 +1,1443 @@ @@ -299135,7 +299104,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 0000000..1fc0939 --- /dev/null +++ b/drivers/dma/hiedmacv310.h @@ -0,0 +1,153 @@ @@ -299293,7 +299262,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 a8180f9..a0c7d1d 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -299317,7 +299286,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 dc42571..f73dd3c 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 +299377,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 2fd2724..b1eebd8 100644 --- a/drivers/gpu/drm/hisilicon/Kconfig +++ b/drivers/gpu/drm/hisilicon/Kconfig @@ -4,3 +4,4 @@ @@ -299417,7 +299386,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 c8155bf..02ef531 100644 --- a/drivers/gpu/drm/hisilicon/Makefile +++ b/drivers/gpu/drm/hisilicon/Makefile @@ -4,3 +4,4 @@ @@ -299427,7 +299396,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 0000000..ffc8564 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/Kconfig @@ -0,0 +1,8 @@ @@ -299441,7 +299410,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 0000000..7e611dd --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/Makefile @@ -0,0 +1,27 @@ @@ -299474,7 +299443,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 0000000..88192d01 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/drm_hal_mipitx.h @@ -0,0 +1,91 @@ @@ -299571,7 +299540,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 0000000..120972b --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.c @@ -0,0 +1,775 @@ @@ -300352,7 +300321,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 0000000..31f13ff --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_crtc.h @@ -0,0 +1,69 @@ @@ -300427,7 +300396,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 0000000..4a58b1a --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.c @@ -0,0 +1,345 @@ @@ -300778,7 +300747,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 0000000..4c7f088 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_hdmitx.h @@ -0,0 +1,28 @@ @@ -300812,7 +300781,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 0000000..22ae4d9 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.c @@ -0,0 +1,223 @@ @@ -301041,7 +301010,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 0000000..d7f3767 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_adp_mipitx.h @@ -0,0 +1,24 @@ @@ -301071,7 +301040,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 0000000..a307863 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.c @@ -0,0 +1,388 @@ @@ -301465,7 +301434,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 0000000..ebe7aac --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_crtc.h @@ -0,0 +1,17 @@ @@ -301488,7 +301457,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 0000000..123a61f --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.c @@ -0,0 +1,367 @@ @@ -301861,7 +301830,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 0000000..0fcfdae --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_drv.h @@ -0,0 +1,29 @@ @@ -301896,7 +301865,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 0000000..f29e7f9 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.c @@ -0,0 +1,43 @@ @@ -301946,7 +301915,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 0000000..83a96b2 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_func_ext.h @@ -0,0 +1,27 @@ @@ -301979,7 +301948,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 0000000..6f04e73 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.c @@ -0,0 +1,232 @@ @@ -302217,7 +302186,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 0000000..22285a5 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_hdmitx.h @@ -0,0 +1,16 @@ @@ -302239,7 +302208,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 0000000..4b85178 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.c @@ -0,0 +1,180 @@ @@ -302425,7 +302394,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 0000000..34d2f0a --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hi_drm_mipitx.h @@ -0,0 +1,17 @@ @@ -302448,7 +302417,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 0000000..5f247a1 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hismart/hisilicon_drm.h @@ -0,0 +1,31 @@ @@ -302485,7 +302454,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 0000000..ecaa952 --- /dev/null +++ b/drivers/hi_vdmav100/Kconfig @@ -0,0 +1,26 @@ @@ -302517,7 +302486,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 0000000..ccac799 --- /dev/null +++ b/drivers/hi_vdmav100/Makefile @@ -0,0 +1,2 @@ @@ -302525,7 +302494,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 0000000..3644fe6 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdma.h @@ -0,0 +1,41 @@ @@ -302572,7 +302541,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 0000000..0199ddd --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100.c @@ -0,0 +1,534 @@ @@ -303112,7 +303081,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 0000000..8b8d3e6 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100.h @@ -0,0 +1,122 @@ @@ -303240,7 +303209,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 0000000..777a7c4 --- /dev/null +++ b/drivers/hi_vdmav100/hi_vdmav100_misc.c @@ -0,0 +1,109 @@ @@ -303354,7 +303323,7 @@ index 000000000000..777a7c47cd53 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Hisilicon VDMA MISC Driver"); diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile -index bd7ac53b75c5..f44c75cf51eb 100644 +index bd7ac53..d7efd1e 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -2,6 +2,15 @@ @@ -303374,7 +303343,7 @@ index bd7ac53b75c5..f44c75cf51eb 100644 hid-$(CONFIG_DEBUG_FS) += hid-debug.o diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 05122167d9d8..98db2015b83f 100644 +index 0512216..98db201 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -35,7 +35,7 @@ @@ -303444,9 +303413,72 @@ index 05122167d9d8..98db2015b83f 100644 } EXPORT_SYMBOL_GPL(hid_disconnect); +diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c +index 11bd2ca..7c040f2 100644 +--- a/drivers/hid/hid-input.c ++++ b/drivers/hid/hid-input.c +@@ -31,7 +31,7 @@ + + #include + #include +- ++#include "hdf_hid_adapter.h" + #include "hid-ids.h" + + #define unk KEY_UNKNOWN +@@ -1364,8 +1364,11 @@ void hidinput_report_event(struct hid_device *hid, struct hid_report *report) + if (hid->quirks & HID_QUIRK_NO_INPUT_SYNC) + return; + +- list_for_each_entry(hidinput, &hid->inputs, list) ++ list_for_each_entry(hidinput, &hid->inputs, list) { + input_sync(hidinput->input); ++ if(hid->input_dev) ++ HidReportEvent(hid->input_dev, EV_SYN, SYN_REPORT, 0); ++ } + } + EXPORT_SYMBOL_GPL(hidinput_report_event); + +@@ -1729,6 +1732,27 @@ static inline void hidinput_configure_usages(struct hid_input *hidinput, + report->field[i]->usage + j); + } + ++static void transferinfo(struct input_dev *dev) ++{ ++ HidInfo info; ++ 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)); ++ info.bustype = dev->id.bustype; ++ info.vendor = dev->id.vendor; ++ info.product = dev->id.product; ++ info.version = dev->id.version; ++ GetInfoFromHid(info); ++} ++ + /* + * Register the input device; print a message. + * Configure the input layer interface +@@ -1811,7 +1835,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) + hidinput_cleanup_hidinput(hid, hidinput); + continue; + } +- ++ transferinfo(hidinput->input); + if (input_register_device(hidinput->input)) + goto out_unwind; + hidinput->registered = true; diff --git a/drivers/hidmac/Kconfig b/drivers/hidmac/Kconfig new file mode 100644 -index 000000000000..dcb3e08bf5d2 +index 0000000..dcb3e08b --- /dev/null +++ b/drivers/hidmac/Kconfig @@ -0,0 +1,21 @@ @@ -303473,7 +303505,7 @@ index 000000000000..dcb3e08bf5d2 +endif diff --git a/drivers/hidmac/Makefile b/drivers/hidmac/Makefile new file mode 100644 -index 000000000000..7e41f4c37ffd +index 0000000..7e41f4c --- /dev/null +++ b/drivers/hidmac/Makefile @@ -0,0 +1,6 @@ @@ -303485,7 +303517,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 0000000..4281caf --- /dev/null +++ b/drivers/hidmac/hi_pl08x.c @@ -0,0 +1,1303 @@ @@ -304794,7 +304826,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 0000000..1c3babf --- /dev/null +++ b/drivers/hidmac/hi_pl08x.h @@ -0,0 +1,90 @@ @@ -304890,7 +304922,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 0000000..aa634518 --- /dev/null +++ b/drivers/hidmac/hidmac_hi3516a.h @@ -0,0 +1,176 @@ @@ -305072,7 +305104,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 0000000..e14d30c --- /dev/null +++ b/drivers/hidmac/hidmac_hi3518ev20x.h @@ -0,0 +1,168 @@ @@ -305246,7 +305278,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 0000000..812f820 --- /dev/null +++ b/drivers/hidmac/hidmac_hi3521a.h @@ -0,0 +1,151 @@ @@ -305403,7 +305435,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 0000000..a74b9f2 --- /dev/null +++ b/drivers/hidmac/hidmac_hi3531a.h @@ -0,0 +1,166 @@ @@ -305575,7 +305607,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 0000000..71bae26 --- /dev/null +++ b/drivers/hidmac/hidmac_hi3536dv100.h @@ -0,0 +1,131 @@ @@ -305712,7 +305744,7 @@ index 000000000000..71bae26667fb +#endif diff --git a/drivers/hiedmac/Kconfig b/drivers/hiedmac/Kconfig new file mode 100644 -index 000000000000..183747be82fb +index 0000000..183747b --- /dev/null +++ b/drivers/hiedmac/Kconfig @@ -0,0 +1,29 @@ @@ -305747,7 +305779,7 @@ index 000000000000..183747be82fb +endif diff --git a/drivers/hiedmac/Makefile b/drivers/hiedmac/Makefile new file mode 100644 -index 000000000000..a1b4b8b767b4 +index 0000000..a1b4b8b --- /dev/null +++ b/drivers/hiedmac/Makefile @@ -0,0 +1,4 @@ @@ -305757,7 +305789,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 0000000..7596326 --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3516cv500.h @@ -0,0 +1,107 @@ @@ -305870,7 +305902,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 0000000..b0ccb6b --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3516ev200.h @@ -0,0 +1,83 @@ @@ -305959,7 +305991,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 0000000..0b3028b --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3519av100.h @@ -0,0 +1,156 @@ @@ -306121,7 +306153,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 0000000..441d061 --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3521dv200.h @@ -0,0 +1,140 @@ @@ -306267,7 +306299,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 0000000..240c1d5 --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3531dv200.h @@ -0,0 +1,90 @@ @@ -306363,7 +306395,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 0000000..ae63fe2 --- /dev/null +++ b/drivers/hiedmac/hiedma_hi3559av100.h @@ -0,0 +1,140 @@ @@ -306509,7 +306541,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 0000000..282ac3e --- /dev/null +++ b/drivers/hiedmac/hiedmacv310.c @@ -0,0 +1,946 @@ @@ -307461,7 +307493,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 0000000..4344d89 --- /dev/null +++ b/drivers/hiedmac/hiedmacv310.h @@ -0,0 +1,184 @@ @@ -307651,7 +307683,7 @@ index 000000000000..4344d8940d61 +#endif diff --git a/drivers/hisilicon/Kconfig b/drivers/hisilicon/Kconfig new file mode 100644 -index 000000000000..ab5884c08df9 +index 0000000..ab5884c --- /dev/null +++ b/drivers/hisilicon/Kconfig @@ -0,0 +1,4 @@ @@ -307661,14 +307693,14 @@ index 000000000000..ab5884c08df9 +endmenu diff --git a/drivers/hisilicon/Makefile b/drivers/hisilicon/Makefile new file mode 100644 -index 000000000000..0ba50a756682 +index 0000000..0ba50a7 --- /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 0000000..7472dcc --- /dev/null +++ b/drivers/hisilicon/cma/Kconfig @@ -0,0 +1,16 @@ @@ -307690,7 +307722,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 0000000..eefda7f --- /dev/null +++ b/drivers/hisilicon/cma/Makefile @@ -0,0 +1,2 @@ @@ -307698,7 +307730,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 0000000..7fa3620 --- /dev/null +++ b/drivers/hisilicon/cma/hi_cma.c @@ -0,0 +1,199 @@ @@ -307902,7 +307934,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 017aec3..0972261 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -593,6 +593,16 @@ config I2C_GPIO_FAULT_INJECTOR @@ -307944,7 +307976,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 18b26af..08a90a9 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -58,6 +58,7 @@ obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o @@ -307957,7 +307989,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 0000000..4c7cd49 --- /dev/null +++ b/drivers/i2c/busses/i2c-hibvt.c @@ -0,0 +1,1451 @@ @@ -309413,7 +309445,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 cbda91a..5033702 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) @@ -309485,7 +309517,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 e1c7996..b608f55 100644 --- a/drivers/infiniband/hw/hfi1/mmu_rb.c +++ b/drivers/infiniband/hw/hfi1/mmu_rb.c @@ -1,4 +1,5 @@ @@ -309634,7 +309666,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 412fa71..8580631 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -872,7 +872,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, @@ -309647,7 +309679,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 b5417012..608bd6f 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -122,6 +122,24 @@ static DEFINE_RAW_SPINLOCK(cpu_map_lock); @@ -309801,7 +309833,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 0000000..5c7bec9 --- /dev/null +++ b/drivers/irqchip/irq-map-hi3559av100.h @@ -0,0 +1,115 @@ @@ -309921,7 +309953,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 1e9835d..68bfd61 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) @@ -309949,7 +309981,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 dd938a5..22780b2 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -457,6 +457,17 @@ config MFD_HI655X_PMIC @@ -309971,7 +310003,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 5856a94..bb4d2ab 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -199,6 +199,7 @@ obj-$(CONFIG_MFD_AAT2870_CORE) += aat2870-core.o @@ -309984,7 +310016,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 0000000..7aa23e5 --- /dev/null +++ b/drivers/mfd/hisi_fmc.c @@ -0,0 +1,134 @@ @@ -310123,7 +310155,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 c723a1e..8d055b1 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, @@ -310156,7 +310188,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 56f7f36..0ae9938 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) @@ -310199,7 +310231,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 4b18034..48309ca 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) @@ -310232,7 +310264,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 0473835..230ac78 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) @@ -310244,7 +310276,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 4e72ad2..d431046 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -31,6 +31,10 @@ @@ -310331,7 +310363,7 @@ index 4e72ad24322f..d4310465cdff 100644 +#endif + diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index b7f809aa40c2..42f7320a06a5 100644 +index b7f809a..42f7320 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -209,6 +209,21 @@ config MMC_SDHCI_CNS3XXX @@ -310377,7 +310409,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 ce8398e..39191b1 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 @@ -310409,7 +310441,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 2c5a6e7..fe1ab3a 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) @@ -310559,7 +310591,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 9e68286..3231af7 100644 --- a/drivers/mmc/host/cqhci.h +++ b/drivers/mmc/host/cqhci.h @@ -88,6 +88,12 @@ @@ -310606,7 +310638,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 0000000..f3331c8 --- /dev/null +++ b/drivers/mmc/host/himci/Kconfig @@ -0,0 +1,23 @@ @@ -310635,7 +310667,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 0000000..6858bfce --- /dev/null +++ b/drivers/mmc/host/himci/Makefile @@ -0,0 +1,2 @@ @@ -310643,7 +310675,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 0000000..e2fc160 --- /dev/null +++ b/drivers/mmc/host/himci/himci.c @@ -0,0 +1,2582 @@ @@ -313231,7 +313263,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 0000000..d882e84 --- /dev/null +++ b/drivers/mmc/host/himci/himci.h @@ -0,0 +1,156 @@ @@ -313393,7 +313425,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 0000000..d9c707d --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3516a.c @@ -0,0 +1,94 @@ @@ -313493,7 +313525,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 0000000..c06e87f --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3516cv500.c @@ -0,0 +1,162 @@ @@ -313661,7 +313693,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 0000000..bb312d6 --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3516dv300.c @@ -0,0 +1,160 @@ @@ -313827,7 +313859,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 0000000..cf7e30b --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3518ev20x.c @@ -0,0 +1,152 @@ @@ -313985,7 +314017,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 0000000..a6aba8f --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3556v200.c @@ -0,0 +1,162 @@ @@ -314153,7 +314185,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 0000000..2a942cb --- /dev/null +++ b/drivers/mmc/host/himci/himci_hi3559v200.c @@ -0,0 +1,164 @@ @@ -314323,7 +314355,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 0000000..ac339c4 --- /dev/null +++ b/drivers/mmc/host/himci/himci_proc.c @@ -0,0 +1,246 @@ @@ -314575,7 +314607,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 0000000..e6ea9a1 --- /dev/null +++ b/drivers/mmc/host/himci/himci_proc.h @@ -0,0 +1,36 @@ @@ -314617,7 +314649,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 0000000..d1d8f9f --- /dev/null +++ b/drivers/mmc/host/himci/himci_reg.h @@ -0,0 +1,241 @@ @@ -314864,7 +314896,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 0000000..9465ad3 --- /dev/null +++ b/drivers/mmc/host/mci_proc.c @@ -0,0 +1,301 @@ @@ -315171,7 +315203,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 0000000..459c5d7 --- /dev/null +++ b/drivers/mmc/host/mci_proc.h @@ -0,0 +1,50 @@ @@ -315227,7 +315259,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 0000000..c149a0d --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3516dv200.c @@ -0,0 +1,674 @@ @@ -315907,7 +315939,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 0000000..9ba4473 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3516ev200.c @@ -0,0 +1,669 @@ @@ -316582,7 +316614,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 0000000..c149a0d --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3516ev300.c @@ -0,0 +1,674 @@ @@ -317262,7 +317294,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 0000000..b241807 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3518ev300.c @@ -0,0 +1,669 @@ @@ -317937,7 +317969,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 0000000..1b7063a --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3519av100.c @@ -0,0 +1,19 @@ @@ -317962,7 +317994,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 0000000..db8a76b --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3521dv200.c @@ -0,0 +1,573 @@ @@ -318541,7 +318573,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 0000000..1ddec9b --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3531dv200.c @@ -0,0 +1,548 @@ @@ -319095,7 +319127,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 0000000..e679b6a7 --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3556av100.c @@ -0,0 +1,627 @@ @@ -319728,7 +319760,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 0000000..69fe6ee --- /dev/null +++ b/drivers/mmc/host/sdhci-hi3559av100.c @@ -0,0 +1,630 @@ @@ -320364,7 +320396,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 0000000..be2a903 --- /dev/null +++ b/drivers/mmc/host/sdhci-hisi.c @@ -0,0 +1,783 @@ @@ -321153,7 +321185,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 0000000..19cea6d --- /dev/null +++ b/drivers/mmc/host/sdhci-hisi.h @@ -0,0 +1,126 @@ @@ -321284,7 +321316,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 499a3d2..c05a44d 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) @@ -321863,7 +321895,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 c0372e3..6ee0260 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -86,6 +86,7 @@ @@ -322070,7 +322102,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 93473d2..d08c653 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -32,7 +32,8 @@ obj-$(CONFIG_MTD_SWAP) += mtdswap.o @@ -322084,7 +322116,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 9033215..16b91f1 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -3,5 +3,29 @@ config MTD_NAND_CORE @@ -322118,7 +322150,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 7ecd80c..547443b 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -1,6 +1,8 @@ @@ -322132,7 +322164,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 0000000..5b15bc8 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/Kconfig @@ -0,0 +1,17 @@ @@ -322155,7 +322187,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 0000000..b1fda5d --- /dev/null +++ b/drivers/mtd/nand/hifmc100/Makefile @@ -0,0 +1,26 @@ @@ -322187,7 +322219,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 0000000..6cb12d3 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100.c @@ -0,0 +1,1218 @@ @@ -323411,7 +323443,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 0000000..9f169f3 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100.h @@ -0,0 +1,354 @@ @@ -323771,7 +323803,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 0000000..980bfb8 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100_os.c @@ -0,0 +1,247 @@ @@ -324024,7 +324056,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 0000000..3b46205f --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc100_spi_general.c @@ -0,0 +1,313 @@ @@ -324343,7 +324375,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 0000000..bf963d1 --- /dev/null +++ b/drivers/mtd/nand/hifmc100/hifmc_spi_nand_ids.c @@ -0,0 +1,2457 @@ @@ -326806,7 +326838,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 0000000..188c9a7 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/Kconfig @@ -0,0 +1,50 @@ @@ -326862,7 +326894,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 0000000..623363c --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/Makefile @@ -0,0 +1,26 @@ @@ -326894,7 +326926,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 0000000..5c08d4b --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.c @@ -0,0 +1,1170 @@ @@ -328070,7 +328102,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 0000000..fba2f43 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand.h @@ -0,0 +1,151 @@ @@ -328227,7 +328259,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 0000000..0849cd3 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.c @@ -0,0 +1,180 @@ @@ -328413,7 +328445,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 0000000..a278135 --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc100_nand_os.h @@ -0,0 +1,72 @@ @@ -328491,7 +328523,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 0000000..b03510a --- /dev/null +++ b/drivers/mtd/nand/hifmc100_nand/hifmc_nand_spl_ids.c @@ -0,0 +1,982 @@ @@ -329478,7 +329510,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 d5a5f98..5e5a48c 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 @@ -329492,7 +329524,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 0000000..127edd6 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_gen.c @@ -0,0 +1,237 @@ @@ -329736,7 +329768,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 0000000..673ab83 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_gen.h @@ -0,0 +1,281 @@ @@ -330024,7 +330056,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 0000000..0fd7db9 --- /dev/null +++ b/drivers/mtd/nand/raw/hinfc_spl_ids.c @@ -0,0 +1,970 @@ @@ -331000,7 +331032,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 0000000..6bad75f --- /dev/null +++ b/drivers/mtd/nand/raw/match_table.c @@ -0,0 +1,102 @@ @@ -331108,7 +331140,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 0000000..9c5f0af --- /dev/null +++ b/drivers/mtd/nand/raw/match_table.h @@ -0,0 +1,51 @@ @@ -331164,7 +331196,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 de3926e..887101d 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -47,6 +47,7 @@ @@ -331256,7 +331288,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 5423c3b..4ec2c85 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[] = { @@ -331280,7 +331312,7 @@ index 5423c3bb388e..4ec2c852a3ea 100644 /** diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig -index 37775fc09e09..7e9bd9ec19eb 100644 +index 37775fc..7e9bd9e 100644 --- a/drivers/mtd/spi-nor/Kconfig +++ b/drivers/mtd/spi-nor/Kconfig @@ -69,11 +69,12 @@ config SPI_FSL_QUADSPI @@ -331334,7 +331366,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 dea7b0c..ebe4199 100644 --- a/drivers/mtd/spi-nor/hisi-sfc.c +++ b/drivers/mtd/spi-nor/hisi-sfc.c @@ -27,6 +27,13 @@ @@ -331614,11 +331646,10 @@ index dea7b0c4b339..ebe41994d194 100644 memcpy(host->buffer, write_buf + offset, trans); ret = hisi_spi_nor_dma_transfer(nor, -@@ -323,25 +436,52 @@ static ssize_t hisi_spi_nor_write(struct spi_nor *nor, loff_t to, - return len; +@@ -324,24 +437,51 @@ static ssize_t hisi_spi_nor_write(struct spi_nor *nor, loff_t to, } -+/** + /** + * parse partitions info and register spi flash device as mtd device. + */ +#ifdef CONFIG_ARCH_HISI_BVT @@ -331636,7 +331667,7 @@ index dea7b0c4b339..ebe41994d194 100644 +} +#endif /* CONFIG_ARCH_HISI_BVT */ + - /** ++/** * Get spi flash device information and register it as a mtd device. */ static int hisi_spi_nor_register(struct device_node *np, @@ -331938,7 +331969,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 ff641c0..9cdc470 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -41,6 +41,73 @@ @@ -333392,7 +333423,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 2515271..c8a6291 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig @@ -125,4 +125,6 @@ config HNS3_ENET @@ -333403,7 +333434,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 7f76d41..95598ff 100644 --- a/drivers/net/ethernet/hisilicon/Makefile +++ b/drivers/net/ethernet/hisilicon/Makefile @@ -8,4 +8,5 @@ obj-$(CONFIG_HIP04_ETH) += hip04_eth.o @@ -333415,7 +333446,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 0000000..97b173e --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/Kconfig @@ -0,0 +1,106 @@ @@ -333527,7 +333558,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 0000000..b19e27d --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/Makefile @@ -0,0 +1,2 @@ @@ -333535,7 +333566,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 0000000..05c2b62 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.c @@ -0,0 +1,162 @@ @@ -333703,7 +333734,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 0000000..30cbb97 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/autoeee.h @@ -0,0 +1,52 @@ @@ -333761,7 +333792,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 0000000..d98bbf1 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/autoeee/phy_id_table.c @@ -0,0 +1,184 @@ @@ -333951,7 +333982,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 0000000..b7a1d87 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/board.c @@ -0,0 +1,118 @@ @@ -334075,7 +334106,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 0000000..e777123 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/higmac.c @@ -0,0 +1,2645 @@ @@ -336726,7 +336757,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 0000000..2e26d80 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/higmac.h @@ -0,0 +1,603 @@ @@ -337335,7 +337366,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 0000000..4ad8e7c --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/pm.c @@ -0,0 +1,341 @@ @@ -337682,7 +337713,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 0000000..e54ced46 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/pm.h @@ -0,0 +1,59 @@ @@ -337748,7 +337779,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 0000000..efb654f --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/proc_dev.c @@ -0,0 +1,119 @@ @@ -337873,7 +337904,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 0000000..349f0f2 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/sockioctl.h @@ -0,0 +1,19 @@ @@ -337898,7 +337929,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 0000000..6c78d1d --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/tso.h @@ -0,0 +1,59 @@ @@ -337963,7 +337994,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 0000000..eae79af --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/util.c @@ -0,0 +1,975 @@ @@ -338944,7 +338975,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 0000000..ca1c99b --- /dev/null +++ b/drivers/net/ethernet/hisilicon/higmac/util.h @@ -0,0 +1,102 @@ @@ -339052,7 +339083,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 0000000..bfad947 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/Makefile @@ -0,0 +1,6 @@ @@ -339064,7 +339095,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 0000000..8b9a11d --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v115_2c02.h @@ -0,0 +1,191 @@ @@ -339262,7 +339293,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 0000000..758d796 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_s28v202_2e01.h @@ -0,0 +1,84 @@ @@ -339352,7 +339383,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 0000000..edb9d53 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/festa_v272_2723.h @@ -0,0 +1,44 @@ @@ -339403,7 +339434,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 0000000..caa38ef --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.c @@ -0,0 +1,1581 @@ @@ -340990,7 +341021,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 0000000..5e260ad --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/hisi_femac.h @@ -0,0 +1,269 @@ @@ -341265,7 +341296,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 0000000..e7a3989 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.c @@ -0,0 +1,109 @@ @@ -341380,7 +341411,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 0000000..b7a7250 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/phy_fix.h @@ -0,0 +1,22 @@ @@ -341408,7 +341439,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 0000000..3617a3b --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/util.c @@ -0,0 +1,318 @@ @@ -341732,7 +341763,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 0000000..0094248 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hisi-femac/util.h @@ -0,0 +1,25 @@ @@ -341763,7 +341794,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 2c28088..82d9552 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -98,7 +98,7 @@ @@ -341784,7 +341815,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 aa2c25d..655a108 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) @@ -341797,7 +341828,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 0942e49..5ff78b4 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) @@ -341810,7 +341841,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 5d64519..8995301 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) @@ -341823,7 +341854,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 e639a36..6b1db3b 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, @@ -341847,7 +341878,7 @@ index e639a365ac2d..6b1db3bb8f19 100644 i += ret; diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig -index 2386871e1294..2772d9304405 100644 +index 2386871..2772d93 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -107,6 +107,13 @@ config MDIO_HISI_FEMAC @@ -341865,7 +341896,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 f21cda9..43af039 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 @@ -341882,7 +341913,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 b03fedd..0000000 --- a/drivers/net/phy/mdio-hisi-femac.c +++ /dev/null @@ -1,166 +0,0 @@ @@ -342054,7 +342085,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 0000000..56a7ba2 --- /dev/null +++ b/drivers/net/phy/mdio_hi3531dv200_gemac.c @@ -0,0 +1,280 @@ @@ -342340,7 +342371,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 0000000..9b82256 --- /dev/null +++ b/drivers/net/phy/mdio_hi3535av100_gemac.c @@ -0,0 +1,280 @@ @@ -342626,7 +342657,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 0000000..25f1875 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_femac.c @@ -0,0 +1,489 @@ @@ -343121,7 +343152,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 0000000..79ebfa4 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_gemac.c @@ -0,0 +1,256 @@ @@ -343383,7 +343414,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 0000000..5eefc01 --- /dev/null +++ b/drivers/net/phy/mdio_hisi_gemac.h @@ -0,0 +1,32 @@ @@ -343420,7 +343451,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 cc454b8..2284c9b 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, @@ -343453,7 +343484,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 271e8ad..d113f4e 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -32,6 +32,12 @@ @@ -343481,7 +343512,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 0362acd..28321ac 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -23,6 +23,7 @@ @@ -343493,7 +343524,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 b80cff9..7059782 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) @@ -343505,7 +343536,7 @@ index b80cff96dea1..70597824c901 100644 } diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig -index 56ff8f6d31fc..2b92852df087 100644 +index 56ff8f6..2b92852 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -148,3 +148,4 @@ source "drivers/pci/hotplug/Kconfig" @@ -343514,7 +343545,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 1b2cfe5..94874cc 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -33,5 +33,6 @@ obj-$(CONFIG_PCI_ENDPOINT) += endpoint/ @@ -343526,7 +343557,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 0000000..c8d88ef --- /dev/null +++ b/drivers/pci/hipcie/Kconfig @@ -0,0 +1,27 @@ @@ -343559,7 +343590,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 0000000..0455420 --- /dev/null +++ b/drivers/pci/hipcie/Makefile @@ -0,0 +1,8 @@ @@ -343573,7 +343604,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 0000000..daefc0f --- /dev/null +++ b/drivers/pci/hipcie/pci.h @@ -0,0 +1,96 @@ @@ -343675,7 +343706,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 0000000..4c44b6b --- /dev/null +++ b/drivers/pci/hipcie/pcie.c @@ -0,0 +1,985 @@ @@ -344666,7 +344697,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 0000000..25e70ce --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3519av100.c @@ -0,0 +1,281 @@ @@ -344953,7 +344984,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 0000000..2803f45 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3519av100.h @@ -0,0 +1,64 @@ @@ -345023,7 +345054,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 0000000..3b15e22 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3531dv200.c @@ -0,0 +1,611 @@ @@ -345640,7 +345671,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 0000000..9b1c3db --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3531dv200.h @@ -0,0 +1,69 @@ @@ -345715,7 +345746,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 0000000..a601e54 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3535av100.c @@ -0,0 +1,479 @@ @@ -346200,7 +346231,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 0000000..fd91603 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3559av100.c @@ -0,0 +1,389 @@ @@ -346595,7 +346626,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 0000000..dd91a30 --- /dev/null +++ b/drivers/pci/hipcie/pcie_hi3559av100.h @@ -0,0 +1,79 @@ @@ -346679,7 +346710,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 78ae1ca..9226e23 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -18,6 +18,7 @@ @@ -346701,7 +346732,7 @@ index 78ae1cab9af7..9226e235bf8a 100644 } diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig -index 5c8d452e35e2..29ec33e7c6ff 100644 +index 5c8d452..29ec33e 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -56,5 +56,6 @@ source "drivers/phy/samsung/Kconfig" @@ -346712,7 +346743,7 @@ index 5c8d452e35e2..29ec33e7c6ff 100644 endmenu diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile -index 84e3bd9c5665..aa1eaf173661 100644 +index 84e3bd9..aa1eaf1 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ @@ -346725,7 +346756,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 0000000..9fcb56c --- /dev/null +++ b/drivers/phy/hibvt/Kconfig @@ -0,0 +1,23 @@ @@ -346754,7 +346785,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 0000000..7b038f4 --- /dev/null +++ b/drivers/phy/hibvt/Makefile @@ -0,0 +1,5 @@ @@ -346765,7 +346796,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 0000000..68d9499 --- /dev/null +++ b/drivers/phy/hibvt/phy-hi3521dv200-sata.c @@ -0,0 +1,681 @@ @@ -347452,7 +347483,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 0000000..cbeb0ae --- /dev/null +++ b/drivers/phy/hibvt/phy-hi3531dv200-sata.c @@ -0,0 +1,1081 @@ @@ -348539,7 +348570,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 0000000..7a546a8 --- /dev/null +++ b/drivers/phy/hibvt/phy-hi3535av100-sata.c @@ -0,0 +1,730 @@ @@ -349275,7 +349306,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 0000000..d7384fe --- /dev/null +++ b/drivers/phy/hibvt/phy-hisi-sata.c @@ -0,0 +1,175 @@ @@ -349456,7 +349487,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 0000000..44730c5 --- /dev/null +++ b/drivers/phy/hibvt/phy-hisi-sata.h @@ -0,0 +1,39 @@ @@ -349501,7 +349532,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 0000000..c7b5ab6 --- /dev/null +++ b/drivers/phy/hibvt/usb/Kconfig @@ -0,0 +1,85 @@ @@ -349592,7 +349623,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 0000000..dc9e8d7 --- /dev/null +++ b/drivers/phy/hibvt/usb/Makefile @@ -0,0 +1,17 @@ @@ -349615,7 +349646,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 0000000..1de2d18 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3516cv500-usb.c @@ -0,0 +1,310 @@ @@ -349931,7 +349962,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 0000000..36abc42 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3516dv300-usb.c @@ -0,0 +1,310 @@ @@ -350247,7 +350278,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 0000000..b46b858 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3519av100-usb.c @@ -0,0 +1,431 @@ @@ -350684,7 +350715,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 0000000..347d571 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3521dv200-usb.c @@ -0,0 +1,446 @@ @@ -351136,7 +351167,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 0000000..8d17cb6 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3531dv200-usb.c @@ -0,0 +1,526 @@ @@ -351668,7 +351699,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 0000000..b511636 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3556av100-usb.c @@ -0,0 +1,429 @@ @@ -352103,7 +352134,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 0000000..b1a2cec --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3556v200-usb.c @@ -0,0 +1,310 @@ @@ -352419,7 +352450,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 0000000..e892c31 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3559av100-usb.c @@ -0,0 +1,372 @@ @@ -352797,7 +352828,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 0000000..614e848 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hi3559v200-usb.c @@ -0,0 +1,310 @@ @@ -353113,7 +353144,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 0000000..da83abd --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hisi-usb.c @@ -0,0 +1,149 @@ @@ -353268,7 +353299,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 0000000..5e20e6e --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hisi-usb.h @@ -0,0 +1,72 @@ @@ -353346,7 +353377,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 0000000..be68319 --- /dev/null +++ b/drivers/phy/hibvt/usb/phy-hixvp-hisi-usb.c @@ -0,0 +1,803 @@ @@ -354154,7 +354185,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 6533aa5..0b14869 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -94,7 +94,7 @@ config POWER_RESET_GPIO_RESTART @@ -354167,7 +354198,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 4c3c67d..0e94b42 100644 --- a/drivers/ras/Kconfig +++ b/drivers/ras/Kconfig @@ -28,8 +28,8 @@ menuconfig RAS @@ -354183,7 +354214,7 @@ index 4c3c67d13254..0e94b42845be 100644 -endif +#endif diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig -index 28a4505a1bc8..d5a1e7f86ff5 100644 +index 28a4505..d5a1e7f 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -868,6 +868,14 @@ comment "Platform RTC drivers" @@ -354202,7 +354233,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 5ff2fc0..51ae605 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -23,6 +23,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o @@ -354215,7 +354246,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 0000000..31b9ffe --- /dev/null +++ b/drivers/rtc/rtc-hibvt.c @@ -0,0 +1,663 @@ @@ -354883,7 +354914,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 e09fe6a..adbb4c5 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -109,3 +109,12 @@ config SCSI_UFS_HISI @@ -354900,7 +354931,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 2c50f03..d1859e3 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -8,3 +8,4 @@ ufshcd-core-objs := ufshcd.o ufs-sysfs.o @@ -354910,7 +354941,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 0000000..e253dc3 --- /dev/null +++ b/drivers/scsi/ufs/hi3559av100.c @@ -0,0 +1,659 @@ @@ -355575,7 +355606,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 0000000..fe309a5 --- /dev/null +++ b/drivers/scsi/ufs/hi3559av100.h @@ -0,0 +1,111 @@ @@ -355691,7 +355722,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 30c22e1..626bd84 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -41,6 +41,9 @@ @@ -355786,7 +355817,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 b2cbdd0..6e0be97 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) @@ -356072,7 +356103,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 4554a4b7..5436fab 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -71,6 +71,7 @@ @@ -356161,7 +356192,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 19687da..3dd616f 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) @@ -356177,7 +356208,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 1af8c96..1c4128d 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -43,6 +43,7 @@ @@ -356546,7 +356577,7 @@ index 1af8c96b940e..1c4128dc95bd 100644 }; diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c -index 34a0e529cb5a..93b9212ea357 100644 +index 34a0e52..93b9212 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_ @@ -356600,7 +356631,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 2fb509d..e86464f 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) @@ -356614,7 +356645,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 fa28f23..8d443a3 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, @@ -356629,7 +356660,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 6e3ef61..22e0bdc 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -2,10 +2,9 @@ @@ -356646,7 +356677,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 86b1cfb..93cad2e 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -37,9 +37,25 @@ @@ -356744,7 +356775,7 @@ index 86b1cfbe48a0..93cad2e47606 100644 } diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -index d6968b90ee6b..f8ffc521e376 100644 +index d6968b9..f8ffc52 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -30,6 +30,8 @@ @@ -356853,7 +356884,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 0000000..d8d3e83 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-hisi.c @@ -0,0 +1,446 @@ @@ -357305,7 +357336,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 0000000..606cf05 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-hisi.h @@ -0,0 +1,54 @@ @@ -357364,7 +357395,7 @@ index 000000000000..606cf0507f6d + +#endif diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c -index 0d95ca804c1e..e89f7bcc99d3 100644 +index 0d95ca8..e89f7bc 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) @@ -357440,7 +357471,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 f0d2f0a..470b136 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -27,6 +27,8 @@ @@ -357755,7 +357786,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 1a3878a..f559472 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) @@ -357779,7 +357810,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 0000000..1d874e4 --- /dev/null +++ b/drivers/usb/dwc3/proc.c @@ -0,0 +1,139 @@ @@ -357923,7 +357954,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 40b3ed9..52da0f0 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) @@ -357936,7 +357967,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 71b15c6..380cef6 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -78,9 +78,16 @@ struct usb_ep *usb_ep_autoconfig_ss( @@ -357960,7 +357991,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 0b7b4d0..8075593 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 { @@ -358007,7 +358038,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 2746a92..b459398 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) @@ -358134,7 +358165,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 d8ce786..db41c9f 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) @@ -358211,7 +358242,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 2ed292e..32e62c2 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 { @@ -358234,7 +358265,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 93cf78b..1b8ac8f 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; @@ -358262,7 +358293,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 2e4c039..080b12d 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( @@ -359108,7 +359139,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 7f1ca3b..21dae27 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -56,8 +56,13 @@ struct uvc_format { @@ -359126,7 +359157,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 2c9821e..68b6775 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -12,13 +12,15 @@ @@ -359338,8 +359369,31 @@ 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 c773db1..723e40e 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); + #define YISO_VENDOR_ID 0x0EAB + #define YISO_PRODUCT_U893 0xC893 + ++/* MEIG PRODUCTS */ ++#define MEIG_VENDOR_ID 0x2DEE ++#define MEIG_PRODUCT_SLM790 0x4D20 ++ + /* + * NOVATEL WIRELESS PRODUCTS + * +@@ -575,6 +579,7 @@ static void option_instat_callback(struct urb *urb); + + + static const struct usb_device_id option_ids[] = { ++ { USB_DEVICE(MEIG_VENDOR_ID, MEIG_PRODUCT_SLM790) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, + { 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 c989f77..0bcb902 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, @@ -359373,7 +359427,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 ec53310..2a9cf43 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -23,9 +23,9 @@ @@ -359390,7 +359444,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 95ce167..36ab530 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -30,6 +30,7 @@ @@ -359425,7 +359479,7 @@ index 95ce167a8ad9..36ab53053190 100644 /* diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c -index 72b779bc0942..8625625e03a5 100644 +index 72b779b..8625625 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, @@ -359459,7 +359513,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 a950a92..f8763ab 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, @@ -359493,7 +359547,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 413ec28..8bb72b6 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) @@ -359519,7 +359573,7 @@ index 413ec289bfa1..8bb72b644049 100644 } diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c -index 94cfcbeaac6d..f03861b1b589 100644 +index 94cfcbe..f03861b 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, @@ -359605,7 +359659,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 de60c05..cf1ef04 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, @@ -360101,7 +360155,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 9d7d2d5..bf113a7 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, @@ -360116,7 +360170,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 4c6c635..d9a7d69 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, @@ -360146,7 +360200,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 f86ea08..8919fa7 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) @@ -360220,7 +360274,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 607e1d1..b40e152 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -622,8 +622,9 @@ static void fat_free_eofblocks(struct inode *inode) @@ -360326,7 +360380,7 @@ index 607e1d124062..b40e15218848 100644 return err; } diff --git a/fs/fat/misc.c b/fs/fat/misc.c -index 573836dcaefc..99fef1c89c6b 100644 +index 573836d..99fef1c 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -189,7 +189,8 @@ static long days_in_year[] = { @@ -360375,7 +360429,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 5e91d57..01116b8 100644 --- a/fs/jffs2/compr.h +++ b/fs/jffs2/compr.h @@ -29,9 +29,15 @@ @@ -360396,7 +360450,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 d7d2fdd..54334fc 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) @@ -360411,7 +360465,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 0000000..c889d56 --- /dev/null +++ b/include/dt-bindings/clock/hi3516a-clock.h @@ -0,0 +1,105 @@ @@ -360522,7 +360576,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 0000000..f937680 --- /dev/null +++ b/include/dt-bindings/clock/hi3516cv500-clock.h @@ -0,0 +1,98 @@ @@ -360626,7 +360680,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 0000000..7cf2cc3 --- /dev/null +++ b/include/dt-bindings/clock/hi3516dv200-clock.h @@ -0,0 +1,89 @@ @@ -360721,7 +360775,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 0000000..408c9b0 --- /dev/null +++ b/include/dt-bindings/clock/hi3516dv300-clock.h @@ -0,0 +1,100 @@ @@ -360827,7 +360881,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 0000000..78fd310 --- /dev/null +++ b/include/dt-bindings/clock/hi3516ev200-clock.h @@ -0,0 +1,89 @@ @@ -360922,7 +360976,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 0000000..9a99dbe --- /dev/null +++ b/include/dt-bindings/clock/hi3516ev300-clock.h @@ -0,0 +1,89 @@ @@ -361017,7 +361071,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 0000000..9d26d02 --- /dev/null +++ b/include/dt-bindings/clock/hi3518ev20x-clock.h @@ -0,0 +1,86 @@ @@ -361109,7 +361163,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 0000000..9c420a8 --- /dev/null +++ b/include/dt-bindings/clock/hi3518ev300-clock.h @@ -0,0 +1,89 @@ @@ -361204,7 +361258,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 0000000..79abf32 --- /dev/null +++ b/include/dt-bindings/clock/hi3519av100-clock.h @@ -0,0 +1,127 @@ @@ -361337,7 +361391,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 0000000..7d1463f --- /dev/null +++ b/include/dt-bindings/clock/hi3521a-clock.h @@ -0,0 +1,97 @@ @@ -361440,7 +361494,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 0000000..70d332a --- /dev/null +++ b/include/dt-bindings/clock/hi3521dv200-clock.h @@ -0,0 +1,94 @@ @@ -361540,7 +361594,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 0000000..f9c035a --- /dev/null +++ b/include/dt-bindings/clock/hi3531a-clock.h @@ -0,0 +1,105 @@ @@ -361651,7 +361705,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 0000000..928ff84 --- /dev/null +++ b/include/dt-bindings/clock/hi3531dv200-clock.h @@ -0,0 +1,132 @@ @@ -361789,7 +361843,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 0000000..a7debff --- /dev/null +++ b/include/dt-bindings/clock/hi3535av100-clock.h @@ -0,0 +1,132 @@ @@ -361927,7 +361981,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 0000000..b3de226 --- /dev/null +++ b/include/dt-bindings/clock/hi3536dv100-clock.h @@ -0,0 +1,82 @@ @@ -362015,7 +362069,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 0000000..02717db --- /dev/null +++ b/include/dt-bindings/clock/hi3556av100-clock.h @@ -0,0 +1,121 @@ @@ -362142,7 +362196,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 0000000..3249447 --- /dev/null +++ b/include/dt-bindings/clock/hi3556v200-clock.h @@ -0,0 +1,98 @@ @@ -362246,7 +362300,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 0000000..0608eee --- /dev/null +++ b/include/dt-bindings/clock/hi3559av100-clock.h @@ -0,0 +1,176 @@ @@ -362428,7 +362482,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 0000000..5313e5b --- /dev/null +++ b/include/dt-bindings/clock/hi3559v200-clock.h @@ -0,0 +1,98 @@ @@ -362531,7 +362585,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 745b2d0..4179254 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); @@ -362547,7 +362601,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 aab4273..b631bd6 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); @@ -362559,7 +362613,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 7bfed84..d39bc88 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -321,6 +321,12 @@ struct fb_ops { @@ -362577,7 +362631,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 0000000..3a7fad2 --- /dev/null +++ b/include/linux/hi_cma.h @@ -0,0 +1,54 @@ @@ -362636,7 +362690,7 @@ index 000000000000..3a7fad239b09 + +#endif diff --git a/include/linux/hid.h b/include/linux/hid.h -index a46b6832b373..c61a17de5eb5 100644 +index a46b683..c61a17d 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -621,6 +621,7 @@ struct hid_device { /* device report descriptor */ @@ -362649,7 +362703,7 @@ index a46b6832b373..c61a17de5eb5 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 0000000..2615789 --- /dev/null +++ b/include/linux/hiedmac.h @@ -0,0 +1,65 @@ @@ -362719,7 +362773,7 @@ index 000000000000..26157899aec8 +} dmac_lli; +#endif diff --git a/include/linux/i2c.h b/include/linux/i2c.h -index 7e748648c7d3..c0e50d78551f 100644 +index 7e74864..c0e50d7 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, @@ -362748,7 +362802,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 0000000..28ce4590 --- /dev/null +++ b/include/linux/mfd/hisi_fmc.h @@ -0,0 +1,477 @@ @@ -363230,7 +363284,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 7e8e5b2..e918d09 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -168,6 +168,7 @@ struct mmc_host_ops { @@ -363267,7 +363321,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 035d641..2810918 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -30,6 +30,12 @@ @@ -363400,7 +363454,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 a4be6b2..974abc0 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) @@ -363432,7 +363486,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 c922e97..890785a 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -29,6 +29,43 @@ @@ -363552,7 +363606,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 4c76fe2..da24ed5 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -35,6 +35,7 @@ enum { @@ -363581,7 +363635,7 @@ index 4c76fe2c8488..da24ed5cac06 100644 /* diff --git a/include/linux/phy.h b/include/linux/phy.h -index 42766e7179d3..4002db144a0e 100644 +index 42766e7..4002db1 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1043,6 +1043,7 @@ void phy_start_machine(struct phy_device *phydev); @@ -363593,7 +363647,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 703ce71..07058ad 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -502,6 +502,7 @@ struct skb_shared_info { @@ -363605,7 +363659,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 e7bbd82..ff87f55 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -149,6 +149,7 @@ struct rpc_xprt_ops { @@ -363617,7 +363671,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 9834e90..8490ebd 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -230,5 +230,8 @@ struct callback_head { @@ -363630,7 +363684,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 db2a879..3484c73 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, @@ -363685,7 +363739,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 0000000..065d004 --- /dev/null +++ b/include/net/ipv6_stubs.h @@ -0,0 +1,60 @@ @@ -363750,7 +363804,7 @@ index 000000000000..065d004f5257 + +#endif diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h -index fe680ab6b15a..859876827acf 100644 +index fe680ab..8598768 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -7,7 +7,7 @@ @@ -363763,7 +363817,7 @@ index fe680ab6b15a..859876827acf 100644 struct udp_port_cfg { diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h -index bfaec6903b8b..ec56de66f407 100644 +index bfaec69..ec56de6 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -27,6 +27,7 @@ @@ -363775,7 +363829,7 @@ index bfaec6903b8b..ec56de66f407 100644 enum { BINDER_TYPE_BINDER = B_PACK_CHARS('s', 'b', '*', B_TYPE_LARGE), diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h -index 85f8047afcf2..3f50287f3289 100644 +index 85f8047..3f50287 100644 --- a/include/uapi/linux/i2c-dev.h +++ b/include/uapi/linux/i2c-dev.h @@ -52,6 +52,8 @@ @@ -363788,7 +363842,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 f71a175..f85deb4 100644 --- a/include/uapi/linux/i2c.h +++ b/include/uapi/linux/i2c.h @@ -22,7 +22,7 @@ @@ -363816,7 +363870,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 fde7537..cc303c4 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h @@ -98,7 +98,23 @@ struct __fat_dirent { @@ -363855,7 +363909,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 3c9ee30..ed7ce8e 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -12,6 +12,7 @@ @@ -363867,7 +363921,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 ff6cc6c..1a1542f 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -304,7 +304,7 @@ struct uvc_processing_unit_descriptor { @@ -363954,7 +364008,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 fdfef08..dafe6e4 100644 --- a/init/main.c +++ b/init/main.c @@ -526,7 +526,33 @@ static void __init mm_init(void) @@ -364002,7 +364056,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 08b9d6b..6728383 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -325,6 +325,19 @@ void lockdep_assert_cpus_held(void) @@ -364026,7 +364080,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 b2a8790..7d883ef 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) @@ -364075,7 +364129,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 cf272ab..3675ccb 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) @@ -364088,7 +364142,7 @@ index cf272aba362b..3675ccb8fbc7 100644 return -ENOMEM; diff --git a/kernel/relay.c b/kernel/relay.c -index 735cb208f023..51dbdb32f5f0 100644 +index 735cb20..51dbdb3 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -581,7 +581,8 @@ struct rchan *relay_open(const char *base_filename, @@ -364102,7 +364156,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 a787a31..6ae73bd 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -38,3 +38,4 @@ struct mm_struct init_mm = { @@ -364111,7 +364165,7 @@ index a787a319211e..6ae73bdf6ed3 100644 }; +EXPORT_SYMBOL(init_mm); diff --git a/mm/madvise.c b/mm/madvise.c -index 71d21df2a3f3..28aa0af2dc84 100644 +index 71d21df..28aa0af 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -24,6 +24,7 @@ @@ -364147,7 +364201,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 2732c8c..f270550 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, @@ -364275,7 +364329,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 9fae584..60eb06d 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, @@ -364289,7 +364343,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 eb44ae0..846a576 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -21,6 +21,7 @@ @@ -364301,7 +364355,7 @@ index eb44ae05abaa..846a5761c4e6 100644 #include #endif diff --git a/net/core/ethtool.c b/net/core/ethtool.c -index 1011625a0ca4..0ff0389e2d01 100644 +index 1011625..0ff0389 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] @@ -364339,7 +364393,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 557bd5c..64f2dd4 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -68,6 +68,7 @@ @@ -364351,7 +364405,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 a648568..6198fb5 100644 --- a/net/core/lwt_bpf.c +++ b/net/core/lwt_bpf.c @@ -16,6 +16,7 @@ @@ -364363,7 +364417,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 74fb211..24b22cf 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, @@ -364379,7 +364433,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 66a1a0e..2f92742 100644 --- a/net/ipv6/addrconf_core.c +++ b/net/ipv6/addrconf_core.c @@ -5,7 +5,7 @@ @@ -364392,7 +364446,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 5c2351d..234340c 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -56,6 +56,7 @@ @@ -364404,7 +364458,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 f590446..93a2dec 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 @@ -364418,7 +364472,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 c7d88f9..946a112 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) @@ -364439,7 +364493,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 d65f8d3..bdd91f5 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1453,15 +1453,22 @@ int @@ -364496,7 +364550,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 90adeff..1c8eb21 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) @@ -364512,7 +364566,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 f56f36b..274c68c 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 = { @@ -364524,7 +364578,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 2ca14f7..aa45c25 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -662,6 +662,7 @@ void xprt_rdma_cleanup(void); @@ -364536,7 +364590,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 9dc059d..c56f1f5 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) @@ -364561,7 +364615,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 fbc8875..8dd594d 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, @@ -364574,7 +364628,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 73fd0ea..3fd2cc7 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, @@ -364588,7 +364642,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 a2cc103..eb85865 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 * @@ -364603,7 +364657,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 d1312f1..e0b3fce 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, @@ -364616,7 +364670,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 67048f9..e950f32 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -9,7 +9,7 @@ ret=0 @@ -364657,68 +364711,3 @@ 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/drivers/hid/hid-input.c b/drivers/hid/hid-input.c -index 11bd2ca22..7c040f28a 100644 ---- a/drivers/hid/hid-input.c -+++ b/drivers/hid/hid-input.c -@@ -31,7 +31,7 @@ - - #include - #include -- -+#include "hdf_hid_adapter.h" - #include "hid-ids.h" - - #define unk KEY_UNKNOWN -@@ -1364,8 +1364,11 @@ void hidinput_report_event(struct hid_device *hid, struct hid_report *report) - if (hid->quirks & HID_QUIRK_NO_INPUT_SYNC) - return; - -- list_for_each_entry(hidinput, &hid->inputs, list) -+ list_for_each_entry(hidinput, &hid->inputs, list) { - input_sync(hidinput->input); -+ if(hid->input_dev) -+ HidReportEvent(hid->input_dev, EV_SYN, SYN_REPORT, 0); -+ } - } - EXPORT_SYMBOL_GPL(hidinput_report_event); - -@@ -1729,6 +1732,27 @@ static inline void hidinput_configure_usages(struct hid_input *hidinput, - report->field[i]->usage + j); - } - -+static void transferinfo(struct input_dev *dev) -+{ -+ HidInfo info; -+ 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)); -+ info.bustype = dev->id.bustype; -+ info.vendor = dev->id.vendor; -+ info.product = dev->id.product; -+ info.version = dev->id.version; -+ GetInfoFromHid(info); -+} -+ - /* - * Register the input device; print a message. - * Configure the input layer interface -@@ -1811,7 +1835,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) - hidinput_cleanup_hidinput(hid, hidinput); - continue; - } -- -+ transferinfo(hidinput->input); - if (input_register_device(hidinput->input)) - goto out_unwind; - hidinput->registered = true; -- Gitee