Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common

https://source.android.com/security/bulletin/2021-12-01 CVE-2021-33909 CVE-2021-38204 CVE-2021-0961 * tag 'ASB-2021-12-05_12-5.10': (3010 commits) ANDROID: workqueue: export symbol of the function wq_worker_comm() ANDROID: GKI: Update symbols to symbol list ANDROID: vendor_hooks: Add hooks for binder proc transaction ANDROID: GKI: Add symbols abi for USB IP kernel modules. ANDROID: GKI: Fix file mode on mtk abi file UPSTREAM: erofs: fix deadlock when shrink erofs slab ANDROID: init_task: Init android vendor and oem data UPSTREAM: sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain() ANDROID: Update symbol list for mtk UPSTREAM: erofs: fix unsafe pagevec reuse of hooked pclusters UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() UPSTREAM: usb: dwc3: gadget: Fix null pointer exception ANDROID: fips140: support "evaluation testing" builds via build.sh FROMGIT: sched/scs: Reset task stack state in bringup_cpu() ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat ANDROID: ABI: Add several spi_mem related symbols UPSTREAM: spi: spi-mem: add spi_mem_dtr_supports_op() ANDROID: gki_defconfig: enable CONFIG_SPI_MEM ANDROID: ABI: Add several iio related symbols ANDROID: ABI: Update symbol list for IMX ... Change-Id: I09cddc92fa34553b944e62cc5cbbba94a84e5437 Conflicts: arch/arm/boot/dts/rk322x.dtsi arch/arm64/boot/dts/rockchip/rk3399.dtsi drivers/dma-buf/heaps/system_heap.c drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c drivers/gpu/drm/rockchip/rockchip_drm_vop.c drivers/gpu/drm/rockchip/rockchip_lvds.c drivers/gpu/drm/rockchip/rockchip_vop_reg.c drivers/mtd/nand/spi/core.c drivers/pci/controller/pcie-rockchip-host.c drivers/soc/rockchip/Kconfig drivers/usb/dwc3/core.c drivers/usb/dwc3/core.h
2026-03-24 19:40:21 +09:00 · 2021-12-14 17:09:02 +08:00
parent da7b445d87 28de741861
commit f6909c028f
2559 changed files with 55467 additions and 28524 deletions
--- a/Documentation/ABI/testing/configfs-usb-gadget-uac2
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uac2
@@ -8,6 +8,8 @@ Description:
 		c_chmask   capture channel mask
 		c_srate    capture sampling rate
 		c_ssize    capture sample size (bytes)
+		c_sync     capture synchronization type (async/adaptive)
+		fb_max     maximum extra bandwidth in async mode
 		p_chmask   playback channel mask
 		p_srate    playback sampling rate
 		p_ssize    playback sample size (bytes)
--- a/Documentation/ABI/testing/evm
+++ b/Documentation/ABI/testing/evm
@@ -49,8 +49,30 @@ Description:
 		modification of EVM-protected metadata and
 		disable all further modification of policy

-		Note that once a key has been loaded, it will no longer be
-		possible to enable metadata modification.
+		Echoing a value is additive, the new value is added to the
+		existing initialization flags.
+
+		For example, after::
+
+		  echo 2 ><securityfs>/evm
+
+		another echo can be performed::
+
+		  echo 1 ><securityfs>/evm
+
+		and the resulting value will be 3.
+
+		Note that once an HMAC key has been loaded, it will no longer
+		be possible to enable metadata modification. Signaling that an
+		HMAC key has been loaded will clear the corresponding flag.
+		For example, if the current value is 6 (2 and 4 set)::
+
+		  echo 1 ><securityfs>/evm
+
+		will set the new value to 3 (4 cleared).
+
+		Loading an HMAC key is the only way to disable metadata
+		modification.

 		Until key loading has been signaled EVM can not create
 		or validate the 'security.evm' xattr, but returns
--- a/Documentation/ABI/testing/sysfs-bus-papr-pmem
+++ b/Documentation/ABI/testing/sysfs-bus-papr-pmem
@@ -39,9 +39,11 @@ KernelVersion:	v5.9
 Contact:	linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, linux-nvdimm@lists.01.org,
 Description:
 		(RO) Report various performance stats related to papr-scm NVDIMM
-		device.  Each stat is reported on a new line with each line
-		composed of a stat-identifier followed by it value. Below are
-		currently known dimm performance stats which are reported:
+		device. This attribute is only available for NVDIMM devices
+		that support reporting NVDIMM performance stats. Each stat is
+		reported on a new line with each line composed of a
+		stat-identifier followed by it value. Below are currently known
+		dimm performance stats which are reported:

 		* "CtlResCt" : Controller Reset Count
 		* "CtlResTm" : Controller Reset Elapsed Time
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -605,6 +605,12 @@
 			loops can be debugged more effectively on production
 			systems.

+	clocksource.max_cswd_read_retries= [KNL]
+			Number of clocksource_watchdog() retries due to
+			external delays before the clock will be marked
+			unstable.  Defaults to three retries, that is,
+			four attempts to read the clock under test.
+
 	clearcpuid=BITNUM[,BITNUM...] [X86]
 			Disable CPUID feature X for the kernel. See
 			arch/x86/include/asm/cpufeatures.h for the valid bit
--- a/Documentation/arm64/tagged-address-abi.rst
+++ b/Documentation/arm64/tagged-address-abi.rst
@@ -45,14 +45,24 @@ how the user addresses are used by the kernel:

 1. User addresses not accessed by the kernel but used for address space
   management (e.g. ``mprotect()``, ``madvise()``). The use of valid
-   tagged pointers in this context is allowed with the exception of
-   ``brk()``, ``mmap()`` and the ``new_address`` argument to
-   ``mremap()`` as these have the potential to alias with existing
-   user addresses.
+   tagged pointers in this context is allowed with these exceptions:

-   NOTE: This behaviour changed in v5.6 and so some earlier kernels may
-   incorrectly accept valid tagged pointers for the ``brk()``,
-   ``mmap()`` and ``mremap()`` system calls.
+   - ``brk()``, ``mmap()`` and the ``new_address`` argument to
+     ``mremap()`` as these have the potential to alias with existing
+      user addresses.
+
+     NOTE: This behaviour changed in v5.6 and so some earlier kernels may
+     incorrectly accept valid tagged pointers for the ``brk()``,
+     ``mmap()`` and ``mremap()`` system calls.
+
+   - The ``range.start``, ``start`` and ``dst`` arguments to the
+     ``UFFDIO_*`` ``ioctl()``s used on a file descriptor obtained from
+     ``userfaultfd()``, as fault addresses subsequently obtained by reading
+     the file descriptor will be untagged, which may otherwise confuse
+     tag-unaware programs.
+
+     NOTE: This behaviour changed in v5.14 and so some earlier kernels may
+     incorrectly accept valid tagged pointers for this system call.

 2. User addresses accessed by the kernel (e.g. ``write()``). This ABI
   relaxation is disabled by default and the application thread needs to
--- a/Documentation/dev-tools/ubsan.rst
+++ b/Documentation/dev-tools/ubsan.rst
@@ -86,3 +86,4 @@ References

 .. _1: https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/Debugging-Options.html
 .. _2: https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html
+.. _3: https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
--- a/Documentation/devicetree/bindings/i2c/i2c-at91.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-at91.txt
@@ -73,7 +73,7 @@ i2c0: i2c@f8034600 {
 	pinctrl-0 = <&pinctrl_i2c0>;
 	pinctrl-1 = <&pinctrl_i2c0_gpio>;
 	sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
-	scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>;
+	scl-gpios = <&pioA 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

 	wm8731: wm8731@1a {
 		compatible = "wm8731";
--- a/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml
+++ b/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml
@@ -24,9 +24,9 @@ allOf:
 select:
  properties:
    compatible:
-      items:
-        - enum:
-            - sifive,fu540-c000-ccache
+      contains:
+        enum:
+          - sifive,fu540-c000-ccache

  required:
    - compatible
--- a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
+++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
@@ -57,7 +57,7 @@ patternProperties:
          rate

      sound-dai:
-        $ref: /schemas/types.yaml#/definitions/phandle
+        $ref: /schemas/types.yaml#/definitions/phandle-array
        description: phandle of the CPU DAI

    patternProperties:
@@ -71,7 +71,7 @@ patternProperties:

        properties:
          sound-dai:
-            $ref: /schemas/types.yaml#/definitions/phandle
+            $ref: /schemas/types.yaml#/definitions/phandle-array
            description: phandle of the codec DAI

        required:
--- a/Documentation/driver-api/early-userspace/early_userspace_support.rst
+++ b/Documentation/driver-api/early-userspace/early_userspace_support.rst
@@ -69,17 +69,17 @@ early userspace image can be built by an unprivileged user.

 As a technical note, when directories and files are specified, the
 entire CONFIG_INITRAMFS_SOURCE is passed to
-usr/gen_initramfs_list.sh.  This means that CONFIG_INITRAMFS_SOURCE
+usr/gen_initramfs.sh.  This means that CONFIG_INITRAMFS_SOURCE
 can really be interpreted as any legal argument to
-gen_initramfs_list.sh.  If a directory is specified as an argument then
+gen_initramfs.sh.  If a directory is specified as an argument then
 the contents are scanned, uid/gid translation is performed, and
 usr/gen_init_cpio file directives are output.  If a directory is
-specified as an argument to usr/gen_initramfs_list.sh then the
+specified as an argument to usr/gen_initramfs.sh then the
 contents of the file are simply copied to the output.  All of the output
 directives from directory scanning and file contents copying are
 processed by usr/gen_init_cpio.

-See also 'usr/gen_initramfs_list.sh -h'.
+See also 'usr/gen_initramfs.sh -h'.

 Where's this all leading?
 =========================
--- a/Documentation/fault-injection/provoke-crashes.rst
+++ b/Documentation/fault-injection/provoke-crashes.rst
@@ -29,7 +29,7 @@ recur_count
 cpoint_name
 	Where in the kernel to trigger the action. It can be
 	one of INT_HARDWARE_ENTRY, INT_HW_IRQ_EN, INT_TASKLET_ENTRY,
-	FS_DEVRW, MEM_SWAPOUT, TIMERADD, SCSI_DISPATCH_CMD,
+	FS_DEVRW, MEM_SWAPOUT, TIMERADD, SCSI_QUEUE_RQ,
 	IDE_CORE_CP, or DIRECT

 cpoint_type
--- a/Documentation/filesystems/ramfs-rootfs-initramfs.rst
+++ b/Documentation/filesystems/ramfs-rootfs-initramfs.rst
@@ -170,7 +170,7 @@ Documentation/driver-api/early-userspace/early_userspace_support.rst for more de
 The kernel does not depend on external cpio tools.  If you specify a
 directory instead of a configuration file, the kernel's build infrastructure
 creates a configuration file from that directory (usr/Makefile calls
-usr/gen_initramfs_list.sh), and proceeds to package up that directory
+usr/gen_initramfs.sh), and proceeds to package up that directory
 using the config file (by feeding it to usr/gen_init_cpio, which is created
 from usr/gen_init_cpio.c).  The kernel's build-time cpio creation code is
 entirely self-contained, and the kernel's boot-time extractor is also
--- a/Documentation/hwmon/max31790.rst
+++ b/Documentation/hwmon/max31790.rst
@@ -38,6 +38,7 @@ Sysfs entries
 fan[1-12]_input    RO  fan tachometer speed in RPM
 fan[1-12]_fault    RO  fan experienced fault
 fan[1-6]_target    RW  desired fan speed in RPM
-pwm[1-6]_enable    RW  regulator mode, 0=disabled, 1=manual mode, 2=rpm mode
-pwm[1-6]           RW  fan target duty cycle (0-255)
+pwm[1-6]_enable    RW  regulator mode, 0=disabled (duty cycle=0%), 1=manual mode, 2=rpm mode
+pwm[1-6]           RW  read: current pwm duty cycle,
+                       write: target pwm duty cycle (0-255)
 ================== === =======================================================
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -751,7 +751,7 @@ tcp_fastopen_blackhole_timeout_sec - INTEGER
 	initial value when the blackhole issue goes away.
 	0 to disable the blackhole detection.

-	By default, it is set to 1hr.
+	By default, it is set to 0 (feature is disabled).

 tcp_fastopen_key - list of comma separated 32-digit hexadecimal INTEGERs
 	The list consists of a primary key and an optional backup key. The
--- a/Documentation/trace/histogram.rst
+++ b/Documentation/trace/histogram.rst
@@ -191,7 +191,7 @@ Documentation written by Tom Zanussi
                                with the event, in nanoseconds.  May be
 			        modified by .usecs to have timestamps
 			        interpreted as microseconds.
-    cpu                    int  the cpu on which the event occurred.
+    common_cpu             int  the cpu on which the event occurred.
    ====================== ==== =======================================

 Extended error information
--- a/Documentation/usb/gadget-testing.rst
+++ b/Documentation/usb/gadget-testing.rst
@@ -728,6 +728,8 @@ The uac2 function provides these attributes in its function directory:
 	c_chmask	capture channel mask
 	c_srate		capture sampling rate
 	c_ssize		capture sample size (bytes)
+	c_sync		capture synchronization type (async/adaptive)
+	fb_max          maximum extra bandwidth in async mode
 	p_chmask	playback channel mask
 	p_srate		playback sampling rate
 	p_ssize		playback sample size (bytes)
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
@@ -4161,7 +4161,7 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
    :stub-columns: 0
    :widths:       1 1 2

-    * - ``V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT``
+    * - ``V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED``
      - 0x00000001
      -
    * - ``V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT``
@@ -4369,6 +4369,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
    * - ``V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED``
      - 0x00000100
      -
+    * - ``V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT``
+      - 0x00000200
+      -

 .. c:type:: v4l2_hevc_dpb_entry

--- a/Documentation/virt/kvm/mmu.rst
+++ b/Documentation/virt/kvm/mmu.rst
@@ -171,8 +171,8 @@ Shadow pages contain the following information:
    shadow pages) so role.quadrant takes values in the range 0..3.  Each
    quadrant maps 1GB virtual address space.
  role.access:
