Merge 476fcfe5bc on remote branch

Change-Id: I666cbe7a15f4bc6b8c4c60b615ab18f314e08323

BUILD.bazel

@@ -24,6 +24,7 @@ _aarch64_additional_kmi_symbol_lists = [
     "android/abi_gki_aarch64_honor",
     "android/abi_gki_aarch64_imx",
     "android/abi_gki_aarch64_lenovo",
+    "android/abi_gki_aarch64_microsoft",
     "android/abi_gki_aarch64_moto",
     "android/abi_gki_aarch64_mtk",
     "android/abi_gki_aarch64_mtktv",
@@ -34,6 +35,7 @@ _aarch64_additional_kmi_symbol_lists = [
     "android/abi_gki_aarch64_rtktv",
     "android/abi_gki_aarch64_sony",
     "android/abi_gki_aarch64_sunxi",
+    "android/abi_gki_aarch64_transsion",
     "android/abi_gki_aarch64_tuxera",
     "android/abi_gki_aarch64_type_visibility",
     "android/abi_gki_aarch64_unisoc",

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -580,3 +580,33 @@ Date:		January 2022
 Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>
 Description:	Controls max # of node block writes to be used for roll forward
 		recovery. This can limit the roll forward recovery time.
+
+What:		/sys/fs/f2fs/<disk>/unusable_blocks_per_sec
+Date:		June 2022
+Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>
+Description:	Shows the number of unusable blocks in a section which was defined by
+		the zone capacity reported by underlying zoned device.
+
+What:		/sys/fs/f2fs/<disk>/current_atomic_write
+Date:		July 2022
+Contact:	"Daeho Jeong" <daehojeong@google.com>
+Description:	Show the total current atomic write block count, which is not committed yet.
+		This is a read-only entry.
+
+What:		/sys/fs/f2fs/<disk>/peak_atomic_write
+Date:		July 2022
+Contact:	"Daeho Jeong" <daehojeong@google.com>
+Description:	Show the peak value of total current atomic write block count after boot.
+		If you write "0" here, you can initialize to "0".
+
+What:		/sys/fs/f2fs/<disk>/committed_atomic_block
+Date:		July 2022
+Contact:	"Daeho Jeong" <daehojeong@google.com>
+Description:	Show the accumulated total committed atomic write block count after boot.
+		If you write "0" here, you can initialize to "0".
+
+What:		/sys/fs/f2fs/<disk>/revoked_atomic_block
+Date:		July 2022
+Contact:	"Daeho Jeong" <daehojeong@google.com>
+Description:	Show the accumulated total revoked atomic write block count after boot.
+		If you write "0" here, you can initialize to "0".

Documentation/admin-guide/device-mapper/dm-init.rst

@@ -123,3 +123,11 @@ Other examples (per target):
     0 1638400 verity 1 8:1 8:2 4096 4096 204800 1 sha256
     fb1a5a0f00deb908d8b53cb270858975e76cf64105d412ce764225d53b8f3cfd
     51934789604d1b92399c52e7cb149d1b3a1b74bbbcb103b2a0aaacbed5c08584
+
+For setups using device-mapper on top of asynchronously probed block
+devices (MMC, USB, ..), it may be necessary to tell dm-init to
+explicitly wait for them to become available before setting up the
+device-mapper tables. This can be done with the "dm-mod.waitfor="
+module parameter, which takes a list of devices to wait for::
+
+  dm-mod.waitfor=<device1>[,..,<deviceN>]

Documentation/filesystems/autofs-mount-control.rst

@@ -196,7 +196,7 @@ information and return operation results::
 		    struct args_ismountpoint	ismountpoint;
 	    };
 
-	    char path[0];
+	    char path[];
     };
 
 The ioctlfd field is a mount point file descriptor of an autofs mount

Documentation/filesystems/autofs.rst

@@ -467,7 +467,7 @@ Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure::
 			struct args_ismountpoint	ismountpoint;
 		};
 
-                char path[0];
+                char path[];
         };
 
 For the **OPEN_MOUNT** and **IS_MOUNTPOINT** commands, the target

Documentation/filesystems/directory-locking.rst

@@ -22,12 +22,11 @@ exclusive.
 3) object removal.  Locking rules: caller locks parent, finds victim,
 locks victim and calls the method.  Locks are exclusive.
 
-4) rename() that is _not_ cross-directory.  Locking rules: caller locks
-the parent and finds source and target.  In case of exchange (with
-RENAME_EXCHANGE in flags argument) lock both.  In any case,
-if the target already exists, lock it.  If the source is a non-directory,
-lock it.  If we need to lock both, lock them in inode pointer order.
-Then call the method.  All locks are exclusive.
+4) rename() that is _not_ cross-directory.  Locking rules: caller locks the
+parent and finds source and target.  We lock both (provided they exist).  If we
+need to lock two inodes of different type (dir vs non-dir), we lock directory
+first.  If we need to lock two inodes of the same type, lock them in inode
+pointer order.  Then call the method.  All locks are exclusive.
 NB: we might get away with locking the source (and target in exchange
 case) shared.
 
@@ -44,15 +43,17 @@ All locks are exclusive.
 rules:
 
 	* lock the filesystem
-	* lock parents in "ancestors first" order.
+	* lock parents in "ancestors first" order. If one is not ancestor of
+	  the other, lock them in inode pointer order.
 	* find source and target.
 	* if old parent is equal to or is a descendent of target
 	  fail with -ENOTEMPTY
 	* if new parent is equal to or is a descendent of source
 	  fail with -ELOOP
-	* If it's an exchange, lock both the source and the target.
-	* If the target exists, lock it.  If the source is a non-directory,
-	  lock it.  If we need to lock both, do so in inode pointer order.
+	* Lock both the source and the target provided they exist. If we
+	  need to lock two inodes of different type (dir vs non-dir), we lock
+	  the directory first. If we need to lock two inodes of the same type,
+	  lock them in inode pointer order.
 	* call the method.
 
 All ->i_rwsem are taken exclusive.  Again, we might get away with locking
@@ -66,8 +67,9 @@ If no directory is its own ancestor, the scheme above is deadlock-free.
 
 Proof:
 
-	First of all, at any moment we have a partial ordering of the
-	objects - A < B iff A is an ancestor of B.
+	First of all, at any moment we have a linear ordering of the
+	objects - A < B iff (A is an ancestor of B) or (B is not an ancestor
+        of A and ptr(A) < ptr(B)).
 
 	That ordering can change.  However, the following is true:
 

Documentation/networking/af_xdp.rst

@@ -433,6 +433,15 @@ start N bytes into the buffer leaving the first N bytes for the
 application to use. The final option is the flags field, but it will
 be dealt with in separate sections for each UMEM flag.
 
+SO_BINDTODEVICE setsockopt
+--------------------------
+
+This is a generic SOL_SOCKET option that can be used to tie AF_XDP
+socket to a particular network interface.  It is useful when a socket
+is created by a privileged process and passed to a non-privileged one.
+Once the option is set, kernel will refuse attempts to bind that socket
+to a different interface.  Updating the value requires CAP_NET_RAW.
+
 XDP_STATISTICS getsockopt
 -------------------------
 

Documentation/networking/ip-sysctl.rst

@@ -2083,6 +2083,17 @@ accept_ra_min_hop_limit - INTEGER
 
 	Default: 1
 
+accept_ra_min_lft - INTEGER
+	Minimum acceptable lifetime value in Router Advertisement.
+
+	RA sections with a lifetime less than this value shall be
+	ignored. Zero lifetimes stay unaffected.
+
+	Possible values: 0-65535
+
+	Default: 0
+
+
 accept_ra_pinfo - BOOLEAN
 	Learn Prefix Information in Router Advertisement.
 

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 15
-SUBLEVEL = 119
+SUBLEVEL = 123
 EXTRAVERSION =
 NAME = Trick or Treat
 

android/ACK_SHA

@@ -1,2 +1,2 @@
-8a670a1c6394cd9153cb465966e86c2b57b78e1a
-android13-5.15-2023-08_r2
+3ca6a2912c7e6f416930ce3dbb26381cb04ec8d5
+android13-5.15-2023-11_r1

android/abi_gki_aarch64

@@ -141,3 +141,6 @@
   unregister_shrinker
   wait_on_page_bit
   __wake_up
+
+# preserved by --additions-only
+  android_kmalloc_64_create

android/abi_gki_aarch64_amlogic

@@ -162,6 +162,8 @@
   clk_register
   clk_register_composite
   clk_round_rate
+  clk_set_max_rate
+  clk_set_min_rate
   clk_set_parent
   clk_set_rate
   clk_unprepare
@@ -469,6 +471,7 @@
   dma_heap_get_dev
   dma_heap_get_drvdata
   dma_heap_get_name
+  dma_heap_put
   d_make_root
   dmam_alloc_attrs
   dma_map_page_attrs
@@ -533,6 +536,7 @@
   drm_atomic_helper_resume
   drm_atomic_helper_set_config
   drm_atomic_helper_setup_commit
+  drm_atomic_helper_shutdown
   drm_atomic_helper_suspend
   drm_atomic_helper_swap_state
   drm_atomic_helper_update_plane
@@ -644,6 +648,8 @@
   drm_poll
   drm_prime_gem_destroy
   drm_printf
+  __drm_printfn_coredump
+  __drm_printfn_seq_file
   drm_property_add_enum
   drm_property_blob_get
   drm_property_blob_put
@@ -654,9 +660,12 @@
   drm_property_destroy
   drm_property_lookup_blob
   drm_property_replace_blob
+  __drm_puts_coredump
+  __drm_puts_seq_file
   drm_read
   drm_release
   drm_self_refresh_helper_update_avg_times
+  drm_state_dump
   drm_universal_plane_init
   drm_vblank_init
   drm_writeback_connector_init
@@ -797,6 +806,7 @@
   get_cpu_iowait_time_us
   get_device
   get_device_system_crosststamp
+  get_each_dmabuf
   __get_free_pages
   get_kernel_pages
   get_net_ns_by_fd
@@ -1020,6 +1030,7 @@
   kill_block_super
   kill_fasync
   kill_pid
+  kimage_vaddr
   kimage_voffset
   __kmalloc
   kmalloc_caches
@@ -1079,6 +1090,7 @@
   led_trigger_unregister_simple
   __list_add_valid
   __list_del_entry_valid
+  list_sort
   ll_rw_block
   load_nls
   load_nls_default
@@ -1302,6 +1314,7 @@
   of_prop_next_u32
   of_pwm_xlate_with_flags
   of_reserved_mem_device_init_by_idx
+  of_reserved_mem_device_init_by_name
   of_reserved_mem_device_release
   of_reserved_mem_lookup
   of_reset_control_array_get
@@ -1327,6 +1340,7 @@
   panic
   panic_notifier_list
   param_array_ops
+  param_get_bool
   param_get_charp
   param_get_hexint
   param_get_int
@@ -1897,6 +1911,7 @@
   syscon_node_to_regmap
   syscon_regmap_lookup_by_phandle
   sysctl_sched_latency
+  sysfs_create_bin_file
   sysfs_create_file_ns
   sysfs_create_group
   sysfs_create_link
@@ -1921,6 +1936,7 @@
   __tasklet_schedule
   tasklet_setup
   tasklet_unlock_wait
+  tasklist_lock
   task_may_not_preempt
   thermal_cooling_device_unregister
   thermal_of_cooling_device_register
@@ -1943,6 +1959,7 @@
   __traceiter_android_rvh_check_preempt_tick
   __traceiter_android_rvh_check_preempt_wakeup
   __traceiter_android_rvh_do_sea
+  __traceiter_android_rvh_do_undefinstr
   __traceiter_android_rvh_enqueue_task
   __traceiter_android_rvh_gic_v3_set_affinity
   __traceiter_android_rvh_iommu_setup_dma_ops
@@ -1952,6 +1969,8 @@
   __traceiter_android_rvh_schedule
   __traceiter_android_rvh_select_task_rq_rt
   __traceiter_android_rvh_tick_entry
+  __traceiter_android_vh_alloc_pages_entry
+  __traceiter_android_vh_cma_alloc_bypass
   __traceiter_android_vh_cma_drain_all_pages_bypass
   __traceiter_android_vh_cpu_idle_enter
   __traceiter_android_vh_cpu_idle_exit
@@ -1959,17 +1978,26 @@
   __traceiter_android_vh_dump_throttled_rt_tasks
   __traceiter_android_vh_ftrace_format_check
   __traceiter_android_vh_iommu_iovad_free_iova
+  __traceiter_android_vh_ipi_stop
+  __traceiter_android_vh_isolate_freepages
   __traceiter_android_vh_mem_cgroup_alloc
   __traceiter_android_vh_mmc_sd_update_cmdline_timing
   __traceiter_android_vh_mmc_sd_update_dataline_timing
   __traceiter_android_vh_rmqueue
   __traceiter_android_vh_sched_show_task
+  __traceiter_android_vh_set_module_permit_after_init
+  __traceiter_android_vh_xhci_urb_suitable_bypass
   __traceiter_gpu_mem_total
   __traceiter_irq_handler_entry
   __traceiter_irq_handler_exit
   __traceiter_mmap_lock_acquire_returned
   __traceiter_mmap_lock_released
   __traceiter_mmap_lock_start_locking
+  __traceiter_mm_page_alloc
+  __traceiter_rwmmio_post_read
+  __traceiter_rwmmio_post_write
+  __traceiter_rwmmio_read
+  __traceiter_rwmmio_write
   __traceiter_sched_switch
   __traceiter_xdp_exception
   trace_output_call
@@ -1977,6 +2005,7 @@
   __tracepoint_android_rvh_check_preempt_tick
   __tracepoint_android_rvh_check_preempt_wakeup
   __tracepoint_android_rvh_do_sea
+  __tracepoint_android_rvh_do_undefinstr
   __tracepoint_android_rvh_enqueue_task
   __tracepoint_android_rvh_gic_v3_set_affinity
   __tracepoint_android_rvh_iommu_setup_dma_ops
@@ -1986,6 +2015,8 @@
   __tracepoint_android_rvh_schedule
   __tracepoint_android_rvh_select_task_rq_rt
   __tracepoint_android_rvh_tick_entry
+  __tracepoint_android_vh_alloc_pages_entry
+  __tracepoint_android_vh_cma_alloc_bypass
   __tracepoint_android_vh_cma_drain_all_pages_bypass
   __tracepoint_android_vh_cpu_idle_enter
   __tracepoint_android_vh_cpu_idle_exit
@@ -1993,19 +2024,28 @@
   __tracepoint_android_vh_dump_throttled_rt_tasks
   __tracepoint_android_vh_ftrace_format_check
   __tracepoint_android_vh_iommu_iovad_free_iova
+  __tracepoint_android_vh_ipi_stop
+  __tracepoint_android_vh_isolate_freepages
   __tracepoint_android_vh_mem_cgroup_alloc
   __tracepoint_android_vh_mmc_sd_update_cmdline_timing
   __tracepoint_android_vh_mmc_sd_update_dataline_timing
   __tracepoint_android_vh_rmqueue
   __tracepoint_android_vh_sched_show_task
+  __tracepoint_android_vh_set_module_permit_after_init
+  __tracepoint_android_vh_xhci_urb_suitable_bypass
   __tracepoint_gpu_mem_total
   __tracepoint_irq_handler_entry
   __tracepoint_irq_handler_exit
   __tracepoint_mmap_lock_acquire_returned
   __tracepoint_mmap_lock_released
   __tracepoint_mmap_lock_start_locking
+  __tracepoint_mm_page_alloc
   tracepoint_probe_register
   tracepoint_probe_unregister
+  __tracepoint_rwmmio_post_read
+  __tracepoint_rwmmio_post_write
+  __tracepoint_rwmmio_read
+  __tracepoint_rwmmio_write
   __tracepoint_sched_switch
   __tracepoint_xdp_exception
   trace_print_array_seq

android/abi_gki_aarch64_microsoft

@@ -0,0 +1,10 @@
+[abi_symbol_list]
+# required by igb.ko
+  dev_trans_start
+  eth_get_headlen
+  flow_rule_match_eth_addrs
+  __hw_addr_sync_dev
+  __hw_addr_unsync_dev
+  ndo_dflt_fdb_add
+  pci_sriov_set_totalvfs
+  ptp_find_pin

android/abi_gki_aarch64_mtk

@@ -794,6 +794,7 @@
   fwnode_property_read_string
   fwnode_property_read_u32_array
   fwnode_property_read_u64_array
+  fwnode_typec_mux_get
   g_audio_cleanup
   g_audio_setup
   gcd
@@ -2191,10 +2192,13 @@
   tty_unregister_ldisc
   tty_write_room
   typec_mux_get_drvdata
+  typec_mux_put
   typec_mux_register
   typec_mux_set
   typec_mux_unregister
   typec_partner_set_identity
+  typec_partner_set_pd_revision
+  typec_partner_set_svdm_version
   typec_register_partner
   typec_register_port
   typec_set_data_role

android/abi_gki_aarch64_oplus

@@ -156,6 +156,7 @@
   kern_unmount
   kfree
   kfree_skb
+  kick_process
   kill_anon_super
   kmalloc_caches
   kmem_cache_alloc
@@ -230,12 +231,14 @@
   nla_reserve
   nonseekable_open
   nr_cpu_ids
+  nr_running
   __num_online_cpus
   of_css
   page_endio
   __page_file_index
   __page_mapcount
   page_mapping
+  page_referenced
   page_to_lruvec
   param_ops_uint
   __per_cpu_offset
@@ -286,6 +289,7 @@
   register_sysctl_table
   register_tcf_proto_ops
   remove_proc_subtree
+  root_mem_cgroup
   rtc_read_alarm
   __rtnl_link_unregister
   sched_clock
@@ -409,9 +413,12 @@
   __traceiter_android_vh_dm_bufio_shrink_scan_bypass
   __traceiter_android_vh_drain_all_pages_bypass
   __traceiter_android_vh_dup_task_struct
+  __traceiter_android_vh_exit_check
   __traceiter_android_vh_exit_mm
   __traceiter_android_vh_exit_signal
+  __traceiter_android_vh_exit_signal_whether_wake
   __traceiter_android_vh_free_task
+  __traceiter_android_vh_freeze_whether_wake
   __traceiter_android_vh_futex_sleep_start
   __traceiter_android_vh_futex_wait_end
   __traceiter_android_vh_futex_wait_start
@@ -427,6 +434,7 @@
   __traceiter_android_vh_madvise_cold_or_pageout_abort
   __traceiter_android_vh_mark_page_accessed
   __traceiter_android_vh_mem_cgroup_alloc
+  __traceiter_android_vh_adjust_alloc_flags
   __traceiter_android_vh_mem_cgroup_css_offline
   __traceiter_android_vh_mem_cgroup_css_online
   __traceiter_android_vh_mem_cgroup_free
@@ -446,6 +454,7 @@
   __traceiter_android_vh_print_slabinfo_header
   __traceiter_android_vh_record_mutex_lock_starttime
   __traceiter_android_vh_record_pcpu_rwsem_starttime
+  __traceiter_android_vh_percpu_rwsem_wq_add
   __traceiter_android_vh_record_rtmutex_lock_starttime
   __traceiter_android_vh_record_rwsem_lock_starttime
   __traceiter_android_vh_rmqueue
@@ -533,9 +542,12 @@
   __tracepoint_android_vh_do_traversal_lruvec
   __tracepoint_android_vh_drain_all_pages_bypass
   __tracepoint_android_vh_dup_task_struct
+  __tracepoint_android_vh_exit_check
   __tracepoint_android_vh_exit_mm
   __tracepoint_android_vh_exit_signal
+  __tracepoint_android_vh_exit_signal_whether_wake
   __tracepoint_android_vh_free_task
+  __tracepoint_android_vh_freeze_whether_wake
   __tracepoint_android_vh_futex_sleep_start
   __tracepoint_android_vh_futex_wait_end
   __tracepoint_android_vh_futex_wait_start
@@ -551,6 +563,7 @@
   __tracepoint_android_vh_madvise_cold_or_pageout_abort
   __tracepoint_android_vh_mark_page_accessed
   __tracepoint_android_vh_mem_cgroup_alloc
