diff --git a/drivers/ko-rt.tar.gz b/drivers/ko-rt.tar.gz index 4d18887b17a56f09f19e2db18c7abcc88a4fafea..5bae48655c66f61fd37e80c99be28c5311550171 100644 Binary files a/drivers/ko-rt.tar.gz and b/drivers/ko-rt.tar.gz differ diff --git a/drivers/ko.tar.gz b/drivers/ko.tar.gz index 2b01aff5940d59530ee76dc3fbd77a436a802cd1..e14b5d9aafecdfe539ece88f7f59395115591ae7 100644 Binary files a/drivers/ko.tar.gz and b/drivers/ko.tar.gz differ diff --git a/drivers/ws73.tar.gz b/drivers/ws73.tar.gz index fe0eefbeb51b6e90f17f2aac515209ecaa1d2de9..3d960d4095f7aea1d2b1659d985ee07f3ec24d48 100644 Binary files a/drivers/ws73.tar.gz and b/drivers/ws73.tar.gz differ diff --git a/linux/5.10.0-153.28.0.patch b/linux/5.10.0-153.28.0.patch index 328c998b961ebbd53ae1990925c1b2904ae42106..07ac435336ca7ed598abe3645f185ecc8c38173b 100644 --- a/linux/5.10.0-153.28.0.patch +++ b/linux/5.10.0-153.28.0.patch @@ -10,9 +10,9 @@ Subject: [PATCH] gen patch arch/arm64/boot/dts/vendor/Makefile | 2 + arch/arm64/boot/dts/vendor/ss928v100-demo.dts | 415 ++ arch/arm64/boot/dts/vendor/ss928v100.dtsi | 1107 ++++ - arch/arm64/configs/hieulerpi1_defconfig | 5376 +++++++++++++++++ + arch/arm64/configs/hieulerpi1_defconfig | 5630 +++++++++++++++++ arch/arm64/configs/ss928v100_defconfig | 3665 +++++++++++ - arch/arm64/configs/ss928v100_emmc_defconfig | 4137 +++++++++++++ + arch/arm64/configs/ss928v100_emmc_defconfig | 4137 ++++++++++++ arch/arm64/configs/ss928v100_nand_defconfig | 3669 +++++++++++ arch/arm64/kernel/pci.c | 12 + arch/arm64/mm/init.c | 4 + @@ -25,7 +25,7 @@ Subject: [PATCH] gen patch drivers/clk/vendor/clk.c | 288 + drivers/clk/vendor/clk.h | 127 + drivers/clk/vendor/clk_hi3519dv500.c | 507 ++ - drivers/clk/vendor/clk_ss928v100.c | 693 +++ + drivers/clk/vendor/clk_ss928v100.c | 693 ++ drivers/clk/vendor/clkgate_separated.c | 108 + drivers/clk/vendor/crg.h | 24 + drivers/clk/vendor/reset.c | 145 + @@ -83,7 +83,7 @@ Subject: [PATCH] gen patch drivers/iommu/sun50i-iommu.c | 16 +- drivers/iommu/sw64/Kconfig | 9 - drivers/iommu/sw64/Makefile | 2 - - drivers/iommu/sw64/sunway_iommu.c | 1693 ------ + drivers/iommu/sw64/sunway_iommu.c | 1693 ----- drivers/iommu/sw64/sunway_iommu.h | 77 - drivers/iommu/virtio-iommu.c | 3 +- drivers/media/usb/uvc/uvc_ctrl.c | 30 +- @@ -103,7 +103,7 @@ Subject: [PATCH] gen patch drivers/mmc/host/bsp_quirk_ids.h | 67 + drivers/mmc/host/cqhci.c | 58 +- drivers/mmc/host/cqhci.h | 8 + - drivers/mmc/host/mci_proc.c | 338 ++ + drivers/mmc/host/mci_proc.c | 338 + drivers/mmc/host/mci_proc.h | 41 + drivers/mmc/host/sdhci-bsp.c | 950 +++ drivers/mmc/host/sdhci-bsp.h | 135 + @@ -127,7 +127,7 @@ Subject: [PATCH] gen patch .../ethernet/vendor/gmac/gmac_netdev_ops.h | 22 + .../net/ethernet/vendor/gmac/gmac_phy_fixup.c | 154 + .../net/ethernet/vendor/gmac/gmac_phy_fixup.h | 13 + - drivers/net/ethernet/vendor/gmac/gmac_pm.c | 340 ++ + drivers/net/ethernet/vendor/gmac/gmac_pm.c | 340 + drivers/net/ethernet/vendor/gmac/gmac_pm.h | 56 + drivers/net/ethernet/vendor/gmac/gmac_proc.c | 80 + drivers/net/ethernet/vendor/gmac/gmac_proc.h | 21 + @@ -141,8 +141,8 @@ Subject: [PATCH] gen patch drivers/phy/vendor/Makefile | 5 + drivers/phy/vendor/phy-bsp-sata.c | 175 + drivers/phy/vendor/phy-bsp-sata.h | 39 + - drivers/phy/vendor/phy-ss524v100-sata.c | 684 +++ - drivers/phy/vendor/phy-ss528v100-sata.c | 1043 ++++ + drivers/phy/vendor/phy-ss524v100-sata.c | 684 ++ + drivers/phy/vendor/phy-ss528v100-sata.c | 1043 +++ drivers/phy/vendor/phy-ss625v100-sata.c | 732 +++ drivers/phy/vendor/usb/Kconfig | 88 + drivers/phy/vendor/usb/Makefile | 21 + @@ -188,7 +188,7 @@ Subject: [PATCH] gen patch drivers/vendor/npu/Kconfig | 7 + drivers/vendor/npu/Makefile | 6 + drivers/vendor/npu/npu_misc.c | 770 +++ - drivers/vendor/npu/npu_svm.c | 1370 +++++ + drivers/vendor/npu/npu_svm.c | 1370 ++++ drivers/vendor/npu/smmu_power_on.c | 91 + drivers/vendor/peri/Makefile | 2 + drivers/vendor/peri/peri_io_ss928v100.c | 46 + @@ -234,7 +234,7 @@ Subject: [PATCH] gen patch lib/securec/src/memcpy_s.c | 555 ++ lib/securec/src/memmove_s.c | 123 + lib/securec/src/memset_s.c | 510 ++ - lib/securec/src/output.inl | 1720 ++++++ + lib/securec/src/output.inl | 1720 +++++ lib/securec/src/scanf_s.c | 51 + lib/securec/src/secinput.h | 181 + lib/securec/src/securecutil.c | 81 + @@ -254,7 +254,7 @@ Subject: [PATCH] gen patch lib/securec/src/vsnprintf_s.c | 138 + lib/securec/src/vsprintf_s.c | 67 + lib/securec/src/vsscanf_s.c | 87 + - 250 files changed, 56152 insertions(+), 5453 deletions(-) + 250 files changed, 56406 insertions(+), 5453 deletions(-) create mode 100644 arch/arm64/boot/dts/vendor/Makefile create mode 100644 arch/arm64/boot/dts/vendor/ss928v100-demo.dts create mode 100644 arch/arm64/boot/dts/vendor/ss928v100.dtsi @@ -381,7 +381,7 @@ Subject: [PATCH] gen patch create mode 100644 lib/securec/src/vsscanf_s.c diff --git a/arch/arm/Makefile b/arch/arm/Makefile -index d6817de42f24..07acfc5380cb 100644 +index d6817de42..07acfc538 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -183,6 +183,7 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge @@ -404,7 +404,7 @@ index d6817de42f24..07acfc5380cb 100644 core-y += arch/arm/ diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms -index c924fce750f1..63cb3695098e 100644 +index c924fce75..63cb36950 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -136,6 +136,77 @@ config ARCH_HISI @@ -486,7 +486,7 @@ index c924fce750f1..63cb3695098e 100644 bool "Keem Bay SoC" help diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile -index 9b1170658d60..33a2db38af67 100644 +index 9b1170658..33a2db38a 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -30,3 +30,4 @@ subdir-y += ti @@ -496,7 +496,7 @@ index 9b1170658d60..33a2db38af67 100644 +subdir-y += vendor diff --git a/arch/arm64/boot/dts/vendor/Makefile b/arch/arm64/boot/dts/vendor/Makefile new file mode 100644 -index 000000000000..bf71c96d6346 +index 000000000..bf71c96d6 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/Makefile @@ -0,0 +1,2 @@ @@ -504,7 +504,7 @@ index 000000000000..bf71c96d6346 +dtb-$(CONFIG_ARCH_BSP) += ss928v100-demo.dtb diff --git a/arch/arm64/boot/dts/vendor/ss928v100-demo.dts b/arch/arm64/boot/dts/vendor/ss928v100-demo.dts new file mode 100644 -index 000000000000..9ebd9255895c +index 000000000..9ebd92558 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/ss928v100-demo.dts @@ -0,0 +1,415 @@ @@ -925,7 +925,7 @@ index 000000000000..9ebd9255895c + diff --git a/arch/arm64/boot/dts/vendor/ss928v100.dtsi b/arch/arm64/boot/dts/vendor/ss928v100.dtsi new file mode 100644 -index 000000000000..5174c39d4923 +index 000000000..5174c39d4 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/ss928v100.dtsi @@ -0,0 +1,1107 @@ @@ -2038,22 +2038,20 @@ index 000000000000..5174c39d4923 + diff --git a/arch/arm64/configs/hieulerpi1_defconfig b/arch/arm64/configs/hieulerpi1_defconfig new file mode 100644 -index 000000000000..e25123138b02 +index 000000000..481993463 --- /dev/null +++ b/arch/arm64/configs/hieulerpi1_defconfig -@@ -0,0 +1,5376 @@ +@@ -0,0 +1,5630 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm64 5.10.0 Kernel Configuration +# -+CONFIG_CC_VERSION_TEXT="aarch64-openeuler-linux-gnu-gcc (crosstool-NG 1.25.0) 12.3.1" ++CONFIG_CC_VERSION_TEXT="aarch64-openeuler-linux-gnu-gcc (crosstool-NG 1.26.0) 12.3.1" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=120301 -+CONFIG_LD_VERSION=240000000 ++CONFIG_LD_VERSION=241000000 +CONFIG_CLANG_VERSION=0 +CONFIG_LLD_VERSION=0 -+CONFIG_CC_CAN_LINK=y -+CONFIG_CC_CAN_LINK_STATIC=y +CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y @@ -2134,7 +2132,8 @@ index 000000000000..e25123138b02 +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set -+# CONFIG_PSI is not set ++CONFIG_PSI=y ++# CONFIG_PSI_DEFAULT_DISABLED is not set +# end of CPU/Task time and stats accounting + +CONFIG_CPU_ISOLATION=y @@ -2168,18 +2167,34 @@ index 000000000000..e25123138b02 +CONFIG_CC_HAS_INT128=y +CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_CGROUPS=y -+# CONFIG_MEMCG is not set -+# CONFIG_BLK_CGROUP is not set -+# CONFIG_CGROUP_SCHED is not set -+# CONFIG_CGROUP_PIDS is not set -+# CONFIG_CGROUP_RDMA is not set -+# CONFIG_CGROUP_FREEZER is not set -+# CONFIG_CPUSETS is not set -+# CONFIG_CGROUP_DEVICE is not set -+# CONFIG_CGROUP_CPUACCT is not set -+# CONFIG_CGROUP_BPF is not set ++CONFIG_PAGE_COUNTER=y ++CONFIG_MEMCG=y ++CONFIG_MEMCG_KMEM=y ++CONFIG_MEMCG_MEMFS_INFO=y ++CONFIG_BLK_CGROUP=y ++CONFIG_CGROUP_WRITEBACK=y ++CONFIG_CGROUP_V1_WRITEBACK=y ++CONFIG_CGROUP_SCHED=y ++CONFIG_QOS_SCHED=y ++CONFIG_QOS_SCHED_MULTILEVEL=y ++CONFIG_QOS_SCHED_SMT_EXPELLER=y ++CONFIG_QOS_SCHED_PRIO_LB=y ++CONFIG_FAIR_GROUP_SCHED=y ++CONFIG_CFS_BANDWIDTH=y ++# CONFIG_RT_GROUP_SCHED is not set ++# CONFIG_QOS_SCHED_DYNAMIC_AFFINITY is not set ++CONFIG_CGROUP_PIDS=y ++CONFIG_CGROUP_RDMA=y ++CONFIG_CGROUP_FREEZER=y ++CONFIG_CPUSETS=y ++CONFIG_PROC_PID_CPUSET=y ++CONFIG_CGROUP_DEVICE=y ++CONFIG_CGROUP_CPUACCT=y ++# CONFIG_CGROUP_PERF is not set ++CONFIG_CGROUP_BPF=y +# CONFIG_CGROUP_DEBUG is not set -+# CONFIG_CGROUP_FILES is not set ++CONFIG_SOCK_CGROUP_DATA=y ++CONFIG_CGROUP_FILES=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_TIME_NS=y @@ -2187,7 +2202,7 @@ index 000000000000..e25123138b02 +# CONFIG_USER_NS is not set +CONFIG_PID_NS=y +CONFIG_NET_NS=y -+# CONFIG_SCHED_STEAL is not set ++CONFIG_SCHED_STEAL=y +# CONFIG_CHECKPOINT_RESTORE is not set +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set @@ -2242,11 +2257,13 @@ index 000000000000..e25123138b02 +# +# Kernel Performance Events And Counters +# -+# CONFIG_PERF_EVENTS is not set ++CONFIG_PERF_EVENTS=y ++# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +# end of Kernel Performance Events And Counters + +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y ++# CONFIG_SLUB_MEMCG_SYSFS_ON is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y @@ -2405,8 +2422,8 @@ index 000000000000..e25123138b02 +# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_SCHED_MC=y -+# CONFIG_SCHED_CLUSTER is not set -+# CONFIG_SCHED_SMT is not set ++CONFIG_SCHED_CLUSTER=y ++CONFIG_SCHED_SMT=y +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y +# CONFIG_ARM64_BOOTPARAM_HOTPLUG_CPU0 is not set @@ -2423,6 +2440,7 @@ index 000000000000..e25123138b02 +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_HAVE_ARCH_PFN_VALID=y ++CONFIG_HW_PERF_EVENTS=y +CONFIG_SYS_SUPPORTS_HUGETLBFS=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y @@ -2624,6 +2642,7 @@ index 000000000000..e25123138b02 +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y ++CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y @@ -2700,14 +2719,18 @@ index 000000000000..e25123138b02 +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set ++CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_ZONED is not set ++# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_CMDLINE_PARSER=y +# CONFIG_BLK_WBT is not set ++# CONFIG_BLK_CGROUP_IOLATENCY is not set ++# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set +# CONFIG_BLK_INLINE_ENCRYPTION is not set @@ -2857,6 +2880,7 @@ index 000000000000..e25123138b02 +# CONFIG_MEMORY_FAILURE is not set +# CONFIG_TRANSPARENT_HUGEPAGE is not set +# CONFIG_CLEANCACHE is not set ++CONFIG_MEMCG_QOS=y +# CONFIG_ETMEM is not set +# CONFIG_USERSWAP is not set +# CONFIG_PAGE_CACHE_LIMIT is not set @@ -2888,6 +2912,7 @@ index 000000000000..e25123138b02 + +CONFIG_NET=y +CONFIG_NET_INGRESS=y ++CONFIG_SKB_EXTENSIONS=y + +# +# Networking options @@ -2898,7 +2923,13 @@ index 000000000000..e25123138b02 +CONFIG_UNIX_SCM=y +# CONFIG_UNIX_DIAG is not set +# CONFIG_TLS is not set -+# CONFIG_XFRM_USER is not set ++CONFIG_XFRM=y ++CONFIG_XFRM_ALGO=m ++CONFIG_XFRM_USER=m ++# CONFIG_XFRM_INTERFACE is not set ++# CONFIG_XFRM_SUB_POLICY is not set ++# CONFIG_XFRM_MIGRATE is not set ++# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +# CONFIG_XDP_SOCKETS is not set +CONFIG_INET=y @@ -2911,6 +2942,7 @@ index 000000000000..e25123138b02 +# CONFIG_IP_MROUTE is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_NET_IPVTI is not set ++CONFIG_NET_UDP_TUNNEL=m +# CONFIG_NET_FOU is not set +# CONFIG_NET_FOU_IP_TUNNELS is not set +# CONFIG_INET_AH is not set @@ -2951,34 +2983,221 @@ index 000000000000..e25123138b02 +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y ++CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y ++CONFIG_NETFILTER_NETLINK=m ++CONFIG_NETFILTER_FAMILY_BRIDGE=y +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set -+# CONFIG_NETFILTER_NETLINK_LOG is not set ++CONFIG_NETFILTER_NETLINK_LOG=m +# CONFIG_NETFILTER_NETLINK_OSF is not set -+# CONFIG_NF_CONNTRACK is not set ++CONFIG_NF_CONNTRACK=m +# CONFIG_NF_LOG_NETDEV is not set -+# CONFIG_NF_TABLES is not set -+# CONFIG_NETFILTER_XTABLES is not set ++CONFIG_NF_CONNTRACK_MARK=y ++# CONFIG_NF_CONNTRACK_ZONES is not set ++# CONFIG_NF_CONNTRACK_PROCFS is not set ++CONFIG_NF_CONNTRACK_EVENTS=y ++# CONFIG_NF_CONNTRACK_TIMEOUT is not set ++# CONFIG_NF_CONNTRACK_TIMESTAMP is not set ++# CONFIG_NF_CONNTRACK_LABELS is not set ++CONFIG_NF_CT_PROTO_DCCP=y ++CONFIG_NF_CT_PROTO_SCTP=y ++CONFIG_NF_CT_PROTO_UDPLITE=y ++# CONFIG_NF_CONNTRACK_AMANDA is not set ++CONFIG_NF_CONNTRACK_FTP=m ++# CONFIG_NF_CONNTRACK_H323 is not set ++# CONFIG_NF_CONNTRACK_IRC is not set ++# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set ++# CONFIG_NF_CONNTRACK_SNMP is not set ++# CONFIG_NF_CONNTRACK_PPTP is not set ++# CONFIG_NF_CONNTRACK_SANE is not set ++# CONFIG_NF_CONNTRACK_SIP is not set ++CONFIG_NF_CONNTRACK_TFTP=m ++CONFIG_NF_CT_NETLINK=m ++CONFIG_NETFILTER_NETLINK_GLUE_CT=y ++CONFIG_NF_NAT=m ++CONFIG_NF_NAT_FTP=m ++CONFIG_NF_NAT_TFTP=m ++CONFIG_NF_NAT_MASQUERADE=y ++CONFIG_NF_TABLES=m ++# CONFIG_NF_TABLES_INET is not set ++# CONFIG_NF_TABLES_NETDEV is not set ++# CONFIG_NFT_NUMGEN is not set ++# CONFIG_NFT_CT is not set ++CONFIG_NFT_COUNTER=m ++# CONFIG_NFT_CONNLIMIT is not set ++# CONFIG_NFT_LOG is not set ++# CONFIG_NFT_LIMIT is not set ++# CONFIG_NFT_MASQ is not set ++# CONFIG_NFT_REDIR is not set ++CONFIG_NFT_NAT=m ++# CONFIG_NFT_TUNNEL is not set ++# CONFIG_NFT_OBJREF is not set ++# CONFIG_NFT_QUOTA is not set ++# CONFIG_NFT_REJECT is not set ++CONFIG_NFT_COMPAT=m ++# CONFIG_NFT_HASH is not set ++# CONFIG_NFT_XFRM is not set ++# CONFIG_NFT_SOCKET is not set ++# CONFIG_NFT_OSF is not set ++# CONFIG_NFT_TPROXY is not set ++# CONFIG_NFT_SYNPROXY is not set ++# CONFIG_NF_FLOW_TABLE is not set ++CONFIG_NETFILTER_XTABLES=m ++ ++# ++# Xtables combined modules ++# ++CONFIG_NETFILTER_XT_MARK=m ++CONFIG_NETFILTER_XT_CONNMARK=m ++ ++# ++# Xtables targets ++# ++# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set ++# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set ++# CONFIG_NETFILTER_XT_TARGET_HMARK is not set ++# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set ++# CONFIG_NETFILTER_XT_TARGET_LOG is not set ++CONFIG_NETFILTER_XT_TARGET_MARK=m ++CONFIG_NETFILTER_XT_NAT=m ++# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set ++CONFIG_NETFILTER_XT_TARGET_NFLOG=m ++# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set ++# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set ++# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set ++CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m ++# CONFIG_NETFILTER_XT_TARGET_TEE is not set ++# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set ++ ++# ++# Xtables matches ++# ++CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m ++# CONFIG_NETFILTER_XT_MATCH_BPF is not set ++# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set ++# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set ++CONFIG_NETFILTER_XT_MATCH_COMMENT=m ++# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set ++# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set ++# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set ++# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set ++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m ++# CONFIG_NETFILTER_XT_MATCH_CPU is not set ++# CONFIG_NETFILTER_XT_MATCH_DCCP is not set ++# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set ++# CONFIG_NETFILTER_XT_MATCH_DSCP is not set ++# CONFIG_NETFILTER_XT_MATCH_ECN is not set ++# CONFIG_NETFILTER_XT_MATCH_ESP is not set ++# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set ++# CONFIG_NETFILTER_XT_MATCH_HELPER is not set ++# CONFIG_NETFILTER_XT_MATCH_HL is not set ++# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set ++# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set ++CONFIG_NETFILTER_XT_MATCH_IPVS=m ++# CONFIG_NETFILTER_XT_MATCH_L2TP is not set ++# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set ++CONFIG_NETFILTER_XT_MATCH_LIMIT=m ++# CONFIG_NETFILTER_XT_MATCH_MAC is not set ++# CONFIG_NETFILTER_XT_MATCH_MARK is not set ++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m ++# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set ++# CONFIG_NETFILTER_XT_MATCH_OSF is not set ++# CONFIG_NETFILTER_XT_MATCH_OWNER is not set ++# CONFIG_NETFILTER_XT_MATCH_POLICY is not set ++CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m ++# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set ++# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set ++# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set ++# CONFIG_NETFILTER_XT_MATCH_REALM is not set ++CONFIG_NETFILTER_XT_MATCH_RECENT=m ++# CONFIG_NETFILTER_XT_MATCH_SCTP is not set ++# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set ++# CONFIG_NETFILTER_XT_MATCH_STATE is not set ++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m ++# CONFIG_NETFILTER_XT_MATCH_STRING is not set ++# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set ++# CONFIG_NETFILTER_XT_MATCH_TIME is not set ++# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# end of Core Netfilter Configuration + +# CONFIG_IP_SET is not set -+# CONFIG_IP_VS is not set ++CONFIG_IP_VS=m ++# CONFIG_IP_VS_IPV6 is not set ++# CONFIG_IP_VS_DEBUG is not set ++CONFIG_IP_VS_TAB_BITS=12 ++ ++# ++# IPVS transport protocol load balancing support ++# ++# CONFIG_IP_VS_PROTO_TCP is not set ++# CONFIG_IP_VS_PROTO_UDP is not set ++# CONFIG_IP_VS_PROTO_ESP is not set ++# CONFIG_IP_VS_PROTO_AH is not set ++# CONFIG_IP_VS_PROTO_SCTP is not set ++ ++# ++# IPVS scheduler ++# ++CONFIG_IP_VS_RR=m ++CONFIG_IP_VS_WRR=m ++# CONFIG_IP_VS_LC is not set ++# CONFIG_IP_VS_WLC is not set ++# CONFIG_IP_VS_FO is not set ++# CONFIG_IP_VS_OVF is not set ++# CONFIG_IP_VS_LBLC is not set ++# CONFIG_IP_VS_LBLCR is not set ++# CONFIG_IP_VS_DH is not set ++CONFIG_IP_VS_SH=m ++# CONFIG_IP_VS_MH is not set ++# CONFIG_IP_VS_SED is not set ++# CONFIG_IP_VS_NQ is not set ++ ++# ++# IPVS SH scheduler ++# ++CONFIG_IP_VS_SH_TAB_BITS=8 ++ ++# ++# IPVS MH scheduler ++# ++CONFIG_IP_VS_MH_TAB_INDEX=12 ++ ++# ++# IPVS application helper ++# ++# CONFIG_IP_VS_NFCT is not set + +# +# IP: Netfilter Configuration +# ++CONFIG_NF_DEFRAG_IPV4=m +# CONFIG_NF_SOCKET_IPV4 is not set +# CONFIG_NF_TPROXY_IPV4 is not set ++CONFIG_NF_TABLES_IPV4=y ++# CONFIG_NFT_DUP_IPV4 is not set ++# CONFIG_NFT_FIB_IPV4 is not set ++# CONFIG_NF_TABLES_ARP is not set +# CONFIG_NF_DUP_IPV4 is not set +# CONFIG_NF_LOG_ARP is not set +# CONFIG_NF_LOG_IPV4 is not set +# CONFIG_NF_REJECT_IPV4 is not set -+# CONFIG_IP_NF_IPTABLES is not set ++CONFIG_IP_NF_IPTABLES=m ++# CONFIG_IP_NF_MATCH_AH is not set ++# CONFIG_IP_NF_MATCH_ECN is not set ++# CONFIG_IP_NF_MATCH_TTL is not set ++# CONFIG_IP_NF_FILTER is not set ++# CONFIG_IP_NF_TARGET_SYNPROXY is not set ++CONFIG_IP_NF_NAT=m ++# CONFIG_IP_NF_TARGET_MASQUERADE is not set ++# CONFIG_IP_NF_TARGET_NETMAP is not set ++# CONFIG_IP_NF_TARGET_REDIRECT is not set ++# CONFIG_IP_NF_MANGLE is not set ++# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set +# end of IP: Netfilter Configuration + @@ -2987,12 +3206,19 @@ index 000000000000..e25123138b02 +# +# CONFIG_NF_SOCKET_IPV6 is not set +# CONFIG_NF_TPROXY_IPV6 is not set ++CONFIG_NF_TABLES_IPV6=y ++# CONFIG_NFT_DUP_IPV6 is not set ++# CONFIG_NFT_FIB_IPV6 is not set +# CONFIG_NF_DUP_IPV6 is not set +# CONFIG_NF_REJECT_IPV6 is not set +# CONFIG_NF_LOG_IPV6 is not set +# CONFIG_IP6_NF_IPTABLES is not set +# end of IPv6: Netfilter Configuration + ++CONFIG_NF_DEFRAG_IPV6=m ++# CONFIG_NF_TABLES_BRIDGE is not set ++# CONFIG_NF_CONNTRACK_BRIDGE is not set ++# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_BPFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set @@ -3000,10 +3226,14 @@ index 000000000000..e25123138b02 +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set -+# CONFIG_BRIDGE is not set ++CONFIG_STP=m ++CONFIG_BRIDGE=m ++CONFIG_BRIDGE_IGMP_SNOOPING=y ++# CONFIG_BRIDGE_MRP is not set +CONFIG_HAVE_NET_DSA=y +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set ++CONFIG_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set @@ -3017,12 +3247,12 @@ index 000000000000..e25123138b02 +# CONFIG_BATMAN_ADV is not set +# CONFIG_OPENVSWITCH is not set +# CONFIG_VSOCKETS is not set -+# CONFIG_NETLINK_DIAG is not set ++CONFIG_NETLINK_DIAG=m +# CONFIG_MPLS is not set +# CONFIG_NET_NSH is not set +# CONFIG_HSR is not set +# CONFIG_NET_SWITCHDEV is not set -+# CONFIG_NET_L3_MASTER_DEV is not set ++CONFIG_NET_L3_MASTER_DEV=y +# CONFIG_QRTR is not set +# CONFIG_NET_NCSI is not set +CONFIG_RPS=y @@ -3033,6 +3263,7 @@ index 000000000000..e25123138b02 +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +# CONFIG_BPF_JIT is not set ++# CONFIG_BPF_STREAM_PARSER is not set +CONFIG_NET_FLOW_LIMIT=y + +# @@ -3486,14 +3717,16 @@ index 000000000000..e25123138b02 +CONFIG_MII=y +CONFIG_NET_CORE=y +# CONFIG_BONDING is not set -+# CONFIG_DUMMY is not set ++CONFIG_DUMMY=m +# CONFIG_WIREGUARD is not set +# CONFIG_EQUALIZER is not set +# CONFIG_NET_FC is not set +# CONFIG_NET_TEAM is not set +# CONFIG_MACVLAN is not set -+# CONFIG_IPVLAN is not set -+# CONFIG_VXLAN is not set ++CONFIG_IPVLAN_L3S=y ++CONFIG_IPVLAN=m ++# CONFIG_IPVTAP is not set ++CONFIG_VXLAN=m +# CONFIG_GENEVE is not set +# CONFIG_BAREUDP is not set +# CONFIG_GTP is not set @@ -3501,7 +3734,7 @@ index 000000000000..e25123138b02 +# CONFIG_NETCONSOLE is not set +# CONFIG_TUN is not set +# CONFIG_TUN_VNET_CROSS_LE is not set -+# CONFIG_VETH is not set ++CONFIG_VETH=m +# CONFIG_NLMON is not set +# CONFIG_ARCNET is not set + @@ -6551,6 +6784,20 @@ index 000000000000..e25123138b02 + +# CONFIG_POWERCAP is not set +# CONFIG_MCB is not set ++ ++# ++# Performance monitor support ++# ++# CONFIG_ARM_CCI_PMU is not set ++# CONFIG_ARM_CCN is not set ++# CONFIG_ARM_CMN is not set ++CONFIG_ARM_PMU=y ++# CONFIG_ARM_DSU_PMU is not set ++# CONFIG_ARM_SPE_PMU is not set ++# CONFIG_HISI_PCIE_PMU is not set ++# CONFIG_HNS3_PMU is not set ++# end of Performance monitor support ++ +# CONFIG_RAS is not set +# CONFIG_USB4 is not set + @@ -6575,6 +6822,7 @@ index 000000000000..e25123138b02 +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set ++# CONFIG_HISI_PTT is not set +# end of HW tracing support + +# CONFIG_FPGA is not set @@ -6654,7 +6902,12 @@ index 000000000000..e25123138b02 +CONFIG_FUSE_FS=y +# CONFIG_CUSE is not set +# CONFIG_VIRTIO_FS is not set -+# CONFIG_OVERLAY_FS is not set ++CONFIG_OVERLAY_FS=m ++CONFIG_OVERLAY_FS_REDIRECT_DIR=y ++CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y ++CONFIG_OVERLAY_FS_INDEX=y ++# CONFIG_OVERLAY_FS_XINO_AUTO is not set ++CONFIG_OVERLAY_FS_METACOPY=y + +# +# Caches @@ -7421,7 +7674,7 @@ index 000000000000..e25123138b02 +# end of Kernel hacking diff --git a/arch/arm64/configs/ss928v100_defconfig b/arch/arm64/configs/ss928v100_defconfig new file mode 100644 -index 000000000000..b1208fd69331 +index 000000000..b1208fd69 --- /dev/null +++ b/arch/arm64/configs/ss928v100_defconfig @@ -0,0 +1,3665 @@ @@ -11092,7 +11345,7 @@ index 000000000000..b1208fd69331 +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/ss928v100_emmc_defconfig b/arch/arm64/configs/ss928v100_emmc_defconfig new file mode 100644 -index 000000000000..0f7a1e6d102c +index 000000000..0f7a1e6d1 --- /dev/null +++ b/arch/arm64/configs/ss928v100_emmc_defconfig @@ -0,0 +1,4137 @@ @@ -15235,7 +15488,7 @@ index 000000000000..0f7a1e6d102c +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/configs/ss928v100_nand_defconfig b/arch/arm64/configs/ss928v100_nand_defconfig new file mode 100644 -index 000000000000..30d5aa8374d1 +index 000000000..30d5aa837 --- /dev/null +++ b/arch/arm64/configs/ss928v100_nand_defconfig @@ -0,0 +1,3669 @@ @@ -18909,7 +19162,7 @@ index 000000000000..30d5aa8374d1 +# CONFIG_ARM64_RELOC_TEST is not set +# CONFIG_CORESIGHT is not set diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c -index 1006ed2d7c60..cdbd2606e4b8 100644 +index 1006ed2d7..cdbd2606e 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -29,6 +29,18 @@ int pcibios_alloc_irq(struct pci_dev *dev) @@ -18932,7 +19185,7 @@ index 1006ed2d7c60..cdbd2606e4b8 100644 /* diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index be67a9c42628..ab6cdc8a503c 100644 +index be67a9c42..ab6cdc8a5 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -188,6 +188,10 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) @@ -18947,7 +19200,7 @@ index be67a9c42628..ab6cdc8a503c 100644 #ifdef CONFIG_ZONE_DMA acpi_zone_dma_bits = fls64(acpi_iort_dma_get_max_cpu_address()); diff --git a/drivers/Kconfig b/drivers/Kconfig -index b1b3d958f065..0f5c83ae9bd8 100644 +index b1b3d958f..0f5c83ae9 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -240,4 +240,6 @@ source "drivers/most/Kconfig" @@ -18958,7 +19211,7 @@ index b1b3d958f065..0f5c83ae9bd8 100644 + endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index bfbf65533169..10342bad3b90 100644 +index bfbf65533..10342bad3 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -192,3 +192,4 @@ obj-$(CONFIG_INTERCONNECT) += interconnect/ @@ -18967,7 +19220,7 @@ index bfbf65533169..10342bad3b90 100644 obj-$(CONFIG_ROH) += roh/ +obj-$(CONFIG_ARCH_BSP) += vendor/ diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index c715d4681a0b..39c659f7a68d 100644 +index c715d4681..39c659f7a 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -384,5 +384,6 @@ source "drivers/clk/ti/Kconfig" @@ -18978,7 +19231,7 @@ index c715d4681a0b..39c659f7a68d 100644 endif diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index da8fcf147eb1..833b7600d36f 100644 +index da8fcf147..833b7600d 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -124,3 +124,4 @@ endif @@ -18988,7 +19241,7 @@ index da8fcf147eb1..833b7600d36f 100644 +obj-$(CONFIG_ARCH_BSP) += vendor/ diff --git a/drivers/clk/vendor/Kconfig b/drivers/clk/vendor/Kconfig new file mode 100644 -index 000000000000..4f446ec69e8e +index 000000000..4f446ec69 --- /dev/null +++ b/drivers/clk/vendor/Kconfig @@ -0,0 +1,12 @@ @@ -19006,7 +19259,7 @@ index 000000000000..4f446ec69e8e + build the clock driver for SS928V100 diff --git a/drivers/clk/vendor/Makefile b/drivers/clk/vendor/Makefile new file mode 100644 -index 000000000000..a2a3626a9954 +index 000000000..a2a3626a9 --- /dev/null +++ b/drivers/clk/vendor/Makefile @@ -0,0 +1,8 @@ @@ -19020,7 +19273,7 @@ index 000000000000..a2a3626a9954 +obj-$(CONFIG_COMMON_CLK_SS928V100) += clk_ss928v100.o diff --git a/drivers/clk/vendor/clk.c b/drivers/clk/vendor/clk.c new file mode 100644 -index 000000000000..ceef293f073f +index 000000000..ceef293f0 --- /dev/null +++ b/drivers/clk/vendor/clk.c @@ -0,0 +1,288 @@ @@ -19314,7 +19567,7 @@ index 000000000000..ceef293f073f + diff --git a/drivers/clk/vendor/clk.h b/drivers/clk/vendor/clk.h new file mode 100644 -index 000000000000..f197a9bc06fd +index 000000000..f197a9bc0 --- /dev/null +++ b/drivers/clk/vendor/clk.h @@ -0,0 +1,127 @@ @@ -19447,7 +19700,7 @@ index 000000000000..f197a9bc06fd +#endif /* __BSP_CLK_H */ diff --git a/drivers/clk/vendor/clk_hi3519dv500.c b/drivers/clk/vendor/clk_hi3519dv500.c new file mode 100644 -index 000000000000..e2c106fa3249 +index 000000000..e2c106fa3 --- /dev/null +++ b/drivers/clk/vendor/clk_hi3519dv500.c @@ -0,0 +1,507 @@ @@ -19960,7 +20213,7 @@ index 000000000000..e2c106fa3249 +MODULE_DESCRIPTION("HiSilicon HI3519DV500 CRG Driver"); diff --git a/drivers/clk/vendor/clk_ss928v100.c b/drivers/clk/vendor/clk_ss928v100.c new file mode 100644 -index 000000000000..952741837aaa +index 000000000..952741837 --- /dev/null +++ b/drivers/clk/vendor/clk_ss928v100.c @@ -0,0 +1,693 @@ @@ -20659,7 +20912,7 @@ index 000000000000..952741837aaa +MODULE_DESCRIPTION("SS928V100 CRG Driver"); diff --git a/drivers/clk/vendor/clkgate_separated.c b/drivers/clk/vendor/clkgate_separated.c new file mode 100644 -index 000000000000..d53783fb317e +index 000000000..d53783fb3 --- /dev/null +++ b/drivers/clk/vendor/clkgate_separated.c @@ -0,0 +1,108 @@ @@ -20773,7 +21026,7 @@ index 000000000000..d53783fb317e +} diff --git a/drivers/clk/vendor/crg.h b/drivers/clk/vendor/crg.h new file mode 100644 -index 000000000000..de73c36ad2b6 +index 000000000..de73c36ad --- /dev/null +++ b/drivers/clk/vendor/crg.h @@ -0,0 +1,24 @@ @@ -20803,7 +21056,7 @@ index 000000000000..de73c36ad2b6 +#endif /* __BSP_CRG_H */ diff --git a/drivers/clk/vendor/reset.c b/drivers/clk/vendor/reset.c new file mode 100644 -index 000000000000..b8c610bb7f4f +index 000000000..b8c610bb7 --- /dev/null +++ b/drivers/clk/vendor/reset.c @@ -0,0 +1,145 @@ @@ -20954,7 +21207,7 @@ index 000000000000..b8c610bb7f4f +EXPORT_SYMBOL_GPL(bsp_reset_exit); diff --git a/drivers/clk/vendor/reset.h b/drivers/clk/vendor/reset.h new file mode 100644 -index 000000000000..a9535170cedf +index 000000000..a9535170c --- /dev/null +++ b/drivers/clk/vendor/reset.h @@ -0,0 +1,29 @@ @@ -20988,7 +21241,7 @@ index 000000000000..a9535170cedf + +#endif /* __BSP_RESET_H */ diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index 8928816a4f30..69c7a9e57230 100644 +index 8928816a4..69c7a9e57 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_XGENE_DMA) += xgene-dma.o @@ -21001,7 +21254,7 @@ index 8928816a4f30..69c7a9e57230 100644 obj-y += qcom/ diff --git a/drivers/dma/edmacv310.c b/drivers/dma/edmacv310.c new file mode 100644 -index 000000000000..d3d475e6092d +index 000000000..d3d475e60 --- /dev/null +++ b/drivers/dma/edmacv310.c @@ -0,0 +1,1450 @@ @@ -22457,7 +22710,7 @@ index 000000000000..d3d475e6092d +MODULE_LICENSE("GPL"); diff --git a/drivers/dma/edmacv310.h b/drivers/dma/edmacv310.h new file mode 100644 -index 000000000000..2a266f3a0767 +index 000000000..2a266f3a0 --- /dev/null +++ b/drivers/dma/edmacv310.h @@ -0,0 +1,147 @@ @@ -22609,7 +22862,7 @@ index 000000000000..2a266f3a0767 +#define EDMAC_CONTROL_DST_WIDTH_MASK GENMASK(14, 12) +#endif diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c -index f1b53dd1df1a..602c9c4eab41 100644 +index f1b53dd1d..602c9c4ea 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -289,6 +289,9 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) @@ -22643,7 +22896,7 @@ index f1b53dd1df1a..602c9c4eab41 100644 pl061->gc.direction_input = pl061_direction_input; pl061->gc.direction_output = pl061_direction_output; diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 5763a1e9360b..027957dc0a20 100644 +index 5763a1e93..027957dc0 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -649,6 +649,16 @@ config I2C_GPIO_FAULT_INJECTOR @@ -22686,7 +22939,7 @@ index 5763a1e9360b..027957dc0a20 100644 + endmenu diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 280e05622d50..ca908fffc09b 100644 +index 280e05622..ca908fffc 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o @@ -22699,7 +22952,7 @@ index 280e05622d50..ca908fffc09b 100644 obj-$(CONFIG_I2C_HIX5HD2) += i2c-hix5hd2.o diff --git a/drivers/i2c/busses/i2c-bsp.c b/drivers/i2c/busses/i2c-bsp.c new file mode 100644 -index 000000000000..4147d18911ce +index 000000000..4147d1891 --- /dev/null +++ b/drivers/i2c/busses/i2c-bsp.c @@ -0,0 +1,1534 @@ @@ -24238,7 +24491,7 @@ index 000000000000..4147d18911ce +MODULE_DESCRIPTION("I2C Bus driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c -index dafad891998e..39ce670c2a15 100644 +index dafad8919..39ce670c2 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -233,6 +233,43 @@ static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr) @@ -24311,7 +24564,7 @@ index dafad891998e..39ce670c2a15 100644 /* NOTE: returning a fault code here could cause trouble * in buggy userspace code. Some old kernel bugs returned diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig -index e39b679126a2..a72d2d224669 100644 +index e39b67912..a72d2d224 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -468,6 +468,16 @@ config HI8435 @@ -24332,7 +24585,7 @@ index e39b679126a2..a72d2d224669 100644 tristate "AVIA HX711 ADC for weight cells" depends on GPIOLIB diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile -index 90f94ada7b30..8375619f83bc 100644 +index 90f94ada7..8375619f8 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_EP93XX_ADC) += ep93xx_adc.o @@ -24345,7 +24598,7 @@ index 90f94ada7b30..8375619f83bc 100644 obj-$(CONFIG_INA2XX_ADC) += ina2xx-adc.o diff --git a/drivers/iio/adc/bsp_lsadc.c b/drivers/iio/adc/bsp_lsadc.c new file mode 100644 -index 000000000000..90fcfeb216eb +index 000000000..90fcfeb21 --- /dev/null +++ b/drivers/iio/adc/bsp_lsadc.c @@ -0,0 +1,473 @@ @@ -24823,7 +25076,7 @@ index 000000000000..90fcfeb216eb +MODULE_DESCRIPTION("Vendor multimedia software group lsadc driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c -index ea98aad9fb81..206505261eac 100644 +index ea98aad9f..206505261 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1843,6 +1843,54 @@ int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev, @@ -24882,7 +25135,7 @@ index ea98aad9fb81..206505261eac 100644 * iio_device_claim_direct_mode - Keep device in direct mode * @indio_dev: the iio_dev associated with the device diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig -index b630e58c49b6..b01313108df2 100644 +index b630e58c4..b01313108 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -58,6 +58,23 @@ config IOMMU_IO_PGTABLE_ARMV7S @@ -25008,7 +25261,7 @@ index b630e58c49b6..b01313108df2 100644 - If you are suffering from the speed of allocing iova with more than - 128 cpus, try to tune this config larger. diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile -index ae38d815537e..60fafc23dee6 100644 +index ae38d8155..60fafc23d 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,5 +1,5 @@ @@ -25026,7 +25279,7 @@ index ae38d815537e..60fafc23dee6 100644 +obj-$(CONFIG_IOMMU_SVA_LIB) += iommu-sva-lib.o +obj-$(CONFIG_IOMMU_SVA_LIB) += io-pgfault.o diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h -index 0c40d22409f2..b4adab698563 100644 +index 0c40d2240..b4adab698 100644 --- a/drivers/iommu/amd/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h @@ -17,7 +17,6 @@ extern int amd_iommu_init_passthrough(void); @@ -25038,7 +25291,7 @@ index 0c40d22409f2..b4adab698563 100644 extern int amd_iommu_init_devices(void); extern void amd_iommu_uninit_devices(void); diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h -index 690c5976575c..33446c9d3bac 100644 +index 690c59765..33446c9d3 100644 --- a/drivers/iommu/amd/amd_iommu_types.h +++ b/drivers/iommu/amd/amd_iommu_types.h @@ -109,7 +109,6 @@ @@ -25050,7 +25303,7 @@ index 690c5976575c..33446c9d3bac 100644 #define MMIO_STATUS_COM_WAIT_INT_MASK (1 << 2) #define MMIO_STATUS_PPR_INT_MASK (1 << 6) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c -index ce822347f747..cc9869cc48e4 100644 +index ce822347f..cc9869cc4 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -20,7 +20,6 @@ @@ -25392,7 +25645,7 @@ index ce822347f747..cc9869cc48e4 100644 return 1; diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c -index f216a86d9c81..5f1195791cb1 100644 +index f216a86d9..5f1195791 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -813,8 +813,7 @@ amd_iommu_set_pci_msi_domain(struct device *dev, struct amd_iommu *iommu) { } @@ -25437,7 +25690,7 @@ index f216a86d9c81..5f1195791cb1 100644 } diff --git a/drivers/iommu/amd/iommu_v2.c b/drivers/iommu/amd/iommu_v2.c -index 16776e3c6eab..5ecc0bc608ec 100644 +index 16776e3c6..5ecc0bc60 100644 --- a/drivers/iommu/amd/iommu_v2.c +++ b/drivers/iommu/amd/iommu_v2.c @@ -587,7 +587,6 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data) @@ -25470,7 +25723,7 @@ index 16776e3c6eab..5ecc0bc608ec 100644 out: diff --git a/drivers/iommu/arm/arm-smmu-v3/Makefile b/drivers/iommu/arm/arm-smmu-v3/Makefile -index 1338466d4d0d..54feb1ecccad 100644 +index 1338466d4..54feb1ecc 100644 --- a/drivers/iommu/arm/arm-smmu-v3/Makefile +++ b/drivers/iommu/arm/arm-smmu-v3/Makefile @@ -3,4 +3,3 @@ obj-$(CONFIG_ARM_SMMU_V3) += arm_smmu_v3.o @@ -25479,7 +25732,7 @@ index 1338466d4d0d..54feb1ecccad 100644 arm_smmu_v3-objs := $(arm_smmu_v3-objs-y) -obj-$(CONFIG_AGENT_SMMU_ATOS) += ascend_smmu.o diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c -index a8e8fd9d7c8b..01094d348774 100644 +index a8e8fd9d7..01094d348 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c @@ -351,13 +351,15 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm) @@ -25539,7 +25792,7 @@ index a8e8fd9d7c8b..01094d348774 100644 + arm64_mm_context_put(mm); +} diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c -index 1ee14a59a3d6..14dbc7785605 100644 +index 1ee14a59a..14dbc7785 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -11,7 +11,6 @@ @@ -27978,7 +28231,7 @@ index 1ee14a59a3d6..14dbc7785605 100644 .probe = arm_smmu_device_probe, .remove = arm_smmu_device_remove, diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h -index 919473d2217b..15f55092f840 100644 +index 919473d22..15f55092f 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -45,7 +45,6 @@ @@ -28194,7 +28447,7 @@ index 919473d2217b..15f55092f840 100644 { diff --git a/drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c b/drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c deleted file mode 100644 -index 5e9ed6add9dc..000000000000 +index 5e9ed6add..000000000 --- a/drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c +++ /dev/null @@ -1,434 +0,0 @@ @@ -28633,7 +28886,7 @@ index 5e9ed6add9dc..000000000000 -}; -module_platform_driver(agent_smmu_driver); diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c -index b57536b024ac..ea89d63370d8 100644 +index b57536b02..ea89d6337 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -43,9 +43,6 @@ @@ -28733,7 +28986,7 @@ index b57536b024ac..ea89d63370d8 100644 * The resource size should effectively match the value of SMMU_TOP; * stash that temporarily until we know PAGESIZE to validate it with. diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c -index 38641110be00..7f280c8d5c53 100644 +index 38641110b..7f280c8d5 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -758,12 +758,9 @@ static bool qcom_iommu_has_secure_context(struct qcom_iommu_dev *qcom_iommu) @@ -28752,7 +29005,7 @@ index 38641110be00..7f280c8d5c53 100644 return false; } diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index d1539b7399a9..0cbcd3fc3e7e 100644 +index d1539b739..0cbcd3fc3 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -216,11 +216,9 @@ static int iova_reserve_pci_windows(struct pci_dev *dev, @@ -28770,7 +29023,7 @@ index d1539b7399a9..0cbcd3fc3e7e 100644 } diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c -index 0cdb5493a464..de324b4eedfe 100644 +index 0cdb5493a..de324b4ee 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -635,7 +635,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) @@ -28794,7 +29047,7 @@ index 0cdb5493a464..de324b4eedfe 100644 static int __maybe_unused exynos_sysmmu_suspend(struct device *dev) diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c -index 25689bdf812e..b9a974d97831 100644 +index 25689bdf8..b9a974d97 100644 --- a/drivers/iommu/fsl_pamu.c +++ b/drivers/iommu/fsl_pamu.c @@ -1122,7 +1122,7 @@ static int fsl_pamu_probe(struct platform_device *pdev) @@ -28807,7 +29060,7 @@ index 25689bdf812e..b9a974d97831 100644 } diff --git a/drivers/iommu/intel/Kconfig b/drivers/iommu/intel/Kconfig -index cecdad7f2aba..5337ee1584b0 100644 +index cecdad7f2..5337ee158 100644 --- a/drivers/iommu/intel/Kconfig +++ b/drivers/iommu/intel/Kconfig @@ -40,7 +40,6 @@ config INTEL_IOMMU_SVM @@ -28819,7 +29072,7 @@ index cecdad7f2aba..5337ee1584b0 100644 Shared Virtual Memory (SVM) provides a facility for devices to access DMA resources through process address space by diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c -index 9e591594183e..02e7c10a4224 100644 +index 9e5915941..02e7c10a4 100644 --- a/drivers/iommu/intel/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -215,7 +215,7 @@ static bool dmar_match_pci_path(struct dmar_pci_notify_info *info, int bus, @@ -28983,7 +29236,7 @@ index 9e591594183e..02e7c10a4224 100644 unmap_iommu(iommu); error_free_seq_id: diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index a19dbb9483eb..e3a7e3f546a0 100644 +index a19dbb948..e3a7e3f54 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -560,36 +560,14 @@ static inline int domain_pfn_supported(struct dmar_domain *domain, @@ -29640,7 +29893,7 @@ index a19dbb9483eb..e3a7e3f546a0 100644 if (risky_device(dev)) diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c -index b853888774e6..aedaae4630bc 100644 +index b85388877..aedaae463 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -576,8 +576,9 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) @@ -29679,7 +29932,7 @@ index b853888774e6..aedaae4630bc 100644 bitmap_free(bitmap); out_free_pages: diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c -index 86fd49ae7f61..ce4ef2d245e3 100644 +index 86fd49ae7..ce4ef2d24 100644 --- a/drivers/iommu/intel/pasid.c +++ b/drivers/iommu/intel/pasid.c @@ -466,6 +466,20 @@ pasid_cache_invalidation_with_pasid(struct intel_iommu *iommu, @@ -29762,7 +30015,7 @@ index 86fd49ae7f61..ce4ef2d245e3 100644 pasid_flush_caches(iommu, pte, pasid, did); diff --git a/drivers/iommu/intel/pasid.h b/drivers/iommu/intel/pasid.h -index 35963e6bf9fa..086ebd697319 100644 +index 35963e6bf..086ebd697 100644 --- a/drivers/iommu/intel/pasid.h +++ b/drivers/iommu/intel/pasid.h @@ -28,12 +28,12 @@ @@ -29797,7 +30050,7 @@ index 35963e6bf9fa..086ebd697319 100644 int intel_pasid_alloc_id(void *ptr, int start, int end, gfp_t gfp); void intel_pasid_free_id(u32 pasid); diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c -index 0b7f9e39ce3b..4260bb089b2c 100644 +index 0b7f9e39c..4260bb089 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -17,37 +17,17 @@ @@ -30345,7 +30598,7 @@ index 0b7f9e39ce3b..4260bb089b2c 100644 mutex_unlock(&pasid_mutex); } diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c -index 1df8c1dcae77..8fd03a24cb14 100644 +index 1df8c1dca..8fd03a24c 100644 --- a/drivers/iommu/io-pgfault.c +++ b/drivers/iommu/io-pgfault.c @@ -12,6 +12,7 @@ @@ -30369,7 +30622,7 @@ index 1df8c1dcae77..8fd03a24cb14 100644 mmap_read_unlock(mm); mmput(mm); diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c -index 701efdbdc12b..3cf72c100add 100644 +index 701efdbdc..3cf72c100 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -242,17 +242,13 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, @@ -30392,7 +30645,7 @@ index 701efdbdc12b..3cf72c100add 100644 if (dma_mapping_error(dev, dma)) goto out_free; diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c -index 3fc6ae00dc96..34fea518785b 100644 +index 3fc6ae00d..34fea5187 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -72,19 +72,16 @@ @@ -30887,7 +31140,7 @@ index 3fc6ae00dc96..34fea518785b 100644 data = arm_lpae_alloc_pgtable(cfg); diff --git a/drivers/iommu/ioasid.c b/drivers/iommu/ioasid.c -index a786c034907c..50ee27bbd04e 100644 +index a786c0349..50ee27bbd 100644 --- a/drivers/iommu/ioasid.c +++ b/drivers/iommu/ioasid.c @@ -2,7 +2,7 @@ @@ -30975,7 +31228,7 @@ index a786c034907c..50ee27bbd04e 100644 /** * ioasid_find - Find IOASID data diff --git a/drivers/iommu/iommu-sva-lib.c b/drivers/iommu/iommu-sva-lib.c -index 106506143896..bd41405d34e9 100644 +index 106506143..bd41405d3 100644 --- a/drivers/iommu/iommu-sva-lib.c +++ b/drivers/iommu/iommu-sva-lib.c @@ -18,7 +18,8 @@ static DECLARE_IOASID_SET(iommu_sva_pasid); @@ -31039,7 +31292,7 @@ index 106506143896..bd41405d34e9 100644 static bool __mmget_not_zero(void *mm) { diff --git a/drivers/iommu/iommu-sva-lib.h b/drivers/iommu/iommu-sva-lib.h -index 8909ea1094e3..031155010ca8 100644 +index 8909ea109..031155010 100644 --- a/drivers/iommu/iommu-sva-lib.h +++ b/drivers/iommu/iommu-sva-lib.h @@ -9,6 +9,7 @@ @@ -31076,7 +31329,7 @@ index 8909ea1094e3..031155010ca8 100644 +#endif /* CONFIG_IOMMU_SVA_LIB */ #endif /* _IOMMU_SVA_LIB_H */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index b888efd65e92..c71f9321c87a 100644 +index b888efd65..c71f9321c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -29,7 +29,7 @@ static struct kset *iommu_group_kset; @@ -31506,7 +31759,7 @@ index b888efd65e92..c71f9321c87a 100644 } -EXPORT_SYMBOL_GPL(iommu_dev_get_config); diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c -index 1246e8f8bf08..30d969a4c5fd 100644 +index 1246e8f8b..30d969a4c 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -64,9 +64,9 @@ static void free_iova_flush_queue(struct iova_domain *iovad) @@ -31591,7 +31844,7 @@ index 1246e8f8bf08..30d969a4c5fd 100644 void queue_iova(struct iova_domain *iovad, diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c -index d9068e8f2db4..d71f10257f15 100644 +index d9068e8f2..d71f10257 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -1012,9 +1012,7 @@ static int ipmmu_probe(struct platform_device *pdev) @@ -31606,7 +31859,7 @@ index d9068e8f2db4..d71f10257f15 100644 /* Map I/O memory and request IRQ. */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c -index 08947fdd4cb4..040e85f70861 100644 +index 08947fdd4..040e85f70 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -609,19 +609,16 @@ static void insert_iommu_master(struct device *dev, @@ -31634,7 +31887,7 @@ index 08947fdd4cb4..040e85f70861 100644 goto fail; } diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c -index dd0ff2d3cfe4..bfe6ec329f8d 100644 +index dd0ff2d3c..bfe6ec329 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -767,7 +767,8 @@ static int mtk_iommu_remove(struct platform_device *pdev) @@ -31648,7 +31901,7 @@ index dd0ff2d3cfe4..bfe6ec329f8d 100644 clk_disable_unprepare(data->bclk); devm_free_irq(&pdev->dev, data->irq, data); diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c -index 2abbdd71d8d9..82ddfe9170d4 100644 +index 2abbdd71d..82ddfe917 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -618,34 +618,18 @@ static int mtk_iommu_probe(struct platform_device *pdev) @@ -31692,7 +31945,7 @@ index 2abbdd71d8d9..82ddfe9170d4 100644 static int mtk_iommu_remove(struct platform_device *pdev) diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c -index 259f65291d90..a99afb5d9011 100644 +index 259f65291..a99afb5d9 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -32,12 +32,12 @@ static inline bool is_omap_iommu_detached(struct omap_iommu *obj) @@ -31712,7 +31965,7 @@ index 259f65291d90..a99afb5d9011 100644 static ssize_t diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c -index ff2c692c0db4..71f29c0927fc 100644 +index ff2c692c0..71f29c092 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1665,7 +1665,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) @@ -31725,7 +31978,7 @@ index ff2c692c0db4..71f29c0927fc 100644 arch_data = kcalloc(num_iommus + 1, sizeof(*arch_data), GFP_KERNEL); if (!arch_data) diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c -index 65aa30d55d3a..ea6db1341916 100644 +index 65aa30d55..ea6db1341 100644 --- a/drivers/iommu/sun50i-iommu.c +++ b/drivers/iommu/sun50i-iommu.c @@ -28,7 +28,6 @@ @@ -31796,7 +32049,7 @@ index 65aa30d55d3a..ea6db1341916 100644 diff --git a/drivers/iommu/sw64/Kconfig b/drivers/iommu/sw64/Kconfig deleted file mode 100644 -index a313c6e2d11b..000000000000 +index a313c6e2d..000000000 --- a/drivers/iommu/sw64/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ @@ -31811,7 +32064,7 @@ index a313c6e2d11b..000000000000 - Support for IOMMU on SW64 platform. diff --git a/drivers/iommu/sw64/Makefile b/drivers/iommu/sw64/Makefile deleted file mode 100644 -index e23dbd40a74d..000000000000 +index e23dbd40a..000000000 --- a/drivers/iommu/sw64/Makefile +++ /dev/null @@ -1,2 +0,0 @@ @@ -31819,7 +32072,7 @@ index e23dbd40a74d..000000000000 -obj-$(CONFIG_SUNWAY_IOMMU) += sunway_iommu.o diff --git a/drivers/iommu/sw64/sunway_iommu.c b/drivers/iommu/sw64/sunway_iommu.c deleted file mode 100644 -index 86920f88faac..000000000000 +index 86920f88f..000000000 --- a/drivers/iommu/sw64/sunway_iommu.c +++ /dev/null @@ -1,1693 +0,0 @@ @@ -33518,7 +33771,7 @@ index 86920f88faac..000000000000 -__setup("iommu_enable=", iommu_enable_setup); diff --git a/drivers/iommu/sw64/sunway_iommu.h b/drivers/iommu/sw64/sunway_iommu.h deleted file mode 100644 -index 52d6452fa14c..000000000000 +index 52d6452fa..000000000 --- a/drivers/iommu/sw64/sunway_iommu.h +++ /dev/null @@ -1,77 +0,0 @@ @@ -33600,7 +33853,7 @@ index 52d6452fa14c..000000000000 -#define PAGE_SHIFT_IOMMU 18 -#define PAGE_SIZE_IOMMU (_AC(1, UL) << PAGE_SHIFT_IOMMU) diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c -index 3c64cb9fb27d..2bfdd5734844 100644 +index 3c64cb9fb..2bfdd5734 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -1115,7 +1115,7 @@ static void viommu_remove(struct virtio_device *vdev) @@ -33621,7 +33874,7 @@ index 3c64cb9fb27d..2bfdd5734844 100644 static struct virtio_driver virtio_iommu_drv = { .driver.name = KBUILD_MODNAME, diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c -index f479d8971dfb..5e0acabed37a 100644 +index f479d8971..5e0acabed 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -6,6 +6,7 @@ @@ -33694,7 +33947,7 @@ index f479d8971dfb..5e0acabed37a 100644 struct uvc_device *dev = chain->dev; struct uvc_ctrl_work *w = &dev->async_ctrl; diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 282f3d2388cc..fe5dfb0deaf6 100644 +index 282f3d238..fe5dfb0de 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -219,6 +219,11 @@ static struct uvc_format_desc uvc_fmts[] = { @@ -33825,7 +34078,7 @@ index 282f3d2388cc..fe5dfb0deaf6 100644 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c -index ca3a9c2eec27..7c9895377118 100644 +index ca3a9c2ee..7c9895377 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c @@ -37,7 +37,7 @@ static int uvc_mc_create_links(struct uvc_video_chain *chain, @@ -33838,7 +34091,7 @@ index ca3a9c2eec27..7c9895377118 100644 source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING) diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c -index 2bdb0ff203f8..73725051cc16 100644 +index 2bdb0ff20..73725051c 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -6,6 +6,7 @@ @@ -33902,7 +34155,7 @@ index 2bdb0ff203f8..73725051cc16 100644 + smp_store_release(&dev->flush_status, false); } diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c -index f6373d678d25..03dfe96bceba 100644 +index f6373d678..03dfe96bc 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1308,7 +1308,9 @@ static void uvc_video_decode_meta(struct uvc_streaming *stream, @@ -33935,7 +34188,7 @@ index f6373d678d25..03dfe96bceba 100644 if (ret < 0) return ret; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h -index c884020b2878..47768c5353ff 100644 +index c884020b2..47768c535 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -169,6 +169,9 @@ @@ -33976,7 +34229,7 @@ index c884020b2878..47768c5353ff 100644 int uvc_ctrl_begin(struct uvc_video_chain *chain); diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index ce8f1c0583d5..b037aa6110e2 100644 +index ce8f1c058..b037aa611 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -211,6 +211,7 @@ obj-$(CONFIG_MFD_AT91_USART) += at91-usart.o @@ -33989,7 +34242,7 @@ index ce8f1c0583d5..b037aa6110e2 100644 obj-$(CONFIG_MFD_INTEL_LPSS_ACPI) += intel-lpss-acpi.o diff --git a/drivers/mfd/bsp_fmc.c b/drivers/mfd/bsp_fmc.c new file mode 100644 -index 000000000000..e56b341f19fc +index 000000000..e56b341f1 --- /dev/null +++ b/drivers/mfd/bsp_fmc.c @@ -0,0 +1,134 @@ @@ -34128,7 +34381,7 @@ index 000000000000..e56b341f19fc +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Flash Memory Controller Driver"); diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 8f2465394253..0d861bbf3b75 100644 +index 8f2465394..0d861bbf3 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1352,6 +1352,7 @@ void mmc_power_up(struct mmc_host *host, u32 ocr) @@ -34218,7 +34471,7 @@ index 8f2465394253..0d861bbf3b75 100644 break; } diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index 87807ef010a9..bca036b15064 100644 +index 87807ef01..bca036b15 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1418,6 +1418,9 @@ static int mmc_select_hs400es(struct mmc_card *card) @@ -34250,7 +34503,7 @@ index 87807ef010a9..bca036b15064 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 868b121ce4f3..0b2e4208c92f 100644 +index 868b121ce..0b2e4208c 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1340,6 +1340,7 @@ int mmc_attach_sd(struct mmc_host *host) @@ -34262,7 +34515,7 @@ index 868b121ce4f3..0b2e4208c92f 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 99a4ce68d82f..438a12197b1d 100644 +index 99a4ce68d..438a12197 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -27,6 +27,10 @@ @@ -34344,7 +34597,7 @@ index 99a4ce68d82f..438a12197b1d 100644 +#endif + diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 82e1fbd6b2ff..9a0e6045326d 100644 +index 82e1fbd6b..9a0e60453 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -1102,3 +1102,10 @@ config MMC_OWL @@ -34359,7 +34612,7 @@ index 82e1fbd6b2ff..9a0e6045326d 100644 + Only for ss928v100 board + diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 451c25fc2c69..444a57ddac64 100644 +index 451c25fc2..444a57dda 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -106,6 +106,8 @@ obj-$(CONFIG_MMC_SDHCI_SPRD) += sdhci-sprd.o @@ -34373,7 +34626,7 @@ index 451c25fc2c69..444a57ddac64 100644 endif diff --git a/drivers/mmc/host/bsp_quirk_ids.h b/drivers/mmc/host/bsp_quirk_ids.h new file mode 100644 -index 000000000000..5846dee0891d +index 000000000..5846dee08 --- /dev/null +++ b/drivers/mmc/host/bsp_quirk_ids.h @@ -0,0 +1,67 @@ @@ -34445,7 +34698,7 @@ index 000000000000..5846dee0891d + +#endif /* _DRIVERS_MMC_BSP_QUIRK_IDS_H */ diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c -index 7ba4f714106f..edb66c70cf94 100644 +index 7ba4f7141..edb66c70c 100644 --- a/drivers/mmc/host/cqhci.c +++ b/drivers/mmc/host/cqhci.c @@ -46,6 +46,11 @@ static inline u8 *get_link_desc(struct cqhci_host *cq_host, u8 tag) @@ -34590,7 +34843,7 @@ index 7ba4f714106f..edb66c70cf94 100644 static int cqhci_error_from_flags(unsigned int flags) diff --git a/drivers/mmc/host/cqhci.h b/drivers/mmc/host/cqhci.h -index 89bf6adbce8c..05571faf079a 100644 +index 89bf6adbc..05571faf0 100644 --- a/drivers/mmc/host/cqhci.h +++ b/drivers/mmc/host/cqhci.h @@ -80,6 +80,12 @@ @@ -34624,7 +34877,7 @@ index 89bf6adbce8c..05571faf079a 100644 bool halted; diff --git a/drivers/mmc/host/mci_proc.c b/drivers/mmc/host/mci_proc.c new file mode 100644 -index 000000000000..1ce672c9817f +index 000000000..1ce672c98 --- /dev/null +++ b/drivers/mmc/host/mci_proc.c @@ -0,0 +1,338 @@ @@ -34968,7 +35221,7 @@ index 000000000000..1ce672c9817f +} diff --git a/drivers/mmc/host/mci_proc.h b/drivers/mmc/host/mci_proc.h new file mode 100644 -index 000000000000..637be3c39b45 +index 000000000..637be3c39 --- /dev/null +++ b/drivers/mmc/host/mci_proc.h @@ -0,0 +1,41 @@ @@ -35015,7 +35268,7 @@ index 000000000000..637be3c39b45 +#endif /* __MCI_PROC_H__ */ diff --git a/drivers/mmc/host/sdhci-bsp.c b/drivers/mmc/host/sdhci-bsp.c new file mode 100644 -index 000000000000..f86c915ca272 +index 000000000..f86c915ca --- /dev/null +++ b/drivers/mmc/host/sdhci-bsp.c @@ -0,0 +1,950 @@ @@ -35971,7 +36224,7 @@ index 000000000000..f86c915ca272 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mmc/host/sdhci-bsp.h b/drivers/mmc/host/sdhci-bsp.h new file mode 100644 -index 000000000000..f8ee2e26cebc +index 000000000..f8ee2e26c --- /dev/null +++ b/drivers/mmc/host/sdhci-bsp.h @@ -0,0 +1,135 @@ @@ -36112,7 +36365,7 @@ index 000000000000..f8ee2e26cebc +#endif /* _DRIVERS_MMC_SDHCI_BSP_H */ diff --git a/drivers/mmc/host/sdhci-ss928v100.c b/drivers/mmc/host/sdhci-ss928v100.c new file mode 100644 -index 000000000000..1f81cb0ba5ca +index 000000000..1f81cb0ba --- /dev/null +++ b/drivers/mmc/host/sdhci-ss928v100.c @@ -0,0 +1,931 @@ @@ -37048,7 +37301,7 @@ index 000000000000..1f81cb0ba5ca + return 0; +} diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index 133f0d376480..62015c39cea4 100644 +index 133f0d376..62015c39c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -342,6 +342,9 @@ static void sdhci_init(struct sdhci_host *host, int soft) @@ -37165,7 +37418,7 @@ index 133f0d376480..62015c39cea4 100644 del_timer_sync(&host->timer); del_timer_sync(&host->data_timer); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h -index 4db57c3a8cd4..5b68369378de 100644 +index 4db57c3a8..5b6836937 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -185,7 +185,7 @@ @@ -37239,7 +37492,7 @@ index 4db57c3a8cd4..5b68369378de 100644 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig -index 48c9601adf2e..33257f23f861 100644 +index 48c9601ad..33257f23f 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -44,6 +44,7 @@ source "drivers/net/ethernet/chelsio/Kconfig" @@ -37251,7 +37504,7 @@ index 48c9601adf2e..33257f23f861 100644 config CX_ECAT tristate "Beckhoff CX5020 EtherCAT master support" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile -index d637fd528a14..47c6df4f19ef 100644 +index d637fd528..47c6df4f1 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -98,3 +98,4 @@ obj-$(CONFIG_NET_VENDOR_SYNOPSYS) += synopsys/ @@ -37261,7 +37514,7 @@ index d637fd528a14..47c6df4f19ef 100644 +obj-$(CONFIG_NET_VENDOR_VENDOR) += vendor/ diff --git a/drivers/net/ethernet/vendor/Kconfig b/drivers/net/ethernet/vendor/Kconfig new file mode 100644 -index 000000000000..c0e4e42161e2 +index 000000000..c0e4e4216 --- /dev/null +++ b/drivers/net/ethernet/vendor/Kconfig @@ -0,0 +1,20 @@ @@ -37287,7 +37540,7 @@ index 000000000000..c0e4e42161e2 +endif # NET_VENDOR_VENDOR diff --git a/drivers/net/ethernet/vendor/Makefile b/drivers/net/ethernet/vendor/Makefile new file mode 100644 -index 000000000000..59540a62a016 +index 000000000..59540a62a --- /dev/null +++ b/drivers/net/ethernet/vendor/Makefile @@ -0,0 +1,6 @@ @@ -37299,7 +37552,7 @@ index 000000000000..59540a62a016 +obj-$(CONFIG_ETH_GMAC) += gmac/ diff --git a/drivers/net/ethernet/vendor/gmac/Kconfig b/drivers/net/ethernet/vendor/gmac/Kconfig new file mode 100644 -index 000000000000..4e2bb132dc48 +index 000000000..4e2bb132d --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/Kconfig @@ -0,0 +1,106 @@ @@ -37411,7 +37664,7 @@ index 000000000000..4e2bb132dc48 +endif # ETH_GMAC diff --git a/drivers/net/ethernet/vendor/gmac/Makefile b/drivers/net/ethernet/vendor/gmac/Makefile new file mode 100644 -index 000000000000..90d5a73b792e +index 000000000..90d5a73b7 --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/Makefile @@ -0,0 +1,2 @@ @@ -37419,7 +37672,7 @@ index 000000000000..90d5a73b792e +eth_gmac-objs := gmac.o gmac_ethtool_ops.o gmac_phy_fixup.o gmac_pm.o gmac_proc.o gmac_netdev_ops.o autoeee/autoeee.o autoeee/phy_id_table.o diff --git a/drivers/net/ethernet/vendor/gmac/autoeee/autoeee.c b/drivers/net/ethernet/vendor/gmac/autoeee/autoeee.c new file mode 100644 -index 000000000000..33bd74fff65a +index 000000000..33bd74fff --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/autoeee/autoeee.c @@ -0,0 +1,137 @@ @@ -37562,7 +37815,7 @@ index 000000000000..33bd74fff65a +} diff --git a/drivers/net/ethernet/vendor/gmac/autoeee/autoeee.h b/drivers/net/ethernet/vendor/gmac/autoeee/autoeee.h new file mode 100644 -index 000000000000..924cc604b3f4 +index 000000000..924cc604b --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/autoeee/autoeee.h @@ -0,0 +1,49 @@ @@ -37617,7 +37870,7 @@ index 000000000000..924cc604b3f4 +#endif diff --git a/drivers/net/ethernet/vendor/gmac/autoeee/phy_id_table.c b/drivers/net/ethernet/vendor/gmac/autoeee/phy_id_table.c new file mode 100644 -index 000000000000..848f0112ede5 +index 000000000..848f0112e --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/autoeee/phy_id_table.c @@ -0,0 +1,181 @@ @@ -37804,7 +38057,7 @@ index 000000000000..848f0112ede5 +}; diff --git a/drivers/net/ethernet/vendor/gmac/gmac.c b/drivers/net/ethernet/vendor/gmac/gmac.c new file mode 100644 -index 000000000000..bf476144c2af +index 000000000..bf476144c --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac.c @@ -0,0 +1,2289 @@ @@ -40099,7 +40352,7 @@ index 000000000000..bf476144c2af +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/ethernet/vendor/gmac/gmac.h b/drivers/net/ethernet/vendor/gmac/gmac.h new file mode 100644 -index 000000000000..d3a3b7842c89 +index 000000000..d3a3b7842 --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac.h @@ -0,0 +1,779 @@ @@ -40884,7 +41137,7 @@ index 000000000000..d3a3b7842c89 +#endif diff --git a/drivers/net/ethernet/vendor/gmac/gmac_ethtool_ops.c b/drivers/net/ethernet/vendor/gmac/gmac_ethtool_ops.c new file mode 100644 -index 000000000000..646a93d567d1 +index 000000000..646a93d56 --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_ethtool_ops.c @@ -0,0 +1,401 @@ @@ -41291,7 +41544,7 @@ index 000000000000..646a93d567d1 +} diff --git a/drivers/net/ethernet/vendor/gmac/gmac_ethtool_ops.h b/drivers/net/ethernet/vendor/gmac/gmac_ethtool_ops.h new file mode 100644 -index 000000000000..f77681838da6 +index 000000000..f77681838 --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_ethtool_ops.h @@ -0,0 +1,35 @@ @@ -41332,7 +41585,7 @@ index 000000000000..f77681838da6 +#endif diff --git a/drivers/net/ethernet/vendor/gmac/gmac_netdev_ops.c b/drivers/net/ethernet/vendor/gmac/gmac_netdev_ops.c new file mode 100644 -index 000000000000..027b16c0b698 +index 000000000..027b16c0b --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_netdev_ops.c @@ -0,0 +1,730 @@ @@ -42068,7 +42321,7 @@ index 000000000000..027b16c0b698 +} diff --git a/drivers/net/ethernet/vendor/gmac/gmac_netdev_ops.h b/drivers/net/ethernet/vendor/gmac/gmac_netdev_ops.h new file mode 100644 -index 000000000000..6d4f088ae27d +index 000000000..6d4f088ae --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_netdev_ops.h @@ -0,0 +1,22 @@ @@ -42096,7 +42349,7 @@ index 000000000000..6d4f088ae27d +#endif diff --git a/drivers/net/ethernet/vendor/gmac/gmac_phy_fixup.c b/drivers/net/ethernet/vendor/gmac/gmac_phy_fixup.c new file mode 100644 -index 000000000000..19089022d504 +index 000000000..19089022d --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_phy_fixup.c @@ -0,0 +1,154 @@ @@ -42256,7 +42509,7 @@ index 000000000000..19089022d504 +} diff --git a/drivers/net/ethernet/vendor/gmac/gmac_phy_fixup.h b/drivers/net/ethernet/vendor/gmac/gmac_phy_fixup.h new file mode 100644 -index 000000000000..e8fe68f7244e +index 000000000..e8fe68f72 --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_phy_fixup.h @@ -0,0 +1,13 @@ @@ -42275,7 +42528,7 @@ index 000000000000..e8fe68f7244e +#endif diff --git a/drivers/net/ethernet/vendor/gmac/gmac_pm.c b/drivers/net/ethernet/vendor/gmac/gmac_pm.c new file mode 100644 -index 000000000000..cee4f62d6e00 +index 000000000..cee4f62d6 --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_pm.c @@ -0,0 +1,340 @@ @@ -42621,7 +42874,7 @@ index 000000000000..cee4f62d6e00 +} diff --git a/drivers/net/ethernet/vendor/gmac/gmac_pm.h b/drivers/net/ethernet/vendor/gmac/gmac_pm.h new file mode 100644 -index 000000000000..92d06ad8d0da +index 000000000..92d06ad8d --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_pm.h @@ -0,0 +1,56 @@ @@ -42683,7 +42936,7 @@ index 000000000000..92d06ad8d0da +#endif diff --git a/drivers/net/ethernet/vendor/gmac/gmac_proc.c b/drivers/net/ethernet/vendor/gmac/gmac_proc.c new file mode 100644 -index 000000000000..0fa531a115a9 +index 000000000..0fa531a11 --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_proc.c @@ -0,0 +1,80 @@ @@ -42769,7 +43022,7 @@ index 000000000000..0fa531a115a9 +} diff --git a/drivers/net/ethernet/vendor/gmac/gmac_proc.h b/drivers/net/ethernet/vendor/gmac/gmac_proc.h new file mode 100644 -index 000000000000..4db48281df8c +index 000000000..4db48281d --- /dev/null +++ b/drivers/net/ethernet/vendor/gmac/gmac_proc.h @@ -0,0 +1,21 @@ @@ -42795,7 +43048,7 @@ index 000000000000..4db48281df8c + +#endif diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig -index 698bea312adc..01eb67c4f9b7 100644 +index 698bea312..01eb67c4f 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -319,3 +319,9 @@ endif # PHYLIB @@ -42809,7 +43062,7 @@ index 698bea312adc..01eb67c4f9b7 100644 + help + This driver support the ss928v100 board diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile -index a13e402074cf..824f61af3131 100644 +index a13e40207..824f61af3 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -80,3 +80,5 @@ obj-$(CONFIG_STE10XP) += ste10Xp.o @@ -42820,7 +43073,7 @@ index a13e402074cf..824f61af3131 100644 +obj-$(CONFIG_SS928V100_PHY) += mdio_bsp_gemac.o diff --git a/drivers/net/phy/mdio_bsp_gemac.c b/drivers/net/phy/mdio_bsp_gemac.c new file mode 100644 -index 000000000000..b6579fb7a3d2 +index 000000000..b6579fb7a --- /dev/null +++ b/drivers/net/phy/mdio_bsp_gemac.c @@ -0,0 +1,232 @@ @@ -43058,7 +43311,7 @@ index 000000000000..b6579fb7a3d2 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/net/phy/mdio_bsp_gemac.h b/drivers/net/phy/mdio_bsp_gemac.h new file mode 100644 -index 000000000000..691b80ab6582 +index 000000000..691b80ab6 --- /dev/null +++ b/drivers/net/phy/mdio_bsp_gemac.h @@ -0,0 +1,28 @@ @@ -43091,7 +43344,7 @@ index 000000000000..691b80ab6582 + +#endif /* __MDIO_BSP_GEMAC_H__ */ diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig -index 9ed5f167a9f3..9a69386e232e 100644 +index 9ed5f167a..9a69386e2 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -83,5 +83,6 @@ source "drivers/phy/tegra/Kconfig" @@ -43102,7 +43355,7 @@ index 9ed5f167a9f3..9a69386e232e 100644 endmenu diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile -index 6eb2916773c5..9c4683a3d342 100644 +index 6eb291677..9c4683a3d 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o @@ -43115,7 +43368,7 @@ index 6eb2916773c5..9c4683a3d342 100644 broadcom/ \ diff --git a/drivers/phy/vendor/Kconfig b/drivers/phy/vendor/Kconfig new file mode 100644 -index 000000000000..38c973de485f +index 000000000..38c973de4 --- /dev/null +++ b/drivers/phy/vendor/Kconfig @@ -0,0 +1,23 @@ @@ -43144,7 +43397,7 @@ index 000000000000..38c973de485f +endif # VENDOR_USB_PHY diff --git a/drivers/phy/vendor/Makefile b/drivers/phy/vendor/Makefile new file mode 100644 -index 000000000000..40ce6d5c2b4c +index 000000000..40ce6d5c2 --- /dev/null +++ b/drivers/phy/vendor/Makefile @@ -0,0 +1,5 @@ @@ -43155,7 +43408,7 @@ index 000000000000..40ce6d5c2b4c +obj-y += usb/ diff --git a/drivers/phy/vendor/phy-bsp-sata.c b/drivers/phy/vendor/phy-bsp-sata.c new file mode 100644 -index 000000000000..997694ff51ca +index 000000000..997694ff5 --- /dev/null +++ b/drivers/phy/vendor/phy-bsp-sata.c @@ -0,0 +1,175 @@ @@ -43336,7 +43589,7 @@ index 000000000000..997694ff51ca +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/vendor/phy-bsp-sata.h b/drivers/phy/vendor/phy-bsp-sata.h new file mode 100644 -index 000000000000..984db03987b4 +index 000000000..984db0398 --- /dev/null +++ b/drivers/phy/vendor/phy-bsp-sata.h @@ -0,0 +1,39 @@ @@ -43381,7 +43634,7 @@ index 000000000000..984db03987b4 +}; diff --git a/drivers/phy/vendor/phy-ss524v100-sata.c b/drivers/phy/vendor/phy-ss524v100-sata.c new file mode 100644 -index 000000000000..b2605fa95dab +index 000000000..b2605fa95 --- /dev/null +++ b/drivers/phy/vendor/phy-ss524v100-sata.c @@ -0,0 +1,684 @@ @@ -44071,7 +44324,7 @@ index 000000000000..b2605fa95dab +} diff --git a/drivers/phy/vendor/phy-ss528v100-sata.c b/drivers/phy/vendor/phy-ss528v100-sata.c new file mode 100644 -index 000000000000..edf6ee730440 +index 000000000..edf6ee730 --- /dev/null +++ b/drivers/phy/vendor/phy-ss528v100-sata.c @@ -0,0 +1,1043 @@ @@ -45120,7 +45373,7 @@ index 000000000000..edf6ee730440 +} diff --git a/drivers/phy/vendor/phy-ss625v100-sata.c b/drivers/phy/vendor/phy-ss625v100-sata.c new file mode 100644 -index 000000000000..596df51badd2 +index 000000000..596df51ba --- /dev/null +++ b/drivers/phy/vendor/phy-ss625v100-sata.c @@ -0,0 +1,732 @@ @@ -45858,7 +46111,7 @@ index 000000000000..596df51badd2 +} diff --git a/drivers/phy/vendor/usb/Kconfig b/drivers/phy/vendor/usb/Kconfig new file mode 100644 -index 000000000000..ab924dabc42f +index 000000000..ab924dabc --- /dev/null +++ b/drivers/phy/vendor/usb/Kconfig @@ -0,0 +1,88 @@ @@ -45952,7 +46205,7 @@ index 000000000000..ab924dabc42f +endif # USB_MODE_OPTION diff --git a/drivers/phy/vendor/usb/Makefile b/drivers/phy/vendor/usb/Makefile new file mode 100644 -index 000000000000..f0526a281da6 +index 000000000..f0526a281 --- /dev/null +++ b/drivers/phy/vendor/usb/Makefile @@ -0,0 +1,21 @@ @@ -45979,7 +46232,7 @@ index 000000000000..f0526a281da6 +obj-$(CONFIG_PHY_BSP_XVP_USB2) += phy-xvp-bsp-usb.o diff --git a/drivers/phy/vendor/usb/phy-bsp-usb.c b/drivers/phy/vendor/usb/phy-bsp-usb.c new file mode 100644 -index 000000000000..d421251ba35d +index 000000000..d421251ba --- /dev/null +++ b/drivers/phy/vendor/usb/phy-bsp-usb.c @@ -0,0 +1,142 @@ @@ -46127,7 +46380,7 @@ index 000000000000..d421251ba35d +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/vendor/usb/phy-bsp-usb.h b/drivers/phy/vendor/usb/phy-bsp-usb.h new file mode 100644 -index 000000000000..a5075771c76e +index 000000000..a5075771c --- /dev/null +++ b/drivers/phy/vendor/usb/phy-bsp-usb.h @@ -0,0 +1,66 @@ @@ -46199,7 +46452,7 @@ index 000000000000..a5075771c76e +#endif /* USB2_INCLUDE_PHY_H */ diff --git a/drivers/phy/vendor/usb/phy-ss524v100-usb.c b/drivers/phy/vendor/usb/phy-ss524v100-usb.c new file mode 100644 -index 000000000000..57524691eca4 +index 000000000..57524691e --- /dev/null +++ b/drivers/phy/vendor/usb/phy-ss524v100-usb.c @@ -0,0 +1,449 @@ @@ -46654,7 +46907,7 @@ index 000000000000..57524691eca4 +EXPORT_SYMBOL(bsp_usb_phy_off); diff --git a/drivers/phy/vendor/usb/phy-ss528v100-usb.c b/drivers/phy/vendor/usb/phy-ss528v100-usb.c new file mode 100644 -index 000000000000..a55bbc774055 +index 000000000..a55bbc774 --- /dev/null +++ b/drivers/phy/vendor/usb/phy-ss528v100-usb.c @@ -0,0 +1,584 @@ @@ -47244,7 +47497,7 @@ index 000000000000..a55bbc774055 +EXPORT_SYMBOL(bsp_usb3_phy_off); diff --git a/drivers/phy/vendor/usb/phy-ss928v100-usb.c b/drivers/phy/vendor/usb/phy-ss928v100-usb.c new file mode 100644 -index 000000000000..b3d1d9e39294 +index 000000000..b3d1d9e39 --- /dev/null +++ b/drivers/phy/vendor/usb/phy-ss928v100-usb.c @@ -0,0 +1,358 @@ @@ -47608,7 +47861,7 @@ index 000000000000..b3d1d9e39294 +EXPORT_SYMBOL(bsp_usb3_phy_off); diff --git a/drivers/phy/vendor/usb/phy-xvp-bsp-usb.c b/drivers/phy/vendor/usb/phy-xvp-bsp-usb.c new file mode 100644 -index 000000000000..08dfa60778c7 +index 000000000..08dfa6077 --- /dev/null +++ b/drivers/phy/vendor/usb/phy-xvp-bsp-usb.c @@ -0,0 +1,798 @@ @@ -48411,7 +48664,7 @@ index 000000000000..08dfa60778c7 +MODULE_ALIAS("platform:bsp-usb-xvp-phy"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig -index 63be5362fd3a..903c743d9df3 100644 +index 63be5362f..903c743d9 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -570,4 +570,13 @@ config PWM_ZX @@ -48429,7 +48682,7 @@ index 63be5362fd3a..903c743d9df3 100644 + endif diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile -index cbdcd55d69ee..04bc1fbe2aa2 100644 +index cbdcd55d6..04bc1fbe2 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_PWM_CROS_EC) += pwm-cros-ec.o @@ -48442,7 +48695,7 @@ index cbdcd55d69ee..04bc1fbe2aa2 100644 obj-$(CONFIG_PWM_IMX27) += pwm-imx27.o diff --git a/drivers/pwm/pwm-bsp.c b/drivers/pwm/pwm-bsp.c new file mode 100644 -index 000000000000..a142062f4a7b +index 000000000..a142062f4 --- /dev/null +++ b/drivers/pwm/pwm-bsp.c @@ -0,0 +1,434 @@ @@ -48881,7 +49134,7 @@ index 000000000000..a142062f4a7b + +MODULE_LICENSE("GPL"); diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c -index 9903c3a7eced..ab108b4a12a7 100644 +index 9903c3a7e..ab108b4a1 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -103,6 +103,80 @@ static ssize_t duty_cycle_store(struct device *child, @@ -49027,7 +49280,7 @@ index 9903c3a7eced..ab108b4a12a7 100644 ret = device_register(&export->child); diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c -index f7603c209e9d..896e765f078d 100644 +index f7603c209..896e765f0 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -35,6 +35,10 @@ @@ -49443,7 +49696,7 @@ index f7603c209e9d..896e765f078d 100644 }; diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile -index ae86da0dc5bd..2f721d2cc8a5 100644 +index ae86da0dc..2f721d2cc 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -2,9 +2,9 @@ @@ -49459,7 +49712,7 @@ index ae86da0dc5bd..2f721d2cc8a5 100644 ifneq ($(CONFIG_TRACING),) dwc3-y += trace.o diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c -index d73f624ed42a..f7cd5400b5d4 100644 +index d73f624ed..f7cd5400b 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -39,6 +39,23 @@ @@ -49564,7 +49817,7 @@ index d73f624ed42a..f7cd5400b5d4 100644 err5: diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -index cbebe541f7e8..24e874afd7d9 100644 +index cbebe541f..24e874afd 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -32,6 +32,10 @@ @@ -49682,7 +49935,7 @@ index cbebe541f7e8..24e874afd7d9 100644 int dwc3_gadget_suspend(struct dwc3 *dwc); diff --git a/drivers/usb/dwc3/dwc3-bsp.c b/drivers/usb/dwc3/dwc3-bsp.c new file mode 100644 -index 000000000000..503c8f4df07f +index 000000000..503c8f4df --- /dev/null +++ b/drivers/usb/dwc3/dwc3-bsp.c @@ -0,0 +1,441 @@ @@ -50129,7 +50382,7 @@ index 000000000000..503c8f4df07f +MODULE_DESCRIPTION("DesignWare USB3"); diff --git a/drivers/usb/dwc3/dwc3-bsp.h b/drivers/usb/dwc3/dwc3-bsp.h new file mode 100644 -index 000000000000..6c146dcb1ce7 +index 000000000..6c146dcb1 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-bsp.h @@ -0,0 +1,47 @@ @@ -50181,7 +50434,7 @@ index 000000000000..6c146dcb1ce7 + +#endif diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c -index 3cd294264372..df943cbabb3b 100644 +index 3cd294264..df943cbab 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -281,6 +281,26 @@ void dwc3_ep0_out_start(struct dwc3 *dwc) @@ -50270,7 +50523,7 @@ index 3cd294264372..df943cbabb3b 100644 } break; diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -index 28a1194f849f..2f894fa664c2 100644 +index 28a1194f8..2f894fa66 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -27,6 +27,11 @@ @@ -50597,7 +50850,7 @@ index 28a1194f849f..2f894fa664c2 100644 +#endif diff --git a/drivers/usb/dwc3/proc.c b/drivers/usb/dwc3/proc.c new file mode 100644 -index 000000000000..8d247280e5b3 +index 000000000..8d247280e --- /dev/null +++ b/drivers/usb/dwc3/proc.c @@ -0,0 +1,132 @@ @@ -50734,7 +50987,7 @@ index 000000000000..8d247280e5b3 + return 0; +} diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig -index 2d152571a7de..2b21e382b6da 100644 +index 2d152571a..2b21e382b 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -487,4 +487,12 @@ config USB_CONFIGFS_F_TCM @@ -50751,7 +51004,7 @@ index 2d152571a7de..2b21e382b6da 100644 + endif # USB_GADGET diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c -index d51ea1c052f2..dc07758ca74c 100644 +index d51ea1c05..dc07758ca 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1262,6 +1262,8 @@ static void purge_configs_funcs(struct gadget_info *gi) @@ -50773,7 +51026,7 @@ index d51ea1c052f2..dc07758ca74c 100644 c->next_interface_id = 0; memset(c->interface, 0, sizeof(c->interface)); diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c -index 1eb4fa2e623f..6d68fa31c00f 100644 +index 1eb4fa2e6..6d68fa31c 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -67,6 +67,7 @@ struct usb_ep *usb_ep_autoconfig_ss( @@ -50815,7 +51068,7 @@ index 1eb4fa2e623f..6d68fa31c00f 100644 * If the protocol driver hasn't yet decided on wMaxPacketSize * and wants to know the maximum possible, provide the info. diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 950c9435beec..a92694ff6357 100644 +index 950c9435b..a92694ff6 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -307,6 +307,7 @@ struct fsg_common { @@ -50862,7 +51115,7 @@ index 950c9435beec..a92694ff6357 100644 for (i = 0; i < ARRAY_SIZE(common->luns); ++i) if (common->luns[i]) diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c -index e65f474ad7b3..1a156cb5fc47 100644 +index e65f474ad..1a156cb5f 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -55,6 +55,17 @@ static inline struct f_uac1_opts *g_audio_to_uac1_opts(struct g_audio *audio) @@ -50974,7 +51227,7 @@ index e65f474ad7b3..1a156cb5fc47 100644 goto fail; diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c -index 5d39aff263f0..ed413a3abbe5 100644 +index 5d39aff26..ed413a3ab 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -14,6 +14,7 @@ @@ -51652,7 +51905,7 @@ index 5d39aff263f0..ed413a3abbe5 100644 (const struct uvc_descriptor_header * const *)ctl_cls; diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c -index 95605b1ef4eb..6c8b8f5b7e0f 100644 +index 95605b1ef..6c8b8f5b7 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -613,7 +613,7 @@ void g_audio_cleanup(struct g_audio *g_audio) @@ -51665,7 +51918,7 @@ index 95605b1ef4eb..6c8b8f5b7e0f 100644 kfree(uac->p_prm.ureq); kfree(uac->c_prm.ureq); diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c -index 2caccbb6e014..7b54e814aefb 100644 +index 2caccbb6e..7b54e814a 100644 --- a/drivers/usb/gadget/function/u_serial.c +++ b/drivers/usb/gadget/function/u_serial.c @@ -81,6 +81,9 @@ @@ -51723,7 +51976,7 @@ index 2caccbb6e014..7b54e814aefb 100644 if (!port->start_delayed) { spin_unlock_irqrestore(&port->port_lock, flags); diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h -index 9a01a7d4f17f..392ae14dcb41 100644 +index 9a01a7d4f..392ae14dc 100644 --- a/drivers/usb/gadget/function/u_uvc.h +++ b/drivers/usb/gadget/function/u_uvc.h @@ -52,6 +52,7 @@ struct f_uvc_opts { @@ -51746,7 +51999,7 @@ index 9a01a7d4f17f..392ae14dcb41 100644 /* * Streaming descriptors for full-speed, high-speed and super-speed. diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h -index 6c4fc4913f4f..8db9e5a95af2 100644 +index 6c4fc4913..8db9e5a95 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -45,6 +45,12 @@ struct uvc_device; @@ -51838,7 +52091,7 @@ index 6c4fc4913f4f..8db9e5a95af2 100644 enum uvc_state { diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c -index 00fb58e50a15..af083ddf3529 100644 +index 00fb58e50..af083ddf3 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -319,7 +319,49 @@ static ssize_t uvcg_default_processing_bm_controls_show( @@ -52815,7 +53068,7 @@ index 00fb58e50a15..af083ddf3529 100644 &uvcg_streaming_class_grp_type, NULL, diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c -index 65abd55ce234..c774cc1037de 100644 +index 65abd55ce..c774cc103 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -19,6 +19,8 @@ @@ -52916,7 +53169,7 @@ index 65abd55ce234..c774cc1037de 100644 } diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c -index 5ce548c2359d..9c62560dfb90 100644 +index 5ce548c23..9c62560df 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -12,16 +12,288 @@ @@ -53581,7 +53834,7 @@ index 5ce548c2359d..9c62560dfb90 100644 } - diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c -index a10f41c4a3f2..601829a6b4ba 100644 +index a10f41c4a..601829a6b 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c @@ -2568,7 +2568,6 @@ static int renesas_usb3_remove(struct platform_device *pdev) @@ -53593,7 +53846,7 @@ index a10f41c4a3f2..601829a6b4ba 100644 usb_del_gadget_udc(&usb3->gadget); diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c -index 3e5563308145..01421b6bc31b 100644 +index 3e5563308..01421b6bc 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -616,6 +616,11 @@ static void option_instat_callback(struct urb *urb); @@ -53610,7 +53863,7 @@ index 3e5563308145..01421b6bc31b 100644 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, diff --git a/drivers/vendor/Kconfig b/drivers/vendor/Kconfig new file mode 100644 -index 000000000000..16c8d40eed64 +index 000000000..16c8d40ee --- /dev/null +++ b/drivers/vendor/Kconfig @@ -0,0 +1,5 @@ @@ -53621,7 +53874,7 @@ index 000000000000..16c8d40eed64 +endmenu diff --git a/drivers/vendor/Makefile b/drivers/vendor/Makefile new file mode 100644 -index 000000000000..f58e85332764 +index 000000000..f58e85332 --- /dev/null +++ b/drivers/vendor/Makefile @@ -0,0 +1,3 @@ @@ -53630,7 +53883,7 @@ index 000000000000..f58e85332764 +obj-y += peri/ diff --git a/drivers/vendor/cma/Kconfig b/drivers/vendor/cma/Kconfig new file mode 100644 -index 000000000000..7472dccd8952 +index 000000000..7472dccd8 --- /dev/null +++ b/drivers/vendor/cma/Kconfig @@ -0,0 +1,16 @@ @@ -53652,7 +53905,7 @@ index 000000000000..7472dccd8952 + CMA Multiplex Ratio will be improved when this macro defined. diff --git a/drivers/vendor/cma/Makefile b/drivers/vendor/cma/Makefile new file mode 100644 -index 000000000000..97d57397963f +index 000000000..97d573979 --- /dev/null +++ b/drivers/vendor/cma/Makefile @@ -0,0 +1,2 @@ @@ -53660,7 +53913,7 @@ index 000000000000..97d57397963f +obj-$(CONFIG_CMA) += cma.o diff --git a/drivers/vendor/cma/cma.c b/drivers/vendor/cma/cma.c new file mode 100644 -index 000000000000..cd3dfcce3600 +index 000000000..cd3dfcce3 --- /dev/null +++ b/drivers/vendor/cma/cma.c @@ -0,0 +1,176 @@ @@ -53842,7 +54095,7 @@ index 000000000000..cd3dfcce3600 + diff --git a/drivers/vendor/npu/Kconfig b/drivers/vendor/npu/Kconfig new file mode 100644 -index 000000000000..f986784037d5 +index 000000000..f98678403 --- /dev/null +++ b/drivers/vendor/npu/Kconfig @@ -0,0 +1,7 @@ @@ -53855,7 +54108,7 @@ index 000000000000..f986784037d5 + diff --git a/drivers/vendor/npu/Makefile b/drivers/vendor/npu/Makefile new file mode 100644 -index 000000000000..e6f29554a159 +index 000000000..e6f29554a --- /dev/null +++ b/drivers/vendor/npu/Makefile @@ -0,0 +1,6 @@ @@ -53867,7 +54120,7 @@ index 000000000000..e6f29554a159 +obj-$(CONFIG_VENDOR_NPU) += smmu_power_on.o diff --git a/drivers/vendor/npu/npu_misc.c b/drivers/vendor/npu/npu_misc.c new file mode 100644 -index 000000000000..879365801549 +index 000000000..879365801 --- /dev/null +++ b/drivers/vendor/npu/npu_misc.c @@ -0,0 +1,770 @@ @@ -54643,7 +54896,7 @@ index 000000000000..879365801549 + diff --git a/drivers/vendor/npu/npu_svm.c b/drivers/vendor/npu/npu_svm.c new file mode 100644 -index 000000000000..4368390f6ba6 +index 000000000..4368390f6 --- /dev/null +++ b/drivers/vendor/npu/npu_svm.c @@ -0,0 +1,1370 @@ @@ -56019,7 +56272,7 @@ index 000000000000..4368390f6ba6 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/vendor/npu/smmu_power_on.c b/drivers/vendor/npu/smmu_power_on.c new file mode 100644 -index 000000000000..ce0579115499 +index 000000000..ce0579115 --- /dev/null +++ b/drivers/vendor/npu/smmu_power_on.c @@ -0,0 +1,91 @@ @@ -56116,7 +56369,7 @@ index 000000000000..ce0579115499 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/vendor/peri/Makefile b/drivers/vendor/peri/Makefile new file mode 100644 -index 000000000000..1a0c92eaea6f +index 000000000..1a0c92eae --- /dev/null +++ b/drivers/vendor/peri/Makefile @@ -0,0 +1,2 @@ @@ -56124,7 +56377,7 @@ index 000000000000..1a0c92eaea6f +obj-$(CONFIG_ARCH_SS927V100) += peri_io_ss928v100.o diff --git a/drivers/vendor/peri/peri_io_ss928v100.c b/drivers/vendor/peri/peri_io_ss928v100.c new file mode 100644 -index 000000000000..1d292650fe51 +index 000000000..1d292650f --- /dev/null +++ b/drivers/vendor/peri/peri_io_ss928v100.c @@ -0,0 +1,46 @@ @@ -56175,7 +56428,7 @@ index 000000000000..1d292650fe51 +} + diff --git a/fs/read_write.c b/fs/read_write.c -index 371a5a76f30e..cc1558d0441f 100644 +index 371a5a76f..cc1558d04 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -500,6 +500,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -56196,7 +56449,7 @@ index 371a5a76f30e..cc1558d0441f 100644 static inline loff_t *file_ppos(struct file *file) diff --git a/include/dt-bindings/clock/ss928v100_clock.h b/include/dt-bindings/clock/ss928v100_clock.h new file mode 100644 -index 000000000000..d3cd2dcb76fc +index 000000000..d3cd2dcb7 --- /dev/null +++ b/include/dt-bindings/clock/ss928v100_clock.h @@ -0,0 +1,146 @@ @@ -56348,7 +56601,7 @@ index 000000000000..d3cd2dcb76fc + diff --git a/include/linux/bsp_cma.h b/include/linux/bsp_cma.h new file mode 100644 -index 000000000000..02bcd5518708 +index 000000000..02bcd5518 --- /dev/null +++ b/include/linux/bsp_cma.h @@ -0,0 +1,52 @@ @@ -56405,7 +56658,7 @@ index 000000000000..02bcd5518708 + +#endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 03a5de5f99f4..e3caf4f19870 100644 +index 03a5de5f9..e3caf4f19 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -22,6 +22,7 @@ @@ -56418,7 +56671,7 @@ index 03a5de5f99f4..e3caf4f19870 100644 #define CLK_GET_ACCURACY_NOCACHE BIT(8) /* do not use the cached clk accuracy */ diff --git a/include/linux/edmac.h b/include/linux/edmac.h new file mode 100644 -index 000000000000..b937e8e6047e +index 000000000..b937e8e60 --- /dev/null +++ b/include/linux/edmac.h @@ -0,0 +1,80 @@ @@ -56503,7 +56756,7 @@ index 000000000000..b937e8e6047e +} dmac_lli; +#endif diff --git a/include/linux/i2c.h b/include/linux/i2c.h -index 58a721c23eca..6d33e0afc713 100644 +index 58a721c23..6d33e0afc 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -128,6 +128,23 @@ static inline int i2c_master_send_dmasafe(const struct i2c_client *client, @@ -56531,7 +56784,7 @@ index 58a721c23eca..6d33e0afc713 100644 int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num); diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h -index f015fa185253..33bfd817a26d 100644 +index f015fa185..33bfd817a 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -694,6 +694,13 @@ struct iio_dev *devm_iio_device_alloc(struct device *parent, int sizeof_priv); @@ -56549,7 +56802,7 @@ index f015fa185253..33bfd817a26d 100644 * iio_buffer_enabled() - helper function to test if the buffer is enabled * @indio_dev: IIO device structure for device diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h -index 27b994e42ec4..4cde111e425b 100644 +index 27b994e42..4cde111e4 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -25,6 +25,8 @@ enum io_pgtable_fmt { @@ -56629,7 +56882,7 @@ index 27b994e42ec4..4cde111e425b 100644 io_pgtable_tlb_add_page(struct io_pgtable *iop, struct iommu_iotlb_gather * gather, unsigned long iova, diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h -index af1c9d62e642..e9dacd4b9f6b 100644 +index af1c9d62e..e9dacd4b9 100644 --- a/include/linux/ioasid.h +++ b/include/linux/ioasid.h @@ -34,16 +34,13 @@ struct ioasid_allocator_ops { @@ -56679,7 +56932,7 @@ index af1c9d62e642..e9dacd4b9f6b 100644 #endif /* CONFIG_IOASID */ #endif /* __LINUX_IOASID_H */ diff --git a/include/linux/iommu.h b/include/linux/iommu.h -index 47294a3a398e..3f54ff2c15e3 100644 +index 47294a3a3..3f54ff2c1 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -87,11 +87,6 @@ struct iommu_domain { @@ -56909,7 +57162,7 @@ index 47294a3a398e..3f54ff2c15e3 100644 /** diff --git a/include/linux/iova.h b/include/linux/iova.h -index 3cb469b366d7..a0637abffee8 100644 +index 3cb469b36..a0637abff 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -26,7 +26,7 @@ struct iova_magazine; @@ -56940,7 +57193,7 @@ index 3cb469b366d7..a0637abffee8 100644 diff --git a/include/linux/iprec.h b/include/linux/iprec.h new file mode 100755 -index 000000000000..1bc1b5ed2a1c +index 000000000..1bc1b5ed2 --- /dev/null +++ b/include/linux/iprec.h @@ -0,0 +1,51 @@ @@ -56997,7 +57250,7 @@ index 000000000000..1bc1b5ed2a1c + diff --git a/include/linux/mfd/bsp_fmc.h b/include/linux/mfd/bsp_fmc.h new file mode 100644 -index 000000000000..e5aebf659005 +index 000000000..e5aebf659 --- /dev/null +++ b/include/linux/mfd/bsp_fmc.h @@ -0,0 +1,480 @@ @@ -57482,7 +57735,7 @@ index 000000000000..e5aebf659005 + +#endif /* __BSP_FMC_H_ */ diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index e3eaf458787a..70128b118c9f 100644 +index e3eaf4587..70128b118 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -611,6 +611,9 @@ struct mm_struct { @@ -57496,7 +57749,7 @@ index e3eaf458787a..70128b118c9f 100644 #ifdef CONFIG_MEMORY_RELIABLE /* total used reliable pages */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 40d7e98fc990..cbd9a1a2cc55 100644 +index 40d7e98fc..cbd9a1a2c 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -173,6 +173,7 @@ struct mmc_host_ops { @@ -57542,7 +57795,7 @@ index 40d7e98fc990..cbd9a1a2cc55 100644 const struct mmc_bus_ops *bus_ops; /* current bus driver */ diff --git a/include/linux/pwm.h b/include/linux/pwm.h -index a13ff383fa1d..cf447184a299 100644 +index a13ff383f..cf447184a 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -58,6 +58,10 @@ enum { @@ -57558,7 +57811,7 @@ index a13ff383fa1d..cf447184a299 100644 }; diff --git a/include/linux/securec.h b/include/linux/securec.h new file mode 100644 -index 000000000000..d93305600689 +index 000000000..d93305600 --- /dev/null +++ b/include/linux/securec.h @@ -0,0 +1,629 @@ @@ -58193,7 +58446,7 @@ index 000000000000..d93305600689 + diff --git a/include/linux/securectype.h b/include/linux/securectype.h new file mode 100644 -index 000000000000..69e79c2f9013 +index 000000000..69e79c2f9 --- /dev/null +++ b/include/linux/securectype.h @@ -0,0 +1,585 @@ @@ -58784,7 +59037,7 @@ index 000000000000..69e79c2f9013 + diff --git a/include/linux/vendor/peri_io.h b/include/linux/vendor/peri_io.h new file mode 100644 -index 000000000000..6b0c8f255b2c +index 000000000..6b0c8f255 --- /dev/null +++ b/include/linux/vendor/peri_io.h @@ -0,0 +1,57 @@ @@ -58847,7 +59100,7 @@ index 000000000000..6b0c8f255b2c +#endif /* __PERIPH_IO_H */ diff --git a/include/linux/vendor/sva_ext.h b/include/linux/vendor/sva_ext.h new file mode 100644 -index 000000000000..130e45f0b3c9 +index 000000000..130e45f0b --- /dev/null +++ b/include/linux/vendor/sva_ext.h @@ -0,0 +1,93 @@ @@ -58945,7 +59198,7 @@ index 000000000000..130e45f0b3c9 + +#endif /* _SVA_EXTEND_H */ diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h -index 85f8047afcf2..3f50287f3289 100644 +index 85f8047af..3f50287f3 100644 --- a/include/uapi/linux/i2c-dev.h +++ b/include/uapi/linux/i2c-dev.h @@ -52,6 +52,8 @@ @@ -58958,7 +59211,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..ff5eb36df35b 100644 +index f71a1751c..ff5eb36df 100644 --- a/include/uapi/linux/i2c.h +++ b/include/uapi/linux/i2c.h @@ -81,6 +81,9 @@ struct i2c_msg { @@ -58972,7 +59225,7 @@ index f71a1751cacf..ff5eb36df35b 100644 __u8 *buf; /* pointer to msg data */ }; diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h -index 652f169a019e..ce03ccc68e19 100644 +index 652f169a0..ce03ccc68 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -34,6 +34,21 @@ struct uvc_event { @@ -58998,7 +59251,7 @@ index 652f169a019e..ce03ccc68e19 100644 #endif /* __LINUX_USB_G_UVC_H */ diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h -index bfdae12cdacf..5966a5b50419 100644 +index bfdae12cd..5966a5b50 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -179,6 +179,36 @@ @@ -59112,7 +59365,7 @@ index bfdae12cdacf..5966a5b50419 100644 #endif /* __LINUX_USB_VIDEO_H */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index b28817c59fdf..0455da8fbacc 100644 +index b28817c59..0455da8fb 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -705,6 +705,7 @@ struct v4l2_pix_format { @@ -59124,7 +59377,7 @@ index b28817c59fdf..0455da8fbacc 100644 /* Vendor-specific formats */ #define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */ diff --git a/kernel/Makefile b/kernel/Makefile -index 3ae3b70c46e8..45a3a6ec0ad0 100644 +index 3ae3b70c4..45a3a6ec0 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,8 @@ obj-y = fork.o exec_domain.o panic.o \ @@ -59137,7 +59390,7 @@ index 3ae3b70c46e8..45a3a6ec0ad0 100644 obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c -index 16b95ff12e4d..bda1b952f9c7 100644 +index 16b95ff12..bda1b952f 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -164,6 +164,11 @@ void __init dma_pernuma_cma_reserve(void) @@ -59185,7 +59438,7 @@ index 16b95ff12e4d..bda1b952f9c7 100644 static struct page *cma_alloc_aligned(struct cma *cma, size_t size, gfp_t gfp) { diff --git a/kernel/fork.c b/kernel/fork.c -index 2547c6a6e5b1..4faf2dd4cd33 100644 +index 2547c6a6e..4faf2dd4c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1038,6 +1038,13 @@ static void mm_init_uprobes_state(struct mm_struct *mm) @@ -59212,7 +59465,7 @@ index 2547c6a6e5b1..4faf2dd4cd33 100644 init_tlb_flush_pending(mm); diff --git a/kernel/iprec.c b/kernel/iprec.c new file mode 100755 -index 000000000000..0650b335d6db +index 000000000..0650b335d --- /dev/null +++ b/kernel/iprec.c @@ -0,0 +1,410 @@ @@ -59627,7 +59880,7 @@ index 000000000000..0650b335d6db + +MODULE_LICENSE("GPL"); diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c -index c6738525fe11..78078cb8d3cf 100644 +index c6738525f..78078cb8d 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -176,6 +176,7 @@ unsigned long kallsyms_lookup_name(const char *name) @@ -59639,7 +59892,7 @@ index c6738525fe11..78078cb8d3cf 100644 int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, unsigned long), diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 974a41b87aa1..b7c0cf2d504f 100644 +index 974a41b87..b7c0cf2d5 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6597,6 +6597,7 @@ int sched_setscheduler(struct task_struct *p, int policy, @@ -59651,7 +59904,7 @@ index 974a41b87aa1..b7c0cf2d504f 100644 int sched_setattr(struct task_struct *p, const struct sched_attr *attr) { diff --git a/lib/Kconfig b/lib/Kconfig -index 36326864249d..eecd86d0133e 100644 +index 363268642..eecd86d01 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -693,3 +693,7 @@ config GENERIC_LIB_UCMPDI2 @@ -59663,7 +59916,7 @@ index 36326864249d..eecd86d0133e 100644 + bool + default y diff --git a/lib/Makefile b/lib/Makefile -index a803e1527c4b..c05d1bad49cc 100644 +index a803e1527..c05d1bad4 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -354,3 +354,5 @@ obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o @@ -59674,7 +59927,7 @@ index a803e1527c4b..c05d1bad49cc 100644 +obj-$(CONFIG_LIB_PRINT) += securec/ diff --git a/lib/securec/LICENSE b/lib/securec/LICENSE new file mode 100644 -index 000000000000..42f2a83670c6 +index 000000000..42f2a8367 --- /dev/null +++ b/lib/securec/LICENSE @@ -0,0 +1,124 @@ @@ -59805,14 +60058,14 @@ index 000000000000..42f2a83670c6 \ No newline at end of file diff --git a/lib/securec/Makefile b/lib/securec/Makefile new file mode 100644 -index 000000000000..9d804337a01e +index 000000000..9d804337a --- /dev/null +++ b/lib/securec/Makefile @@ -0,0 +1 @@ +obj-y += src/ diff --git a/lib/securec/README.en.md b/lib/securec/README.en.md new file mode 100644 -index 000000000000..60c477fe8978 +index 000000000..60c477fe8 --- /dev/null +++ b/lib/securec/README.en.md @@ -0,0 +1,59 @@ @@ -59878,7 +60131,7 @@ index 000000000000..60c477fe8978 \ No newline at end of file diff --git a/lib/securec/README.md b/lib/securec/README.md new file mode 100644 -index 000000000000..c16cbb17696c +index 000000000..c16cbb176 --- /dev/null +++ b/lib/securec/README.md @@ -0,0 +1,56 @@ @@ -59941,7 +60194,7 @@ index 000000000000..c16cbb17696c \ No newline at end of file diff --git a/lib/securec/src/Makefile b/lib/securec/src/Makefile new file mode 100644 -index 000000000000..42554f880412 +index 000000000..42554f880 --- /dev/null +++ b/lib/securec/src/Makefile @@ -0,0 +1,17 @@ @@ -59964,7 +60217,7 @@ index 000000000000..42554f880412 +obj-y += sscanf_s.o diff --git a/lib/securec/src/input.inl b/lib/securec/src/input.inl new file mode 100644 -index 000000000000..5880d45df453 +index 000000000..5880d45df --- /dev/null +++ b/lib/securec/src/input.inl @@ -0,0 +1,2229 @@ @@ -62199,7 +62452,7 @@ index 000000000000..5880d45df453 + diff --git a/lib/securec/src/memcpy_s.c b/lib/securec/src/memcpy_s.c new file mode 100644 -index 000000000000..a7fd48748e50 +index 000000000..a7fd48748 --- /dev/null +++ b/lib/securec/src/memcpy_s.c @@ -0,0 +1,555 @@ @@ -62760,7 +63013,7 @@ index 000000000000..a7fd48748e50 + diff --git a/lib/securec/src/memmove_s.c b/lib/securec/src/memmove_s.c new file mode 100644 -index 000000000000..f231f05da966 +index 000000000..f231f05da --- /dev/null +++ b/lib/securec/src/memmove_s.c @@ -0,0 +1,123 @@ @@ -62889,7 +63142,7 @@ index 000000000000..f231f05da966 + diff --git a/lib/securec/src/memset_s.c b/lib/securec/src/memset_s.c new file mode 100644 -index 000000000000..d9a657fd326a +index 000000000..d9a657fd3 --- /dev/null +++ b/lib/securec/src/memset_s.c @@ -0,0 +1,510 @@ @@ -63405,7 +63658,7 @@ index 000000000000..d9a657fd326a + diff --git a/lib/securec/src/output.inl b/lib/securec/src/output.inl new file mode 100644 -index 000000000000..9392efaaff1f +index 000000000..9392efaaf --- /dev/null +++ b/lib/securec/src/output.inl @@ -0,0 +1,1720 @@ @@ -65131,7 +65384,7 @@ index 000000000000..9392efaaff1f + diff --git a/lib/securec/src/scanf_s.c b/lib/securec/src/scanf_s.c new file mode 100644 -index 000000000000..dc575714e516 +index 000000000..dc575714e --- /dev/null +++ b/lib/securec/src/scanf_s.c @@ -0,0 +1,51 @@ @@ -65188,7 +65441,7 @@ index 000000000000..dc575714e516 + diff --git a/lib/securec/src/secinput.h b/lib/securec/src/secinput.h new file mode 100644 -index 000000000000..176ee05d96d4 +index 000000000..176ee05d9 --- /dev/null +++ b/lib/securec/src/secinput.h @@ -0,0 +1,181 @@ @@ -65375,7 +65628,7 @@ index 000000000000..176ee05d96d4 + diff --git a/lib/securec/src/securecutil.c b/lib/securec/src/securecutil.c new file mode 100644 -index 000000000000..7518eb300b2e +index 000000000..7518eb300 --- /dev/null +++ b/lib/securec/src/securecutil.c @@ -0,0 +1,81 @@ @@ -65462,7 +65715,7 @@ index 000000000000..7518eb300b2e + diff --git a/lib/securec/src/securecutil.h b/lib/securec/src/securecutil.h new file mode 100644 -index 000000000000..35112a248658 +index 000000000..35112a248 --- /dev/null +++ b/lib/securec/src/securecutil.h @@ -0,0 +1,574 @@ @@ -66042,7 +66295,7 @@ index 000000000000..35112a248658 + diff --git a/lib/securec/src/secureinput_a.c b/lib/securec/src/secureinput_a.c new file mode 100644 -index 000000000000..e79868f45eff +index 000000000..e79868f45 --- /dev/null +++ b/lib/securec/src/secureinput_a.c @@ -0,0 +1,38 @@ @@ -66086,7 +66339,7 @@ index 000000000000..e79868f45eff + diff --git a/lib/securec/src/secureprintoutput.h b/lib/securec/src/secureprintoutput.h new file mode 100644 -index 000000000000..a00b10dfffab +index 000000000..a00b10dff --- /dev/null +++ b/lib/securec/src/secureprintoutput.h @@ -0,0 +1,146 @@ @@ -66238,7 +66491,7 @@ index 000000000000..a00b10dfffab + diff --git a/lib/securec/src/secureprintoutput_a.c b/lib/securec/src/secureprintoutput_a.c new file mode 100644 -index 000000000000..b2b4b6a65cfa +index 000000000..b2b4b6a65 --- /dev/null +++ b/lib/securec/src/secureprintoutput_a.c @@ -0,0 +1,112 @@ @@ -66356,7 +66609,7 @@ index 000000000000..b2b4b6a65cfa + diff --git a/lib/securec/src/snprintf_s.c b/lib/securec/src/snprintf_s.c new file mode 100644 -index 000000000000..ec18328e3b27 +index 000000000..ec18328e3 --- /dev/null +++ b/lib/securec/src/snprintf_s.c @@ -0,0 +1,110 @@ @@ -66472,7 +66725,7 @@ index 000000000000..ec18328e3b27 + diff --git a/lib/securec/src/sprintf_s.c b/lib/securec/src/sprintf_s.c new file mode 100644 -index 000000000000..1f25f83990ad +index 000000000..1f25f8399 --- /dev/null +++ b/lib/securec/src/sprintf_s.c @@ -0,0 +1,58 @@ @@ -66536,7 +66789,7 @@ index 000000000000..1f25f83990ad + diff --git a/lib/securec/src/sscanf_s.c b/lib/securec/src/sscanf_s.c new file mode 100644 -index 000000000000..a8141ed25a6e +index 000000000..a8141ed25 --- /dev/null +++ b/lib/securec/src/sscanf_s.c @@ -0,0 +1,58 @@ @@ -66600,7 +66853,7 @@ index 000000000000..a8141ed25a6e + diff --git a/lib/securec/src/strcat_s.c b/lib/securec/src/strcat_s.c new file mode 100644 -index 000000000000..f835e7bc90a6 +index 000000000..f835e7bc9 --- /dev/null +++ b/lib/securec/src/strcat_s.c @@ -0,0 +1,101 @@ @@ -66707,7 +66960,7 @@ index 000000000000..f835e7bc90a6 + diff --git a/lib/securec/src/strcpy_s.c b/lib/securec/src/strcpy_s.c new file mode 100644 -index 000000000000..ca1b2ddb1f44 +index 000000000..ca1b2ddb1 --- /dev/null +++ b/lib/securec/src/strcpy_s.c @@ -0,0 +1,353 @@ @@ -67066,7 +67319,7 @@ index 000000000000..ca1b2ddb1f44 + diff --git a/lib/securec/src/strncat_s.c b/lib/securec/src/strncat_s.c new file mode 100644 -index 000000000000..6686d2994a64 +index 000000000..6686d2994 --- /dev/null +++ b/lib/securec/src/strncat_s.c @@ -0,0 +1,119 @@ @@ -67191,7 +67444,7 @@ index 000000000000..6686d2994a64 + diff --git a/lib/securec/src/strncpy_s.c b/lib/securec/src/strncpy_s.c new file mode 100644 -index 000000000000..5f4c5b709ff9 +index 000000000..5f4c5b709 --- /dev/null +++ b/lib/securec/src/strncpy_s.c @@ -0,0 +1,145 @@ @@ -67342,7 +67595,7 @@ index 000000000000..5f4c5b709ff9 + diff --git a/lib/securec/src/strtok_s.c b/lib/securec/src/strtok_s.c new file mode 100644 -index 000000000000..cd5dcd2cdfa0 +index 000000000..cd5dcd2cd --- /dev/null +++ b/lib/securec/src/strtok_s.c @@ -0,0 +1,116 @@ @@ -67464,7 +67717,7 @@ index 000000000000..cd5dcd2cdfa0 + diff --git a/lib/securec/src/vscanf_s.c b/lib/securec/src/vscanf_s.c new file mode 100644 -index 000000000000..61480a69722f +index 000000000..61480a697 --- /dev/null +++ b/lib/securec/src/vscanf_s.c @@ -0,0 +1,63 @@ @@ -67533,7 +67786,7 @@ index 000000000000..61480a69722f + diff --git a/lib/securec/src/vsnprintf_s.c b/lib/securec/src/vsnprintf_s.c new file mode 100644 -index 000000000000..35caaa2206a3 +index 000000000..35caaa220 --- /dev/null +++ b/lib/securec/src/vsnprintf_s.c @@ -0,0 +1,138 @@ @@ -67677,7 +67930,7 @@ index 000000000000..35caaa2206a3 + diff --git a/lib/securec/src/vsprintf_s.c b/lib/securec/src/vsprintf_s.c new file mode 100644 -index 000000000000..f50fa4a9802f +index 000000000..f50fa4a98 --- /dev/null +++ b/lib/securec/src/vsprintf_s.c @@ -0,0 +1,67 @@ @@ -67750,7 +68003,7 @@ index 000000000000..f50fa4a9802f + diff --git a/lib/securec/src/vsscanf_s.c b/lib/securec/src/vsscanf_s.c new file mode 100644 -index 000000000000..a19abe2b93da +index 000000000..a19abe2b9 --- /dev/null +++ b/lib/securec/src/vsscanf_s.c @@ -0,0 +1,87 @@