-    Inherited guest access permissions in the form uwx.  Note execute
-    permission is positive, not negative.
+    Inherited guest access permissions from the parent ptes in the form uwx.
+    Note execute permission is positive, not negative.
  role.invalid:
    The page is invalid and should not be used.  It is a root page that is
    currently pinned (by a cpu hardware register pointing to it); once it is
--- a/Documentation/vm/arch_pgtable_helpers.rst
+++ b/Documentation/vm/arch_pgtable_helpers.rst
@@ -50,7 +50,7 @@ PTE Page Table Helpers
 +---------------------------+--------------------------------------------------+
 | pte_mkwrite               | Creates a writable PTE                           |
 +---------------------------+--------------------------------------------------+
-| pte_mkwrprotect           | Creates a write protected PTE                    |
+| pte_wrprotect             | Creates a write protected PTE                    |
 +---------------------------+--------------------------------------------------+
 | pte_mkspecial             | Creates a special PTE                            |
 +---------------------------+--------------------------------------------------+
@@ -120,7 +120,7 @@ PMD Page Table Helpers
 +---------------------------+--------------------------------------------------+
 | pmd_mkwrite               | Creates a writable PMD                           |
 +---------------------------+--------------------------------------------------+
-| pmd_mkwrprotect           | Creates a write protected PMD                    |
+| pmd_wrprotect             | Creates a write protected PMD                    |
 +---------------------------+--------------------------------------------------+
 | pmd_mkspecial             | Creates a special PMD                            |
 +---------------------------+--------------------------------------------------+
@@ -186,7 +186,7 @@ PUD Page Table Helpers
 +---------------------------+--------------------------------------------------+
 | pud_mkwrite               | Creates a writable PUD                           |
 +---------------------------+--------------------------------------------------+
-| pud_mkwrprotect           | Creates a write protected PUD                    |
+| pud_wrprotect             | Creates a write protected PUD                    |
 +---------------------------+--------------------------------------------------+
 | pud_mkdevmap              | Creates a ZONE_DEVICE mapped PUD                 |
 +---------------------------+--------------------------------------------------+
@@ -224,7 +224,7 @@ HugeTLB Page Table Helpers
 +---------------------------+--------------------------------------------------+
 | huge_pte_mkwrite          | Creates a writable HugeTLB                       |
 +---------------------------+--------------------------------------------------+
-| huge_pte_mkwrprotect      | Creates a write protected HugeTLB                |
+| huge_pte_wrprotect        | Creates a write protected HugeTLB                |
 +---------------------------+--------------------------------------------------+
 | huge_ptep_get_and_clear   | Clears a HugeTLB                                 |
 +---------------------------+--------------------------------------------------+
--- a/Documentation/vm/slub.rst
+++ b/Documentation/vm/slub.rst
@@ -181,7 +181,7 @@ SLUB Debug output
 Here is a sample of slub debug output::

 ====================================================================
- BUG kmalloc-8: Redzone overwritten
+ BUG kmalloc-8: Right Redzone overwritten
 --------------------------------------------------------------------

 INFO: 0xc90f6d28-0xc90f6d2b. First byte 0x00 instead of 0xcc
@@ -189,10 +189,10 @@ Here is a sample of slub debug output::
 INFO: Object 0xc90f6d20 @offset=3360 fp=0xc90f6d58
 INFO: Allocated in get_modalias+0x61/0xf5 age=53 cpu=1 pid=554

- Bytes b4 0xc90f6d10:  00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ
-   Object 0xc90f6d20:  31 30 31 39 2e 30 30 35                         1019.005
-  Redzone 0xc90f6d28:  00 cc cc cc                                     .
-  Padding 0xc90f6d50:  5a 5a 5a 5a 5a 5a 5a 5a                         ZZZZZZZZ
+ Bytes b4 (0xc90f6d10): 00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ
+ Object   (0xc90f6d20): 31 30 31 39 2e 30 30 35                         1019.005
+ Redzone  (0xc90f6d28): 00 cc cc cc                                     .
+ Padding  (0xc90f6d50): 5a 5a 5a 5a 5a 5a 5a 5a                         ZZZZZZZZ

   [<c010523d>] dump_trace+0x63/0x1eb
   [<c01053df>] show_trace_log_lvl+0x1a/0x2f
--- a/11
+++ b/11
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 43
+SUBLEVEL = 66
 EXTRAVERSION =
 NAME = Dare mighty things

@@ -728,11 +728,12 @@ $(KCONFIG_CONFIG):
 # This exploits the 'multi-target pattern rule' trick.
 # The syncconfig should be executed only once to make all the targets.
 # (Note: use the grouped target '&:' when we bump to GNU Make 4.3)
-quiet_cmd_syncconfig = SYNC    $@
-      cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig
-
+#
+# Do not use $(call cmd,...) here. That would suppress prompts from syncconfig,
+# so you cannot notice that Kconfig is waiting for the user input.
 %/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG)
-	+$(call cmd,syncconfig)
+	$(Q)$(kecho) "  SYNC    $@"
+	$(Q)$(MAKE) -f $(srctree)/Makefile syncconfig
 else # !may-sync-config
 # External modules and some install targets need include/generated/autoconf.h
 # and include/config/auto.conf but do not care if they are up-to-date.
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
--- a/android/abi_gki_aarch64_db845c
+++ b/android/abi_gki_aarch64_db845c
@@ -1499,6 +1499,7 @@
  irq_chip_retrigger_hierarchy
  irq_domain_alloc_irqs_parent
  irq_domain_create_hierarchy
+  irq_domain_disconnect_hierarchy
  irq_domain_set_hwirq_and_chip
  irq_domain_update_bus_token

@@ -1660,6 +1661,7 @@
  sdhci_reset
  sdhci_set_bus_width
  sdhci_set_power_noreg
+  __sdhci_set_timeout
  sdhci_setup_host

 # required by slim-qcom-ngd-ctrl.ko
--- a/android/abi_gki_aarch64_exynos
+++ b/android/abi_gki_aarch64_exynos
@@ -762,7 +762,11 @@
  enable_percpu_irq
  end_buffer_read_sync
  ether_setup
+  eth_platform_get_mac_address
+  ethtool_op_get_link
+  ethtool_op_get_ts_info
  eth_type_trans
+  eth_validate_addr
  event_triggers_call
  extcon_get_state
  extcon_set_state_sync
@@ -799,6 +803,7 @@
  gcd
  generic_file_llseek
  generic_handle_irq
+  generic_mii_ioctl
  genlmsg_multicast_allns
  genlmsg_put
  genl_register_family
@@ -1148,6 +1153,10 @@
  memunmap
  mfd_add_devices
  mfd_remove_devices
+  mii_ethtool_get_link_ksettings
+  mii_ethtool_gset
+  mii_ethtool_set_link_ksettings
+  mii_nway_restart
  mipi_dsi_attach
  mipi_dsi_compression_mode
  mipi_dsi_dcs_read
@@ -1208,6 +1217,8 @@
  napi_schedule_prep
  __netdev_alloc_skb
  netdev_err
+  netdev_info
+  netdev_warn
  netif_carrier_off
  netif_carrier_on
  netif_napi_add
@@ -1267,6 +1278,7 @@
  of_find_device_by_node
  of_find_matching_node_and_match
  of_find_node_by_name
+  of_find_node_by_phandle
  of_find_node_by_type
  of_find_node_opts_by_path
  of_find_node_with_property
@@ -1479,6 +1491,7 @@
  proc_set_user
  proc_symlink
  __pskb_copy_fclone
+  pskb_expand_head
  __pskb_pull_tail
  put_device
  put_disk
@@ -1929,8 +1942,10 @@
  __traceiter_android_rvh_select_task_rq_rt
  __traceiter_android_vh_cpu_idle_enter
  __traceiter_android_vh_cpu_idle_exit
+  __traceiter_android_vh_do_wake_up_sync
  __traceiter_android_vh_ipi_stop
  __traceiter_android_vh_scheduler_tick
+  __traceiter_android_vh_set_wake_flags
  __traceiter_android_vh_show_mem
  __traceiter_android_vh_ufs_compl_command
  __traceiter_android_vh_ufs_prepare_command
@@ -1978,8 +1993,10 @@
  __tracepoint_android_rvh_select_task_rq_rt
  __tracepoint_android_vh_cpu_idle_enter
  __tracepoint_android_vh_cpu_idle_exit
+  __tracepoint_android_vh_do_wake_up_sync
  __tracepoint_android_vh_ipi_stop
  __tracepoint_android_vh_scheduler_tick
+  __tracepoint_android_vh_set_wake_flags
  __tracepoint_android_vh_show_mem
  __tracepoint_android_vh_ufs_compl_command
  __tracepoint_android_vh_ufs_prepare_command
@@ -2085,6 +2102,7 @@
  __udelay
  ufshcd_auto_hibern8_update
  ufshcd_dme_get_attr
+  ufshcd_dme_set_attr
  ufshcd_hold
  ufshcd_pltfrm_init
  ufshcd_query_flag_retry
@@ -2118,6 +2136,7 @@
  usb_choose_configuration
  usb_copy_descriptors
  __usb_create_hcd
+  usb_deregister
  usb_disabled
  usb_enable_autosuspend
  usb_ep_alloc_request
@@ -2131,9 +2150,31 @@
  usb_hcd_platform_shutdown
  usb_hub_find_child
  usb_interface_id
+  usbnet_disconnect
+  usbnet_get_endpoints
+  usbnet_get_msglevel
+  usbnet_get_stats64
+  usbnet_link_change
+  usbnet_nway_reset
+  usbnet_open
+  usbnet_probe
+  usbnet_read_cmd
+  usbnet_read_cmd_nopm
+  usbnet_resume
+  usbnet_set_msglevel
+  usbnet_skb_return
+  usbnet_start_xmit
+  usbnet_stop
+  usbnet_suspend
+  usbnet_tx_timeout
+  usbnet_update_max_qlen
+  usbnet_write_cmd
+  usbnet_write_cmd_async
+  usbnet_write_cmd_nopm
  usb_otg_state_string
  usb_put_function_instance
  usb_put_hcd
+  usb_register_driver
  usb_register_notify
  usb_remove_hcd
  usb_speed_string
@@ -2262,6 +2303,7 @@
  wakeup_source_register
  wakeup_source_unregister
  __wake_up_sync
+  __wake_up_sync_key
  __warn_printk
  watchdog_init_timeout
  watchdog_register_device
--- a/android/abi_gki_aarch64_fips140
+++ b/android/abi_gki_aarch64_fips140
@@ -6,12 +6,14 @@
 # required by fips140.ko
  add_random_ready_callback
  aead_register_instance
-  arm64_const_caps_ready
+  ahash_register_instance
+  arch_timer_read_counter
  bcmp
  cancel_work_sync
  __cfi_slowpath
+  complete_all
+  completion_done
  cpu_have_feature
-  cpu_hwcap_keys
  crypto_aead_decrypt
  crypto_aead_encrypt
  crypto_aead_setauthsize
@@ -19,7 +21,6 @@
  crypto_ahash_finup
  crypto_ahash_setkey
  crypto_alg_list
-  crypto_alg_mod_lookup
  crypto_alg_sem
  crypto_alloc_aead
  crypto_alloc_base
@@ -28,7 +29,6 @@
  crypto_alloc_skcipher
  crypto_attr_alg_name
  crypto_check_attr_type
-  crypto_cipher_decrypt_one
  crypto_cipher_encrypt_one
  crypto_cipher_setkey
  crypto_destroy_tfm
@@ -38,17 +38,23 @@
  crypto_grab_ahash
  crypto_grab_shash
  crypto_grab_skcipher
+  crypto_grab_spawn
  crypto_inst_setname
  crypto_put_default_null_skcipher
  crypto_register_aead
+  crypto_register_aeads
+  crypto_register_ahash
+  crypto_register_ahashes
  crypto_register_alg
+  crypto_register_algs
+  crypto_register_rng
  crypto_register_rngs
  crypto_register_shash
  crypto_register_shashes
+  crypto_register_skcipher
  crypto_register_skciphers
  crypto_register_template
  crypto_register_templates
-  crypto_remove_final
  crypto_remove_spawns
  crypto_req_done
  crypto_rng_reset
@@ -63,8 +69,10 @@
  crypto_skcipher_encrypt
  crypto_skcipher_setkey
  crypto_spawn_tfm2
+  crypto_spawn_tfm
  crypto_unregister_aead
  crypto_unregister_alg
+  crypto_unregister_rng
  crypto_unregister_rngs
  crypto_unregister_shash
  crypto_unregister_shashes
@@ -87,6 +95,7 @@
  kmalloc_order_trace
  kmem_cache_alloc_trace
  kmemdup
+  ktime_get
  __list_add_valid
  __list_del_entry_valid
  memcpy
@@ -99,6 +108,9 @@
  preempt_schedule_notrace
  printk
  queue_work_on
+  ___ratelimit
+  _raw_spin_lock
+  _raw_spin_unlock
  refcount_warn_saturate
  scatterwalk_ffwd
  scatterwalk_map_and_copy
@@ -121,7 +133,6 @@
  strlcpy
  strlen
  strncmp
-  synchronize_rcu_tasks
  system_wq
  __traceiter_android_vh_aes_decrypt
  __traceiter_android_vh_aes_encrypt
@@ -134,23 +145,29 @@
  tracepoint_probe_register
  up_write
  wait_for_completion
+  xa_load
+  xa_store