+  __tracepoint_android_vh_adjust_alloc_flags
   __tracepoint_android_vh_mem_cgroup_css_offline
   __tracepoint_android_vh_mem_cgroup_css_online
   __tracepoint_android_vh_mem_cgroup_free
@@ -570,6 +583,7 @@
   __tracepoint_android_vh_print_slabinfo_header
   __tracepoint_android_vh_record_mutex_lock_starttime
   __tracepoint_android_vh_record_pcpu_rwsem_starttime
+  __tracepoint_android_vh_percpu_rwsem_wq_add
   __tracepoint_android_vh_record_rtmutex_lock_starttime
   __tracepoint_android_vh_record_rwsem_lock_starttime
   __tracepoint_android_vh_rmqueue
@@ -629,6 +643,7 @@
   wait_for_completion_io_timeout
   __wake_up
   wake_up_process
+  wake_up_state
   wq_worker_comm
   is_ashmem_file
   zero_pfn

android/abi_gki_aarch64_pixel

@@ -1919,6 +1919,7 @@
   __traceiter_android_vh_cpu_idle_enter
   __traceiter_android_vh_cpu_idle_exit
   __traceiter_android_vh_dup_task_struct
+  __traceiter_android_vh_enable_thermal_genl_check
   __traceiter_android_vh_ipi_stop
   __traceiter_android_vh_scheduler_tick
   __traceiter_android_vh_setscheduler_uclamp
@@ -1975,6 +1976,7 @@
   __tracepoint_android_vh_cpu_idle_enter
   __tracepoint_android_vh_cpu_idle_exit
   __tracepoint_android_vh_dup_task_struct
+  __tracepoint_android_vh_enable_thermal_genl_check
   __tracepoint_android_vh_ipi_stop
   __tracepoint_android_vh_scheduler_tick
   __tracepoint_android_vh_setscheduler_uclamp

android/abi_gki_aarch64_qcom

@@ -103,6 +103,7 @@
   blk_get_request
   blk_ksm_get_slot_idx
   blk_ksm_register
+  blk_ksm_reprogram_all_keys
   blk_mark_disk_dead
   blk_mq_alloc_request
   blk_mq_alloc_request_hctx
@@ -374,6 +375,7 @@
   dev_get_by_name
   dev_get_by_name_rcu
   dev_get_regmap
+  dev_get_tstats64
   device_add
   device_add_disk
   device_add_groups
@@ -697,6 +699,7 @@
   ethnl_cable_test_pulse
   ethnl_cable_test_result
   ethnl_cable_test_step
+  eth_platform_get_mac_address
   ethtool_convert_legacy_u32_to_link_mode
   ethtool_convert_link_mode_to_legacy_u32
   eventfd_ctx_fdget
@@ -764,6 +767,7 @@
   generic_handle_domain_irq
   generic_handle_irq
   generic_iommu_put_resv_regions
+  generic_mii_ioctl
   geni_icc_disable
   geni_icc_enable
   geni_icc_get
@@ -1295,6 +1299,8 @@
   migrate_pages
   migrate_swap
   __migrate_task
+  mii_check_media
+  mii_ethtool_gset
   mipi_dsi_dcs_set_tear_off
   misc_deregister
   misc_register
@@ -1461,6 +1467,7 @@
   page_endio
   page_is_ram
   page_mapping
+  page_owner_inited
   page_pool_alloc_pages
   page_pool_create
   page_pool_destroy
@@ -1991,6 +1998,7 @@
   set_next_entity
   set_normalized_timespec64
   __SetPageMovable
+  __set_page_owner
   set_task_cpu
   set_user_nice
   sg_alloc_table
@@ -2495,6 +2503,7 @@
   typec_set_pwr_opmode
   typec_set_pwr_role
   typec_unregister_partner
+  typec_get_orientation
   uart_add_one_port
   uart_get_baud_rate
   uart_insert_char
@@ -2569,6 +2578,8 @@
   usb_alloc_coherent
   usb_alloc_dev
   usb_assign_descriptors
+  usb_autopm_get_interface_async
+  usb_autopm_put_interface_async
   usb_bus_idr
   usb_bus_idr_lock
   usb_composite_setup_continue
@@ -2597,6 +2608,26 @@
   usb_interface_id
   usb_mon_deregister
   usb_mon_register
+  usbnet_disconnect
+  usbnet_get_endpoints
+  usbnet_get_msglevel
+  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_phy_set_charger_current
   usb_pipe_type_check
   usb_put_function_instance
@@ -2672,6 +2703,7 @@
   wait_for_completion_interruptible_timeout
   wait_for_completion_io_timeout
   wait_for_completion_timeout
+  wait_for_device_probe
   __wait_rcu_gp
   __wake_up
   wake_up_if_idle

android/abi_gki_aarch64_sunxi

@@ -1603,6 +1603,7 @@
   __v4l2_device_register_subdev_nodes
   v4l2_device_unregister
   v4l2_device_unregister_subdev
+  v4l2_enum_dv_timings_cap
   v4l2_event_queue
   v4l2_event_subdev_unsubscribe
   v4l2_event_subscribe
@@ -1614,8 +1615,11 @@
   v4l2_s_ctrl
   v4l2_spi_new_subdev
   v4l2_spi_subdev_init
+  v4l2_src_change_event_subdev_subscribe
   v4l2_subdev_call_wrappers
   v4l2_subdev_init
+  v4l2_subdev_notify_event
+  v4l2_valid_dv_timings
   v4l_bound_align_image
   vabits_actual
   vb2_buffer_done

android/abi_gki_aarch64_transsion

@@ -0,0 +1,2 @@
+[abi_symbol_list]
+  avenrun

android/abi_gki_aarch64_tuxera

@@ -23,6 +23,7 @@ blk_start_plug
 __blockdev_direct_IO
 block_invalidatepage
 block_is_partially_uptodate
+block_read_full_page
 __breadahead
 __bread_gfp
 __brelse
@@ -49,6 +50,7 @@ delete_from_page_cache
 d_instantiate
 d_make_root
 d_obtain_alias
+dirty_writeback_interval
 down_read
 down_write
 down_write_trylock
@@ -104,6 +106,7 @@ __init_rwsem
 init_special_inode
 init_wait_entry
 __init_waitqueue_head
+inode_add_bytes
 inode_dio_wait
 inode_init_once
 inode_init_owner
@@ -255,6 +258,7 @@ truncate_inode_pages
 truncate_inode_pages_final
 truncate_pagecache
 truncate_setsize
+try_to_free_buffers
 try_to_release_page
 try_to_writeback_inodes_sb
 __ubsan_handle_cfi_check_fail_abort
@@ -266,6 +270,7 @@ unmap_mapping_range
 unregister_filesystem
 up_read
 up_write
+utf32_to_utf8
 vfree
 vfs_fsync_range
 __vmalloc

android/abi_gki_aarch64_unisoc

@@ -2354,6 +2354,8 @@
   skb_copy_bits
   skb_vlan_untag
   unregister_netdevice_notifier
+  vlan_dev_real_dev
+  vlan_dev_vlan_id
 
 # required by sha1-ce.ko
   crypto_sha1_finup
@@ -3164,17 +3166,21 @@
   __tracepoint_android_vh_show_mem
 
 # required by unisoc_mm_reclaim.ko
+  __traceiter_android_vh_clear_page_migrating
   __traceiter_android_vh_do_page_trylock
   __traceiter_android_vh_handle_failed_page_trylock
   __traceiter_android_vh_page_trylock_clear
   __traceiter_android_vh_page_trylock_get_result
   __traceiter_android_vh_page_trylock_set
+  __traceiter_android_vh_set_page_migrating
   __traceiter_android_vh_shrink_slab_bypass
+  __tracepoint_android_vh_clear_page_migrating
   __tracepoint_android_vh_do_page_trylock
   __tracepoint_android_vh_handle_failed_page_trylock
   __tracepoint_android_vh_page_trylock_clear
   __tracepoint_android_vh_page_trylock_get_result
   __tracepoint_android_vh_page_trylock_set
+  __tracepoint_android_vh_set_page_migrating
   __tracepoint_android_vh_shrink_slab_bypass
 
 # required by unisoc_mm_slab.ko
@@ -3254,6 +3260,9 @@
   usb_store_new_id
   usb_unpoison_urb
 
+# required by sprd_time_sync_cp.ko
+  pvclock_gtod_register_notifier
+
 # required by vha.ko
   clk_bulk_get
   device_wakeup_disable

arch/arc/include/asm/linkage.h

@@ -8,6 +8,10 @@
 
 #include <asm/dwarf.h>
 
+#define ASM_NL		 `	/* use '`' to mark new line in macro */
+#define __ALIGN		.align 4
+#define __ALIGN_STR	__stringify(__ALIGN)
+
 #ifdef __ASSEMBLY__
 
 .macro ST2 e, o, off
@@ -28,10 +32,6 @@
 #endif
 .endm
 
-#define ASM_NL		 `	/* use '`' to mark new line in macro */
-#define __ALIGN		.align 4
-#define __ALIGN_STR	__stringify(__ALIGN)
-
 /* annotation for data we want in DCCM - if enabled in .config */
 .macro ARCFP_DATA nm
 #ifdef CONFIG_ARC_HAS_DCCM

arch/arm/boot/dts/bcm53015-meraki-mr26.dts

@@ -128,7 +128,7 @@
 
 			fixed-link {
 				speed = <1000>;
-				duplex-full;
+				full-duplex;
 			};
 		};
 	};

arch/arm/boot/dts/bcm53016-meraki-mr32.dts

@@ -212,7 +212,7 @@
 
 			fixed-link {
 				speed = <1000>;
-				duplex-full;
+				full-duplex;
 			};
 		};
 	};

arch/arm/boot/dts/bcm5301x.dtsi

@@ -542,7 +542,6 @@
 				  "spi_lr_session_done",
 				  "spi_lr_overread";
 		clocks = <&iprocmed>;
-		clock-names = "iprocmed";
 		num-cs = <2>;
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/iwg20d-q7-common.dtsi

@@ -49,7 +49,7 @@
 	lcd_backlight: backlight {
 		compatible = "pwm-backlight";
 
-		pwms = <&pwm3 0 5000000 0>;
+		pwms = <&pwm3 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;
 		default-brightness-level = <7>;
 		enable-gpios = <&gpio5 14 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/meson8.dtsi

@@ -749,13 +749,13 @@
 
 &uart_B {
 	compatible = "amlogic,meson8-uart";
-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+	clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>;
 	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_C {
 	compatible = "amlogic,meson8-uart";
-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+	clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
 	clock-names = "xtal", "pclk", "baud";
 };
 

arch/arm/boot/dts/meson8b.dtsi

@@ -737,13 +737,13 @@
 
 &uart_B {
 	compatible = "amlogic,meson8b-uart";
-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+	clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>;
 	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_C {
 	compatible = "amlogic,meson8b-uart";
-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+	clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
 	clock-names = "xtal", "pclk", "baud";
 };
 

arch/arm/boot/dts/omap3-gta04a5one.dts

@@ -5,9 +5,11 @@
 
 #include "omap3-gta04a5.dts"
 
-&omap3_pmx_core {
+/ {
 	model = "Goldelico GTA04A5/Letux 2804 with OneNAND";
+};
 
+&omap3_pmx_core {
 	gpmc_pins: pinmux_gpmc_pins {
 		pinctrl-single,pins = <
 

arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts

@@ -11,9 +11,9 @@
 		dma@7984000 {
 			status = "okay";
 		};
-
-		qpic-nand@79b0000 {
-			status = "okay";
-		};
 	};
 };
+
+&nand {
+	status = "okay";
+};

arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi

@@ -102,10 +102,10 @@
 			status = "okay";
 			perst-gpio = <&tlmm 38 0x1>;
 		};
-
-		qpic-nand@79b0000 {
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-		};
 	};
 };
+
+&nand {
+	pinctrl-0 = <&nand_pins>;
+	pinctrl-names = "default";
+};

arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi

@@ -65,11 +65,11 @@
 		dma@7984000 {
 			status = "okay";
 		};
+	};
+};
 
-		qpic-nand@79b0000 {
+&nand {
 	pinctrl-0 = <&nand_pins>;
 	pinctrl-names = "default";
 	status = "okay";
-		};
-	};
 };

arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi

@@ -137,10 +137,13 @@
 
 	sound {
 		compatible = "audio-graph-card";
-		routing =
-			"MIC_IN", "Capture",
-			"Capture", "Mic Bias",
-			"Playback", "HP_OUT";
+		widgets = "Headphone", "Headphone Jack",
+			  "Line", "Line In Jack",
+			  "Microphone", "Microphone Jack";
+		routing = "Headphone Jack", "HP_OUT",
+			  "LINE_IN", "Line In Jack",
+			  "MIC_IN", "Microphone Jack",
+			  "Microphone Jack", "Mic Bias";
 		dais = <&sai2a_port &sai2b_port>;
 		status = "okay";
 	};

arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi

@@ -88,7 +88,7 @@
 
 	sound {
 		compatible = "audio-graph-card";
-		label = "STM32MP1-AV96-HDMI";
+		label = "STM32-AV96-HDMI";
 		dais = <&sai2a_port>;
 		status = "okay";
 	};
@@ -267,6 +267,12 @@
 			};
 		};
 	};
+
+	dh_mac_eeprom: eeprom@53 {
+		compatible = "atmel,24c02";
+		reg = <0x53>;
+		pagesize = <16>;
+	};
 };
 
 &ltdc {

arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi

@@ -171,12 +171,6 @@
 			status = "disabled";
 		};
 	};
-
-	eeprom@53 {
-		compatible = "atmel,24c02";
-		reg = <0x53>;
-		pagesize = <16>;
-	};
 };
 
 &iwdg2 {

arch/arm/boot/dts/stm32mp15xx-dkx.dtsi

@@ -438,7 +438,7 @@
 	i2s2_port: port {
 		i2s2_endpoint: endpoint {
 			remote-endpoint = <&sii9022_tx_endpoint>;
-			format = "i2s";
+			dai-format = "i2s";
 			mclk-fs = <256>;
 		};
 	};

arch/arm/include/asm/assembler.h

@@ -326,6 +326,23 @@
 #endif
 	.endm
 
+/*
+ * Raw SMP data memory barrier
+ */
+	.macro	__smp_dmb mode
+#if __LINUX_ARM_ARCH__ >= 7
+	.ifeqs "\mode","arm"
+	dmb	ish
+	.else
+	W(dmb)	ish
+	.endif
+#elif __LINUX_ARM_ARCH__ == 6
+	mcr	p15, 0, r0, c7, c10, 5	@ dmb
+#else
+	.error "Incompatible SMP platform"
+#endif
+	.endm
+
 #if defined(CONFIG_CPU_V7M)
 	/*
 	 * setmode is used to assert to be in svc mode during boot. For v7-M

arch/arm/include/asm/sync_bitops.h

@@ -14,14 +14,35 @@
  * ops which are SMP safe even on a UP kernel.
  */
 
+/*
+ * Unordered
+ */
+
 #define sync_set_bit(nr, p)		_set_bit(nr, p)
 #define sync_clear_bit(nr, p)		_clear_bit(nr, p)
 #define sync_change_bit(nr, p)		_change_bit(nr, p)
-#define sync_test_and_set_bit(nr, p)	_test_and_set_bit(nr, p)
-#define sync_test_and_clear_bit(nr, p)	_test_and_clear_bit(nr, p)
-#define sync_test_and_change_bit(nr, p)	_test_and_change_bit(nr, p)
 #define sync_test_bit(nr, addr)		test_bit(nr, addr)
-#define arch_sync_cmpxchg		arch_cmpxchg
 
+/*
+ * Fully ordered
+ */
+
+int _sync_test_and_set_bit(int nr, volatile unsigned long * p);
+#define sync_test_and_set_bit(nr, p)	_sync_test_and_set_bit(nr, p)
+
+int _sync_test_and_clear_bit(int nr, volatile unsigned long * p);
+#define sync_test_and_clear_bit(nr, p)	_sync_test_and_clear_bit(nr, p)
+
+int _sync_test_and_change_bit(int nr, volatile unsigned long * p);
+#define sync_test_and_change_bit(nr, p)	_sync_test_and_change_bit(nr, p)
+
+#define arch_sync_cmpxchg(ptr, old, new)				\
+({									\
+	__typeof__(*(ptr)) __ret;					\
+	__smp_mb__before_atomic();					\
+	__ret = arch_cmpxchg_relaxed((ptr), (old), (new));		\
+	__smp_mb__after_atomic();					\
+	__ret;								\
+})
 
 #endif

arch/arm/include/asm/syscall.h

@@ -25,6 +25,9 @@ static inline int syscall_get_nr(struct task_struct *task,
 	if (IS_ENABLED(CONFIG_AEABI) && !IS_ENABLED(CONFIG_OABI_COMPAT))
 		return task_thread_info(task)->abi_syscall;
 
+	if (task_thread_info(task)->abi_syscall == -1)
+		return -1;
+
 	return task_thread_info(task)->abi_syscall & __NR_SYSCALL_MASK;
 }
 

arch/arm/kernel/entry-common.S

@@ -101,6 +101,7 @@ slow_work_pending:
 	cmp	r0, #0
 	beq	no_work_pending
 	movlt	scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE)