-# needed by fips140.ko but not identified by the tooling
-# TODO(b/189327973): [GKI: ABI] Build of fips140.ko module fails to identify some symbols
-  __crypto_memneq
-  __crypto_xor
+# preserved by --additions-only
  aes_decrypt
  aes_encrypt
  aes_expandkey
+  arm64_const_caps_ready
  ce_aes_expandkey
+  cpu_hwcap_keys
  crypto_aes_inv_sbox
  crypto_aes_sbox
  crypto_aes_set_key
+  crypto_alg_mod_lookup
+  crypto_cipher_decrypt_one
  crypto_ft_tab
  crypto_inc
  crypto_it_tab
+  __crypto_memneq
+  crypto_remove_final
  crypto_sha1_finup
  crypto_sha1_update
+  __crypto_xor
  gf128mul_lle
  sha1_transform
  sha224_final
@@ -158,3 +175,4 @@
  sha256_block_data_order
  sha256_final
  sha256_update
+  synchronize_rcu_tasks
--- a/android/abi_gki_aarch64_galaxy
+++ b/android/abi_gki_aarch64_galaxy
--- a/android/abi_gki_aarch64_generic
+++ b/android/abi_gki_aarch64_generic
@@ -398,6 +398,7 @@
  __devm_regmap_init_spi
  devm_regulator_bulk_get
  devm_regulator_get
+  devm_regulator_get_exclusive
  devm_regulator_get_optional
  devm_regulator_put
  devm_regulator_register
@@ -967,6 +968,7 @@
  __ioremap
  io_schedule_timeout
  iounmap
+  iov_iter_bvec
  ip_send_check
  iput
  __irq_alloc_descs
@@ -1052,6 +1054,7 @@
  kstrtouint
  kstrtouint_from_user
  kstrtoull
+  kstrtoull_from_user
  kthread_bind
  kthread_bind_mask
  kthread_cancel_delayed_work_sync
@@ -1246,6 +1249,7 @@
  of_get_regulator_init_data
  of_iomap
  of_irq_find_parent
+  of_irq_get
  of_irq_get_byname
  of_irq_parse_one
  of_machine_is_compatible
@@ -1280,6 +1284,7 @@
  of_root
  of_thermal_get_ntrips
  of_thermal_get_trip_points
+  of_thermal_is_trip_valid
  of_translate_address
  of_usb_host_tpl_support
  page_endio
@@ -1355,6 +1360,7 @@
  pinctrl_remove_gpio_range
  pinctrl_select_state
  pin_get_name
+  pin_user_pages
  pin_user_pages_fast
  pin_user_pages_remote
  pktgen_xfrm_outer_mode_output
@@ -1582,6 +1588,9 @@
  rtc_tm_to_time64
  rtc_update_irq
  rtc_valid_tm
+  __rt_mutex_init
+  rt_mutex_lock
+  rt_mutex_unlock
  rtnl_is_locked
  rtnl_lock
  rtnl_unlock
@@ -1923,6 +1932,7 @@
  __traceiter_android_rvh_typec_tcpci_chk_contaminant
  __traceiter_android_rvh_typec_tcpci_get_vbus
  __traceiter_android_rvh_uclamp_eff_get
+  __traceiter_android_rvh_ufs_complete_init
  __traceiter_android_rvh_ufs_reprogram_all_keys
  __traceiter_android_rvh_util_est_update
  __traceiter_android_vh_arch_set_freq_scale
@@ -1956,6 +1966,8 @@
  __traceiter_android_vh_ufs_send_tm_command
  __traceiter_android_vh_ufs_send_uic_command
  __traceiter_android_vh_ufs_update_sysfs
+  __traceiter_android_vh_usb_dev_resume
+  __traceiter_android_vh_usb_dev_suspend
  __traceiter_clock_set_rate
  __traceiter_cpu_frequency
  __traceiter_device_pm_callback_end
@@ -1998,6 +2010,7 @@
  __tracepoint_android_rvh_typec_tcpci_chk_contaminant
  __tracepoint_android_rvh_typec_tcpci_get_vbus
  __tracepoint_android_rvh_uclamp_eff_get
+  __tracepoint_android_rvh_ufs_complete_init
  __tracepoint_android_rvh_ufs_reprogram_all_keys
  __tracepoint_android_rvh_util_est_update
  __tracepoint_android_vh_arch_set_freq_scale
@@ -2031,6 +2044,8 @@
  __tracepoint_android_vh_ufs_send_tm_command
  __tracepoint_android_vh_ufs_send_uic_command
  __tracepoint_android_vh_ufs_update_sysfs
+  __tracepoint_android_vh_usb_dev_resume
+  __tracepoint_android_vh_usb_dev_suspend
  __tracepoint_clock_set_rate
  __tracepoint_cpu_frequency
  __tracepoint_device_pm_callback_end
--- a/android/abi_gki_aarch64_imx
+++ b/android/abi_gki_aarch64_imx
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -292,6 +292,7 @@
  destroy_workqueue
  dev_alloc_name
  dev_base_lock
+  dev_change_flags
  dev_change_net_namespace
  dev_close
  dev_driver_string
@@ -452,6 +453,7 @@
  devres_alloc_node
  devres_free
  devres_release
+  dev_set_mac_address
  dev_set_name
  _dev_warn
  disable_irq
@@ -973,6 +975,7 @@
  kfree_skb
  kfree_skb_list
  kill_anon_super
+  kill_pid
  kimage_vaddr
  kimage_voffset
  __kmalloc
@@ -1020,6 +1023,7 @@
  kthread_destroy_worker
  kthread_flush_work
  kthread_flush_worker
+  kthread_freezable_should_stop
  __kthread_init_worker
  kthread_queue_delayed_work
  kthread_queue_work
@@ -1923,8 +1927,13 @@
  __traceiter_android_vh_exit_creds
  __traceiter_android_vh_fill_ext_fmtdesc
  __traceiter_android_vh_finish_update_load_avg_se
+  __traceiter_android_vh_freq_qos_add_request
+  __traceiter_android_vh_freq_qos_update_request
+  __traceiter_android_vh_freq_qos_remove_request
  __traceiter_android_vh_iommu_alloc_iova
+  __traceiter_android_vh_iommu_iovad_alloc_iova
  __traceiter_android_vh_iommu_free_iova
+  __traceiter_android_vh_iommu_iovad_free_iova
  __traceiter_android_vh_ipv6_gen_linklocal_addr
  __traceiter_android_vh_logbuf
  __traceiter_android_vh_override_creds
@@ -1934,6 +1943,7 @@
  __traceiter_android_vh_rwsem_wake
  __traceiter_android_vh_rwsem_write_finished
  __traceiter_android_vh_scheduler_tick
+  __traceiter_android_vh_scmi_timeout_sync
  __traceiter_android_vh_selinux_avc_insert
  __traceiter_android_vh_selinux_avc_lookup
  __traceiter_android_vh_selinux_avc_node_delete
@@ -1946,6 +1956,7 @@
  __traceiter_android_vh_set_module_permit_after_init
  __traceiter_android_vh_set_module_permit_before_init
  __traceiter_android_vh_set_wake_flags
+  __traceiter_android_vh_snd_soc_card_get_comp_chain
  __traceiter_android_vh_syscall_prctl_finished
  __traceiter_android_vh_ufs_send_command
  __traceiter_android_vh_ufs_send_tm_command
@@ -1996,8 +2007,13 @@
  __tracepoint_android_vh_exit_creds
  __tracepoint_android_vh_fill_ext_fmtdesc
  __tracepoint_android_vh_finish_update_load_avg_se
+  __tracepoint_android_vh_freq_qos_add_request
+  __tracepoint_android_vh_freq_qos_update_request
+  __tracepoint_android_vh_freq_qos_remove_request
  __tracepoint_android_vh_iommu_alloc_iova
+  __tracepoint_android_vh_iommu_iovad_alloc_iova
  __tracepoint_android_vh_iommu_free_iova
+  __tracepoint_android_vh_iommu_iovad_free_iova
  __tracepoint_android_vh_ipv6_gen_linklocal_addr
  __tracepoint_android_vh_logbuf
  __tracepoint_android_vh_override_creds
@@ -2007,6 +2023,7 @@
  __tracepoint_android_vh_rwsem_wake
  __tracepoint_android_vh_rwsem_write_finished
  __tracepoint_android_vh_scheduler_tick
+  __tracepoint_android_vh_scmi_timeout_sync
  __tracepoint_android_vh_selinux_avc_insert
  __tracepoint_android_vh_selinux_avc_lookup
  __tracepoint_android_vh_selinux_avc_node_delete
@@ -2019,6 +2036,7 @@
  __tracepoint_android_vh_set_module_permit_after_init
  __tracepoint_android_vh_set_module_permit_before_init
  __tracepoint_android_vh_set_wake_flags
+  __tracepoint_android_vh_snd_soc_card_get_comp_chain
  __tracepoint_android_vh_syscall_prctl_finished
  __tracepoint_android_vh_ufs_send_command
  __tracepoint_android_vh_ufs_send_tm_command
@@ -2040,6 +2058,7 @@
  trace_raw_output_prep
  trace_seq_printf
  trace_seq_putc
+  trace_set_clr_event
  tracing_off
  try_wait_for_completion
  tty_flip_buffer_push
@@ -2189,6 +2208,7 @@
  usbnet_write_cmd
  usbnet_write_cmd_async
  usbnet_write_cmd_nopm
+  usb_os_desc_prepare_interf_dir
  usb_put_function
  usb_put_function_instance
  usb_put_hcd
@@ -2229,6 +2249,7 @@
  v4l2_ctrl_request_complete
  v4l2_ctrl_request_setup
  __v4l2_ctrl_s_ctrl
+  __v4l2_ctrl_s_ctrl_compound
  v4l2_ctrl_subdev_subscribe_event
  v4l2_ctrl_subscribe_event
  v4l2_device_register
@@ -2352,6 +2373,7 @@
  vscnprintf
  vsnprintf
  vsprintf
+  vsscanf
  vunmap
  vzalloc
  wait_for_completion
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -359,6 +359,7 @@
  dev_alloc_name
  dev_change_net_namespace
  dev_close
+  dev_coredumpm
  dev_coredumpv
  _dev_crit
  __dev_direct_xmit
@@ -1216,6 +1217,7 @@
  __irq_domain_add
  irq_domain_alloc_irqs_parent
  irq_domain_create_hierarchy
+  irq_domain_disconnect_hierarchy
  irq_domain_free_irqs_common
  irq_domain_free_irqs_parent
  irq_domain_get_irq_data
@@ -1438,11 +1440,21 @@
  misc_deregister
  misc_register
  mmc_cqe_request_done
+  mmc_hs200_tuning
+  mmc_issue_type
  mmc_of_parse
  mmc_regulator_get_supply
  mmc_regulator_set_ocr
  mmc_regulator_set_vqmmc
+  mmc_select_bus_width
+  mmc_select_hs
+  mmc_select_hs400
+  mmc_select_hs_ddr
+  mmc_select_timing
  mmc_send_tuning
+  mmc_set_clock
+  mmc_set_initial_state
+  mmc_set_timing
  mmput
  mod_delayed_work_on
  __mod_node_page_state
@@ -1470,6 +1482,7 @@
  neigh_destroy
  __neigh_event_send
  neigh_lookup
+  neigh_resolve_output
  neigh_xmit
  __netdev_alloc_skb
  netdev_err
@@ -1772,6 +1785,8 @@
  platform_get_resource
  platform_get_resource_byname
  platform_irq_count
+  platform_msi_domain_alloc_irqs
+  platform_msi_domain_free_irqs
  pm_clk_add
  pm_clk_create
  pm_clk_destroy
@@ -1946,6 +1961,7 @@
  register_kretprobe
  register_memory_notifier
  register_module_notifier
+  register_qdisc
  register_netdev
  register_netdevice
  register_netdevice_notifier
@@ -2074,8 +2090,10 @@
  rproc_remove_subdev
  rproc_report_crash
  rproc_shutdown
+  rtc_ktime_to_tm
  __rtc_register_device
  rtc_time64_to_tm
+  rtc_tm_to_ktime
  rtc_tm_to_time64
  rtc_update_irq
  rt_mutex_lock
@@ -2233,6 +2251,7 @@
  smp_call_function
  smp_call_function_any
  smp_call_function_single
+  smp_call_function_single_async
  snd_card_free
  snd_card_new
  snd_card_register
@@ -2482,6 +2501,7 @@
  __traceiter_android_rvh_cpu_cgroup_online
  __traceiter_android_rvh_cpufreq_transition
  __traceiter_android_rvh_dequeue_task
+  __traceiter_android_rvh_do_sched_yield
  __traceiter_android_rvh_enqueue_task
  __traceiter_android_rvh_find_busiest_queue
  __traceiter_android_rvh_find_lowest_rq
@@ -2512,6 +2532,7 @@
  __traceiter_android_rvh_schedule_bug
  __traceiter_android_rvh_select_task_rq_fair
  __traceiter_android_rvh_select_task_rq_rt
+  __traceiter_android_rvh_set_balance_anon_file_reclaim
  __traceiter_android_rvh_set_gfp_zone_flags
  __traceiter_android_rvh_set_readahead_gfp_mask
  __traceiter_android_rvh_set_skip_swapcache_flags
@@ -2550,6 +2571,7 @@
  __traceiter_android_vh_logbuf_pr_cont
  __traceiter_android_vh_printk_hotplug
  __traceiter_android_vh_rproc_recovery
+  __traceiter_android_vh_rproc_recovery_set
  __traceiter_android_vh_scheduler_tick
  __traceiter_android_vh_show_max_freq
  __traceiter_android_vh_show_resume_epoch_val
@@ -2591,6 +2613,7 @@
  __tracepoint_android_rvh_cpu_cgroup_online
  __tracepoint_android_rvh_cpufreq_transition
  __tracepoint_android_rvh_dequeue_task
+  __tracepoint_android_rvh_do_sched_yield
  __tracepoint_android_rvh_enqueue_task
  __tracepoint_android_rvh_find_busiest_queue
  __tracepoint_android_rvh_find_lowest_rq
@@ -2621,6 +2644,7 @@
  __tracepoint_android_rvh_schedule_bug
  __tracepoint_android_rvh_select_task_rq_fair
  __tracepoint_android_rvh_select_task_rq_rt
+  __tracepoint_android_rvh_set_balance_anon_file_reclaim
  __tracepoint_android_rvh_set_gfp_zone_flags
  __tracepoint_android_rvh_set_readahead_gfp_mask
  __tracepoint_android_rvh_set_skip_swapcache_flags
@@ -2666,6 +2690,7 @@
  __tracepoint_android_vh_psi_event
  __tracepoint_android_vh_psi_group
  __tracepoint_android_vh_rproc_recovery
+  __tracepoint_android_vh_rproc_recovery_set
  __tracepoint_android_vh_scheduler_tick
  __tracepoint_android_vh_shmem_alloc_page
  __tracepoint_android_vh_show_max_freq
@@ -2796,6 +2821,7 @@
  unregister_oom_notifier
  unregister_pernet_device
  unregister_pm_notifier
+  unregister_qdisc
  unregister_reboot_notifier
  unregister_restart_handler
  unregister_rpmsg_driver
@@ -2969,6 +2995,8 @@
  vprintk
  vscnprintf
  vsnprintf
+  vsock_addr_init
+  vsock_remove_sock
  vunmap
  vzalloc
  wait_for_completion
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
--- a/android/abi_gki_aarch64_unisoc
+++ b/android/abi_gki_aarch64_unisoc
@@ -0,0 +1,272 @@
+[abi_symbol_list]
+# commonly used symbols
+  __arch_copy_from_user
+  arm64_const_caps_ready
+  atomic_notifier_chain_register
+  atomic_notifier_chain_unregister
+  __cfi_slowpath
+  __check_object_size
+  clk_bulk_disable
+  clk_bulk_enable
+  clk_bulk_prepare
+  clk_bulk_unprepare
+  clk_disable
+  clk_enable
+  clk_fixed_factor_ops
+  clk_get_rate
+  clk_hw_get_num_parents
+  clk_hw_get_parent
+  clk_hw_is_enabled
+  __clk_mux_determine_rate
+  clk_prepare
+  clk_round_rate
+  clk_set_parent
+  clk_unprepare
+  complete
+  __const_udelay
+  cpu_hwcap_keys
+  cpu_hwcaps
+  _dev_emerg
+  _dev_err
+  dev_err_probe
+  dev_get_regmap
+  device_get_match_data
+  device_init_wakeup
+  device_node_to_regmap
+  device_property_read_u32_array
+  _dev_info
+  devm_add_action
+  devm_clk_bulk_get
+  devm_clk_get
+  devm_clk_hw_register
+  devm_free_irq
+  devm_gpiochip_add_data_with_key
+  devm_gpiod_get
+  devm_hwspin_lock_register
+  devm_hwspin_lock_request_specific
+  devm_iio_channel_get
+  devm_iio_device_alloc
+  __devm_iio_device_register
+  devm_ioremap_resource
+  devm_kfree
+  devm_kmalloc
+  devm_kmemdup
+  devm_mbox_controller_register
+  devm_nvmem_register
+  devm_of_clk_add_hw_provider
+  devm_of_platform_populate
+  devm_pinctrl_get
+  devm_platform_ioremap_resource
+  devm_power_supply_register
+  devm_regmap_add_irq_chip
+  __devm_regmap_init
+  __devm_regmap_init_mmio_clk
+  devm_regulator_register
+  devm_request_threaded_irq
+  devm_snd_soc_register_component
+  devm_spi_register_controller
+  devm_thermal_zone_of_sensor_register
+  devm_thermal_zone_of_sensor_unregister
+  devm_usb_get_phy_by_phandle
+  devm_watchdog_register_device
+  _dev_warn
+  divider_get_val
+  divider_recalc_rate
+  divider_round_rate_parent
+  dma_async_device_register
+  dma_async_device_unregister
+  dma_async_tx_descriptor_init
+  dmam_alloc_attrs
+  dmam_free_coherent
+  dma_release_channel
+  dma_request_chan
+  dma_set_coherent_mask
+  dma_set_mask
+  driver_unregister
+  __dynamic_dev_dbg
+  find_next_bit
+  finish_wait
+  generic_handle_irq
+  gic_nonsecure_priorities
+  gpiochip_find
+  gpiochip_get_data
+  gpiod_get_value_cansleep
+  gpiod_to_irq
+  handle_bad_irq
+  handle_edge_irq
+  handle_level_irq
+  handle_nested_irq
+  __hwspin_lock_timeout
+  __hwspin_unlock
+  i2c_add_numbered_adapter
+  i2c_del_adapter
+  iio_read_channel_processed
+  __init_swait_queue_head
+  init_wait_entry
+  __init_waitqueue_head
+  irq_find_mapping
+  irq_get_irq_data
+  irq_set_irq_wake
+  jiffies
+  kfree
+  __kmalloc
+  kmalloc_caches
+  kmem_cache_alloc_trace
+  ktime_get
+  ktime_get_mono_fast_ns
+  __list_add_valid
+  __list_del_entry_valid
+  __log_post_read_mmio
+  __log_read_mmio
+  __log_write_mmio
+  mbox_chan_received_data
+  mbox_chan_txdone
+  memcpy
+  memset
+  mmc_cqe_request_done
+  mmc_of_parse
+  mmc_regulator_set_vqmmc
+  mmc_request_done
+  __msecs_to_jiffies
+  __mutex_init
+  mutex_lock
+  mutex_unlock
+  nvmem_cell_get
+  nvmem_cell_put
+  nvmem_cell_read
+  of_alias_get_id
+  of_clk_hw_onecell_get
+  of_device_get_match_data
+  of_device_is_compatible
+  of_dma_controller_free
+  of_dma_controller_register
+  of_dma_simple_xlate
+  of_find_property
+  of_get_next_child
+  of_get_parent
+  of_get_property
+  of_hwspin_lock_get_id
+  of_match_node
+  of_nvmem_cell_get
+  of_property_read_string
+  of_property_read_string_helper
+  of_property_read_variable_u32_array
+  of_prop_next_string
+  of_reserved_mem_device_init_by_idx
+  pinconf_generic_parse_dt_config
+  pinctrl_dev_get_drvdata
+  pinctrl_lookup_state
+  pinctrl_register
+  pinctrl_select_state
+  pinctrl_unregister
+  pinctrl_utils_add_map_configs
+  pinctrl_utils_add_map_mux
+  pinctrl_utils_free_map
+  pinctrl_utils_reserve_map
+  pin_get_name
+  __platform_driver_probe
+  __platform_driver_register
+  platform_driver_unregister
+  platform_get_irq
+  platform_get_resource
+  __pm_runtime_disable
+  pm_runtime_enable
+  pm_runtime_force_resume
+  pm_runtime_force_suspend
+  __pm_runtime_idle
+  __pm_runtime_resume
+  pm_runtime_set_autosuspend_delay
+  __pm_runtime_set_status
+  __pm_runtime_suspend
+  __pm_runtime_use_autosuspend
+  power_supply_changed
+  power_supply_find_ocv2cap_table
+  power_supply_get_battery_info
+  power_supply_get_by_name
+  power_supply_get_drvdata
+  power_supply_get_property
+  power_supply_ocv2cap_simple
+  power_supply_put
+  power_supply_put_battery_info
+  power_supply_temp2resist_simple
+  prepare_to_wait_event
+  printk
+  put_device
+  pwmchip_add
+  pwmchip_remove
+  queue_work_on
+  ___ratelimit
+  _raw_spin_lock
+  _raw_spin_lock_irq
+  _raw_spin_lock_irqsave
+  _raw_spin_unlock
+  _raw_spin_unlock_irq
+  _raw_spin_unlock_irqrestore
+  register_restart_handler
+  regmap_read
+  regmap_update_bits_base
+  regmap_write
+  regulator_disable_regmap
+  regulator_enable_regmap
+  regulator_get_voltage_sel_regmap
+  regulator_is_enabled_regmap
+  regulator_list_voltage_linear
+  regulator_set_voltage_sel_regmap
+  remap_pfn_range
+  schedule
+  schedule_timeout
+  __sdhci_add_host
+  sdhci_cleanup_host
+  sdhci_enable_clk
+  sdhci_enable_v4_mode
+  sdhci_pltfm_free
+  sdhci_pltfm_init
+  sdhci_remove_host
+  sdhci_request
+  sdhci_request_atomic
+  sdhci_reset
+  sdhci_runtime_resume_host
+  sdhci_runtime_suspend_host
+  sdhci_set_bus_width
+  sdhci_setup_host
+  seq_printf
+  seq_putc
+  sg_init_table
+  sg_next
+  snd_dma_alloc_pages
+  snd_dma_free_pages
+  snd_pcm_hw_constraint_integer
+  snd_pcm_hw_constraint_step
+  snd_pcm_period_elapsed
+  snd_soc_set_runtime_hwparams
+  __spi_alloc_controller
+  spi_controller_suspend
+  spi_finalize_current_transfer
+  __spi_register_driver
+  spi_sync
+  __stack_chk_fail
+  __stack_chk_guard
+  strcmp
+  strncmp
+  syscon_regmap_lookup_by_phandle
+  system_wq
+  tasklet_kill
+  __tasklet_schedule
+  thermal_zone_device_disable
+  thermal_zone_device_enable
+  __tracepoint_rwmmio_post_read
+  __tracepoint_rwmmio_read
+  __tracepoint_rwmmio_write
+  __udelay
+  unregister_restart_handler
+  usb_phy_get_charger_current
+  usleep_range
+  vchan_dma_desc_free_list
+  vchan_find_desc
+  vchan_init
+  vchan_tx_desc_free
+  vchan_tx_submit
+  wait_for_completion
+  wait_for_completion_timeout
+  __wake_up
+  watchdog_init_timeout
--- a/android/abi_gki_aarch64_virtual_device
+++ b/android/abi_gki_aarch64_virtual_device
@@ -3,6 +3,7 @@
  alloc_anon_inode
  __alloc_disk_node
  alloc_etherdev_mqs
+  alloc_netdev_mqs
  __alloc_pages_nodemask
  __alloc_skb
  alloc_workqueue
@@ -27,10 +28,18 @@
  blk_queue_physical_block_size
  blk_queue_write_cache
  blk_status_to_errno
+  bpf_trace_run1
  bpf_trace_run2
  bpf_trace_run3
+  bpf_trace_run4
+  bpf_trace_run5
+  bpf_trace_run6
+  bt_err
+  bt_info
+  bt_warn
  bus_register
  bus_unregister
+  cancel_delayed_work
  cancel_delayed_work_sync
  cancel_work_sync
  capable
@@ -38,6 +47,8 @@
  __check_object_size
  __class_create
  class_destroy
+  __class_register
+  class_unregister
  __ClearPageMovable
  clk_disable
  clk_enable
@@ -58,6 +69,8 @@
  cpu_number
  __cpu_online_mask
  __cpu_possible_mask
+  crc32_le
+  crypto_destroy_tfm
  crypto_register_alg
  crypto_register_scomp
  crypto_unregister_alg
@@ -71,10 +84,16 @@
  del_timer
  del_timer_sync
  destroy_workqueue
+  dev_alloc_name
+  dev_close
  _dev_err
+  __dev_get_by_index
+  device_add
  device_add_disk
  device_create
+  device_del
  device_initialize
+  device_init_wakeup
  device_register
  device_release_driver
  device_unregister
@@ -86,6 +105,7 @@
  devm_kmalloc
  devm_request_threaded_irq
  _dev_notice
+  dev_printk
  dev_queue_xmit
  dev_set_name
  _dev_warn
@@ -104,7 +124,9 @@
  down_read
  down_write
  ether_setup
+  eth_mac_addr
  ethtool_op_get_link
+  eth_type_trans
  eth_validate_addr
  event_triggers_call
  failure_tracking
@@ -117,19 +139,33 @@
  free_netdev
  __free_pages
  free_pages
+  free_percpu
  fs_bio_set
+  genlmsg_put
+  genl_register_family
+  genl_unregister_family
  get_device
  __get_free_pages
  get_random_bytes
  get_unused_fd_flags
  gic_nonsecure_priorities
+  hci_alloc_dev
+  __hci_cmd_sync
+  hci_free_dev
+  hci_recv_frame
+  hci_register_dev
+  hci_unregister_dev
  hwrng_register
  hwrng_unregister
  ida_alloc_range
  ida_free
  idr_alloc
  idr_destroy
+  idr_find
+  idr_for_each
+  idr_get_next
  idr_remove
+  init_net
  init_pseudo
  __init_rwsem
  __init_swait_queue_head
@@ -153,11 +189,13 @@
  kern_mount
  kern_unmount
  kfree
+  kfree_sensitive
  kfree_skb
  kill_anon_super
  kimage_voffset
  __kmalloc
  kmalloc_caches
+  kmalloc_order_trace
  kmem_cache_alloc
  kmem_cache_alloc_trace
  kmem_cache_create
@@ -183,6 +221,7 @@
  ktime_get_ts64
  ktime_get_with_offset
  kvfree
+  kvfree_call_rcu
  kvmalloc_node
  __list_add_valid
  __list_del_entry_valid
@@ -200,6 +239,7 @@
  memunmap
  misc_deregister
  misc_register
+  mod_delayed_work_on
  mod_timer
  module_layout
  module_put