+	str	scno, [tsk, #TI_ABI_SYSCALL]	@ make sure tracers see update
 	ldmia	sp, {r0 - r6}			@ have to reload r0 - r6
 	b	local_restart			@ ... and off we go
 ENDPROC(ret_fast_syscall)

arch/arm/kernel/ptrace.c

@@ -786,8 +786,9 @@ long arch_ptrace(struct task_struct *child, long request,
 			break;
 
 		case PTRACE_SET_SYSCALL:
-			task_thread_info(child)->abi_syscall = data &
-							__NR_SYSCALL_MASK;
+			if (data != -1)
+				data &= __NR_SYSCALL_MASK;
+			task_thread_info(child)->abi_syscall = data;
 			ret = 0;
 			break;
 

arch/arm/lib/bitops.h

@@ -28,7 +28,7 @@ UNWIND(	.fnend		)
 ENDPROC(\name		)
 	.endm
 
-	.macro	testop, name, instr, store
+	.macro	__testop, name, instr, store, barrier
 ENTRY(	\name		)
 UNWIND(	.fnstart	)
 	ands	ip, r1, #3
@@ -38,7 +38,7 @@ UNWIND(	.fnstart	)
 	mov	r0, r0, lsr #5
 	add	r1, r1, r0, lsl #2	@ Get word offset
 	mov	r3, r2, lsl r3		@ create mask
-	smp_dmb
+	\barrier
 #if __LINUX_ARM_ARCH__ >= 7 && defined(CONFIG_SMP)
 	.arch_extension	mp
 	ALT_SMP(W(pldw)	[r1])
@@ -50,13 +50,21 @@ UNWIND(	.fnstart	)
 	strex	ip, r2, [r1]
 	cmp	ip, #0
 	bne	1b
-	smp_dmb
+	\barrier
 	cmp	r0, #0
 	movne	r0, #1
 2:	bx	lr
 UNWIND(	.fnend		)
 ENDPROC(\name		)
 	.endm
+
+	.macro	testop, name, instr, store
+	__testop \name, \instr, \store, smp_dmb
+	.endm
+
+	.macro	sync_testop, name, instr, store
+	__testop \name, \instr, \store, __smp_dmb
+	.endm
 #else
 	.macro	bitop, name, instr
 ENTRY(	\name		)

arch/arm/lib/testchangebit.S

@@ -10,3 +10,7 @@
                 .text
 
 testop	_test_and_change_bit, eor, str
+
+#if __LINUX_ARM_ARCH__ >= 6
+sync_testop	_sync_test_and_change_bit, eor, str
+#endif

arch/arm/lib/testclearbit.S

@@ -10,3 +10,7 @@
                 .text
 
 testop	_test_and_clear_bit, bicne, strne
+
+#if __LINUX_ARM_ARCH__ >= 6
+sync_testop	_sync_test_and_clear_bit, bicne, strne
+#endif

arch/arm/lib/testsetbit.S

@@ -10,3 +10,7 @@
                 .text
 
 testop	_test_and_set_bit, orreq, streq
+
+#if __LINUX_ARM_ARCH__ >= 6
+sync_testop	_sync_test_and_set_bit, orreq, streq
+#endif

arch/arm/mach-ep93xx/timer-ep93xx.c

@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <asm/mach/time.h>
 #include "soc.h"
+#include "platform.h"
 
 /*************************************************************************
  * Timer handling for EP93xx
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)
 	return ret;
 }
 
-u64 ep93xx_clocksource_read(struct clocksource *c)
+static u64 ep93xx_clocksource_read(struct clocksource *c)
 {
 	u64 ret;
 

arch/arm/mach-omap2/board-generic.c

@@ -13,6 +13,7 @@
 #include <linux/of_platform.h>
 #include <linux/irqdomain.h>
 #include <linux/clocksource.h>
+#include <linux/clockchips.h>
 
 #include <asm/setup.h>
 #include <asm/mach/arch.h>

arch/arm/mach-orion5x/board-dt.c

@@ -63,6 +63,9 @@ static void __init orion5x_dt_init(void)
 	if (of_machine_is_compatible("maxtor,shared-storage-2"))
 		mss2_init();
 
+	if (of_machine_is_compatible("lacie,d2-network"))
+		d2net_init();
+
 	of_platform_default_populate(NULL, orion5x_auxdata_lookup, NULL);
 }
 

arch/arm/mach-orion5x/common.h

@@ -75,6 +75,12 @@ extern void mss2_init(void);
 static inline void mss2_init(void) {}
 #endif
 
+#ifdef CONFIG_MACH_D2NET_DT
+void d2net_init(void);
+#else
+static inline void d2net_init(void) {}
+#endif
+
 /*****************************************************************************
  * Helpers to access Orion registers
  ****************************************************************************/

arch/arm/probes/kprobes/checkers-common.c

@@ -40,7 +40,7 @@ enum probes_insn checker_stack_use_imm_0xx(probes_opcode_t insn,
  * Different from other insn uses imm8, the real addressing offset of
  * STRD in T32 encoding should be imm8 * 4. See ARMARM description.
  */
-enum probes_insn checker_stack_use_t32strd(probes_opcode_t insn,
+static enum probes_insn checker_stack_use_t32strd(probes_opcode_t insn,
 		struct arch_probes_insn *asi,
 		const struct decode_header *h)
 {

arch/arm/probes/kprobes/core.c

@@ -233,7 +233,7 @@ singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
  * kprobe, and that level is reserved for user kprobe handlers, so we can't
  * risk encountering a new kprobe in an interrupt handler.
  */
-void __kprobes kprobe_handler(struct pt_regs *regs)
+static void __kprobes kprobe_handler(struct pt_regs *regs)
 {
 	struct kprobe *p, *cur;
 	struct kprobe_ctlblk *kcb;

arch/arm/probes/kprobes/opt-arm.c

@@ -145,8 +145,6 @@ __arch_remove_optimized_kprobe(struct optimized_kprobe *op, int dirty)
 	}
 }
 
-extern void kprobe_handler(struct pt_regs *regs);
-
 static void
 optimized_callback(struct optimized_kprobe *op, struct pt_regs *regs)
 {

arch/arm/probes/kprobes/test-core.c

@@ -720,7 +720,7 @@ static const char coverage_register_lookup[16] = {
 	[REG_TYPE_NOSPPCX]	= COVERAGE_ANY_REG | COVERAGE_SP,
 };
 
-unsigned coverage_start_registers(const struct decode_header *h)
+static unsigned coverage_start_registers(const struct decode_header *h)
 {
 	unsigned regs = 0;
 	int i;

arch/arm/probes/kprobes/test-core.h

@@ -454,3 +454,7 @@ void kprobe_thumb32_test_cases(void);
 #else
 void kprobe_arm_test_cases(void);
 #endif
+
+void __kprobes_test_case_start(void);
+void __kprobes_test_case_end_16(void);
+void __kprobes_test_case_end_32(void);

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi

@@ -281,6 +281,10 @@
 	};
 };
 
+&gic {
+	mediatek,broken-save-restore-fw;
+};
+
 &gpu {
 	mali-supply = <&mt6358_vgpu_reg>;
 	sram-supply = <&mt6358_vsram_gpu_reg>;

arch/arm64/boot/dts/mediatek/mt8192.dtsi

@@ -41,7 +41,8 @@
 			clock-frequency = <1701000000>;
 			cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>;
 			next-level-cache = <&l2_0>;
-			capacity-dmips-mhz = <530>;
+			performance-domains = <&performance 0>;
+			capacity-dmips-mhz = <427>;
 		};
 
 		cpu1: cpu@100 {
@@ -52,7 +53,8 @@
 			clock-frequency = <1701000000>;
 			cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>;
 			next-level-cache = <&l2_0>;
-			capacity-dmips-mhz = <530>;
+			performance-domains = <&performance 0>;
+			capacity-dmips-mhz = <427>;
 		};
 
 		cpu2: cpu@200 {
@@ -63,7 +65,8 @@
 			clock-frequency = <1701000000>;
 			cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>;
 			next-level-cache = <&l2_0>;
-			capacity-dmips-mhz = <530>;
+			performance-domains = <&performance 0>;
+			capacity-dmips-mhz = <427>;
 		};
 
 		cpu3: cpu@300 {
@@ -74,7 +77,8 @@
 			clock-frequency = <1701000000>;
 			cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>;
 			next-level-cache = <&l2_0>;
-			capacity-dmips-mhz = <530>;
+			performance-domains = <&performance 0>;
+			capacity-dmips-mhz = <427>;
 		};
 
 		cpu4: cpu@400 {
@@ -85,6 +89,7 @@
 			clock-frequency = <2171000000>;
 			cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>;
 			next-level-cache = <&l2_1>;
+			performance-domains = <&performance 1>;
 			capacity-dmips-mhz = <1024>;
 		};
 
@@ -96,6 +101,7 @@
 			clock-frequency = <2171000000>;
 			cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>;
 			next-level-cache = <&l2_1>;
+			performance-domains = <&performance 1>;
 			capacity-dmips-mhz = <1024>;
 		};
 
@@ -107,6 +113,7 @@
 			clock-frequency = <2171000000>;
 			cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>;
 			next-level-cache = <&l2_1>;
+			performance-domains = <&performance 1>;
 			capacity-dmips-mhz = <1024>;
 		};
 
@@ -118,6 +125,7 @@
 			clock-frequency = <2171000000>;
 			cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>;
 			next-level-cache = <&l2_1>;
+			performance-domains = <&performance 1>;
 			capacity-dmips-mhz = <1024>;
 		};
 
@@ -234,6 +242,12 @@
 		compatible = "simple-bus";
 		ranges;
 
+		performance: performance-controller@11bc10 {
+			compatible = "mediatek,cpufreq-hw";
+			reg = <0 0x0011bc10 0 0x120>, <0 0x0011bd30 0 0x120>;
+			#performance-domain-cells = <1>;
+		};
+
 		gic: interrupt-controller@c000000 {
 			compatible = "arm,gic-v3";
 			#interrupt-cells = <4>;

arch/arm64/boot/dts/microchip/sparx5.dtsi

@@ -61,7 +61,7 @@
 		interrupt-affinity = <&cpu0>, <&cpu1>;
 	};
 
-	psci {
+	psci: psci {
 		compatible = "arm,psci-0.2";
 		method = "smc";
 	};

arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi

@@ -6,6 +6,18 @@
 /dts-v1/;
 #include "sparx5.dtsi"
 
+&psci {
+	status = "disabled";
+};
+
+&cpu0 {
+	enable-method = "spin-table";
+};
+
+&cpu1 {
+	enable-method = "spin-table";
+};
+
 &uart0 {
 	status = "okay";
 };

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

@@ -5,9 +5,847 @@
 
 /dts-v1/;
 
-#include "apq8016-sbc.dtsi"
+#include "msm8916-pm8916.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
+#include <dt-bindings/sound/apq8016-lpass.h>
 
 / {
 	model = "Qualcomm Technologies, Inc. APQ 8016 SBC";
 	compatible = "qcom,apq8016-sbc", "qcom,apq8016";
+
+	aliases {
+		serial0 = &blsp1_uart2;
+		serial1 = &blsp1_uart1;
+		usid0 = &pm8916_0;
+		i2c0	= &blsp_i2c2;
+		i2c1	= &blsp_i2c6;
+		i2c3	= &blsp_i2c4;
+		spi0	= &blsp_spi5;
+		spi1	= &blsp_spi3;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+
+	camera_vdddo_1v8: camera-vdddo-1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "camera_vdddo";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+	};
+
+	camera_vdda_2v8: camera-vdda-2v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "camera_vdda";
+		regulator-min-microvolt = <2800000>;
+		regulator-max-microvolt = <2800000>;
+		regulator-always-on;
+	};
+
+	camera_vddd_1v5: camera-vddd-1v5 {
+		compatible = "regulator-fixed";
+		regulator-name = "camera_vddd";
+		regulator-min-microvolt = <1500000>;
+		regulator-max-microvolt = <1500000>;
+		regulator-always-on;
+	};
+
+	reserved-memory {
+		ramoops@bff00000 {
+			compatible = "ramoops";
+			reg = <0x0 0xbff00000 0x0 0x100000>;
+
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			ftrace-size = <0x20000>;
+		};
+	};
+
+	usb2513 {
+		compatible = "smsc,usb3503";
+		reset-gpios = <&pm8916_gpios 3 GPIO_ACTIVE_LOW>;
+		initial-mode = <1>;
+	};
+
+	usb_id: usb-id {
+		compatible = "linux,extcon-usb-gpio";
+		id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb_id_default>;
+	};
+
+	hdmi-out {
+		compatible = "hdmi-connector";
+		type = "a";
+
+		port {
+			hdmi_con: endpoint {
+				remote-endpoint = <&adv7533_out>;
+			};
+		};
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		autorepeat;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&msm_key_volp_n_default>;
+
+		button@0 {
+			label = "Volume Up";
+			linux,code = <KEY_VOLUMEUP>;
+			gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	leds {
+		pinctrl-names = "default";
+		pinctrl-0 = <&msmgpio_leds>,
+			    <&pm8916_gpios_leds>,
+			    <&pm8916_mpps_leds>;
+
+		compatible = "gpio-leds";
+
+		led@1 {
+			label = "apq8016-sbc:green:user1";
+			gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "heartbeat";
+			default-state = "off";
+		};
+
+		led@2 {
+			label = "apq8016-sbc:green:user2";
+			gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "mmc0";
+			default-state = "off";
+		};
+
+		led@3 {
+			label = "apq8016-sbc:green:user3";
+			gpios = <&pm8916_gpios 1 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "mmc1";
+			default-state = "off";
+		};
+
+		led@4 {
+			label = "apq8016-sbc:green:user4";
+			gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "none";
+			panic-indicator;
+			default-state = "off";
+		};
+
+		led@5 {
+			label = "apq8016-sbc:yellow:wlan";
+			gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "phy0tx";
+			default-state = "off";
+		};
+
+		led@6 {
+			label = "apq8016-sbc:blue:bt";
+			gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "bluetooth-power";
+			default-state = "off";
+		};
+	};
+};
+
+&blsp_dma {
+	status = "okay";
+};
+
+&blsp_i2c2 {
+	/* On Low speed expansion */
+	status = "okay";
+	label = "LS-I2C0";
+};
+
+&blsp_i2c4 {
+	/* On High speed expansion */
+	status = "okay";
+	label = "HS-I2C2";
+
+	adv_bridge: bridge@39 {
+		status = "okay";
+
+		compatible = "adi,adv7533";
+		reg = <0x39>;
+
+		interrupt-parent = <&msmgpio>;
+		interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
+
+		adi,dsi-lanes = <4>;
+		clocks = <&rpmcc RPM_SMD_BB_CLK2>;
+		clock-names = "cec";
+
+		pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+
+		avdd-supply = <&pm8916_l6>;
+		v1p2-supply = <&pm8916_l6>;
+		v3p3-supply = <&pm8916_l17>;
+
+		pinctrl-names = "default","sleep";
+		pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;
+		pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
+		#sound-dai-cells = <1>;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				adv7533_in: endpoint {
+					remote-endpoint = <&dsi0_out>;
+				};
+			};
+
+			port@1 {
+				reg = <1>;
+				adv7533_out: endpoint {
+					remote-endpoint = <&hdmi_con>;
+				};
+			};
+		};
+	};
+};
+
+&blsp_i2c6 {
+	/* On Low speed expansion */
+	status = "okay";
+	label = "LS-I2C1";
+};
+
+&blsp_spi3 {
+	/* On High speed expansion */
+	status = "okay";
+	label = "HS-SPI1";
+};
+
+&blsp_spi5 {
+	/* On Low speed expansion */
+	status = "okay";
+	label = "LS-SPI0";
+};
+
+&blsp1_uart1 {
+	status = "okay";
+	label = "LS-UART0";
+};
+
+&blsp1_uart2 {
+	status = "okay";
+	label = "LS-UART1";
+};
+
+&camss {
+	status = "okay";
+	ports {
+		port@0 {
+			reg = <0>;
+			csiphy0_ep: endpoint {
+				clock-lanes = <1>;
+				data-lanes = <0 2>;
+				remote-endpoint = <&ov5640_ep>;
+				status = "okay";
+			};
+		};
+	};
+};
+
+&cci {
+	status = "okay";
+};
+
+&cci_i2c0 {
+	camera_rear@3b {
+		compatible = "ovti,ov5640";
+		reg = <0x3b>;
+
+		enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&camera_rear_default>;
+
+		clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
+		clock-names = "xclk";
+		clock-frequency = <23880000>;
+
+		vdddo-supply = <&camera_vdddo_1v8>;
+		vdda-supply = <&camera_vdda_2v8>;
+		vddd-supply = <&camera_vddd_1v5>;
+
+		/* No camera mezzanine by default */
+		status = "disabled";
+
+		port {
+			ov5640_ep: endpoint {
+				clock-lanes = <1>;
+				data-lanes = <0 2>;
+				remote-endpoint = <&csiphy0_ep>;
+			};
+		};
+	};
+};
+
+&dsi0_out {
+	data-lanes = <0 1 2 3>;
+	remote-endpoint = <&adv7533_in>;
+};
+
+&lpass {
+	status = "okay";
+};
+
+&mdss {
+	status = "okay";
+};
+
+&mpss {
+	status = "okay";
+
+	firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
+};
+
+&pm8916_resin {
+	status = "okay";
+	linux,code = <KEY_VOLUMEDOWN>;
+};
+
+&pronto {
+	status = "okay";
+
+	firmware-name = "qcom/apq8016/wcnss.mbn";
+};
+
+&sdhc_1 {
+	status = "okay";
+
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
+	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+};
+
+&sdhc_2 {
+	status = "okay";
+
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
+	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+
+	cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+};
+
+&sound {
+	status = "okay";
+
+	pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
+	pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
+	pinctrl-names = "default", "sleep";
+	qcom,model = "DB410c";
+	qcom,audio-routing =
+		"AMIC2", "MIC BIAS Internal2",
+		"AMIC3", "MIC BIAS External1";
+
+	external-dai-link@0 {
+		link-name = "ADV7533";
+		cpu {
+			sound-dai = <&lpass MI2S_QUATERNARY>;
+		};
+		codec {
+			sound-dai = <&adv_bridge 0>;
+		};
+	};
+
+	internal-codec-playback-dai-link@0 {
+		link-name = "WCD";
+		cpu {
+			sound-dai = <&lpass MI2S_PRIMARY>;
+		};
+		codec {
+			sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
+		};
+	};
+
+	internal-codec-capture-dai-link@0 {
+		link-name = "WCD-Capture";
+		cpu {
+			sound-dai = <&lpass MI2S_TERTIARY>;
+		};
+		codec {
+			sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
+		};
+	};
+};
+
+&usb {
+	status = "okay";
+	extcon = <&usb_id>, <&usb_id>;
+
+	pinctrl-names = "default", "device";
+	pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>;
+	pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>;
+};
+
+&usb_hs_phy {
+	extcon = <&usb_id>;
+};
+
+&wcd_codec {
+	clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
+	clock-names = "mclk";
+	qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
+	qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
+};
+
+&wcnss_ctrl {
+	firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin";
+};
+
+/* Enable CoreSight */
+&cti0 { status = "okay"; };
+&cti1 { status = "okay"; };
+&cti12 { status = "okay"; };
+&cti13 { status = "okay"; };
+&cti14 { status = "okay"; };
+&cti15 { status = "okay"; };
+&debug0 { status = "okay"; };
+&debug1 { status = "okay"; };
+&debug2 { status = "okay"; };
+&debug3 { status = "okay"; };
+&etf { status = "okay"; };
+&etm0 { status = "okay"; };
+&etm1 { status = "okay"; };
+&etm2 { status = "okay"; };
+&etm3 { status = "okay"; };
+&etr { status = "okay"; };
+&funnel0 { status = "okay"; };
+&funnel1 { status = "okay"; };
+&replicator { status = "okay"; };
+&stm { status = "okay"; };
+&tpiu { status = "okay"; };
+
+&smd_rpm_regulators {
+	vdd_l1_l2_l3-supply = <&pm8916_s3>;
+	vdd_l4_l5_l6-supply = <&pm8916_s4>;
+	vdd_l7-supply = <&pm8916_s4>;
+
+	s3 {
+		regulator-min-microvolt = <1250000>;
+		regulator-max-microvolt = <1350000>;
+	};
+
+	s4 {
+		regulator-min-microvolt = <1850000>;
+		regulator-max-microvolt = <2150000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	l1 {
+		regulator-min-microvolt = <1225000>;
+		regulator-max-microvolt = <1225000>;
+	};
+
+	l2 {
+		regulator-min-microvolt = <1200000>;
+		regulator-max-microvolt = <1200000>;
+	};
+
+	l4 {
+		regulator-min-microvolt = <2050000>;
+		regulator-max-microvolt = <2050000>;
+	};
+
+	l5 {
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+	};
+
+	l6 {
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+	};
+
+	l7 {
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+	};
+
+	l8 {
+		regulator-min-microvolt = <2900000>;
+		regulator-max-microvolt = <2900000>;
+	};
+
+	l9 {
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	l10 {
+		regulator-min-microvolt = <2800000>;
+		regulator-max-microvolt = <2800000>;
+	};
+
+	l11 {
+		regulator-min-microvolt = <2950000>;
+		regulator-max-microvolt = <2950000>;
+		regulator-allow-set-load;
+		regulator-system-load = <200000>;
+	};
+
+	l12 {
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <2950000>;
+	};
+
+	l13 {
+		regulator-min-microvolt = <3075000>;
+		regulator-max-microvolt = <3075000>;
+	};
+
+	l14 {
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	/*
+	 * The 96Boards specification expects a 1.8V power rail on the low-speed
+	 * expansion connector that is able to provide at least 0.18W / 100 mA.
+	 * L15/L16 are connected in parallel to provide 55 mA each. A minimum load
+	 * must be specified to ensure the regulators are not put in LPM where they
+	 * would only provide 5 mA.
+	 */
+	l15 {
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-system-load = <50000>;
+		regulator-allow-set-load;
+		regulator-always-on;
+	};
+
+	l16 {
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-system-load = <50000>;
+		regulator-allow-set-load;
+		regulator-always-on;
+	};
+
+	l17 {
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	l18 {
+		regulator-min-microvolt = <2700000>;
+		regulator-max-microvolt = <2700000>;
+	};
+};
+
+/*
+ * 2mA drive strength is not enough when connecting multiple
+ * I2C devices with different pull up resistors.
+ */
+&i2c2_default {
+	drive-strength = <16>;
+};
+
+&i2c4_default {
+	drive-strength = <16>;
+};
+
+&i2c6_default {
+	drive-strength = <16>;
+};
+
+/*
+ * GPIO name legend: proper name = the GPIO line is used as GPIO
+ *         NC = not connected (pin out but not routed from the chip to
+ *              anything the board)
+ *         "[PER]" = pin is muxed for [peripheral] (not GPIO)
+ *         LSEC = Low Speed External Connector
+ *         HSEC = High Speed External Connector
+ *
+ * Line names are taken from the schematic "DragonBoard410c"
+ * dated monday, august 31, 2015. Page 5 in particular.
+ *
+ * For the lines routed to the external connectors the
+ * lines are named after the 96Boards CE Specification 1.0,
+ * Appendix "Expansion Connector Signal Description".
+ *
+ * When the 96Board naming of a line and the schematic name of
+ * the same line are in conflict, the 96Board specification
+ * takes precedence, which means that the external UART on the
+ * LSEC is named UART0 while the schematic and SoC names this
+ * UART3. This is only for the informational lines i.e. "[FOO]",
+ * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only
+ * ones actually used for GPIO.
+ */
+
+&msmgpio {
+	gpio-line-names =
+		"[UART0_TX]", /* GPIO_0, LSEC pin 5 */
+		"[UART0_RX]", /* GPIO_1, LSEC pin 7 */
+		"[UART0_CTS_N]", /* GPIO_2, LSEC pin 3 */
+		"[UART0_RTS_N]", /* GPIO_3, LSEC pin 9 */
+		"[UART1_TX]", /* GPIO_4, LSEC pin 11 */
+		"[UART1_RX]", /* GPIO_5, LSEC pin 13 */
+		"[I2C0_SDA]", /* GPIO_8, LSEC pin 17 */
+		"[I2C0_SCL]", /* GPIO_7, LSEC pin 15 */
+		"[SPI1_DOUT]", /* SPI1_MOSI, HSEC pin 1 */
+		"[SPI1_DIN]", /* SPI1_MISO, HSEC pin 11 */
+		"[SPI1_CS]", /* SPI1_CS_N, HSEC pin 7 */
+		"[SPI1_SCLK]", /* SPI1_CLK, HSEC pin 9 */
+		"GPIO-B", /* LS_EXP_GPIO_B, LSEC pin 24 */
+		"GPIO-C", /* LS_EXP_GPIO_C, LSEC pin 25 */
+		"[I2C3_SDA]", /* HSEC pin 38 */
+		"[I2C3_SCL]", /* HSEC pin 36 */
+		"[SPI0_MOSI]", /* LSEC pin 14 */
+		"[SPI0_MISO]", /* LSEC pin 10 */
+		"[SPI0_CS_N]", /* LSEC pin 12 */
+		"[SPI0_CLK]", /* LSEC pin 8 */
+		"HDMI_HPD_N", /* GPIO 20 */
+		"USR_LED_1_CTRL",
+		"[I2C1_SDA]", /* GPIO_22, LSEC pin 21 */
+		"[I2C1_SCL]", /* GPIO_23, LSEC pin 19 */
+		"GPIO-G", /* LS_EXP_GPIO_G, LSEC pin 29 */
+		"GPIO-H", /* LS_EXP_GPIO_H, LSEC pin 30 */
+		"[CSI0_MCLK]", /* HSEC pin 15 */
+		"[CSI1_MCLK]", /* HSEC pin 17 */
+		"GPIO-K", /* LS_EXP_GPIO_K, LSEC pin 33 */
+		"[I2C2_SDA]", /* HSEC pin 34 */
+		"[I2C2_SCL]", /* HSEC pin 32 */
+		"DSI2HDMI_INT_N",
+		"DSI_SW_SEL_APQ",
+		"GPIO-L", /* LS_EXP_GPIO_L, LSEC pin 34 */
+		"GPIO-J", /* LS_EXP_GPIO_J, LSEC pin 32 */
+		"GPIO-I", /* LS_EXP_GPIO_I, LSEC pin 31 */
+		"GPIO-A", /* LS_EXP_GPIO_A, LSEC pin 23 */
+		"FORCED_USB_BOOT",
+		"SD_CARD_DET_N",
+		"[WCSS_BT_SSBI]",
+		"[WCSS_WLAN_DATA_2]", /* GPIO 40 */
+		"[WCSS_WLAN_DATA_1]",
+		"[WCSS_WLAN_DATA_0]",
+		"[WCSS_WLAN_SET]",
+		"[WCSS_WLAN_CLK]",
+		"[WCSS_FM_SSBI]",
+		"[WCSS_FM_SDI]",
+		"[WCSS_BT_DAT_CTL]",
+		"[WCSS_BT_DAT_STB]",
+		"NC",
+		"NC", /* GPIO 50 */
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC", /* GPIO 60 */
+		"NC",
+		"NC",
+		"[CDC_PDM0_CLK]",
+		"[CDC_PDM0_SYNC]",
+		"[CDC_PDM0_TX0]",
+		"[CDC_PDM0_RX0]",
+		"[CDC_PDM0_RX1]",
+		"[CDC_PDM0_RX2]",
+		"GPIO-D", /* LS_EXP_GPIO_D, LSEC pin 26 */
+		"NC", /* GPIO 70 */
+		"NC",
+		"NC",
+		"NC",
+		"NC", /* GPIO 74 */
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"BOOT_CONFIG_0", /* GPIO 80 */
+		"BOOT_CONFIG_1",
+		"BOOT_CONFIG_2",
+		"BOOT_CONFIG_3",
+		"NC",
+		"NC",
+		"BOOT_CONFIG_5",
+		"NC",
+		"NC",
+		"NC",
+		"NC", /* GPIO 90 */
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC",
+		"NC", /* GPIO 100 */
+		"NC",
+		"NC",
+		"NC",
+		"SSBI_GPS",
+		"NC",
+		"NC",
+		"KEY_VOLP_N",
+		"NC",
+		"NC",
+		"[LS_EXP_MI2S_WS]", /* GPIO 110 */
+		"NC",
+		"NC",
+		"[LS_EXP_MI2S_SCK]",
+		"[LS_EXP_MI2S_DATA0]",
+		"GPIO-E", /* LS_EXP_GPIO_E, LSEC pin 27 */
+		"NC",
+		"[DSI2HDMI_MI2S_WS]",
+		"[DSI2HDMI_MI2S_SCK]",
+		"[DSI2HDMI_MI2S_DATA0]",
+		"USR_LED_2_CTRL", /* GPIO 120 */
+		"SB_HS_ID";
+
+	msmgpio_leds: msmgpio-leds {
+		pins = "gpio21", "gpio120";
+		function = "gpio";
+
+		output-low;
+	};
+
+	usb_id_default: usb-id-default {
+		pins = "gpio121";
+		function = "gpio";
+
+		drive-strength = <8>;
+		input-enable;
+		bias-pull-up;
+	};
+
+	adv7533_int_active: adv533-int-active {
+		pins = "gpio31";
+		function = "gpio";
+
+		drive-strength = <16>;
+		bias-disable;
+	};
+
+	adv7533_int_suspend: adv7533-int-suspend {
+		pins = "gpio31";
+		function = "gpio";
+
+		drive-strength = <2>;
+		bias-disable;
+	};
+
+	adv7533_switch_active: adv7533-switch-active {
+		pins = "gpio32";
+		function = "gpio";
+
+		drive-strength = <16>;
+		bias-disable;
+	};
+
+	adv7533_switch_suspend: adv7533-switch-suspend {
+		pins = "gpio32";
+		function = "gpio";
+
+		drive-strength = <2>;
+		bias-disable;
+	};
+
+	msm_key_volp_n_default: msm-key-volp-n-default {
+		pins = "gpio107";
+		function = "gpio";
+
+		drive-strength = <8>;
+		input-enable;
+		bias-pull-up;
+	};
+};
+
+&pm8916_gpios {
+	gpio-line-names =
+		"USR_LED_3_CTRL",
+		"USR_LED_4_CTRL",
+		"USB_HUB_RESET_N_PM",
+		"USB_SW_SEL_PM";
+
+	usb_hub_reset_pm: usb-hub-reset-pm {
+		pins = "gpio3";
+		function = PMIC_GPIO_FUNC_NORMAL;
+
+		input-disable;
+		output-high;
+	};
+
+	usb_hub_reset_pm_device: usb-hub-reset-pm-device {
+		pins = "gpio3";
+		function = PMIC_GPIO_FUNC_NORMAL;
+
+		output-low;
+	};
+
+	usb_sw_sel_pm: usb-sw-sel-pm {
+		pins = "gpio4";
+		function = PMIC_GPIO_FUNC_NORMAL;
+
+		power-source = <PM8916_GPIO_VPH>;
+		input-disable;
+		output-high;
+	};
+
+	usb_sw_sel_pm_device: usb-sw-sel-pm-device {
+		pins = "gpio4";
+		function = PMIC_GPIO_FUNC_NORMAL;
+
+		power-source = <PM8916_GPIO_VPH>;
+		input-disable;
+		output-low;
+	};
+
+	pm8916_gpios_leds: pm8916-gpios-leds {
+		pins = "gpio1", "gpio2";
+		function = PMIC_GPIO_FUNC_NORMAL;
+
+		output-low;
+	};
+};
+
+&pm8916_mpps {
+	gpio-line-names =
+		"VDD_PX_BIAS",
+		"WLAN_LED_CTRL",
+		"BT_LED_CTRL",
+		"GPIO-F"; /* LS_EXP_GPIO_F, LSEC pin 28 */
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&ls_exp_gpio_f>;
+
+	ls_exp_gpio_f: pm8916-mpp4-state {
+		pins = "mpp4";
+		function = "digital";
+
+		output-low;
+		power-source = <PM8916_MPP_L5>;	// 1.8V
+	};
+
+	pm8916_mpps_leds: pm8916-mpps-state {
+		pins = "mpp2", "mpp3";
+		function = "digital";
+
+		output-low;
+	};
 };

arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

@@ -1,826 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
- */
-
-#include "msm8916-pm8916.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
-#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
-#include <dt-bindings/sound/apq8016-lpass.h>
-
-/ {
-	aliases {
-		serial0 = &blsp1_uart2;
-		serial1 = &blsp1_uart1;
-		usid0 = &pm8916_0;
-		i2c0	= &blsp_i2c2;
-		i2c1	= &blsp_i2c6;
-		i2c3	= &blsp_i2c4;
-		spi0	= &blsp_spi5;
-		spi1	= &blsp_spi3;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-
-	camera_vdddo_1v8: camera-vdddo-1v8 {
-		compatible = "regulator-fixed";
-		regulator-name = "camera_vdddo";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
-	camera_vdda_2v8: camera-vdda-2v8 {
-		compatible = "regulator-fixed";
-		regulator-name = "camera_vdda";
-		regulator-min-microvolt = <2800000>;
-		regulator-max-microvolt = <2800000>;
-		regulator-always-on;
-	};
-
-	camera_vddd_1v5: camera-vddd-1v5 {
-		compatible = "regulator-fixed";
-		regulator-name = "camera_vddd";
-		regulator-min-microvolt = <1500000>;
-		regulator-max-microvolt = <1500000>;
-		regulator-always-on;
-	};
-
-	reserved-memory {
-		ramoops@bff00000 {
-			compatible = "ramoops";
-			reg = <0x0 0xbff00000 0x0 0x100000>;
-
-			record-size = <0x20000>;
-			console-size = <0x20000>;
-			ftrace-size = <0x20000>;
-		};
-	};
-
-	usb2513 {
-		compatible = "smsc,usb3503";
-		reset-gpios = <&pm8916_gpios 3 GPIO_ACTIVE_LOW>;
-		initial-mode = <1>;
-	};
-
-	usb_id: usb-id {
-		compatible = "linux,extcon-usb-gpio";
-		id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&usb_id_default>;
-	};
-
-	hdmi-out {
-		compatible = "hdmi-connector";
-		type = "a";
-
-		port {
-			hdmi_con: endpoint {
-				remote-endpoint = <&adv7533_out>;
-			};
-		};
-	};
-
-	gpio-keys {
-		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		autorepeat;
-
-		pinctrl-names = "default";
-		pinctrl-0 = <&msm_key_volp_n_default>;
-
-		button@0 {
-			label = "Volume Up";
-			linux,code = <KEY_VOLUMEUP>;
-			gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	leds {
-		pinctrl-names = "default";
-		pinctrl-0 = <&msmgpio_leds>,
-			    <&pm8916_gpios_leds>,
-			    <&pm8916_mpps_leds>;
-
-		compatible = "gpio-leds";
-
-		led@1 {
-			label = "apq8016-sbc:green:user1";
-			gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "heartbeat";
-			default-state = "off";
-		};
-
-		led@2 {
-			label = "apq8016-sbc:green:user2";
-			gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "mmc0";
-			default-state = "off";
-		};
-
-		led@3 {
-			label = "apq8016-sbc:green:user3";
-			gpios = <&pm8916_gpios 1 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "mmc1";
-			default-state = "off";
-		};
-
-		led@4 {
-			label = "apq8016-sbc:green:user4";
-			gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "none";
-			panic-indicator;
-			default-state = "off";
-		};
-
-		led@5 {
-			label = "apq8016-sbc:yellow:wlan";
-			gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy0tx";
-			default-state = "off";
-		};
-
-		led@6 {
-			label = "apq8016-sbc:blue:bt";
-			gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "bluetooth-power";
-			default-state = "off";
-		};
-	};
-};
-
-&blsp_dma {
-	status = "okay";
-};
-
-&blsp_i2c2 {
-	/* On Low speed expansion */
-	status = "okay";
-	label = "LS-I2C0";
-};
-
-&blsp_i2c4 {
-	/* On High speed expansion */
-	status = "okay";
-	label = "HS-I2C2";
-
-	adv_bridge: bridge@39 {
-		status = "okay";
-
-		compatible = "adi,adv7533";
-		reg = <0x39>;
-
-		interrupt-parent = <&msmgpio>;
-		interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
-
-		adi,dsi-lanes = <4>;
-		clocks = <&rpmcc RPM_SMD_BB_CLK2>;
-		clock-names = "cec";
-
-		pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
-
-		avdd-supply = <&pm8916_l6>;
-		v1p2-supply = <&pm8916_l6>;
-		v3p3-supply = <&pm8916_l17>;
-
-		pinctrl-names = "default","sleep";
-		pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;
-		pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
-		#sound-dai-cells = <1>;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
-				adv7533_in: endpoint {
-					remote-endpoint = <&dsi0_out>;
-				};
-			};
-
-			port@1 {
-				reg = <1>;
-				adv7533_out: endpoint {
-					remote-endpoint = <&hdmi_con>;
-				};
-			};
-		};
-	};
-};
-
-&blsp_i2c6 {
-	/* On Low speed expansion */
-	status = "okay";
-	label = "LS-I2C1";
-};
-
-&blsp_spi3 {
-	/* On High speed expansion */
-	status = "okay";
-	label = "HS-SPI1";
-};
-
-&blsp_spi5 {
-	/* On Low speed expansion */
-	status = "okay";
-	label = "LS-SPI0";
-};
-
-&blsp1_uart1 {
-	status = "okay";
-	label = "LS-UART0";
-};
-
-&blsp1_uart2 {
-	status = "okay";
-	label = "LS-UART1";
-};
-
-&camss {
-	status = "okay";
-	ports {
-		port@0 {
-			reg = <0>;
-			csiphy0_ep: endpoint {
-				clock-lanes = <1>;
-				data-lanes = <0 2>;
-				remote-endpoint = <&ov5640_ep>;
-				status = "okay";
-			};
-		};
-	};
-};
-
-&cci {
-	status = "okay";
-};
-
-&cci_i2c0 {
-	camera_rear@3b {
-		compatible = "ovti,ov5640";
-		reg = <0x3b>;
-
-		enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>;
-		reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&camera_rear_default>;
-
-		clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
-		clock-names = "xclk";
-		clock-frequency = <23880000>;
-
-		vdddo-supply = <&camera_vdddo_1v8>;
-		vdda-supply = <&camera_vdda_2v8>;
-		vddd-supply = <&camera_vddd_1v5>;
-
-		/* No camera mezzanine by default */
-		status = "disabled";
-
-		port {
-			ov5640_ep: endpoint {
-				clock-lanes = <1>;
-				data-lanes = <0 2>;
-				remote-endpoint = <&csiphy0_ep>;
-			};
-		};
-	};
-};
-
-&dsi0_out {
-	data-lanes = <0 1 2 3>;
-	remote-endpoint = <&adv7533_in>;
-};
-
-&lpass {
-	status = "okay";
-};
-
-&mdss {
-	status = "okay";
-};
-
-&pm8916_resin {
-	status = "okay";
-	linux,code = <KEY_VOLUMEDOWN>;
-};
-
-&pronto {
-	status = "okay";
-};
-
-&sdhc_1 {
-	status = "okay";
-
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
-	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-
-&sdhc_2 {
-	status = "okay";
-
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
-
-	cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
-};
-
-&sound {
-	status = "okay";
-
-	pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
-	pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
-	pinctrl-names = "default", "sleep";
-	qcom,model = "DB410c";
-	qcom,audio-routing =
-		"AMIC2", "MIC BIAS Internal2",
-		"AMIC3", "MIC BIAS External1";
-
-	external-dai-link@0 {
-		link-name = "ADV7533";
-		cpu {
-			sound-dai = <&lpass MI2S_QUATERNARY>;
-		};
-		codec {
-			sound-dai = <&adv_bridge 0>;
-		};
-	};
-
-	internal-codec-playback-dai-link@0 {
-		link-name = "WCD";
-		cpu {
-			sound-dai = <&lpass MI2S_PRIMARY>;
-		};
-		codec {
-			sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
-		};
-	};
-
-	internal-codec-capture-dai-link@0 {
-		link-name = "WCD-Capture";
-		cpu {
-			sound-dai = <&lpass MI2S_TERTIARY>;
-		};
-		codec {
-			sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
-		};
-	};
-};
-
-&usb {
-	status = "okay";
-	extcon = <&usb_id>, <&usb_id>;
-
-	pinctrl-names = "default", "device";
-	pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>;
-	pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>;
-};
-
-&usb_hs_phy {
-	extcon = <&usb_id>;
-};
-
-&wcd_codec {
-	clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
-	clock-names = "mclk";
-	qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
-	qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
-};
-
-/* Enable CoreSight */
-&cti0 { status = "okay"; };
-&cti1 { status = "okay"; };
-&cti12 { status = "okay"; };
-&cti13 { status = "okay"; };
-&cti14 { status = "okay"; };
-&cti15 { status = "okay"; };
-&debug0 { status = "okay"; };
-&debug1 { status = "okay"; };
-&debug2 { status = "okay"; };
-&debug3 { status = "okay"; };
-&etf { status = "okay"; };
-&etm0 { status = "okay"; };
-&etm1 { status = "okay"; };
-&etm2 { status = "okay"; };
-&etm3 { status = "okay"; };
-&etr { status = "okay"; };
-&funnel0 { status = "okay"; };
-&funnel1 { status = "okay"; };
-&replicator { status = "okay"; };
-&stm { status = "okay"; };
-&tpiu { status = "okay"; };
-
-&smd_rpm_regulators {
-	vdd_l1_l2_l3-supply = <&pm8916_s3>;
-	vdd_l4_l5_l6-supply = <&pm8916_s4>;
-	vdd_l7-supply = <&pm8916_s4>;
-
-	s3 {
-		regulator-min-microvolt = <375000>;
-		regulator-max-microvolt = <1562000>;
-	};
-
-	s4 {
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
-	l1 {
-		regulator-min-microvolt = <375000>;
-		regulator-max-microvolt = <1525000>;
-	};
-
-	l2 {
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1200000>;
-	};
-
-	l4 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l5 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l6 {
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-	};
-
-	l7 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l8 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l9 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l10 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l11 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-		regulator-allow-set-load;
-		regulator-system-load = <200000>;
-	};
-
-	l12 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l13 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l14 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	/**
-	 * 1.8v required on LS expansion
-	 * for mezzanine boards
-	 */
-	l15 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-		regulator-always-on;
-	};
-
-	l16 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-
-	l17 {
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
-	l18 {
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <3337000>;
-	};
-};
-
-/*
- * 2mA drive strength is not enough when connecting multiple
- * I2C devices with different pull up resistors.
- */
-&i2c2_default {
-	drive-strength = <16>;
-};
-
-&i2c4_default {
-	drive-strength = <16>;
-};
-
-&i2c6_default {
-	drive-strength = <16>;
-};
-
-/*
- * GPIO name legend: proper name = the GPIO line is used as GPIO
- *         NC = not connected (pin out but not routed from the chip to
- *              anything the board)
- *         "[PER]" = pin is muxed for [peripheral] (not GPIO)
- *         LSEC = Low Speed External Connector
- *         HSEC = High Speed External Connector
- *
- * Line names are taken from the schematic "DragonBoard410c"
- * dated monday, august 31, 2015. Page 5 in particular.
- *
- * For the lines routed to the external connectors the
- * lines are named after the 96Boards CE Specification 1.0,
- * Appendix "Expansion Connector Signal Description".
- *
- * When the 96Board naming of a line and the schematic name of
- * the same line are in conflict, the 96Board specification
- * takes precedence, which means that the external UART on the
- * LSEC is named UART0 while the schematic and SoC names this
- * UART3. This is only for the informational lines i.e. "[FOO]",
- * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only
- * ones actually used for GPIO.
- */
-
-&msmgpio {
-	gpio-line-names =
-		"[UART0_TX]", /* GPIO_0, LSEC pin 5 */
-		"[UART0_RX]", /* GPIO_1, LSEC pin 7 */
-		"[UART0_CTS_N]", /* GPIO_2, LSEC pin 3 */
-		"[UART0_RTS_N]", /* GPIO_3, LSEC pin 9 */
-		"[UART1_TX]", /* GPIO_4, LSEC pin 11 */
-		"[UART1_RX]", /* GPIO_5, LSEC pin 13 */
-		"[I2C0_SDA]", /* GPIO_8, LSEC pin 17 */
-		"[I2C0_SCL]", /* GPIO_7, LSEC pin 15 */
-		"[SPI1_DOUT]", /* SPI1_MOSI, HSEC pin 1 */
-		"[SPI1_DIN]", /* SPI1_MISO, HSEC pin 11 */
-		"[SPI1_CS]", /* SPI1_CS_N, HSEC pin 7 */
-		"[SPI1_SCLK]", /* SPI1_CLK, HSEC pin 9 */
-		"GPIO-B", /* LS_EXP_GPIO_B, LSEC pin 24 */
-		"GPIO-C", /* LS_EXP_GPIO_C, LSEC pin 25 */
-		"[I2C3_SDA]", /* HSEC pin 38 */
-		"[I2C3_SCL]", /* HSEC pin 36 */
-		"[SPI0_MOSI]", /* LSEC pin 14 */
-		"[SPI0_MISO]", /* LSEC pin 10 */
-		"[SPI0_CS_N]", /* LSEC pin 12 */
-		"[SPI0_CLK]", /* LSEC pin 8 */
-		"HDMI_HPD_N", /* GPIO 20 */
-		"USR_LED_1_CTRL",
-		"[I2C1_SDA]", /* GPIO_22, LSEC pin 21 */
-		"[I2C1_SCL]", /* GPIO_23, LSEC pin 19 */
-		"GPIO-G", /* LS_EXP_GPIO_G, LSEC pin 29 */
-		"GPIO-H", /* LS_EXP_GPIO_H, LSEC pin 30 */
-		"[CSI0_MCLK]", /* HSEC pin 15 */
-		"[CSI1_MCLK]", /* HSEC pin 17 */
-		"GPIO-K", /* LS_EXP_GPIO_K, LSEC pin 33 */
-		"[I2C2_SDA]", /* HSEC pin 34 */
-		"[I2C2_SCL]", /* HSEC pin 32 */
-		"DSI2HDMI_INT_N",
-		"DSI_SW_SEL_APQ",
-		"GPIO-L", /* LS_EXP_GPIO_L, LSEC pin 34 */
-		"GPIO-J", /* LS_EXP_GPIO_J, LSEC pin 32 */
-		"GPIO-I", /* LS_EXP_GPIO_I, LSEC pin 31 */
-		"GPIO-A", /* LS_EXP_GPIO_A, LSEC pin 23 */
-		"FORCED_USB_BOOT",
-		"SD_CARD_DET_N",
-		"[WCSS_BT_SSBI]",
-		"[WCSS_WLAN_DATA_2]", /* GPIO 40 */
-		"[WCSS_WLAN_DATA_1]",
-		"[WCSS_WLAN_DATA_0]",
-		"[WCSS_WLAN_SET]",
-		"[WCSS_WLAN_CLK]",
-		"[WCSS_FM_SSBI]",
-		"[WCSS_FM_SDI]",
-		"[WCSS_BT_DAT_CTL]",
-		"[WCSS_BT_DAT_STB]",
-		"NC",
-		"NC", /* GPIO 50 */
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC", /* GPIO 60 */
-		"NC",
-		"NC",
-		"[CDC_PDM0_CLK]",
-		"[CDC_PDM0_SYNC]",
-		"[CDC_PDM0_TX0]",
-		"[CDC_PDM0_RX0]",
-		"[CDC_PDM0_RX1]",
-		"[CDC_PDM0_RX2]",
-		"GPIO-D", /* LS_EXP_GPIO_D, LSEC pin 26 */
-		"NC", /* GPIO 70 */
-		"NC",
-		"NC",
-		"NC",
-		"NC", /* GPIO 74 */
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"BOOT_CONFIG_0", /* GPIO 80 */
-		"BOOT_CONFIG_1",
-		"BOOT_CONFIG_2",
-		"BOOT_CONFIG_3",
-		"NC",
-		"NC",
-		"BOOT_CONFIG_5",
-		"NC",
-		"NC",
-		"NC",
-		"NC", /* GPIO 90 */
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC",
-		"NC", /* GPIO 100 */
-		"NC",
-		"NC",
-		"NC",
-		"SSBI_GPS",
-		"NC",
-		"NC",
-		"KEY_VOLP_N",
-		"NC",
-		"NC",
-		"[LS_EXP_MI2S_WS]", /* GPIO 110 */
-		"NC",
-		"NC",
-		"[LS_EXP_MI2S_SCK]",
-		"[LS_EXP_MI2S_DATA0]",
-		"GPIO-E", /* LS_EXP_GPIO_E, LSEC pin 27 */
-		"NC",
-		"[DSI2HDMI_MI2S_WS]",
-		"[DSI2HDMI_MI2S_SCK]",
-		"[DSI2HDMI_MI2S_DATA0]",
-		"USR_LED_2_CTRL", /* GPIO 120 */
-		"SB_HS_ID";
-
-	msmgpio_leds: msmgpio-leds {
-		pins = "gpio21", "gpio120";
-		function = "gpio";
-
-		output-low;
-	};
-
-	usb_id_default: usb-id-default {
-		pins = "gpio121";
-		function = "gpio";
-
-		drive-strength = <8>;
-		input-enable;
-		bias-pull-up;
-	};
-
-	adv7533_int_active: adv533-int-active {
-		pins = "gpio31";
-		function = "gpio";
-
-		drive-strength = <16>;
-		bias-disable;
-	};
-
-	adv7533_int_suspend: adv7533-int-suspend {
-		pins = "gpio31";
-		function = "gpio";
-
-		drive-strength = <2>;
-		bias-disable;
-	};
-
-	adv7533_switch_active: adv7533-switch-active {
-		pins = "gpio32";
-		function = "gpio";
-
-		drive-strength = <16>;
-		bias-disable;
-	};
-
-	adv7533_switch_suspend: adv7533-switch-suspend {
-		pins = "gpio32";
-		function = "gpio";
-
-		drive-strength = <2>;
-		bias-disable;
-	};
-
-	msm_key_volp_n_default: msm-key-volp-n-default {
-		pins = "gpio107";
-		function = "gpio";
-
-		drive-strength = <8>;
-		input-enable;
-		bias-pull-up;
-	};
-};
-
-&pm8916_gpios {
-	gpio-line-names =
-		"USR_LED_3_CTRL",
-		"USR_LED_4_CTRL",
-		"USB_HUB_RESET_N_PM",
-		"USB_SW_SEL_PM";
-
-	usb_hub_reset_pm: usb-hub-reset-pm {
-		pins = "gpio3";
-		function = PMIC_GPIO_FUNC_NORMAL;
-
-		input-disable;
-		output-high;
-	};
-
-	usb_hub_reset_pm_device: usb-hub-reset-pm-device {
-		pins = "gpio3";
-		function = PMIC_GPIO_FUNC_NORMAL;
-
-		output-low;
-	};
-
-	usb_sw_sel_pm: usb-sw-sel-pm {
-		pins = "gpio4";
-		function = PMIC_GPIO_FUNC_NORMAL;
-
-		power-source = <PM8916_GPIO_VPH>;
-		input-disable;
-		output-high;
-	};
-
-	usb_sw_sel_pm_device: usb-sw-sel-pm-device {
-		pins = "gpio4";
-		function = PMIC_GPIO_FUNC_NORMAL;
-
-		power-source = <PM8916_GPIO_VPH>;
-		input-disable;
-		output-low;
-	};
-
-	pm8916_gpios_leds: pm8916-gpios-leds {
-		pins = "gpio1", "gpio2";
-		function = PMIC_GPIO_FUNC_NORMAL;
-
-		output-low;
-	};
-};
-
-&pm8916_mpps {
-	gpio-line-names =
-		"VDD_PX_BIAS",
-		"WLAN_LED_CTRL",
-		"BT_LED_CTRL",
-		"GPIO-F"; /* LS_EXP_GPIO_F, LSEC pin 28 */
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&ls_exp_gpio_f>;
-
-	ls_exp_gpio_f: pm8916-mpp4 {
-		pins = "mpp4";
-		function = "digital";
-
-		output-low;
-		power-source = <PM8916_MPP_L5>;	// 1.8V
-	};
-
-	pm8916_mpps_leds: pm8916-mpps-leds {
-		pins = "mpp2", "mpp3";
-		function = "digital";
-
-		output-low;
-	};
-};

arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts

@@ -26,7 +26,7 @@
 
 	v1p05: v1p05-regulator {
 		compatible = "regulator-fixed";
-		reglator-name = "v1p05";
+		regulator-name = "v1p05";
 		regulator-always-on;
 		regulator-boot-on;
 
@@ -38,7 +38,7 @@
 
 	v12_poe: v12-poe-regulator {
 		compatible = "regulator-fixed";
-		reglator-name = "v12_poe";
+		regulator-name = "v12_poe";
 		regulator-always-on;
 		regulator-boot-on;
 

arch/arm64/boot/dts/qcom/msm8916-mtp.dts

@@ -5,9 +5,22 @@
 
 /dts-v1/;
 
-#include "msm8916-mtp.dtsi"
+#include "msm8916-pm8916.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8916 MTP";
 	compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916";
+
+	aliases {
+		serial0 = &blsp1_uart2;
+		usid0 = &pm8916_0;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+};
+
+&blsp1_uart2 {
+	status = "okay";
 };

arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi

@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
- */
-
-#include "msm8916-pm8916.dtsi"
-
-/ {
-	aliases {
-		serial0 = &blsp1_uart2;
-		usid0 = &pm8916_0;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-};
-
-&blsp1_uart2 {
-	status = "okay";
-};

arch/arm64/boot/dts/qcom/msm8916.dtsi

@@ -1064,7 +1064,7 @@
 			};
 		};
 
-		camss: camss@1b00000 {
+		camss: camss@1b0ac00 {
 			compatible = "qcom,msm8916-camss";
 			reg = <0x01b0ac00 0x200>,
 				<0x01b00030 0x4>,
@@ -1771,7 +1771,7 @@
 
 				label = "pronto";
 
-				wcnss {
+				wcnss_ctrl: wcnss {
 					compatible = "qcom,wcnss";
 					qcom,smd-channels = "WCNSS_CTRL";
 

arch/arm64/boot/dts/qcom/msm8994.dtsi

@@ -725,7 +725,7 @@
 			reg = <0xfc4ab000 0x4>;
 		};
 
-		spmi_bus: spmi@fc4c0000 {
+		spmi_bus: spmi@fc4cf000 {
 			compatible = "qcom,spmi-pmic-arb";
 			reg = <0xfc4cf000 0x1000>,
 			      <0xfc4cb000 0x1000>,

arch/arm64/boot/dts/qcom/msm8996-mtp.dts

@@ -5,9 +5,31 @@
 
 /dts-v1/;
 
-#include "msm8996-mtp.dtsi"
+#include "msm8996.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996 MTP";
 	compatible = "qcom,msm8996-mtp";
+
+	aliases {
+		serial0 = &blsp2_uart2;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+
+	soc {
+		serial@75b0000 {
+			status = "okay";
+		};
+	};
+};
+
+&hdmi {
+	status = "okay";
+};
+
+&hdmi_phy {
+	status = "okay";
 };

arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi

@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
- */
-
-#include "msm8996.dtsi"
-
-/ {
-	aliases {
-		serial0 = &blsp2_uart2;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-
-	soc {
-		serial@75b0000 {
-			status = "okay";
-		};
-	};
-};
-
-&hdmi {
-	status = "okay";
-};
-
-&hdmi_phy {
-	status = "okay";
-};

arch/arm64/boot/dts/qcom/msm8996.dtsi

@@ -1228,6 +1228,20 @@
 				};
 			};
 
+			blsp1_uart2_default: blsp1-uart2-default {
+				pins = "gpio41", "gpio42", "gpio43", "gpio44";
+				function = "blsp_uart2";
+				drive-strength = <16>;
+				bias-disable;
+			};
+
+			blsp1_uart2_sleep: blsp1-uart2-sleep {
+				pins = "gpio41", "gpio42", "gpio43", "gpio44";
+				function = "gpio";
+				drive-strength = <2>;
+				bias-disable;
+			};
+
 			blsp1_i2c3_default: blsp1-i2c2-default {
 				pins = "gpio47", "gpio48";
 				function = "blsp_i2c3";
@@ -1771,7 +1785,7 @@
 			};
 		};
 
-		camss: camss@a00000 {
+		camss: camss@a34000 {
 			compatible = "qcom,msm8996-camss";
 			reg = <0x00a34000 0x1000>,
 			      <0x00a00030 0x4>,
@@ -2724,6 +2738,9 @@
 			clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>,
 				 <&gcc GCC_BLSP1_AHB_CLK>;
 			clock-names = "core", "iface";
+			pinctrl-names = "default", "sleep";
+			pinctrl-0 = <&blsp1_uart2_default>;
+			pinctrl-1 = <&blsp1_uart2_sleep>;
 			dmas = <&blsp1_dma 2>, <&blsp1_dma 3>;
 			dma-names = "tx", "rx";
 			status = "disabled";

arch/arm64/boot/dts/qcom/sdm630.dtsi

@@ -1834,7 +1834,7 @@
 			};
 		};
 
-		camss: camss@ca00000 {
+		camss: camss@ca00020 {
 			compatible = "qcom,sdm660-camss";
 			reg = <0x0c824000 0x1000>,
 			      <0x0ca00120 0x4>,

arch/arm64/boot/dts/qcom/sdm845.dtsi

@@ -3921,7 +3921,7 @@
 			#reset-cells = <1>;
 		};
 
-		camss: camss@a00000 {
+		camss: camss@acb3000 {
 			compatible = "qcom,sdm845-camss";
 
 			reg = <0 0xacb3000 0 0x1000>,

arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi

@@ -26,9 +26,10 @@
 		framebuffer: framebuffer@9c000000 {
 			compatible = "simple-framebuffer";
 			reg = <0 0x9c000000 0 0x2300000>;
-			width = <1644>;
-			height = <3840>;
-			stride = <(1644 * 4)>;
+			/* pdx203 BL initializes in 2.5k mode, not 4k */
+			width = <1096>;
+			height = <2560>;
+			stride = <(1096 * 4)>;
 			format = "a8r8g8b8";
 			/*
 			 * That's a lot of clocks, but it's necessary due

arch/arm64/boot/dts/renesas/ulcb-kf.dtsi

@@ -270,7 +270,7 @@
 	};
 
 	scif1_pins: scif1 {
-		groups = "scif1_data_b", "scif1_ctrl";
+		groups = "scif1_data_b";
 		function = "scif1";
 	};
 
@@ -330,7 +330,6 @@
 &scif1 {
 	pinctrl-0 = <&scif1_pins>;
 	pinctrl-names = "default";
-	uart-has-rtscts;
 
 	status = "okay";
 };

arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts

@@ -80,25 +80,25 @@
 &wkup_pmx2 {
 	mcu_cpsw_pins_default: mcu-cpsw-pins-default {
 		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x0068, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
-			J721E_WKUP_IOPAD(0x006c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
-			J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */
-			J721E_WKUP_IOPAD(0x0074, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */
-			J721E_WKUP_IOPAD(0x0078, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */
-			J721E_WKUP_IOPAD(0x007c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */
-			J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */
-			J721E_WKUP_IOPAD(0x008c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */
-			J721E_WKUP_IOPAD(0x0090, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */
-			J721E_WKUP_IOPAD(0x0094, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */
-			J721E_WKUP_IOPAD(0x0080, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */
-			J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RXC */
+			J721E_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
+			J721E_WKUP_IOPAD(0x0004, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
+			J721E_WKUP_IOPAD(0x0008, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */
+			J721E_WKUP_IOPAD(0x000c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */
+			J721E_WKUP_IOPAD(0x0010, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */
+			J721E_WKUP_IOPAD(0x0014, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */
+			J721E_WKUP_IOPAD(0x0020, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */
+			J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */
+			J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */
+			J721E_WKUP_IOPAD(0x002c, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */
+			J721E_WKUP_IOPAD(0x0018, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */
+			J721E_WKUP_IOPAD(0x001c, PIN_INPUT, 0) /* MCU_RGMII1_RXC */
 		>;
 	};
 
 	mcu_mdio_pins_default: mcu-mdio1-pins-default {
 		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x009c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
-			J721E_WKUP_IOPAD(0x0098, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
+			J721E_WKUP_IOPAD(0x0034, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
+			J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
 		>;
 	};
 };

arch/arm64/configs/generic_iot_defconfig

@@ -96,7 +96,6 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
 CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
-CONFIG_GKI_HACKS_TO_FIX=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -104,7 +103,6 @@ CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CLEANCACHE=y
 CONFIG_CMA=y
-CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_AREAS=16
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -119,10 +117,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_NET_IPIP=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPGRE=y
-CONFIG_NET_IPVTI=y
 CONFIG_INET_ESP=y
 CONFIG_INET_UDP_DIAG=y
 CONFIG_INET_DIAG_DESTROY=y
@@ -132,8 +126,6 @@ CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_VTI=y
-CONFIG_IPV6_GRE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
@@ -144,14 +136,12 @@ CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CONNTRACK_H323=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-CONFIG_NF_CONNTRACK_PPTP=y
 CONFIG_NF_CONNTRACK_SANE=y
 CONFIG_NF_CONNTRACK_TFTP=y
 CONFIG_NF_CT_NETLINK=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_DSCP=y
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -162,7 +152,6 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_TRACE=y
 CONFIG_NETFILTER_XT_TARGET_SECMARK=y
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=y
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -177,7 +166,6 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
@@ -211,7 +199,6 @@ CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_MANGLE=y
 CONFIG_IP6_NF_RAW=y
 CONFIG_TIPC=y
-CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_6LOWPAN=y
 CONFIG_IEEE802154=y
@@ -220,21 +207,10 @@ CONFIG_MAC802154=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_PRIO=y
-CONFIG_NET_SCH_MULTIQ=y
-CONFIG_NET_SCH_SFQ=y
-CONFIG_NET_SCH_TBF=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_NET_SCH_CODEL=y
-CONFIG_NET_SCH_FQ_CODEL=y
-CONFIG_NET_SCH_FQ=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NET_CLS_BASIC=y
 CONFIG_NET_CLS_FW=y
 CONFIG_NET_CLS_U32=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_FLOW=y
-CONFIG_NET_CLS_BPF=y
-CONFIG_NET_CLS_MATCHALL=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_CMP=y
 CONFIG_NET_EMATCH_NBYTE=y
@@ -242,12 +218,9 @@ CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_EMATCH_META=y
 CONFIG_NET_EMATCH_TEXT=y
 CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
 CONFIG_NET_ACT_MIRRED=y
-CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_VSOCKETS=y
-CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=y
 CONFIG_CFG80211=y
 CONFIG_NL80211_TESTMODE=y
@@ -303,8 +276,6 @@ CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
-CONFIG_PPPOL2TP=y
 CONFIG_USB_RTL8150=y
 CONFIG_USB_RTL8152=y
 CONFIG_USB_USBNET=y
@@ -336,7 +307,6 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_MOUSE_PS2 is not set
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_XPAD=y
-CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_VT is not set
@@ -393,18 +363,6 @@ CONFIG_LIRC=y
 CONFIG_BPF_LIRC_MODE2=y
 CONFIG_RC_DECODERS=y
 CONFIG_RC_DEVICES=y
-CONFIG_MEDIA_CEC_RC=y
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_TEST_SUPPORT is not set
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=y
-CONFIG_USB_GSPCA=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VGA_ARB is not set
 CONFIG_DRM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -418,7 +376,6 @@ CONFIG_HID_LOGITECH=y
 CONFIG_HID_LOGITECH_DJ=y
 CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MULTITOUCH=y
 CONFIG_HID_NINTENDO=y
 CONFIG_HID_PICOLCD=y
 CONFIG_HID_PLANTRONICS=y
@@ -603,15 +560,12 @@ CONFIG_XZ_DEC=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CALLER=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_HEADERS_INSTALL=y
 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_PAGE_OWNER=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_TIMEOUT=-1
 CONFIG_SOFTLOCKUP_DETECTOR=y
@@ -622,5 +576,3 @@ CONFIG_SCHEDSTATS=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_TRACE_MMIO_ACCESS=y
 CONFIG_KUNIT=y
-CONFIG_KUNIT_DEBUGFS=y
-# CONFIG_RUNTIME_TESTING_MENU is not set

arch/arm64/configs/generic_robotics_defconfig

@@ -30,7 +30,6 @@ CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_BPF=y
 CONFIG_NAMESPACES=y
-# CONFIG_PID_NS is not set
 CONFIG_RT_SOFTINT_OPTIMIZATION=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
@@ -697,3 +696,16 @@ CONFIG_PINCTRL_SX150X=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CH341=y
 CONFIG_USB_SERIAL_CP210X=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_PID_NS=y
+CONFIG_USER_NS=y
+CONFIG_IPC_NS=y
+CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_PIDS=y

arch/arm64/configs/gki_defconfig

@@ -489,6 +489,7 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PCI_RENESAS=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y

arch/arm64/configs/kalama_le_gki.fragment

@@ -3,6 +3,13 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CH341=y
 CONFIG_USB_SERIAL_CP210X=y
+CONFIG_I2C_MUX=y
+CONFIG_PINCTRL_SX150X=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_CAN=y
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_HWMON=y
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_THERMAL_HWMON=y
+

arch/arm64/configs/kalama_lu_gki.fragment

@@ -0,0 +1,7 @@
+CONFIG_DEVTMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_CH341=y
+CONFIG_USB_SERIAL_CP210X=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_PM_AUTOSLEEP=y

arch/arm64/configs/vendor/autogvm.config

@@ -6,6 +6,7 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_QCOM=y
 # CONFIG_ARM_SMMU_SELFTEST is not set
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_BRIDGE_NETFILTER=y
 CONFIG_CFG80211=y
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 # CONFIG_CFG80211_CRDA_SUPPORT is not set
@@ -35,6 +36,32 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=y
 # CONFIG_IP6_NF_TARGET_NPT is not set
 CONFIG_IPC_LOGGING=y
 CONFIG_IPC_LOG_MINIDUMP_BUFFERS=0
+CONFIG_IP_VS=y
+# CONFIG_IP_VS_DEBUG is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_FO is not set
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_MH is not set
+CONFIG_IP_VS_MH_TAB_INDEX=12
+# CONFIG_IP_VS_NFCT is not set
+# CONFIG_IP_VS_NQ is not set
+# CONFIG_IP_VS_OVF is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_SCTP is not set
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_RR is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_SH is not set
+CONFIG_IP_VS_SH_TAB_BITS=8
+CONFIG_IP_VS_TAB_BITS=12
+# CONFIG_IP_VS_TWOS is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_WRR is not set
 CONFIG_KPROBES=y
 CONFIG_KPROBE_EVENTS=y
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
@@ -52,9 +79,13 @@ CONFIG_MSM_BOOT_TIME_MARKER=y
 CONFIG_MSM_HAB=y
 CONFIG_MSM_HSUSB_PHY=y
 CONFIG_MSM_QUIN_SUBSYSTEM_NOTIF_VIRT=y
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_NETLINK_ACCT=y
 CONFIG_NETFILTER_XT_MATCH_CGROUP=y
+CONFIG_NETFILTER_XT_MATCH_IPVS=y
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_FAILOVER=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_LOG_IPV6=y
@@ -87,6 +118,7 @@ CONFIG_QCOM_MEM_BUF_GH=y
 CONFIG_QCOM_MEM_BUF_MSGQ=y
 CONFIG_QCOM_MINIDUMP=y
 CONFIG_QCOM_MINIDUMP_MMIO=y
+# CONFIG_QCOM_MINIDUMP_SMEM is not set
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_QMI_HELPERS=y
 CONFIG_QCOM_RAMDUMP=y

arch/arm64/configs/vendor/autogvm_GKI.config

@@ -1,4 +1,5 @@
 CONFIG_ARCH_QCOM=y
+CONFIG_ARM_PARAVIRT_SMMU_V3=m
 CONFIG_ARM_SMMU=m
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_QCOM=m
@@ -146,6 +147,7 @@ CONFIG_USB_F_CDEV=m
 CONFIG_USB_F_DIAG=m
 # CONFIG_USB_F_FS_IPC_LOGGING is not set
 CONFIG_USB_F_QDSS=m
+CONFIG_USB_LINK_LAYER_TEST=m
 CONFIG_USB_MON=m
 CONFIG_USB_MSM_SSPHY_QMP=m
 # CONFIG_USB_NET_RNDIS_WLAN is not set

arch/arm64/configs/vendor/gen3auto.config

@@ -236,6 +236,7 @@ CONFIG_QTI_CPU_HOTPLUG_COOLING_DEVICE=m
 CONFIG_QTI_CPU_PAUSE_COOLING_DEVICE=m
 CONFIG_QTI_CRYPTO_COMMON=y
 CONFIG_QTI_CRYPTO_FDE=y
+CONFIG_QTI_CRYPTO_LEGACY_KEY_FDE=y
 CONFIG_QTI_CRYPTO_TZ=y
 CONFIG_QTI_DEVFREQ_CDEV=m
 CONFIG_QTI_IOMMU_SUPPORT=y

arch/arm64/configs/vendor/gen3auto_GKI.config

@@ -296,6 +296,10 @@ CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PCI is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_OST=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_FTRACE=m
 CONFIG_THERMAL_TSENS_LEGACY=m
 CONFIG_UIO_MSM_SHAREDMEM=m
 CONFIG_USB_BAM=m

arch/arm64/configs/vendor/gen3auto_consolidate.config

@@ -7,4 +7,8 @@ CONFIG_LKDTM=m
 CONFIG_LOCALVERSION="-gki-consolidate"
 CONFIG_MHI_BUS_DEBUG=y
 CONFIG_MSM_GPI_DMA_DEBUG=y
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_OST=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_FTRACE=m
 CONFIG_TEST_USER_COPY=m

arch/arm64/configs/vendor/gen4auto_GKI.config

@@ -43,6 +43,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
 CONFIG_DEEPSLEEP=y
 CONFIG_DRM_ANALOGIX_ANX7625=m
+CONFIG_DUMP_XBL_LOG=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 # CONFIG_DWMAC_GENERIC is not set
 # CONFIG_DWMAC_INTEL_PLAT is not set
@@ -51,6 +52,9 @@ CONFIG_DRM_ANALOGIX_ANX7625=m
 CONFIG_DWMAC_QCOM_VER3=y
 # CONFIG_DWMAC_SUN8I is not set
 # CONFIG_DWMAC_SUNXI is not set
+CONFIG_EDAC_QCOM=m
+# CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE is not set
+# CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE is not set
 CONFIG_ETHQOS_QCOM_SERDES=y
 # CONFIG_ETM4X_IMPDEF_FEATURE is not set
 CONFIG_GPIO_PCA953X=m
@@ -108,12 +112,15 @@ CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE=m
 CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE_DEFAULT=y
 CONFIG_POWER_RESET_QCOM_PON=m
 CONFIG_POWER_RESET_QCOM_REBOOT_REASON=m
+CONFIG_PROFILER=m
+CONFIG_QCOM_AOP_SET_DDR=m
 CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_BWMON=m
 CONFIG_QCOM_CLK_RPMH=m
 CONFIG_QCOM_COMMAND_DB=m
 CONFIG_QCOM_CPUSS_SLEEP_STATS=m
 CONFIG_QCOM_CPU_VENDOR_HOOKS=m
+CONFIG_QCOM_DCC_V2=m
 CONFIG_QCOM_DCVS=m
 CONFIG_QCOM_DCVS_FP=m
 CONFIG_QCOM_DMABUF_HEAPS=m

arch/arm64/configs/vendor/kalama_GKI.config

@@ -7,6 +7,7 @@ CONFIG_ARM_SMMU=m
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 # CONFIG_ARM_SMMU_SELFTEST is not set
 CONFIG_BLK_DEV_NVME=m
+CONFIG_CAN_MCP25XXFD=m
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 # CONFIG_CFG80211_CRDA_SUPPORT is not set

arch/arm64/configs/vendor/kalama_le_GKI.config

@@ -1,3 +1,4 @@
+CONFIG_ADS7052_TDK_THERMISTOR=m
 CONFIG_ARCH_KAKA=y
 CONFIG_ARCH_KALAMA=y
 CONFIG_ARCH_QCOM=y
@@ -17,6 +18,8 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 # CONFIG_CFG80211_WEXT is not set
+CONFIG_CH101=m
+CONFIG_CH101_I2C=m
 # CONFIG_CHARGER_QCOM_SMBB is not set
 CONFIG_CHR_DEV_SG=m
 CONFIG_COMMON_CLK_QCOM=m
@@ -32,7 +35,7 @@ CONFIG_CORESIGHT_TGU=m
 CONFIG_CORESIGHT_TPDA=m
 CONFIG_CORESIGHT_TPDM=m
 CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
-CONFIG_DRM_LT9611UXC=m
+# CONFIG_DRM_LT9611UXC is not set
 CONFIG_EDAC_QCOM=m
 # CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE is not set
 CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y

arch/arm64/configs/vendor/kalama_le_consolidate.config

@@ -4,6 +4,7 @@ CONFIG_CMA_DEBUGFS=y
 CONFIG_CNSS2_DEBUG=y
 CONFIG_CORESIGHT_SOURCE_ETM4X=m
 CONFIG_QTI_THERMALZONE_CONFIG_DEBUG=m
+CONFIG_HWMON=y
 # CONFIG_HYP_ASSIGN_DEBUG is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_IOMMU_TLBSYNC_DEBUG=y
@@ -12,15 +13,20 @@ CONFIG_LOCALVERSION="-gki-consolidate"
 CONFIG_LOCK_TORTURE_TEST=m
 CONFIG_MHI_BUS_DEBUG=y
 CONFIG_MSM_GPI_DMA_DEBUG=y
+CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_QCOM_DYN_MINIDUMP_STACK is not set
 CONFIG_QCOM_RTB=m
 CONFIG_QCOM_RTB_SEPARATE_CPUS=y
+CONFIG_QRC=m
+CONFIG_QRC_DEBUG=m
 CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y
 CONFIG_RCU_TORTURE_TEST=m
 CONFIG_REGMAP_QTI_DEBUGFS_ALLOW_WRITE=y
 CONFIG_RPMSG_QCOM_GLINK_DEBUG=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_SCHED_WALT_DEBUG=m
+CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SPI_SPIDEV=m
 CONFIG_TEST_USER_COPY=m
+CONFIG_THERMAL_HWMON=y
 CONFIG_UFS_DBG=y

arch/arm64/configs/vendor/kalama_lu_GKI.config

@@ -0,0 +1,379 @@
+CONFIG_ARCH_KAKA=y
+CONFIG_ARCH_KALAMA=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
+CONFIG_ARM_QCOM_CPUFREQ_HW_DEBUG=m
+CONFIG_ARM_SMMU=m
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+# CONFIG_ARM_SMMU_SELFTEST is not set
+CONFIG_BLK_DEV_NVME=m
+CONFIG_CFG80211=m
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+# CONFIG_CFG80211_CRDA_SUPPORT is not set
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_DEFAULT_PS is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CHARGER_QCOM_SMBB is not set
+CONFIG_CHR_DEV_SG=m
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_CORESIGHT=m
+CONFIG_CORESIGHT_CTI=m
+CONFIG_CORESIGHT_DUMMY=m
+CONFIG_CORESIGHT_HWEVENT=m
+CONFIG_CORESIGHT_LINKS_AND_SINKS=m
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=m
+CONFIG_CORESIGHT_REMOTE_ETM=m
+CONFIG_CORESIGHT_STM=m
+CONFIG_CORESIGHT_TGU=m
+CONFIG_CORESIGHT_TPDA=m
+CONFIG_CORESIGHT_TPDM=m
+CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
+CONFIG_DRM_LT9611UXC=m
+CONFIG_EDAC_QCOM=m
+# CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE is not set
+CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y
+# CONFIG_EXT4_KUNIT_TESTS is not set
+# CONFIG_FAT_KUNIT_TEST is not set
+CONFIG_GH_ARM64_DRV=m
+CONFIG_GH_CTRL=m
+CONFIG_GH_DBL=m
+# CONFIG_GH_GUEST_POPS is not set
+CONFIG_GH_IRQ_LEND=m
+CONFIG_GH_MEM_NOTIFIER=m
+CONFIG_GH_MSGQ=m
+CONFIG_GH_PROXY_SCHED=m
+CONFIG_GH_RM_DRV=m
+CONFIG_GH_SECURE_VM_LOADER=m
+CONFIG_GH_TLMM_VM_MEM_ACCESS=m
+CONFIG_GH_VIRT_WATCHDOG=m
+CONFIG_GUNYAH=m
+CONFIG_GUNYAH_DRIVERS=y
+CONFIG_HVC_GUNYAH=m
+# CONFIG_HVC_GUNYAH_CONSOLE is not set
+CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_I2C_EUSB2_REPEATER=m
+CONFIG_I2C_MSM_GENI=m
+CONFIG_I3C_MASTER_MSM_GENI=m
+CONFIG_INPUT_PM8941_PWRKEY=m
+# CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+CONFIG_INPUT_QCOM_HV_HAPTICS=m
+CONFIG_INTERCONNECT_QCOM=m
+CONFIG_INTERCONNECT_QCOM_DEBUG=m
+CONFIG_INTERCONNECT_QCOM_KALAMA=m
+CONFIG_INTERCONNECT_TEST=m
+CONFIG_IOMMU_IO_PGTABLE_FAST=y
+# CONFIG_IOMMU_IO_PGTABLE_FAST_PROVE_TLB is not set
+# CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST is not set
+CONFIG_IPA3=m
+CONFIG_IPC_LOGGING=m
+CONFIG_IPC_LOG_MINIDUMP_BUFFERS=16
+# CONFIG_KASAN_KUNIT_TEST is not set
+# CONFIG_KFENCE_KUNIT_TEST is not set
+CONFIG_KUNIT=m
+# CONFIG_KUNIT_ALL_TESTS is not set
+CONFIG_KUNIT_DEBUGFS=y
+# CONFIG_KUNIT_EXAMPLE_TEST is not set
+# CONFIG_KUNIT_TEST is not set
+CONFIG_LEDS_QTI_FLASH=m
+CONFIG_LEDS_QTI_TRI_LED=m
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+CONFIG_MAC80211_RC_DEFAULT=""
+# CONFIG_MAC80211_RC_MINSTREL is not set
+CONFIG_MAX31760_FAN_CONTROLLER=m
+CONFIG_MEM_SHARE_QMI_SERVICE=m
+CONFIG_MFD_SPMI_PMIC=m
+# CONFIG_MFD_WCD934X is not set
+CONFIG_MHI_BUS=m
+CONFIG_MHI_BUS_MISC=y
+CONFIG_MHI_DTR=m
+CONFIG_MHI_NETDEV=m
+CONFIG_MHI_QCOM=m
+CONFIG_MHI_SATELLITE=m
+CONFIG_MHI_UCI=m
+CONFIG_MINIDUMP_MAX_ENTRIES=200
+CONFIG_MMC_SDHCI_MSM=m
+# CONFIG_MODULE_SIG_ALL is not set
+CONFIG_MSM_ADSPRPC=m
+CONFIG_MSM_BOOT_STATS=m
+CONFIG_MSM_BOOT_TIME_MARKER=y
+CONFIG_MSM_CDSP_LOADER=m
+CONFIG_MSM_CORE_HANG_DETECT=m
+CONFIG_MSM_GLOBAL_SYNX=m
+CONFIG_MSM_GPI_DMA=m
+# CONFIG_MSM_GPI_DMA_DEBUG is not set
+CONFIG_MSM_PERFORMANCE=m
+CONFIG_MSM_POWER_STATE=m
+CONFIG_MSM_QBT_HANDLER=m
+CONFIG_MSM_QMP=m
+CONFIG_MSM_RDBG=m
+CONFIG_MSM_SPCOM=m
+CONFIG_MSM_SPSS_UTILS=m
+CONFIG_MSM_SYSSTATS=m
+CONFIG_MSM_TMECOM_QMP=m
+CONFIG_NL80211_TESTMODE=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_NVME_CORE=m
+# CONFIG_NVME_MULTIPATH is not set
+CONFIG_PCI_MSM=m
+CONFIG_PDR_INDICATION_NOTIF_TIMEOUT=9000
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
+CONFIG_PHY_QCOM_UFS_V4=m
+CONFIG_PINCTRL_KALAMA=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE=m
+CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE_DEFAULT=y
+CONFIG_POWER_RESET_QCOM_PON=m
+CONFIG_POWER_RESET_QCOM_REBOOT_REASON=m
+# CONFIG_PRISM2_USB is not set
+CONFIG_PWM_QTI_LPG=m
+CONFIG_QCOM_ADSP_SLEEPMON=m
+CONFIG_QCOM_AOSS_QMP=m
+CONFIG_QCOM_BALANCE_ANON_FILE_RECLAIM=y
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_BWMON=m
+CONFIG_QCOM_CDSP_RM=m
+CONFIG_QCOM_CLK_RPMH=m
+# CONFIG_QCOM_COINCELL is not set
+CONFIG_QCOM_COMMAND_DB=m
+CONFIG_QCOM_CPUSS_SLEEP_STATS=m
+CONFIG_QCOM_CPU_VENDOR_HOOKS=m
+CONFIG_QCOM_DCC_V2=m
+CONFIG_QCOM_DCVS=m
+CONFIG_QCOM_DCVS_FP=m
+CONFIG_QCOM_DMABUF_HEAPS=m
+CONFIG_QCOM_DMABUF_HEAPS_BITSTREAM_CONTIG=y
+CONFIG_QCOM_DMABUF_HEAPS_CARVEOUT=y
+CONFIG_QCOM_DMABUF_HEAPS_CMA=y
+CONFIG_QCOM_DMABUF_HEAPS_PAGE_POOL_REFILL=y
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y
+# CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_UNCACHED is not set
+# CONFIG_QCOM_DYN_MINIDUMP_STACK is not set
+CONFIG_QCOM_ESOC=m
+CONFIG_QCOM_ESOC_CLIENT=m
+# CONFIG_QCOM_ESOC_DBG_ENG is not set
+CONFIG_QCOM_ESOC_DEBUG=m
+CONFIG_QCOM_ESOC_DEV=m
+CONFIG_QCOM_ESOC_MDM_4X=m
+CONFIG_QCOM_ESOC_MDM_DRV=m
+CONFIG_QCOM_EUD=m
+CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
+CONFIG_QCOM_FSA4480_I2C=m
+CONFIG_QCOM_GDSC_REGULATOR=m
+CONFIG_QCOM_GLINK=m
+CONFIG_QCOM_GLINK_PKT=m
+# CONFIG_QCOM_GUESTVM is not set
+CONFIG_QCOM_HUNG_TASK_ENH=m
+CONFIG_QCOM_IOMMU_DEBUG=m
+CONFIG_QCOM_IOMMU_UTIL=m
+# CONFIG_QCOM_IPA is not set
+CONFIG_QCOM_IRQ_STAT=y
+CONFIG_QCOM_LAZY_MAPPING=m
+CONFIG_QCOM_LLCC=m
+CONFIG_QCOM_LLCC_PERFMON=m
+CONFIG_QCOM_LLCC_PMU=m
+CONFIG_QCOM_LOGBUF_VENDOR_HOOKS=m
+CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_MEMLAT=m
+CONFIG_QCOM_MEMORY_DUMP_V2=m
+CONFIG_QCOM_MEM_BUF=m
+CONFIG_QCOM_MEM_BUF_DEV=m
+CONFIG_QCOM_MEM_BUF_GH=y
+CONFIG_QCOM_MEM_BUF_MSGQ=m
+CONFIG_QCOM_MEM_HOOKS=m
+CONFIG_QCOM_MEM_OFFLINE=m
+CONFIG_QCOM_MICRODUMP=m
+CONFIG_QCOM_MINIDUMP=m
+CONFIG_QCOM_MINIDUMP_FTRACE=y
+CONFIG_QCOM_MINIDUMP_PANIC_CPU_CONTEXT=y
+CONFIG_QCOM_MINIDUMP_PANIC_DUMP=y
+CONFIG_QCOM_MINIDUMP_PSTORE=y
+CONFIG_QCOM_MSM_IPCC=m
+CONFIG_QCOM_PANEL_EVENT_NOTIFIER=m
+CONFIG_QCOM_PANIC_ON_NOTIF_TIMEOUT=y
+CONFIG_QCOM_PANIC_ON_PDR_NOTIF_TIMEOUT=y
+CONFIG_QCOM_PDC=m
+CONFIG_QCOM_PDR_HELPERS=m
+CONFIG_QCOM_PIL_INFO=m
+CONFIG_QCOM_PMU_LIB=m
+# CONFIG_QCOM_Q6V5_ADSP is not set
+CONFIG_QCOM_Q6V5_COMMON=m
+# CONFIG_QCOM_Q6V5_MSS is not set
+CONFIG_QCOM_Q6V5_PAS=m
+# CONFIG_QCOM_Q6V5_WCSS is not set
+CONFIG_QCOM_QDSS_BRIDGE=m
+CONFIG_QCOM_QFPROM=m
+CONFIG_QCOM_QMI_HELPERS=m
+CONFIG_QCOM_RAMDUMP=m
+CONFIG_QCOM_RIMPS=m
+CONFIG_QCOM_RPMH=m
+CONFIG_QCOM_RPROC_COMMON=m
+CONFIG_QCOM_RUN_QUEUE_STATS=m
+CONFIG_QCOM_S2D_VENDOR_HOOK=m
+CONFIG_QCOM_SCM=m
+CONFIG_QCOM_SECURE_BUFFER=m
+CONFIG_QCOM_SHOW_RESUME_IRQ=m
+CONFIG_QCOM_SMEM=m
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_SMP2P_SLEEPSTATE=m
+# CONFIG_QCOM_SMSM is not set
+CONFIG_QCOM_SOCINFO=m
+CONFIG_QCOM_SOC_SLEEP_STATS=m
+# CONFIG_QCOM_SOC_WATCHDOG is not set
+CONFIG_QCOM_SPMI_ADC5_GEN3=m
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
+CONFIG_QCOM_SPSS=m
+CONFIG_QCOM_SUBSYSTEM_SLEEP_STATS=m
+CONFIG_QCOM_SYSMON=m
+CONFIG_QCOM_SYSMON_SUBSYSTEM_STATS=m
+CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_VA_MINIDUMP=m
+CONFIG_QCOM_VM_DMESG_DUMPER=m
+CONFIG_QCOM_WATCHDOG_BARK_TIME=11000
+CONFIG_QCOM_WATCHDOG_IPI_PING=y
+CONFIG_QCOM_WATCHDOG_PET_TIME=9360
+# CONFIG_QCOM_WATCHDOG_USERSPACE_PET is not set
+CONFIG_QCOM_WATCHDOG_WAKEUP_ENABLE=y
+# CONFIG_QCOM_WCNSS_PIL is not set
+# CONFIG_QCOM_WDOG_BITE_EARLY_PANIC is not set
+CONFIG_QCOM_WDT_CORE=m
+CONFIG_QRTR=m
+CONFIG_QRTR_GUNYAH=m
+CONFIG_QRTR_MHI=m
+CONFIG_QRTR_SMD=m
+# CONFIG_QRTR_TUN is not set
+CONFIG_QSEECOM_PROXY=m
+CONFIG_QSEE_IPC_IRQ_BRIDGE=m
+CONFIG_QTI_ALTMODE_GLINK=m
+CONFIG_QTI_BATTERY_CHARGER=m
+CONFIG_QTI_BATTERY_GLINK_DEBUG=m
+CONFIG_QTI_BCL_PMIC5=m
+CONFIG_QTI_BCL_SOC_DRIVER=m
+CONFIG_QTI_C1DCVS_SCMI_CLIENT=m
+CONFIG_QTI_CHARGER_ULOG_GLINK=m
+CONFIG_QTI_CPUFREQ_CDEV=m
+CONFIG_QTI_CPU_HOTPLUG_COOLING_DEVICE=m
+CONFIG_QTI_CPU_PAUSE_COOLING_DEVICE=m
+CONFIG_QTI_CPU_VOLTAGE_COOLING_DEVICE=m
+CONFIG_QTI_CRYPTO_COMMON=m
+CONFIG_QTI_DDR_COOLING_DEVICE=m
+CONFIG_QTI_DEVFREQ_CDEV=m
+CONFIG_QTI_HW_KEY_MANAGER=m
+CONFIG_QTI_HW_MEMLAT_SCMI_CLIENT=m
+CONFIG_QTI_IOMMU_SUPPORT=m
+CONFIG_QTI_PMIC_EUSB2_REPEATER=m
+CONFIG_QTI_PMIC_GLINK=m
+# CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG is not set
+CONFIG_QTI_PMIC_GLINK_DEBUG=m
+CONFIG_QTI_PMIC_PON_LOG=m
+CONFIG_QTI_PMU_SCMI_CLIENT=m
+CONFIG_QTI_POLICY_ENGINE_SENSOR=m
+CONFIG_QTI_QMI_COOLING_DEVICE=m
+CONFIG_QTI_QMI_SENSOR_V2=m
+CONFIG_QTI_RIMPS_LOG=m
+CONFIG_QTI_SCMI_C1DCVS_PROTOCOL=m
+CONFIG_QTI_SCMI_MEMLAT_PROTOCOL=m
+CONFIG_QTI_SCMI_PMU_PROTOCOL=m
+CONFIG_QTI_SDPM_CLOCK_MONITOR=m
+CONFIG_QTI_SYS_PM_VX=m
+CONFIG_QTI_THERMAL_LIMITS_DCVS=m
+CONFIG_QTI_THERMAL_MINIDUMP=m
+CONFIG_QTI_USERSPACE_CDEV=m
+# CONFIG_R8188EU is not set
+# CONFIG_R8712U is not set
+CONFIG_REBOOT_MODE=m
+CONFIG_REGMAP_QTI_DEBUGFS=m
+# CONFIG_REGMAP_QTI_DEBUGFS_ALLOW_WRITE is not set
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGULATOR_DEBUG_CONTROL=m
+CONFIG_REGULATOR_PROXY_CONSUMER=m
+# CONFIG_REGULATOR_PROXY_CONSUMER_LEGACY is not set
+CONFIG_REGULATOR_QTI_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_QTI_OCP_NOTIFIER=m
+CONFIG_REGULATOR_RPMH=m
+CONFIG_REGULATOR_STUB=m
+CONFIG_RPMSG_QCOM_GLINK=m
+CONFIG_RPMSG_QCOM_GLINK_SMEM=m
+CONFIG_RPMSG_QCOM_GLINK_SPSS=m
+CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPROC_SSR_NOTIF_TIMEOUT=20000
+CONFIG_RPROC_SYSMON_NOTIF_TIMEOUT=20000
+CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_LIB_KUNIT_TEST is not set
+# CONFIG_RTL8723BS is not set
+CONFIG_SCHED_WALT=m
+CONFIG_SCSI_UFS_CRYPTO_QTI=m
+CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SERIAL_MSM_GENI=m
+CONFIG_SHOW_SUSPEND_EPOCH=m
+CONFIG_SLIMBUS=m
+# CONFIG_SLIM_QCOM_CTRL is not set
+CONFIG_SLIM_QCOM_NGD_CTRL=m
+CONFIG_SM_CAMCC_KALAMA=m
+CONFIG_SM_DEBUGCC_KALAMA=m
+CONFIG_SM_DISPCC_KALAMA=m
+CONFIG_SM_GCC_KALAMA=m
+CONFIG_SM_GPUCC_KALAMA=m
+CONFIG_SM_TCSRCC_KALAMA=m
+CONFIG_SM_VIDEOCC_KALAMA=m
+# CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST is not set
+# CONFIG_SND_SOC_WCD9335 is not set
+CONFIG_SND_USB_AUDIO_QMI=m
+CONFIG_SPI_MSM_GENI=m
+CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=m
+CONFIG_SPS=m
+# CONFIG_SPS_SUPPORT_BAMDMA is not set
+CONFIG_SPS_SUPPORT_NDP_BAM=y
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_OST=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_FTRACE=m
+# CONFIG_SWIOTLB_NONLINEAR is not set
+# CONFIG_TIME_KUNIT_TEST is not set
+CONFIG_UCSI_QTI_GLINK=m
+CONFIG_UIO_MSM_SHAREDMEM=m
+CONFIG_USB_BAM=m
+CONFIG_USB_CONFIGFS_F_CCID=m
+CONFIG_USB_CONFIGFS_F_CDEV=m
+CONFIG_USB_CONFIGFS_F_DIAG=m
+CONFIG_USB_CONFIGFS_F_GSI=m
+CONFIG_USB_CONFIGFS_F_QDSS=m
+CONFIG_USB_DWC3_MSM=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_F_CCID=m
+CONFIG_USB_F_CDEV=m
+CONFIG_USB_F_DIAG=m
+CONFIG_USB_F_FS_IPC_LOGGING=m
+CONFIG_USB_F_GSI=m
+CONFIG_USB_F_QDSS=m
+CONFIG_USB_M31_MSM_EUSB2_PHY=m
+CONFIG_USB_MON=m
+CONFIG_USB_MSM_EUSB2_PHY=m
+CONFIG_USB_MSM_SSPHY_QMP=m
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+CONFIG_USB_QCOM_EMU_PHY=m
+CONFIG_USB_REDRIVER=m
+CONFIG_USB_REDRIVER_NB7VPQ904M=m
+CONFIG_USB_REPEATER=m
+# CONFIG_VIDEO_QCOM_VENUS is not set
+CONFIG_VIRT_DRIVERS=y
+# CONFIG_VIRT_WIFI is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_WFX is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set

arch/arm64/configs/vendor/kalama_lu_consolidate.config

@@ -0,0 +1,26 @@
+CONFIG_ATOMIC64_SELFTEST=m
+CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL=y
+CONFIG_CMA_DEBUGFS=y
+CONFIG_CNSS2_DEBUG=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=m
+CONFIG_QTI_THERMALZONE_CONFIG_DEBUG=m
+# CONFIG_HYP_ASSIGN_DEBUG is not set
+CONFIG_I2C_CHARDEV=m
+CONFIG_IOMMU_TLBSYNC_DEBUG=y
+CONFIG_LKDTM=m
+CONFIG_LOCALVERSION="-gki-consolidate"
+CONFIG_LOCK_TORTURE_TEST=m
+CONFIG_MHI_BUS_DEBUG=y
+CONFIG_MSM_GPI_DMA_DEBUG=y
+# CONFIG_QCOM_DYN_MINIDUMP_STACK is not set
+CONFIG_QCOM_RTB=m
+CONFIG_QCOM_RTB_SEPARATE_CPUS=y
+CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y
+CONFIG_RCU_TORTURE_TEST=m
+CONFIG_REGMAP_QTI_DEBUGFS_ALLOW_WRITE=y
+CONFIG_RPMSG_QCOM_GLINK_DEBUG=y
+CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_SCHED_WALT_DEBUG=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_UFS_DBG=y

arch/arm64/configs/vendor/kona_le_GKI.config

@@ -257,6 +257,8 @@ CONFIG_QPNP_REVID=m
 CONFIG_QPNP_SMB5=m
 # CONFIG_QPNP_SMBLITE is not set
 CONFIG_QPNP_USB_PDPHY=m
+CONFIG_QRC=m
+CONFIG_QRC_DEBUG=m
 CONFIG_QRTR=m
 # CONFIG_QRTR_GENPOOL is not set
 # CONFIG_QRTR_GUNYAH is not set

arch/arm64/configs/vendor/kona_le_consolidate.config

@@ -50,8 +50,6 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PREEMPTIRQ_TRACEPOINTS=y
-CONFIG_QRC=m
-CONFIG_QRC_DEBUG=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RCU_TORTURE_TEST=m
 # CONFIG_REED_SOLOMON_TEST is not set

arch/arm64/configs/vendor/qcs405.config

@@ -1,7 +1,5 @@
 CONFIG_ANON_VMA_NAME=y
 CONFIG_ARCH_QCS405=y
-CONFIG_ARM_QCOM_CPUFREQ_HW=y
-CONFIG_ARM_QCOM_CPUFREQ_HW_DEBUG=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_QCOM=y
@@ -36,6 +34,7 @@ CONFIG_DWMAC_QCOM_ETHQOS=y
 # CONFIG_EP_PCIE is not set
 # CONFIG_ETHQOS_QCOM_SERDES is not set
 # CONFIG_GPIO_SYSFS is not set
+# CONFIG_HID_MULTITOUCH is not set
 CONFIG_HWMON=y
 CONFIG_HWSPINLOCK_QCOM=y
 CONFIG_I2C_CHARDEV=y
@@ -43,12 +42,15 @@ CONFIG_I2C_MSM_V2=y
 CONFIG_I2C_SLAVE_QCOM=y
 CONFIG_I2C_SLAVE_TEST=y
 CONFIG_INPUT_QPNP_POWER_ON=y
+# CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INTERCONNECT_QCOM=y
 CONFIG_INTERCONNECT_QCOM_DEBUG=y
 CONFIG_INTERCONNECT_QCOM_QCS405=y
 CONFIG_INTERCONNECT_QCOM_QOS_RPM=y
 CONFIG_INTERCONNECT_QCOM_RPM=y
 CONFIG_INTERCONNECT_TEST=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_INTERVAL_TREE_TEST=y
 # CONFIG_IOMMU_IO_PGTABLE_FAST is not set
 CONFIG_IPC_LOGGING=y
 CONFIG_IPC_LOG_MINIDUMP_BUFFERS=16
@@ -78,7 +80,6 @@ CONFIG_MSM_BOOT_STATS=y
 # CONFIG_MSM_BOOT_TIME_MARKER is not set
 CONFIG_MSM_CDSP_LOADER=y
 CONFIG_MSM_CORE_HANG_DETECT=y
-CONFIG_MSM_GPI_DMA=y
 CONFIG_MSM_HSUSB_PHY=y
 CONFIG_MSM_L2_SPM=y
 CONFIG_MSM_QMP=y
@@ -108,7 +109,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PWM_QTI_LPG=y
 CONFIG_QCOM_APCS_IPC=y
 CONFIG_QCOM_BALANCE_ANON_FILE_RECLAIM=y
-CONFIG_QCOM_BAM_DMA=y
 CONFIG_QCOM_BWMON=y
 # CONFIG_QCOM_CLK_APCC_MSM8996 is not set
 # CONFIG_QCOM_CLK_APCS_MSM8916 is not set
@@ -180,7 +180,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 CONFIG_QCOM_SPMI_ADC_TM5=y
 CONFIG_QCOM_SPMI_TEMP_ALARM=y
 # CONFIG_QCOM_SPSS is not set
-CONFIG_QCOM_SPS_DMA=y
 CONFIG_QCOM_SUBSYSTEM_SLEEP_STATS=y
 CONFIG_QCOM_SYSMON=y
 # CONFIG_QCOM_SYSMON_SUBSYSTEM_STATS is not set
@@ -233,6 +232,7 @@ CONFIG_QTI_RPM_STATS_LOG=y
 # CONFIG_QTI_THERMAL_MINIDUMP is not set
 CONFIG_REBOOT_MODE=y
 CONFIG_REGMAP_SPMI=y
+CONFIG_REGULATOR_COOLING_DEVICE=y
 CONFIG_REGULATOR_CPR=y
 CONFIG_REGULATOR_MEM_ACC=y
 CONFIG_REGULATOR_PROXY_CONSUMER=y
@@ -252,7 +252,6 @@ CONFIG_SERIAL_MSM=y
 # CONFIG_SERIAL_MSM_CONSOLE is not set
 CONFIG_SERIAL_MSM_HS=y
 CONFIG_SLIMBUS=y
-CONFIG_SLIM_QCOM_NGD_CTRL=y
 CONFIG_SND=y
 CONFIG_SND_HRTIMER=y
 CONFIG_SND_SOC=y
@@ -261,7 +260,6 @@ CONFIG_SOUND=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI_MSM_PMIC_ARB=y
-CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y
 CONFIG_SPMI_PMIC_CLKDIV=y
 CONFIG_SPS=y
 # CONFIG_SPS_SUPPORT_BAMDMA is not set
@@ -281,14 +279,12 @@ CONFIG_STM_SOURCE_FTRACE=y
 # CONFIG_STM_SOURCE_HEARTBEAT is not set
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_TSENS_LEGACY=y
-# CONFIG_TOUCHSCREEN_SUN4I is not set
 CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_USB_DWC3_MSM=y
 CONFIG_USB_EHSET_TEST_FIXTURE=y
 # CONFIG_USB_F_FS_IPC_LOGGING is not set
 CONFIG_USB_MSM_SSPHY=y
 CONFIG_USER_NS=y
-# CONFIG_VIDEO_QCOM_VENUS is not set
 CONFIG_XDP_SOCKETS=y
 CONFIG_ZRAM=y
 CONFIG_ZRAM_DEF_COMP="zstd"

arch/arm64/configs/vendor/qcs405_debug.config

@@ -1,5 +1,6 @@
 # CONFIG_ARM_SMMU_CAPTUREBUS_DEBUGFS is not set
 CONFIG_CMA_DEBUG=y
+CONFIG_CMA_DEBUGFS=y
 CONFIG_CMDLINE="stack_depot_disable=off kasan.stacktrace=off cgroup_disable=pressure page_owner=on"
 CONFIG_CORESIGHT=y
 # CONFIG_CORESIGHT_CATU is not set
@@ -30,6 +31,7 @@ CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
 # CONFIG_DEBUG_KOBJECT_RELEASE is not set
+CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_OBJECTS=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
@@ -42,6 +44,7 @@ CONFIG_DEBUG_OBJECTS_WORK=y
 CONFIG_DEBUG_PAGEALLOC=y
 # CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT is not set
 CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_ECPRI_DMA=y
 # CONFIG_ETM4X_IMPDEF_FEATURE is not set
@@ -52,11 +55,11 @@ CONFIG_INPUT_GPIO_BEEPER=y
 CONFIG_INPUT_QPNP_POWER_ON=y
 CONFIG_INPUT_TABLET=y
 CONFIG_IOMMU_TLBSYNC_DEBUG=y
+CONFIG_KUNIT_DEBUGFS=y
 CONFIG_LKDTM=y
 CONFIG_LOCK_TORTURE_TEST=y
 CONFIG_MODULE_SIG_HASH="sha512"
 CONFIG_MODULE_SIG_SHA512=y
-CONFIG_MSM_GPI_DMA_DEBUG=y
 CONFIG_MSM_SNPS_FEMTO_PHY=y
 CONFIG_MSM_TZ_SMMU=y
 CONFIG_PARTITION_ADVANCED=y
@@ -67,7 +70,6 @@ CONFIG_QCOM_GLINK=y
 CONFIG_QCOM_GLINK_PKT=y
 CONFIG_QCOM_IOMMU_DEBUG=y
 CONFIG_QCOM_SMP2P_SLEEPSTATE=y
-CONFIG_QCOM_SPS_DMA=y
 CONFIG_QCOM_SYSMON_SUBSYSTEM_STATS=y
 CONFIG_QRTR=y
 # CONFIG_QRTR_BPF_FILTER is not set
@@ -104,8 +106,6 @@ CONFIG_SPMI_PMIC_CLKDIV=y
 CONFIG_STM_PROTO_OST=y
 CONFIG_THERMAL_TSENS_LEGACY=y
 CONFIG_TORTURE_TEST=y
-CONFIG_TOUCHSCREEN_ATMEL_MXT=y
-CONFIG_TOUCHSCREEN_BU21029=y
 CONFIG_USB_DWC3_MSM=y
 CONFIG_USB_EHSET_TEST_FIXTURE=y
 # CONFIG_USB_F_FS_IPC_LOGGING is not set

arch/arm64/configs/vendor/qcs605_GKI.config

@@ -0,0 +1,279 @@
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_SDM670=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
+CONFIG_ARM_QCOM_CPUFREQ_HW_DEBUG=m
+CONFIG_ARM_SMMU=m
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+# CONFIG_ARM_SMMU_SELFTEST is not set
+CONFIG_CFG80211=m
+# CONFIG_CFG80211_CRDA_SUPPORT is not set
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_DEFAULT_PS is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CHARGER_QCOM_SMBB is not set
+CONFIG_CHR_DEV_SG=m
+CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_COMPAT_BRK is not set
+CONFIG_CORESIGHT=m
+CONFIG_CORESIGHT_CTI=m
+CONFIG_CORESIGHT_DUMMY=m
+CONFIG_CORESIGHT_HWEVENT=m
+CONFIG_CORESIGHT_LINKS_AND_SINKS=m
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=m
+CONFIG_CORESIGHT_REMOTE_ETM=m
+CONFIG_CORESIGHT_STM=m
+CONFIG_CORESIGHT_TGU=m
+CONFIG_CORESIGHT_TPDA=m
+CONFIG_CORESIGHT_TPDM=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
+# CONFIG_DEBUG_PREEMPT is not set
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HW_RANDOM_MSM_LEGACY=m
+CONFIG_I2C_MSM_GENI=m
+# CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+CONFIG_INPUT_QPNP_POWER_ON=m
+CONFIG_INPUT_QTI_HAPTICS=m
+CONFIG_INTERCONNECT_QCOM=m
+CONFIG_INTERCONNECT_QCOM_BCM_VOTER=m
+CONFIG_INTERCONNECT_QCOM_DEBUG=m
+CONFIG_INTERCONNECT_QCOM_QOS=m
+CONFIG_INTERCONNECT_QCOM_RPMH=m
+CONFIG_INTERCONNECT_QCOM_RPMH_POSSIBLE=m
+CONFIG_INTERCONNECT_QCOM_SDM670=m
+CONFIG_IOMMU_IO_PGTABLE_FAST=y
+# CONFIG_IOMMU_IO_PGTABLE_FAST_PROVE_TLB is not set
+# CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST is not set
+CONFIG_IPA3=m
+CONFIG_IPC_LOGGING=m
+CONFIG_IPC_LOG_MINIDUMP_BUFFERS=16
+CONFIG_LEDS_QPNP_FLASH_V2=m
+CONFIG_LEDS_QTI_TRI_LED=m
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
+CONFIG_MEM_SHARE_QMI_SERVICE=m
+CONFIG_MFD_I2C_PMIC=m
+CONFIG_MFD_SPMI_PMIC=m
+# CONFIG_MFD_WCD934X is not set
+CONFIG_MINIDUMP_MAX_ENTRIES=200
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_SDHCI_MSM=m
+# CONFIG_MODULE_SIG_ALL is not set
+CONFIG_MSM_ADSPRPC=m
+CONFIG_MSM_BOOT_STATS=m
+CONFIG_MSM_CDSP_LOADER=m
+CONFIG_MSM_CORE_HANG_DETECT=m
+CONFIG_MSM_GPI_DMA=m
+# CONFIG_MSM_GPI_DMA_DEBUG is not set
+CONFIG_MSM_PERFORMANCE=m
+CONFIG_MSM_QMP=m
+CONFIG_MSM_QUSB_PHY=m
+CONFIG_MSM_RDBG=m
+CONFIG_MSM_SYSSTATS=m
+CONFIG_MSM_TMECOM_QMP=m
+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NL80211_TESTMODE=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_NVMEM_SYSFS is not set
+CONFIG_PCI_MSM=m
+CONFIG_PDR_INDICATION_NOTIF_TIMEOUT=9000
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
+CONFIG_PHY_QCOM_UFS_V4=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_SDM670=m
+# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_POWER_RESET_MSM=m
+# CONFIG_PRISM2_USB is not set
+CONFIG_PWM_QTI_LPG=m
+CONFIG_QCOM_AOSS_QMP=m
+CONFIG_QCOM_APCS_IPC=m
+CONFIG_QCOM_BALANCE_ANON_FILE_RECLAIM=y
+CONFIG_QCOM_BWMON=m
+CONFIG_QCOM_CDSP_RM=m
+CONFIG_QCOM_CLK_RPMH=m
+# CONFIG_QCOM_COINCELL is not set
+CONFIG_QCOM_COMMAND_DB=m
+CONFIG_QCOM_CPUSS_SLEEP_STATS=m
+CONFIG_QCOM_CPU_VENDOR_HOOKS=m
+CONFIG_QCOM_DCC_V2=m
+CONFIG_QCOM_DCVS=m
+CONFIG_QCOM_DCVS_FP=m
+CONFIG_QCOM_DMABUF_HEAPS=m
+CONFIG_QCOM_DMABUF_HEAPS_BITSTREAM_CONTIG=y
+CONFIG_QCOM_DMABUF_HEAPS_CARVEOUT=y
+CONFIG_QCOM_DMABUF_HEAPS_CMA=y
+CONFIG_QCOM_DMABUF_HEAPS_PAGE_POOL_REFILL=y
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y
+# CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_UNCACHED is not set
+# CONFIG_QCOM_DYN_MINIDUMP_STACK is not set
+CONFIG_QCOM_EUD=m
+CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
+CONFIG_QCOM_GDSC_REGULATOR=m
+CONFIG_QCOM_GLINK=m
+CONFIG_QCOM_GLINK_PKT=m
+# CONFIG_QCOM_GUESTVM is not set
+CONFIG_QCOM_HUNG_TASK_ENH=m
+CONFIG_QCOM_IOMMU_DEBUG=m
+CONFIG_QCOM_IOMMU_UTIL=m
+# CONFIG_QCOM_IPA is not set
+CONFIG_QCOM_IRQ_STAT=y
+CONFIG_QCOM_LAZY_MAPPING=m
+CONFIG_QCOM_LLCC=m
+CONFIG_QCOM_LLCC_PERFMON=m
+CONFIG_QCOM_LLCC_PMU=m
+CONFIG_QCOM_LOGBUF_VENDOR_HOOKS=m
+CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_MEMLAT=m
+CONFIG_QCOM_MEMORY_DUMP_V2=m
+CONFIG_QCOM_MEM_BUF=m
+CONFIG_QCOM_MEM_BUF_DEV=m
+CONFIG_QCOM_MEM_HOOKS=m
+CONFIG_QCOM_MEM_OFFLINE=m
+# CONFIG_QCOM_MICRODUMP is not set
+CONFIG_QCOM_MINIDUMP=m
+CONFIG_QCOM_MINIDUMP_FTRACE=y
+CONFIG_QCOM_MINIDUMP_PANIC_CPU_CONTEXT=y
+CONFIG_QCOM_MINIDUMP_PANIC_DUMP=y
+CONFIG_QCOM_MINIDUMP_PSTORE=y
+CONFIG_QCOM_PANEL_EVENT_NOTIFIER=m
+CONFIG_QCOM_PANIC_ON_NOTIF_TIMEOUT=y
+CONFIG_QCOM_PDC=m
+CONFIG_QCOM_PDR_HELPERS=m
+CONFIG_QCOM_PIL_INFO=m
+CONFIG_QCOM_PMU_LIB=m
+CONFIG_QCOM_POWER_SUPPLY=y
+# CONFIG_QCOM_Q6V5_ADSP is not set
+CONFIG_QCOM_Q6V5_COMMON=m
+# CONFIG_QCOM_Q6V5_MSS is not set
+CONFIG_QCOM_Q6V5_PAS=m
+# CONFIG_QCOM_Q6V5_WCSS is not set
+CONFIG_QCOM_QFPROM=m
+CONFIG_QCOM_QFPROM_SYS=m
+CONFIG_QCOM_QMI_HELPERS=m
+CONFIG_QCOM_RAMDUMP=m
+CONFIG_QCOM_RPMH=m
+CONFIG_QCOM_RPROC_COMMON=m
+CONFIG_QCOM_RUN_QUEUE_STATS=m
+CONFIG_QCOM_SCM=m
+CONFIG_QCOM_SECURE_BUFFER=m
+CONFIG_QCOM_SHOW_RESUME_IRQ=m
+CONFIG_QCOM_SMEM=m
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_SMP2P_SLEEPSTATE=m
+# CONFIG_QCOM_SMSM is not set
+CONFIG_QCOM_SOCINFO=m
+CONFIG_QCOM_SOC_SLEEP_STATS=m
+# CONFIG_QCOM_SOC_WATCHDOG is not set
+CONFIG_QCOM_SPMI_ADC5_GEN3=m
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
+CONFIG_QCOM_SYSMON=m
+CONFIG_QCOM_SYSMON_SUBSYSTEM_STATS=m
+CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_VA_MINIDUMP=m
+CONFIG_QCOM_WATCHDOG_BARK_TIME=11000
+CONFIG_QCOM_WATCHDOG_IPI_PING=y
+CONFIG_QCOM_WATCHDOG_PET_TIME=9360
+# CONFIG_QCOM_WATCHDOG_USERSPACE_PET is not set
+CONFIG_QCOM_WATCHDOG_WAKEUP_ENABLE=y
+# CONFIG_QCOM_WCNSS_PIL is not set
+# CONFIG_QCOM_WDOG_BITE_EARLY_PANIC is not set
+CONFIG_QCOM_WDT_CORE=m
+# CONFIG_QPNP_QG is not set
+# CONFIG_QPNP_QNOVO5 is not set
+# CONFIG_QPNP_SMB5 is not set
+# CONFIG_QPNP_SMBLITE is not set
+CONFIG_QPNP_USB_PDPHY=m
+CONFIG_QRTR=m
+CONFIG_QSEECOM_PROXY=m
+CONFIG_QTI_CRYPTO_COMMON=m
+CONFIG_QTI_HW_KEY_MANAGER=m
+CONFIG_QTI_IOMMU_SUPPORT=m
+CONFIG_QTI_PMIC_GLINK=m
+# CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG is not set
+CONFIG_QTI_QMI_COOLING_DEVICE=m
+CONFIG_QTI_THERMAL_LIMITS_DCVS=m
+# CONFIG_R8188EU is not set
+# CONFIG_R8712U is not set
+# CONFIG_RD_LZ4 is not set
+CONFIG_REGMAP_QTI_DEBUGFS=m
+# CONFIG_REGMAP_QTI_DEBUGFS_ALLOW_WRITE is not set
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGULATOR_DEBUG_CONTROL=m
+CONFIG_REGULATOR_PROXY_CONSUMER=m
+# CONFIG_REGULATOR_PROXY_CONSUMER_LEGACY is not set
+CONFIG_REGULATOR_QTI_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_QTI_OCP_NOTIFIER=m
+CONFIG_REGULATOR_REFGEN=m
+CONFIG_REGULATOR_RPMH=m
+CONFIG_REGULATOR_STUB=m
+CONFIG_RPMSG_QCOM_GLINK=m
+CONFIG_RPMSG_QCOM_GLINK_SMEM=m
+CONFIG_RPMSG_QCOM_GLINK_SPSS=m
+CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPROC_SSR_NOTIF_TIMEOUT=20000
+CONFIG_RPROC_SYSMON_NOTIF_TIMEOUT=20000
+# CONFIG_RTL8723BS is not set
+CONFIG_SCHED_WALT=m
+CONFIG_SCSI_UFS_CRYPTO_QTI=m
+CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SDM_CAMCC_845=m
+CONFIG_SDM_DISPCC_845=m
+CONFIG_SDM_GCC_845=m
+CONFIG_SDM_GPUCC_845=m
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SERIAL_MSM_GENI=m
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SLIMBUS=m
+# CONFIG_SLIM_QCOM_CTRL is not set
+CONFIG_SLIM_QCOM_NGD_CTRL=m
+CONFIG_SMB1355_SLAVE_CHARGER=m
+# CONFIG_SMB1390_CHARGE_PUMP_PSY is not set
+# CONFIG_SMB1398_CHARGER is not set
+# CONFIG_SMB23X_CHARGER is not set
+# CONFIG_SMB358_CHARGER is not set
+# CONFIG_SND_SOC_WCD9335 is not set
+CONFIG_SND_USB_AUDIO_QMI=m
+CONFIG_SPI_MSM_GENI=m
+CONFIG_SPI_QUP=m
+CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=m
+CONFIG_SPS=m
+# CONFIG_SPS_SUPPORT_BAMDMA is not set
+CONFIG_SPS_SUPPORT_NDP_BAM=y
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_OST=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_FTRACE=m
+# CONFIG_SWIOTLB_NONLINEAR is not set
+CONFIG_UIO_MSM_SHAREDMEM=m
+CONFIG_USB_BAM=m
+CONFIG_USB_CONFIGFS_F_CCID=m
+CONFIG_USB_CONFIGFS_F_CDEV=m
+CONFIG_USB_CONFIGFS_F_DIAG=m
+CONFIG_USB_CONFIGFS_F_GSI=m
+CONFIG_USB_CONFIGFS_F_QDSS=m
+CONFIG_USB_DWC3_MSM=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_F_CCID=m
+CONFIG_USB_F_CDEV=m
+CONFIG_USB_F_DIAG=m
+CONFIG_USB_F_FS_IPC_LOGGING=m
+CONFIG_USB_F_GSI=m
+CONFIG_USB_F_QDSS=m
+CONFIG_USB_MSM_SSPHY_QMP=m
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+CONFIG_USB_PD_POLICY=m
+CONFIG_USB_QCOM_EMU_PHY=m
+# CONFIG_UTS_NS is not set
+# CONFIG_VIDEO_QCOM_VENUS is not set
+# CONFIG_VIRT_WIFI is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set

arch/arm64/configs/vendor/qcs605_consolidate.config

@@ -0,0 +1,25 @@
+CONFIG_ATOMIC64_SELFTEST=m
+CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL=y
+CONFIG_CMA_DEBUGFS=y
+CONFIG_CNSS2_DEBUG=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=m
+CONFIG_QTI_THERMALZONE_CONFIG_DEBUG=m
+CONFIG_HYP_ASSIGN_DEBUG=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_ICNSS2_DEBUG=y
+CONFIG_IOMMU_TLBSYNC_DEBUG=y
+CONFIG_LKDTM=m
+CONFIG_LOCALVERSION="-gki-consolidate"
+CONFIG_LOCK_TORTURE_TEST=m
+CONFIG_MSM_GPI_DMA_DEBUG=y
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_QCOM_DYN_MINIDUMP_STACK is not set
+CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y
+CONFIG_RCU_TORTURE_TEST=m
+CONFIG_REGMAP_QTI_DEBUGFS_ALLOW_WRITE=y
+CONFIG_RPMSG_QCOM_GLINK_DEBUG=y
+CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_SCHED_WALT_DEBUG=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_UFS_DBG=y

arch/arm64/configs/vendor/trinket_GKI.config

@@ -60,6 +60,7 @@ CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MINIDUMP_MAX_ENTRIES=200
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_CQHCI=m
+CONFIG_MMC_CRYPTO_QTI=m
 CONFIG_MMC_SDHCI_MSM=m
 # CONFIG_MODULE_SIG_ALL is not set
 CONFIG_MSM_ADSPRPC=m
@@ -88,6 +89,7 @@ CONFIG_NOP_USB_XCEIV=m
 CONFIG_NVMEM_SPMI_SDAM=m
 # CONFIG_NVMEM_SYSFS is not set
 CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_V3=m
 CONFIG_PHY_QCOM_UFS_V4=m
 CONFIG_PHY_XGENE=m
 CONFIG_PINCTRL_MSM=m
@@ -200,6 +202,9 @@ CONFIG_QTI_CHARGER_ULOG_GLINK=m
 CONFIG_QTI_CPUFREQ_CDEV=m
 CONFIG_QTI_CPU_HOTPLUG_COOLING_DEVICE=m
 CONFIG_QTI_CPU_PAUSE_COOLING_DEVICE=m
+CONFIG_QTI_CRYPTO_COMMON=m
+# CONFIG_QTI_CRYPTO_FDE is not set
+CONFIG_QTI_CRYPTO_TZ=m
 CONFIG_QTI_DEVFREQ_CDEV=m
 CONFIG_QTI_IOMMU_SUPPORT=m
 CONFIG_QTI_LMH_CPU_VDD_COOLING_DEVICE=m
@@ -208,7 +213,7 @@ CONFIG_QTI_PMIC_GLINK=m
 # CONFIG_QTI_QBG is not set
 CONFIG_QTI_QMI_COOLING_DEVICE=m
 CONFIG_QTI_QMI_SENSOR=m
-# CONFIG_QTI_RPM_SMD_COOLING_DEVICE is not set
+CONFIG_QTI_RPM_SMD_COOLING_DEVICE=m
 CONFIG_QTI_RPM_STATS_LOG=m
 CONFIG_QTI_THERMAL_LIMITS_DCVS=m
 # CONFIG_R8188EU is not set
@@ -217,6 +222,7 @@ CONFIG_QTI_THERMAL_LIMITS_DCVS=m
 CONFIG_REGMAP_QTI_DEBUGFS=m
 # CONFIG_REGMAP_QTI_DEBUGFS_ALLOW_WRITE is not set
 CONFIG_REGMAP_SPMI=m
+CONFIG_REGULATOR_COOLING_DEVICE=m
 CONFIG_REGULATOR_DEBUG_CONTROL=m
 CONFIG_REGULATOR_PROXY_CONSUMER=m
 # CONFIG_REGULATOR_PROXY_CONSUMER_LEGACY is not set
@@ -249,6 +255,7 @@ CONFIG_SM_GCC_TRINKET=m
 CONFIG_SM_GPUCC_TRINKET=m
 CONFIG_SM_VIDEOCC_TRINKET=m
 # CONFIG_SND_SOC_WCD9335 is not set
+CONFIG_SND_USB_AUDIO_QMI=m
 CONFIG_SPI_MSM_GENI=m
 CONFIG_SPI_QCOM_GENI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m

arch/mips/include/asm/dec/prom.h

@@ -70,7 +70,7 @@ static inline bool prom_is_rex(u32 magic)
  */
 typedef struct {
 	int pagesize;
-	unsigned char bitmap[0];
+	unsigned char bitmap[];
 } memmap;