@@ -210,17 +250,31 @@
  mutex_lock_interruptible
  mutex_trylock
  mutex_unlock
+  napi_gro_receive
+  __netdev_alloc_skb
  netdev_err
  netdev_info
  netdev_rx_handler_register
  netdev_rx_handler_unregister
  netdev_upper_dev_unlink
+  netdev_warn
  netif_carrier_off
  netif_carrier_on
  netif_device_detach
+  netif_rx
+  netif_rx_ni
  netif_tx_stop_all_queues
  netif_tx_wake_queue
+  netlink_broadcast
+  netlink_register_notifier
+  netlink_unicast
+  netlink_unregister_notifier
+  net_ratelimit
  nf_conntrack_destroy
+  nla_memcpy
+  __nla_parse
+  nla_put_64bit
+  nla_put
  no_llseek
  nonseekable_open
  noop_llseek
@@ -253,6 +307,7 @@
  __per_cpu_offset
  perf_trace_buf_alloc
  perf_trace_run_bpf_submit
+  platform_device_register_full
  platform_device_unregister
  __platform_driver_register
  platform_driver_unregister
@@ -268,11 +323,13 @@
  pm_runtime_set_autosuspend_delay
  __pm_runtime_suspend
  __pm_runtime_use_autosuspend
+  pm_wakeup_dev_event
  preempt_schedule
  preempt_schedule_notrace
  prepare_to_wait
  prepare_to_wait_event
  printk
+  __pskb_pull_tail
  put_device
  put_disk
  __put_page
@@ -296,6 +353,7 @@
  register_netdev
  register_netdevice
  register_netdevice_notifier
+  register_pernet_device
  register_shrinker
  register_virtio_device
  register_virtio_driver
@@ -303,10 +361,19 @@
  __regmap_init
  regmap_read
  regmap_write
+  release_firmware
  remap_pfn_range
+  request_firmware
  __request_module
  request_threaded_irq
  revalidate_disk_size
+  rhashtable_insert_slow
+  __rht_bucket_nested
+  rht_bucket_nested
+  rht_bucket_nested_insert
+  rtnl_is_locked
+  rtnl_link_register
+  rtnl_link_unregister
  rtnl_lock
  rtnl_unlock
  schedule
@@ -334,10 +401,18 @@
  sg_next
  simple_strtoul
  skb_add_rx_frag
+  skb_clone
+  skb_copy
+  skb_copy_bits
+  skb_copy_expand
  skb_dequeue
+  skb_pull
  skb_push
  skb_put
+  skb_queue_head
+  skb_queue_purge
  skb_queue_tail
+  skb_trim
  snd_card_disconnect
  snd_card_free
  snd_card_new
@@ -355,6 +430,8 @@
  snd_device_new
  snd_dma_alloc_pages
  snd_dma_free_pages
+  snd_jack_new
+  snd_jack_report
  snd_pci_quirk_lookup
  snd_pcm_add_chmap_ctls
  snd_pcm_alt_chmaps
@@ -368,6 +445,7 @@
  snprintf
  sort
  sprintf
+  sscanf
  __stack_chk_fail
  __stack_chk_guard
  strcmp
@@ -378,13 +456,23 @@
  strncpy
  strsep
  submit_bio
+  __sw_hweight16
+  __sw_hweight32
+  __sw_hweight64
+  __sw_hweight8
  sync_file_create
+  synchronize_net
  synchronize_rcu
  sysfs_create_group
+  sysfs_create_link
  __sysfs_match_string
  sysfs_remove_group
  sysfs_remove_link
+  system_freezable_wq
  system_wq
+  tasklet_init
+  tasklet_kill
+  __tasklet_schedule
  trace_event_buffer_commit
  trace_event_buffer_reserve
  trace_event_ignore_this_pid
@@ -404,13 +492,24 @@
  unlock_page
  unregister_blkdev
  unregister_netdev
+  unregister_netdevice_many
  unregister_netdevice_notifier
  unregister_netdevice_queue
+  unregister_pernet_device
  unregister_shrinker
  unregister_virtio_device
  unregister_virtio_driver
  up_read
  up_write
+  usb_alloc_urb
+  usb_anchor_urb
+  usb_control_msg
+  usb_deregister
+  usb_free_urb
+  usb_kill_anchored_urbs
+  usb_register_driver
+  usb_submit_urb
+  usb_unanchor_urb
  __usecs_to_jiffies
  usleep_range
  vabits_actual
@@ -483,6 +582,88 @@
  sg_miter_start
  sg_miter_stop

+# required by btintel.ko
+  bt_to_errno
+  hci_cmd_sync
+  request_firmware_direct
+
+# required by btusb.ko
+  bit_wait_timeout
+  btbcm_set_bdaddr
+  btbcm_setup_apple
+  btbcm_setup_patchram
+  device_wakeup_disable
+  disable_irq
+  disable_irq_nosync
+  enable_irq
+  gpiod_get_optional
+  gpiod_put
+  gpiod_set_value_cansleep
+  __hci_cmd_sync_ev
+  hci_recv_diag
+  irq_modify_status
+  irq_set_irq_wake
+  of_irq_get_byname
+  of_match_device
+  of_property_read_variable_u16_array
+  out_of_line_wait_on_bit_timeout
+  pm_system_wakeup
+  usb_autopm_get_interface
+  usb_autopm_put_interface
+  usb_bulk_msg
+  usb_driver_claim_interface
+  usb_driver_release_interface
+  usb_enable_autosuspend
+  usb_get_from_anchor
+  usb_ifnum_to_if
+  usb_match_id
+  usb_queue_reset_device
+  usb_scuttle_anchored_urbs
+  usb_set_interface
+  wake_up_bit
+
+# required by cfg80211.ko
+  bpf_trace_run10
+  bpf_trace_run7
+  debugfs_rename
+  dev_change_net_namespace
+  dev_get_by_index
+  device_rename
+  gcd
+  genlmsg_multicast_allns
+  get_net_ns_by_fd
+  get_net_ns_by_pid
+  inet_csk_get_port
+  init_uts_ns
+  key_create_or_update
+  key_put
+  keyring_alloc
+  ktime_get_coarse_with_offset
+  memcmp
+  net_ns_type_operations
+  nla_find
+  nla_reserve
+  __nla_validate
+  of_prop_next_u32
+  __put_net
+  rb_erase
+  rb_insert_color
+  request_firmware_nowait
+  rfkill_alloc
+  rfkill_blocked
+  rfkill_destroy
+  rfkill_pause_polling
+  rfkill_register
+  rfkill_resume_polling
+  rfkill_set_hw_state
+  rfkill_unregister
+  __sock_create
+  sock_release
+  system_power_efficient_wq
+  trace_print_array_seq
+  verify_pkcs7_signature
+  wireless_nlevent_flush
+
 # required by clk-vexpress-osc.ko
  clk_hw_set_rate_range
  devm_clk_hw_register
@@ -497,7 +678,6 @@

 # required by failover.ko
  netdev_master_upper_dev_link
-  rtnl_is_locked

 # required by gnss-cmdline.ko
  bus_find_device
@@ -529,31 +709,36 @@
 # required by goldfish_pipe.ko
  get_user_pages_fast
  set_page_dirty
-  tasklet_init
-  tasklet_kill
-  __tasklet_schedule

 # required by goldfish_sync.ko
  __close_fd
  dma_fence_default_wait
  dma_fence_free

+# required by gs_usb.ko
+  alloc_candev_mqs
+  alloc_can_err_skb
+  alloc_can_skb
+  can_change_mtu
+  can_free_echo_skb
+  can_get_echo_skb
+  can_put_echo_skb
+  close_candev
+  free_candev
+  open_candev
+  register_candev
+  unregister_candev
+  usb_alloc_coherent
+  usb_free_coherent
+
 # required by hci_vhci.ko
-  bt_err
  _copy_from_iter_full
-  hci_alloc_dev
-  hci_free_dev
-  hci_recv_frame
-  hci_register_dev
-  hci_unregister_dev
-  skb_pull
-  skb_queue_head
-  skb_queue_purge

 # required by ledtrig-audio.ko
+  led_set_brightness_nosleep
  led_trigger_event
-  led_trigger_register_simple
-  led_trigger_unregister_simple
+  led_trigger_register
+  led_trigger_unregister

 # required by lzo-rle.ko
  lzorle1x_1_compress
@@ -561,51 +746,82 @@
 # required by lzo.ko
  lzo1x_1_compress

+# required by mac80211.ko
+  __alloc_percpu_gfp
+  arc4_crypt
+  arc4_setkey
+  call_rcu
+  crc32_be
+  crypto_aead_decrypt
+  crypto_aead_encrypt
+  crypto_aead_setauthsize
+  crypto_aead_setkey
+  crypto_alloc_aead
+  crypto_alloc_shash
+  crypto_alloc_skcipher
+  __crypto_memneq
+  crypto_shash_digest
+  crypto_shash_finup
+  crypto_shash_setkey
+  crypto_shash_update
+  crypto_skcipher_decrypt
+  crypto_skcipher_encrypt
+  crypto_skcipher_setkey
+  __crypto_xor
+  dev_fetch_sw_netstats
+  find_next_bit
+  flush_delayed_work
+  get_random_u32
+  __hw_addr_init
+  __hw_addr_sync
+  __hw_addr_unsync
+  kernel_param_lock
+  kernel_param_unlock
+  kfree_skb_list
+  ktime_get_seconds
+  netdev_set_default_ethtool_ops
+  netif_receive_skb
+  netif_receive_skb_list
+  prandom_bytes
+  prandom_u32
+  pskb_expand_head
+  ___pskb_trim
+  rcu_barrier
+  register_inet6addr_notifier
+  register_inetaddr_notifier
+  rhashtable_free_and_destroy
+  rhltable_init
+  round_jiffies
+  round_jiffies_relative
+  round_jiffies_up
+  skb_checksum_help
+  skb_clone_sk
+  skb_complete_wifi_ack
+  skb_ensure_writable
+  __skb_get_hash
+  __skb_gso_segment
+  unregister_inet6addr_notifier
+  unregister_inetaddr_notifier
+
 # required by mac80211_hwsim.ko
-  alloc_netdev_mqs
  debugfs_attr_read
  debugfs_attr_write
-  dev_alloc_name
  device_bind_driver
  dst_release
-  eth_mac_addr
-  genlmsg_put
  genl_notify
-  genl_register_family
-  genl_unregister_family
  hrtimer_cancel
  hrtimer_forward
  hrtimer_init
  hrtimer_start_range_ns
-  init_net
-  __netdev_alloc_skb
-  netif_rx
-  netlink_broadcast
-  netlink_register_notifier
-  netlink_unicast
-  netlink_unregister_notifier
  net_namespace_list
-  nla_memcpy
-  __nla_parse
-  nla_put_64bit
-  nla_put
  param_ops_ushort
-  register_pernet_device
  rhashtable_destroy
  rhashtable_init
-  rhashtable_insert_slow
-  __rht_bucket_nested
-  rht_bucket_nested
-  rht_bucket_nested_insert
  schedule_timeout_interruptible
  simple_attr_open
  simple_attr_release
-  skb_copy
-  skb_copy_expand
  __skb_ext_put
-  skb_trim
  skb_unlink
-  unregister_pernet_device

 # required by md-mod.ko
  ack_all_badblocks
@@ -683,7 +899,6 @@
  submit_bh
  submit_bio_wait
  sync_blockdev
-  sysfs_create_link
  unregister_reboot_notifier
  unregister_sysctl_table
  vfs_fsync
@@ -695,7 +910,6 @@

 # required by net_failover.ko
  call_netdevice_notifiers
-  dev_close
  dev_get_stats
  dev_mc_sync_multiple
  dev_mc_unsync
@@ -732,7 +946,6 @@
  input_mt_sync_frame
  input_set_capability
  kstrtou8
-  pm_wakeup_dev_event
  ps2_begin_command
  ps2_cmd_aborted
  ps2_command
@@ -761,7 +974,6 @@

 # required by rtc-test.ko
  add_timer
-  device_init_wakeup
  devm_rtc_allocate_device
  platform_device_add
  platform_device_alloc
@@ -772,6 +984,15 @@
  rtc_tm_to_time64
  rtc_update_irq

+# required by slcan.ko
+  hex_asc_upper
+  hex_to_bin
+  msleep_interruptible
+  tty_hangup
+  tty_mode_ioctl
+  tty_register_ldisc
+  tty_unregister_ldisc
+
 # required by snd-ac97-codec.ko
  snd_ctl_remove_id
  snd_info_create_card_entry
@@ -785,10 +1006,8 @@
  snd_ctl_boolean_stereo_info
  strchr
  strlcat
-  __sw_hweight32

 # required by snd-hda-codec.ko
-  bpf_trace_run4
  current_work
  device_attach
  driver_register
@@ -804,8 +1023,6 @@
  snd_ctl_remove
  snd_device_disconnect
  snd_device_free
-  snd_jack_new
-  snd_jack_report
  snd_jack_set_key
  snd_pcm_hw_constraint_minmax
  snd_pcm_hw_constraint_step
@@ -816,8 +1033,6 @@

 # required by snd-hda-core.ko
  add_uevent_var
-  device_add
-  device_del
  kasprintf
  kobject_create_and_add
  pm_runtime_get_if_active
@@ -826,11 +1041,9 @@
  regcache_sync
  regmap_update_bits_base
  snd_pcm_format_width
-  __sw_hweight64
  timecounter_init

 # required by snd-hda-intel.ko
-  bpf_trace_run1
  complete_all
  param_array_ops
  param_get_int
@@ -876,7 +1089,6 @@
  efi
  efi_tpm_final_log_size
  hash_digest_size
-  idr_get_next
  idr_replace
  jiffies_to_usecs
  memchr_inv
@@ -893,6 +1105,12 @@
  anon_inode_getfile
  compat_ptr_ioctl

+# required by usbip-core.ko
+  sock_recvmsg
+
+# required by vcan.ko
+  sock_efree
+
 # required by vexpress-config.ko
  devres_add
  devres_alloc_node
@@ -909,20 +1127,15 @@
  devm_gpiochip_add_data_with_key
  devm_mfd_add_devices

+# required by vhci-hcd.ko
+  kernel_sock_shutdown
+  platform_bus
+  sockfd_lookup
+
 # required by virt_wifi.ko
-  __dev_get_by_index
-  dev_printk
  __module_get
  netdev_upper_dev_link
  netif_stacked_transfer_operstate
-  rtnl_link_register
-  rtnl_link_unregister
-  skb_clone
-  unregister_netdevice_many
-
-# required by virt_wifi_sim.ko
-  release_firmware
-  request_firmware

 # required by virtio-gpu.ko
  __devm_request_region
@@ -1039,7 +1252,6 @@
  __get_task_comm
  iomem_resource
  is_vmalloc_addr
-  kmalloc_order_trace
  memdup_user
  seq_puts
  sync_file_get_fence
@@ -1069,7 +1281,6 @@
  register_oom_notifier
  si_mem_available
  si_meminfo
-  system_freezable_wq
  unregister_oom_notifier
  vm_event_states
  vm_node_stat
@@ -1127,8 +1338,6 @@
 # required by virtio_mmio.ko
  device_for_each_child
  devm_platform_ioremap_resource
-  platform_device_register_full
-  sscanf

 # required by virtio_net.ko
  bpf_dispatcher_xdp_func
@@ -1145,17 +1354,14 @@
  eth_prepare_mac_addr_change
  ethtool_op_get_ts_info
  ethtool_virtdev_set_link_ksettings
-  eth_type_trans
  flow_keys_basic_dissector
  __napi_alloc_skb
  napi_complete_done
  napi_consume_skb
  napi_disable
-  napi_gro_receive
  __napi_schedule
  napi_schedule_prep
  netdev_notify_peers
-  netdev_warn
  netif_device_attach
  netif_napi_add
  __netif_napi_del
@@ -1163,8 +1369,6 @@
  netif_set_real_num_rx_queues
  netif_set_real_num_tx_queues
  __netif_set_xps_queue
-  net_ratelimit
-  __pskb_pull_tail
  _raw_spin_trylock
  sched_clock
  skb_coalesce_rx_frag
@@ -1174,7 +1378,6 @@
  skb_to_sgvec
  skb_tstamp_tx
  softnet_data
-  synchronize_net
  __traceiter_xdp_exception
  __tracepoint_xdp_exception
  virtqueue_add_inbuf_ctx
@@ -1195,6 +1398,7 @@
 # required by virtio_pci.ko
  irq_set_affinity_hint
  pci_alloc_irq_vectors_affinity
+  pci_device_is_present
  pci_disable_sriov
  pci_enable_sriov
  pci_find_capability
@@ -1208,6 +1412,7 @@
  pci_request_selected_regions
  pci_vfs_assigned
  synchronize_irq
+  virtio_break_device
  virtio_device_freeze
  virtio_device_restore

@@ -1216,9 +1421,18 @@
  nvdimm_bus_unregister
  nvdimm_pmem_region_create

+# required by virtio_snd.ko
+  snd_ctl_notify
+  snd_pcm_format_physical_width
+  snd_pcm_lib_free_pages
+  snd_pcm_lib_ioctl
+  snd_pcm_lib_malloc_pages
+  snd_pcm_lib_preallocate_pages
+  _snd_pcm_stream_lock_irqsave
+  snd_pcm_stream_unlock_irqrestore
+  wait_for_completion_interruptible_timeout
+
 # required by vmw_vsock_virtio_transport.ko
-  lock_sock_nested
-  release_sock
  virtio_transport_connect
  virtio_transport_deliver_tap_pkt
  virtio_transport_destruct
@@ -1257,20 +1471,14 @@
  __alloc_percpu
  bdget_disk
  bdput
-  __class_register
-  class_unregister
  crypto_alloc_base
  crypto_comp_compress
  crypto_comp_decompress
-  crypto_destroy_tfm
  crypto_has_alg
  disk_end_io_acct
  disk_start_io_acct
  flush_dcache_page
-  free_percpu
  fsync_bdev
-  idr_find
-  idr_for_each
  kstrtou16
  memset64
  mutex_is_locked
@@ -1287,28 +1495,3 @@
  _raw_read_unlock
  _raw_write_lock
  _raw_write_unlock
-
-# required by gs_usb.ko
-  usb_kill_anchored_urbs
-  alloc_candev_mqs
-  register_candev
-  free_candev
-  can_change_mtu
-  open_candev
-  usb_anchor_urb
-  usb_unanchor_urb
-  alloc_can_skb
-  can_get_echo_skb
-  alloc_can_err_skb
-  close_candev
-  can_put_echo_skb
-  can_free_echo_skb
-  unregister_candev
-
-# required by vcan.ko
-  sock_efree
-
-# required by slcan.ko
-  tty_mode_ioctl
-  tty_hangup
-  hex_asc_upper
--- a/android/abi_gki_aarch64_vivo
+++ b/android/abi_gki_aarch64_vivo
@@ -54,6 +54,8 @@
  __bitmap_set
  blk_alloc_queue
  blk_bio_list_merge
+  blkcg_policy_register
+  blkcg_policy_unregister
  blk_cleanup_queue
  blk_execute_rq
  blk_execute_rq_nowait
@@ -869,6 +871,7 @@
  kstrtou8_from_user
  kstrtouint
  kstrtouint_from_user
+  _kstrtoul
  kstrtoul_from_user
  kstrtoull
  kstrtoull_from_user
@@ -1000,6 +1003,7 @@
  of_count_phandle_with_args
  of_cpufreq_cooling_register
  of_cpu_node_to_id
+  of_css
  of_devfreq_cooling_register
  of_device_get_match_data
  of_device_is_available
@@ -1226,6 +1230,8 @@
  proc_dointvec_minmax
  proc_dostring
  proc_douintvec_minmax
+  profile_event_register
+  profile_event_unregister
  proto_register
  proto_unregister
  __pskb_pull_tail
@@ -1667,6 +1673,7 @@
  trace_event_reg
  trace_handle_return
  __traceiter_android_rvh_account_irq
+  __traceiter_android_rvh_binder_transaction
  __traceiter_android_rvh_build_perf_domains
  __traceiter_android_rvh_can_migrate_task
  __traceiter_android_rvh_check_preempt_wakeup
@@ -1708,8 +1715,12 @@
  __traceiter_android_vh_binder_restore_priority
  __traceiter_android_vh_binder_set_priority
  __traceiter_android_vh_binder_wakeup_ilocked
+  __traceiter_android_vh_blk_alloc_rqs
+  __traceiter_android_vh_blk_rq_ctx_init
  __traceiter_android_vh_cpu_idle_enter
  __traceiter_android_vh_cpu_idle_exit
+  __traceiter_android_vh_filemap_fault_cache_page
+  __traceiter_android_vh_filemap_fault_get_page
  __traceiter_android_vh_ftrace_dump_buffer
  __traceiter_android_vh_ftrace_format_check
  __traceiter_android_vh_ftrace_oops_enter
@@ -1718,10 +1729,12 @@
  __traceiter_android_vh_iommu_setup_dma_ops
  __traceiter_android_vh_ipi_stop
  __traceiter_android_vh_jiffies_update
+  __traceiter_android_vh_mmap_region
  __traceiter_android_vh_mmc_attach_sd
  __traceiter_android_vh_mmc_blk_mq_rw_recovery
  __traceiter_android_vh_mmc_blk_reset
  __traceiter_android_vh_mmc_gpio_cd_irqt
+  __traceiter_android_vh_mm_dirty_limits
  __traceiter_android_vh_printk_hotplug
  __traceiter_android_vh_scheduler_tick
  __traceiter_android_vh_sdhci_get_cd
@@ -1729,12 +1742,23 @@
  __traceiter_android_vh_show_max_freq
  __traceiter_android_vh_show_resume_epoch_val
  __traceiter_android_vh_show_suspend_epoch_val
+  __traceiter_android_vh_shrink_slab_bypass
  __traceiter_android_vh_timer_calc_index
+  __traceiter_android_vh_try_to_unmap_one
  __traceiter_android_vh_ufs_check_int_errors
  __traceiter_android_vh_ufs_compl_command
  __traceiter_android_vh_ufs_send_command
  __traceiter_android_vh_ufs_update_sdev
  __traceiter_binder_transaction_received
+  __traceiter_block_bio_complete
+  __traceiter_block_bio_queue
+  __traceiter_block_getrq
+  __traceiter_block_rq_complete
+  __traceiter_block_rq_insert
+  __traceiter_block_rq_issue
+  __traceiter_block_rq_merge
+  __traceiter_block_rq_requeue
+  __traceiter_block_split
  __traceiter_cpu_frequency_limits
  __traceiter_cpu_idle
  __traceiter_dwc3_complete_trb
@@ -1749,6 +1773,7 @@
  __traceiter_usb_gadget_connect
  __traceiter_usb_gadget_disconnect
  __tracepoint_android_rvh_account_irq
+  __tracepoint_android_rvh_binder_transaction
  __tracepoint_android_rvh_build_perf_domains
  __tracepoint_android_rvh_can_migrate_task
  __tracepoint_android_rvh_check_preempt_wakeup
@@ -1761,6 +1786,7 @@
  __tracepoint_android_rvh_flush_task
  __tracepoint_android_rvh_migrate_queued_task
  __tracepoint_android_rvh_new_task_stats
+  __tracepoint_android_rvh_refrigerator
  __tracepoint_android_rvh_replace_next_task_fair
  __tracepoint_android_rvh_resume_cpus
  __tracepoint_android_rvh_sched_cpu_dying
@@ -1778,20 +1804,32 @@
  __tracepoint_android_rvh_set_readahead_gfp_mask
  __tracepoint_android_rvh_set_skip_swapcache_flags
  __tracepoint_android_rvh_set_task_cpu
+  __tracepoint_android_rvh_tcp_recvmsg
+  __tracepoint_android_rvh_tcp_recvmsg_stat
+  __tracepoint_android_rvh_tcp_sendmsg_locked
  __tracepoint_android_rvh_tick_entry
  __tracepoint_android_rvh_try_to_wake_up
  __tracepoint_android_rvh_try_to_wake_up_success
  __tracepoint_android_rvh_ttwu_cond
+  __tracepoint_android_rvh_udp_recvmsg
+  __tracepoint_android_rvh_udp_sendmsg
  __tracepoint_android_rvh_update_cpu_capacity
  __tracepoint_android_rvh_update_cpus_allowed
  __tracepoint_android_rvh_update_misfit_status
  __tracepoint_android_rvh_wake_up_new_task
+  __tracepoint_android_vh_account_task_time
  __tracepoint_android_vh_allow_domain_state
  __tracepoint_android_vh_binder_restore_priority
  __tracepoint_android_vh_binder_set_priority
+  __tracepoint_android_vh_binder_trans
  __tracepoint_android_vh_binder_wakeup_ilocked
+  __tracepoint_android_vh_blk_alloc_rqs
+  __tracepoint_android_vh_blk_rq_ctx_init
  __tracepoint_android_vh_cpu_idle_enter
  __tracepoint_android_vh_cpu_idle_exit
+  __tracepoint_android_vh_dup_task_struct
+  __tracepoint_android_vh_filemap_fault_cache_page
+  __tracepoint_android_vh_filemap_fault_get_page
  __tracepoint_android_vh_ftrace_dump_buffer
  __tracepoint_android_vh_ftrace_format_check
  __tracepoint_android_vh_ftrace_oops_enter
@@ -1799,11 +1837,14 @@
  __tracepoint_android_vh_ftrace_size_check
  __tracepoint_android_vh_iommu_setup_dma_ops
  __tracepoint_android_vh_ipi_stop
+  __tracepoint_android_vh_irqtime_account_process_tick
  __tracepoint_android_vh_jiffies_update
+  __tracepoint_android_vh_mmap_region
  __tracepoint_android_vh_mmc_attach_sd
  __tracepoint_android_vh_mmc_blk_mq_rw_recovery
  __tracepoint_android_vh_mmc_blk_reset
  __tracepoint_android_vh_mmc_gpio_cd_irqt
+  __tracepoint_android_vh_mm_dirty_limits
  __tracepoint_android_vh_printk_hotplug
  __tracepoint_android_vh_scheduler_tick
  __tracepoint_android_vh_sdhci_get_cd
@@ -1811,12 +1852,26 @@
  __tracepoint_android_vh_show_max_freq
  __tracepoint_android_vh_show_resume_epoch_val
  __tracepoint_android_vh_show_suspend_epoch_val
+  __tracepoint_android_vh_shrink_slab_bypass
  __tracepoint_android_vh_timer_calc_index
+  __tracepoint_android_vh_try_to_unmap_one
+  __tracepoint_android_vh_tune_scan_type
+  __tracepoint_android_vh_tune_swappiness
  __tracepoint_android_vh_ufs_check_int_errors
  __tracepoint_android_vh_ufs_compl_command
  __tracepoint_android_vh_ufs_send_command
  __tracepoint_android_vh_ufs_update_sdev
+  __tracepoint_android_vh_vmpressure
  __tracepoint_binder_transaction_received
+  __tracepoint_block_bio_complete
+  __tracepoint_block_bio_queue
+  __tracepoint_block_getrq
+  __tracepoint_block_rq_complete
+  __tracepoint_block_rq_insert
+  __tracepoint_block_rq_issue
+  __tracepoint_block_rq_merge
+  __tracepoint_block_rq_requeue
+  __tracepoint_block_split
  __tracepoint_cpu_frequency_limits
  __tracepoint_cpu_idle
  __tracepoint_dwc3_complete_trb
@@ -1865,6 +1920,7 @@
  ucsi_destroy
  ucsi_get_drvdata
  ucsi_register
+  ucsi_send_command
  ucsi_set_drvdata
  ucsi_unregister
  __udelay
--- a/android/abi_gki_aarch64_xiaomi
+++ b/android/abi_gki_aarch64_xiaomi
@@ -40,6 +40,7 @@
  scsi_print_command
  scsi_dma_map
  scsi_host_alloc
+  scsi_normalize_sense
  sg_copy_from_buffer
  sg_copy_to_buffer
  ufshcd_alloc_host
@@ -58,6 +59,9 @@
  blk_queue_update_dma_alignment
  blk_queue_update_dma_pad
  blk_ksm_get_slot_idx
+  mempool_resize
+  mempool_alloc_pages
+  mempool_free_pages

 #required by cs35l41 module
  regmap_raw_write_async
@@ -139,6 +143,33 @@
  __traceiter_android_vh_free_task
  __tracepoint_android_vh_free_task
  jiffies_64
+  free_uid
+  find_user
+
+#required by migt.ko
+  __traceiter_android_rvh_after_enqueue_task
+  __traceiter_android_rvh_after_dequeue_task
+  __traceiter_android_vh_map_util_freq
+  __tracepoint_android_rvh_after_enqueue_task
+  __tracepoint_android_rvh_after_dequeue_task
+  __tracepoint_android_vh_map_util_freq
+
+#required by turbo.ko
+  __traceiter_android_rvh_set_cpus_allowed_comm
+  __traceiter_android_vh_sched_setaffinity_early
+  __traceiter_android_rvh_cpuset_fork
+  __tracepoint_android_rvh_set_cpus_allowed_comm
+  __tracepoint_android_vh_sched_setaffinity_early
+  __tracepoint_android_rvh_cpuset_fork
+  cpuset_cpus_allowed
+
+#required by fas.ko
+  __traceiter_android_rvh_check_preempt_tick
+  __traceiter_android_rvh_dequeue_entity
+  __traceiter_android_rvh_enqueue_entity
+  __tracepoint_android_rvh_check_preempt_tick
+  __tracepoint_android_rvh_dequeue_entity
+  __tracepoint_android_rvh_enqueue_entity

 #required by pm8941-pwrkey.ko module
  console_printk
@@ -155,3 +186,11 @@
  __traceiter_android_vh_tune_swappiness
  __tracepoint_android_vh_tune_swappiness

+#required by msm_drm.ko module
+  drm_get_connector_type_name
+
+#required by mi_gamekey.ko module
+  gpio_request_array
+
+#extend_reclaim.ko
+  try_to_free_mem_cgroup_pages
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -325,18 +325,19 @@ setup_memory(void *kernel_end)
 		       i, cluster->usage, cluster->start_pfn,
 		       cluster->start_pfn + cluster->numpages);

-		/* Bit 0 is console/PALcode reserved.  Bit 1 is
-		   non-volatile memory -- we might want to mark
-		   this for later.  */
-		if (cluster->usage & 3)
-			continue;
-
 		end = cluster->start_pfn + cluster->numpages;
 		if (end > max_low_pfn)
 			max_low_pfn = end;

 		memblock_add(PFN_PHYS(cluster->start_pfn),
 			     cluster->numpages << PAGE_SHIFT);
+
+		/* Bit 0 is console/PALcode reserved.  Bit 1 is
+		   non-volatile memory -- we might want to mark
+		   this for later.  */
+		if (cluster->usage & 3)
+			memblock_reserve(PFN_PHYS(cluster->start_pfn),
+				         cluster->numpages << PAGE_SHIFT);
 	}

 	/*
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -166,7 +166,6 @@ smp_callin(void)
 	DBGS(("smp_callin: commencing CPU %d current %p active_mm %p\n",
 	      cpuid, current, current->active_mm));

-	preempt_disable();
 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
 }

@@ -583,7 +582,7 @@ void
 smp_send_stop(void)
 {
 	cpumask_t to_whom;
-	cpumask_copy(&to_whom, cpu_possible_mask);
+	cpumask_copy(&to_whom, cpu_online_mask);
 	cpumask_clear_cpu(smp_processor_id(), &to_whom);
 #ifdef DEBUG_IPI_MSG
 	if (hard_smp_processor_id() != boot_cpu_id)
--- a/arch/arc/include/uapi/asm/sigcontext.h
+++ b/arch/arc/include/uapi/asm/sigcontext.h
@@ -18,6 +18,7 @@
 */
 struct sigcontext {
 	struct user_regs_struct regs;
+	struct user_regs_arcv2 v2abi;
 };

 #endif /* _ASM_ARC_SIGCONTEXT_H */
--- a/arch/arc/kernel/fpu.c
+++ b/arch/arc/kernel/fpu.c
@@ -57,23 +57,26 @@ void fpu_save_restore(struct task_struct *prev, struct task_struct *next)

 void fpu_init_task(struct pt_regs *regs)
 {
+	const unsigned int fwe = 0x80000000;
+
 	/* default rounding mode */
 	write_aux_reg(ARC_REG_FPU_CTRL, 0x100);

-	/* set "Write enable" to allow explicit write to exception flags */
-	write_aux_reg(ARC_REG_FPU_STATUS, 0x80000000);
+	/* Initialize to zero: setting requires FWE be set */
+	write_aux_reg(ARC_REG_FPU_STATUS, fwe);
 }

 void fpu_save_restore(struct task_struct *prev, struct task_struct *next)
 {
 	struct arc_fpu *save = &prev->thread.fpu;
 	struct arc_fpu *restore = &next->thread.fpu;
+	const unsigned int fwe = 0x80000000;

 	save->ctrl = read_aux_reg(ARC_REG_FPU_CTRL);
 	save->status = read_aux_reg(ARC_REG_FPU_STATUS);

 	write_aux_reg(ARC_REG_FPU_CTRL, restore->ctrl);
-	write_aux_reg(ARC_REG_FPU_STATUS, restore->status);
+	write_aux_reg(ARC_REG_FPU_STATUS, (fwe | restore->status));
 }

 #endif
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -61,6 +61,41 @@ struct rt_sigframe {
 	unsigned int sigret_magic;
 };

+static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
+{
+	int err = 0;
+#ifndef CONFIG_ISA_ARCOMPACT
+	struct user_regs_arcv2 v2abi;
+
+	v2abi.r30 = regs->r30;
+#ifdef CONFIG_ARC_HAS_ACCL_REGS
+	v2abi.r58 = regs->r58;
+	v2abi.r59 = regs->r59;
+#else
+	v2abi.r58 = v2abi.r59 = 0;
+#endif
+	err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));
+#endif
+	return err;
+}
+
+static int restore_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
+{
+	int err = 0;
+#ifndef CONFIG_ISA_ARCOMPACT
+	struct user_regs_arcv2 v2abi;
+
+	err = __copy_from_user(&v2abi, &mctx->v2abi, sizeof(v2abi));
+
+	regs->r30 = v2abi.r30;
+#ifdef CONFIG_ARC_HAS_ACCL_REGS
+	regs->r58 = v2abi.r58;
+	regs->r59 = v2abi.r59;
+#endif
+#endif
+	return err;
+}
+
 static int
 stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs,
 	       sigset_t *set)
@@ -94,6 +129,10 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs,

 	err = __copy_to_user(&(sf->uc.uc_mcontext.regs.scratch), &uregs.scratch,
 			     sizeof(sf->uc.uc_mcontext.regs.scratch));
+
+	if (is_isa_arcv2())
+		err |= save_arcv2_regs(&(sf->uc.uc_mcontext), regs);
+
 	err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));

 	return err ? -EFAULT : 0;
@@ -109,6 +148,10 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
 	err |= __copy_from_user(&uregs.scratch,
 				&(sf->uc.uc_mcontext.regs.scratch),
 				sizeof(sf->uc.uc_mcontext.regs.scratch));
+
+	if (is_isa_arcv2())
+		err |= restore_arcv2_regs(&(sf->uc.uc_mcontext), regs);
+
 	if (err)
 		return -EFAULT;

--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -189,7 +189,6 @@ void start_kernel_secondary(void)
 	pr_info("## CPU%u LIVE ##: Executing Code...\n", cpu);

 	local_irq_enable();
-	preempt_disable();
 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
 }

--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -88,6 +88,8 @@ SECTIONS
 		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
+		IRQENTRY_TEXT
+		SOFTIRQENTRY_TEXT
 		*(.fixup)
 		*(.gnu.warning)
 	}
--- a/arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -393,10 +393,10 @@
 	status = "okay";
 };

-&gpio0 {
+&gpio0_target {
 	ti,no-reset-on-init;
 };

-&gpio3 {
+&gpio3_target {
 	ti,no-reset-on-init;
 };
--- a/arch/arm/boot/dts/am335x-cm-t335.dts
+++ b/arch/arm/boot/dts/am335x-cm-t335.dts
@@ -496,7 +496,7 @@ status = "okay";
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi0_pins>;
-	ti,pindir-d0-out-d1-in = <1>;
+	ti,pindir-d0-out-d1-in;
 	/* WLS1271 WiFi */
 	wlcore: wlcore@1 {
 		compatible = "ti,wl1271";
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -648,7 +648,7 @@
 	status = "okay";
 };

-&gpio0 {
+&gpio0_target {
 	ti,no-reset-on-init;
 };

--- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
+++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
@@ -150,7 +150,7 @@
 	status = "okay";
 };

-&gpio0 {
+&gpio0_target {
 	ti,no-reset-on-init;
 };

--- a/arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi
+++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi
@@ -353,7 +353,7 @@
 	status = "okay";
 };

-&gpio0 {
+&gpio0_target {
 	ti,no-reset-on-init;
 };

--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -1723,7 +1723,7 @@
 			};
 		};

-		target-module@ae000 {			/* 0x481ae000, ap 56 3a.0 */
+		gpio3_target: target-module@ae000 {		/* 0x481ae000, ap 56 3a.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			reg = <0xae000 0x4>,
 			      <0xae010 0x4>,
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -813,11 +813,14 @@
 	status = "okay";
 };

+&gpio5_target {
+	ti,no-reset-on-init;
+};
+
 &gpio5 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&display_mux_pins>;
 	status = "okay";
-	ti,no-reset-on-init;

 	p8 {
 		/*
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -1576,7 +1576,7 @@
 				compatible = "ti,am4372-d_can", "ti,am3352-d_can";
 				reg = <0x0 0x2000>;
 				clocks = <&dcan1_fck>;
-				clock-name = "fck";
+				clock-names = "fck";
 				syscon-raminit = <&scm_conf 0x644 1>;
 				interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
 				status = "disabled";
@@ -2033,7 +2033,7 @@
 			};
 		};

-		target-module@22000 {			/* 0x48322000, ap 116 64.0 */
+		gpio5_target: target-module@22000 {		/* 0x48322000, ap 116 64.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			reg = <0x22000 0x4>,
 			      <0x22010 0x4>,
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -582,7 +582,7 @@
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
-	clock-frequency = <400000>;
+	clock-frequency = <100000>;

 	tps65218: tps65218@24 {
 		reg = <0x24>;
@@ -860,7 +860,7 @@
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&spi0_pins_default>;
 	pinctrl-1 = <&spi0_pins_sleep>;
-	ti,pindir-d0-out-d1-in = <1>;
+	ti,pindir-d0-out-d1-in;
 };

 &spi1 {
@@ -868,7 +868,7 @@
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&spi1_pins_default>;
 	pinctrl-1 = <&spi1_pins_sleep>;
-	ti,pindir-d0-out-d1-in = <1>;
+	ti,pindir-d0-out-d1-in;
 };

 &usb2_phy1 {
--- a/arch/arm/boot/dts/am5718.dtsi
+++ b/arch/arm/boot/dts/am5718.dtsi
@@ -17,17 +17,13 @@
 * VCP1, VCP2
 * MLB
 * ISS
- * USB3, USB4
+ * USB3
 */

 &usb3_tm {
 	status = "disabled";
 };

-&usb4_tm {
-	status = "disabled";
-};
-
 &atl_tm {
 	status = "disabled";
 };
--- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
+++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
@@ -454,20 +454,20 @@

 &mailbox5 {
 	status = "okay";
-	mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
+	mbox_ipu1_ipc3x: mbox-ipu1-ipc3x {
 		status = "okay";
 	};
-	mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
+	mbox_dsp1_ipc3x: mbox-dsp1-ipc3x {
 		status = "okay";
 	};
 };

 &mailbox6 {
 	status = "okay";
-	mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
+	mbox_ipu2_ipc3x: mbox-ipu2-ipc3x {
 		status = "okay";
 	};
-	mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
+	mbox_dsp2_ipc3x: mbox-dsp2-ipc3x {
 		status = "okay";
 	};
 };
@@ -610,12 +610,11 @@
 	>;
 };

-&gpio3 {
-	status = "okay";
+&gpio3_target {
 	ti,no-reset-on-init;
 };

-&gpio2 {
+&gpio2_target {
 	status = "okay";
 	ti,no-reset-on-init;
 };
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -156,10 +156,7 @@
 	/*W0-W7*/	"","","","","","","","",
 	/*X0-X7*/	"","","","","","","","",
 	/*Y0-Y7*/	"","","","","","","","",
-	/*Z0-Z7*/	"","","","","","","","",
-	/*AA0-AA7*/	"","","","","","","","",
-	/*AB0-AB7*/	"","","","","","","","",
-	/*AC0-AC7*/	"","","","","","","","";
+	/*Z0-Z7*/	"","","","","","","","";

 	pin_mclr_vpp {
 		gpio-hog;
--- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
@@ -127,10 +127,7 @@
 	/*W0-W7*/	"","","","","","","","",
 	/*X0-X7*/	"","","","","","","","",
 	/*Y0-Y7*/	"","","","","","","","",
-	/*Z0-Z7*/	"","","","","","","","",
-	/*AA0-AA7*/	"","","","","","","","",
-	/*AB0-AB7*/	"","","","","","","","",
-	/*AC0-AC7*/	"","","","","","","","";
+	/*Z0-Z7*/	"","","","","","","","";
 };

 &fmc {
@@ -180,6 +177,7 @@

 &emmc {
 	status = "okay";
+	clk-phase-mmc-hs200 = <36>, <270>;
 };

 &fsim0 {
--- a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
@@ -208,12 +208,12 @@
 	};

 	pinctrl_hvi3c3_default: hvi3c3_default {
-		function = "HVI3C3";
+		function = "I3C3";
 		groups = "HVI3C3";
 	};

 	pinctrl_hvi3c4_default: hvi3c4_default {
-		function = "HVI3C4";
+		function = "I3C4";
 		groups = "HVI3C4";
 	};

--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -92,6 +92,8 @@

 	leds {
 		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
 		status = "okay"; /* Conflict with pwm0. */

 		red {
@@ -537,6 +539,10 @@
 				 AT91_PIOA 19 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA19 DAT2 periph A with pullup */
 				 AT91_PIOA 20 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>;	/* PA20 DAT3 periph A with pullup */
 		};
+		pinctrl_sdmmc0_cd: sdmmc0_cd {
+			atmel,pins =
+				<AT91_PIOA 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+		};
 	};

 	sdmmc1 {
@@ -569,6 +575,14 @@
 				      AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
 		};
 	};
+
+	leds {
+		pinctrl_gpio_leds: gpio_leds {
+			atmel,pins = <AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+				      AT91_PIOB 12 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+				      AT91_PIOB 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+		};
+	};
 }; /* pinctrl */

 &pwm0 {
@@ -580,7 +594,7 @@
 &sdmmc0 {
 	bus-width = <4>;
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_sdmmc0_default>;
+	pinctrl-0 = <&pinctrl_sdmmc0_default &pinctrl_sdmmc0_cd>;
 	status = "okay";
 	cd-gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
 	disable-wp;
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -57,6 +57,8 @@
 			};

 			spi0: spi@f0004000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_spi0_cs>;
 				cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
 				status = "okay";
 			};
@@ -169,6 +171,8 @@
 			};

 			spi1: spi@f8008000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_spi1_cs>;
 				cs-gpios = <&pioC 25 0>;
 				status = "okay";
 			};
@@ -248,6 +252,26 @@
 							<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
 							 AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
 					};
+
+					pinctrl_gpio_leds: gpio_leds_default {
+						atmel,pins =
+							<AT91_PIOE 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+							 AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
+
+					pinctrl_spi0_cs: spi0_cs_default {
+						atmel,pins =
+							<AT91_PIOD 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+							 AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
+
+					pinctrl_spi1_cs: spi1_cs_default {
+						atmel,pins = <AT91_PIOC 25 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
+
+					pinctrl_vcc_mmc0_reg_gpio: vcc_mmc0_reg_gpio_default {
+						atmel,pins = <AT91_PIOE 2 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
 				};
 			};
 		};
@@ -339,6 +363,8 @@

 	vcc_mmc0_reg: fixedregulator_mmc0 {
 		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_vcc_mmc0_reg_gpio>;
 		gpio = <&pioE 2 GPIO_ACTIVE_LOW>;
 		regulator-name = "mmc0-card-supply";
 		regulator-min-microvolt = <3300000>;
@@ -362,6 +388,9 @@

 	leds {
 		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
+		status = "okay";

 		d2 {
 			label = "d2";
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -90,6 +90,8 @@
 			};

 			spi1: spi@fc018000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_spi0_cs>;
 				cs-gpios = <&pioB 21 0>;
 				status = "okay";
 			};
@@ -147,6 +149,19 @@
 						atmel,pins =
 							<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
 					};
+					pinctrl_spi0_cs: spi0_cs_default {
+						atmel,pins =
+							<AT91_PIOB 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
+					pinctrl_gpio_leds: gpio_leds_default {
+						atmel,pins =
+							<AT91_PIOD 30 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+							 AT91_PIOE 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
+					pinctrl_vcc_mmc1_reg: vcc_mmc1_reg {
+						atmel,pins =
+							<AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
 				};
 			};
 		};
@@ -252,6 +267,8 @@

 	leds {
 		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
 		status = "okay";

 		d8 {
@@ -278,6 +295,8 @@

 	vcc_mmc1_reg: fixedregulator_mmc1 {
 		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_vcc_mmc1_reg>;
 		gpio = <&pioE 4 GPIO_ACTIVE_LOW>;
 		regulator-name = "VDD MCI1";
 		regulator-min-microvolt = <3300000>;
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -460,7 +460,7 @@
 			status = "disabled";
 		};

-		nand: nand@18046000 {
+		nand_controller: nand-controller@18046000 {
 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
 			reg = <0x18046000 0x600>, <0xf8105408 0x600>,
 			      <0x18046f00 0x20>;
--- a/arch/arm/boot/dts/bcm-hr2.dtsi
+++ b/arch/arm/boot/dts/bcm-hr2.dtsi
@@ -179,7 +179,7 @@
 			status = "disabled";
 		};

-		nand: nand@26000 {
+		nand_controller: nand-controller@26000 {
 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
 			reg = <0x26000 0x600>,
 			      <0x11b408 0x600>,
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -269,7 +269,7 @@
 			dma-coherent;
 		};

-		nand: nand@26000 {
+		nand_controller: nand-controller@26000 {
 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
 			reg = <0x026000 0x600>,
 			      <0x11b408 0x600>,
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -28,11 +28,11 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 		};

-		pwr {
+		led-pwr {
 			label = "PWR";
 			gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -395,7 +395,7 @@
 		ranges = <0x0 0x7e000000  0x0 0xfe000000  0x01800000>;
 		dma-ranges = <0x0 0xc0000000  0x0 0x00000000  0x40000000>;

-		emmc2: emmc2@7e340000 {
+		emmc2: mmc@7e340000 {
 			compatible = "brcm,bcm2711-emmc2";
 			reg = <0x0 0x7e340000 0x100>;
 			interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -14,11 +14,11 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
 		};

-		pwr {
+		led-pwr {
 			label = "PWR";
 			gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -14,7 +14,7 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -15,11 +15,11 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
 		};

-		pwr {
+		led-pwr {
 			label = "PWR";
 			gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -15,7 +15,7 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -15,7 +15,7 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
@@ -5,7 +5,7 @@

 / {
 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 	};
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -23,7 +23,7 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 	};
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -18,7 +18,7 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
 		};
 	};
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -4,7 +4,7 @@
 	leds {
 		compatible = "gpio-leds";

-		act {
+		led-act {
 			label = "ACT";
 			default-state = "keep";
 			linux,default-trigger = "heartbeat";
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -15,11 +15,11 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
 		};

-		pwr {
+		led-pwr {
 			label = "PWR";
 			gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
--- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
@@ -19,11 +19,11 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
 		};

-		pwr {
+		led-pwr {
 			label = "PWR";
 			gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -20,11 +20,11 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
 		};

-		pwr {
+		led-pwr {
 			label = "PWR";
 			gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -20,7 +20,7 @@
 	};

 	leds {
-		act {
+		led-act {
 			gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
 		};
 	};
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
@@ -14,7 +14,7 @@
 		 * Since there is no upstream GPIO driver yet,
 		 * remove the incomplete node.
 		 */
-		/delete-node/ act;
+		/delete-node/ led-act;
 	};

 	reg_3v3: fixed-regulator {
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -420,7 +420,7 @@
 			status = "disabled";
 		};

-		sdhci: sdhci@7e300000 {
+		sdhci: mmc@7e300000 {
 			compatible = "brcm,bcm2835-sdhci";
 			reg = <0x7e300000 0x100>;
 			interrupts = <2 30>;
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -515,27 +515,27 @@
 		      <0x1811b408 0x004>,
 		      <0x180293a0 0x01c>;
 		reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";
-		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "spi_lr_fullness_reached",
+			     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "mspi_done",
+				  "mspi_halted",
+				  "spi_lr_fullness_reached",
 				  "spi_lr_session_aborted",
 				  "spi_lr_impatient",
 				  "spi_lr_session_done",
-				  "spi_lr_overhead",
-				  "mspi_done",
-				  "mspi_halted";
+				  "spi_lr_overread";
 		clocks = <&iprocmed>;
 		clock-names = "iprocmed";
 		num-cs = <2>;
 		#address-cells = <1>;
 		#size-cells = <0>;

-		spi_nor: spi-nor@0 {
+		spi_nor: flash@0 {
 			compatible = "jedec,spi-nor";
 			reg = <0>;
 			spi-max-frequency = <20000000>;
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -203,7 +203,7 @@
 			status = "disabled";
 		};

-		nand: nand@2000 {
+		nand_controller: nand-controller@2000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
--- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
+++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
@@ -14,10 +14,10 @@
 	};
 };

-&nand {
+&nand_controller {
 	status = "okay";

-	nandcs@1 {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <1>;
 		nand-ecc-step-size = <512>;
--- a/arch/arm/boot/dts/bcm7445.dtsi
+++ b/arch/arm/boot/dts/bcm7445.dtsi
@@ -148,7 +148,7 @@
 			reg-names = "aon-ctrl", "aon-sram";
 		};

-		nand: nand@3e2800 {
+		nand_controller: nand-controller@3e2800 {
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -82,8 +82,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@1 {
+&nand_controller {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958300k.dts
+++ b/arch/arm/boot/dts/bcm958300k.dts
@@ -60,8 +60,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@1 {
+&nand_controller {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958305k.dts
+++ b/arch/arm/boot/dts/bcm958305k.dts
@@ -68,8 +68,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@1 {
+&nand_controller {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958522er.dts
+++ b/arch/arm/boot/dts/bcm958522er.dts
@@ -74,8 +74,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958525er.dts
+++ b/arch/arm/boot/dts/bcm958525er.dts
@@ -74,8 +74,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958525xmc.dts
+++ b/arch/arm/boot/dts/bcm958525xmc.dts
@@ -90,8 +90,8 @@
 	};
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958622hr.dts
+++ b/arch/arm/boot/dts/bcm958622hr.dts
@@ -78,8 +78,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958623hr.dts
+++ b/arch/arm/boot/dts/bcm958623hr.dts
@@ -78,8 +78,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -89,8 +89,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -68,8 +68,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/arch/arm/boot/dts/bcm963138dvt.dts
@@ -31,10 +31,10 @@
 	status = "okay";
 };

-&nand {
+&nand_controller {
 	status = "okay";

-	nandcs@0 {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-ecc-strength = <4>;
--- a/arch/arm/boot/dts/bcm988312hr.dts
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -74,8 +74,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -351,7 +351,7 @@
 			#mbox-cells = <1>;
 			ti,mbox-num-users = <4>;
 			ti,mbox-num-fifos = <12>;
-			mbox_dsp: mbox_dsp {
+			mbox_dsp: mbox-dsp {
 				ti,mbox-tx = <3 0 0>;
 				ti,mbox-rx = <0 0 0>;
 			};
--- a/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
+++ b/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
@@ -5,17 +5,17 @@

 &mailbox5 {
 	status = "okay";
-	mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
+	mbox_ipu1_ipc3x: mbox-ipu1-ipc3x {
 		status = "okay";
 	};
-	mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
+	mbox_dsp1_ipc3x: mbox-dsp1-ipc3x {
 		status = "okay";
 	};
 };

 &mailbox6 {
 	status = "okay";
-	mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
+	mbox_ipu2_ipc3x: mbox-ipu2-ipc3x {
 		status = "okay";
 	};
 };
--- a/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@ -1315,7 +1315,7 @@
 			};
 		};

-		target-module@55000 {			/* 0x48055000, ap 13 0e.0 */
+		gpio2_target: target-module@55000 {		/* 0x48055000, ap 13 0e.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			reg = <0x55000 0x4>,
 			      <0x55010 0x4>,
@@ -1348,7 +1348,7 @@
 			};
 		};

-		target-module@57000 {			/* 0x48057000, ap 15 06.0 */
+		gpio3_target: target-module@57000 {		/* 0x48057000, ap 15 06.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			reg = <0x57000 0x4>,
 			      <0x57010 0x4>,
@@ -4095,28 +4095,6 @@
 			};
 		};

-		usb4_tm: target-module@140000 {		/* 0x48940000, ap 75 3c.0 */
-			compatible = "ti,sysc-omap4", "ti,sysc";
-			reg = <0x140000 0x4>,
-			      <0x140010 0x4>;
-			reg-names = "rev", "sysc";
-			ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
-			ti,sysc-midle = <SYSC_IDLE_FORCE>,
-					<SYSC_IDLE_NO>,
-					<SYSC_IDLE_SMART>,
-					<SYSC_IDLE_SMART_WKUP>;
-			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
-					<SYSC_IDLE_NO>,
-					<SYSC_IDLE_SMART>,
-					<SYSC_IDLE_SMART_WKUP>;
-			/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
-			clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
-			clock-names = "fck";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x140000 0x20000>;
-		};
-
 		target-module@170000 {			/* 0x48970000, ap 21 0a.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
 			reg = <0x170010 0x4>;
--- a/arch/arm/boot/dts/dra71x.dtsi
+++ b/arch/arm/boot/dts/dra71x.dtsi
@@ -11,7 +11,3 @@
 &rtctarget {
 	status = "disabled";
 };
-
-&usb4_tm {
-	status = "disabled";
-};
--- a/Show More
+++ b/Show More