Merge commit d2b4477 into orange-pi-6.1-rk35xx

Signed-off-by: Khusika Dhamar Gusti <[email protected]>

Conflicts:
	arch/arm64/boot/dts/rockchip/Makefile
	arch/arm64/boot/dts/rockchip/rk3588.dtsi
	sound/soc/codecs/aw87xxx/aw87xxx.c

Author: khusika

Documentation/ABI/testing/configfs-usb-gadget-uvc

@@ -199,7 +199,7 @@ Description:	Specific MJPEG format descriptors
 					read-only
 		bmaControls		this format's data for bmaControls in
 					the streaming header
-		bmInterfaceFlags	specifies interlace information,
+		bmInterlaceFlags	specifies interlace information,
 					read-only
 		bAspectRatioY		the X dimension of the picture aspect
 					ratio, read-only
@@ -255,7 +255,7 @@ Description:	Specific uncompressed format descriptors
 					read-only
 		bmaControls		this format's data for bmaControls in
 					the streaming header
-		bmInterfaceFlags	specifies interlace information,
+		bmInterlaceFlags	specifies interlace information,
 					read-only
 		bAspectRatioY		the X dimension of the picture aspect
 					ratio, read-only
@@ -297,6 +297,70 @@ Description:	Specific uncompressed frame descriptors
 					   support
 		=========================  =====================================
 
+What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased
+Date:           Sept 2024
+KernelVersion:  5.15
+Description:    Framebased format descriptors
+
+What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name
+Date:           Sept 2024
+KernelVersion:  5.15
+Description:    Specific framebased format descriptors
+
+                ==================      =======================================
+                bFormatIndex            unique id for this format descriptor;
+                                        only defined after parent header is
+                                        linked into the streaming class;
+                                        read-only
+                bmaControls             this format's data for bmaControls in
+                                        the streaming header
+                bmInterlaceFlags        specifies interlace information,
+                                        read-only
+                bAspectRatioY           the X dimension of the picture aspect
+                                        ratio, read-only
+                bAspectRatioX           the Y dimension of the picture aspect
+                                        ratio, read-only
+                bDefaultFrameIndex      optimum frame index for this stream
+                bBitsPerPixel           number of bits per pixel used to
+                                        specify color in the decoded video
+                                        frame
+                guidFormat              globally unique id used to identify
+                                        stream-encoding format
+                ==================      =======================================
+
+What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name/name
+Date:           Sept 2024
+KernelVersion:  5.15
+Description:    Specific framebased frame descriptors
+
+                =========================  =====================================
+                bFrameIndex                unique id for this framedescriptor;
+                                           only defined after parent format is
+                                           linked into the streaming header;
+                                           read-only
+                dwFrameInterval            indicates how frame interval can be
+                                           programmed; a number of values
+                                           separated by newline can be specified
+                dwDefaultFrameInterval     the frame interval the device would
+                                           like to use as default
+                dwBytesPerLine             Specifies the number of bytes per line
+                                           of video for packed fixed frame size
+                                           formats, allowing the receiver to
+                                           perform stride alignment of the video.
+                                           If the bVariableSize value (above) is
+                                           TRUE (1), or if the format does not
+                                           permit such alignment, this value shall
+                                           be set to zero (0).
+                dwMaxBitRate               the maximum bit rate at the shortest
+                                           frame interval in bps
+                dwMinBitRate               the minimum bit rate at the longest
+                                           frame interval in bps
+                wHeight                    height of decoded bitmap frame in px
+                wWidth                     width of decoded bitmam frame in px
+                bmCapabilities             still image support, fixed frame-rate
+                                           support
+                =========================  =====================================
+
 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header
 Date:		Dec 2014
 KernelVersion:	4.0

Documentation/ABI/testing/sysfs-device-mali

@@ -1,15 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2023 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2017-2024 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
- * Foundation) and any use by you of this program is subject to the terms
- * of such GNU licence.
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU license.
  *
- * A copy of the licence is included with the program) and can also be obtained
- * from Free Software Foundation) Inc.) 51 Franklin Street) Fifth Floor)
- * Boston) MA  02110-1301) USA.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you can access it online at
+ * http://www.gnu.org/licenses/gpl-2.0.html.
  *
  */
 
@@ -34,16 +40,6 @@ Description:
 		driver, On reading it provides the current DVFS sampling period,
 		on writing a value we set the DVFS sampling period.
 
-What:		/sys/class/misc/mali%u/device/dummy_job_wa_info
-Description:
-		This attribute is available only with platform device that
-                supports a Job Manager based GPU that requires a GPU workaround
-		to execute the dummy fragment job on all shader cores to
-		workaround a hang issue.
-
-		Its a readonly attribute and on reading gives details on the
-		options used with the dummy workaround.
-
 What:		/sys/class/misc/mali%u/device/fw_timeout
 Description:
 		This attribute is available only with mali platform
@@ -78,111 +74,6 @@ Description:
 		is supported or is powered down after suspending command
 		stream groups.
 
-What:		/sys/class/misc/mali%u/device/js_ctx_scheduling_mode
-Description:
-		This attribute is available only with platform device that
-		supports a Job Manager based GPU. This attribute is used to set
-		context scheduling priority for a job slot.
-
-		On Reading it provides the currently set job slot context
-		priority.
-
-		Writing 0 to this attribute sets it to the mode were
-		higher priority atoms will be scheduled first, regardless of
-		the context they belong to. Newly-runnable higher priority atoms
-		can preempt lower priority atoms currently running on the GPU,
-		even if they belong to a different context.
-
-		Writing 1 to this attribute set it to the mode were the
-		highest-priority atom will be chosen from each context in turn
-		using a round-robin algorithm, so priority only has an effect
-		within the context an atom belongs to. Newly-runnable higher
-		priority atoms can preempt the lower priority atoms currently
-		running on the GPU, but only if they belong to the same context.
-
-What:		/sys/class/misc/mali%u/device/js_scheduling_period
-Description:
-		This attribute is available only with platform device that
-                supports a Job Manager based GPU. Used to set the job scheduler
-		tick period in nano-seconds. The Job Scheduler determines the
-		jobs that are run on the GPU, and for how long, Job Scheduler
-		makes decisions at a regular time interval determined by value
-		in js_scheduling_period.
-
-What:		/sys/class/misc/mali%u/device/js_softstop_always
-Description:
-		This attribute is available only with platform device that
-                supports a Job Manager based GPU. Soft-stops are disabled when
-		only a single context is present, this attribute is used to
-		enable soft-stop when only a single context is present can be
-		used for debug and unit-testing purposes.
-
-What:		/sys/class/misc/mali%u/device/js_timeouts
-Description:
-		This attribute is available only with platform device that
-                supports a Job Manager based GPU. It used to set the soft stop
-		and hard stop times for the job scheduler.
-
-		Writing value 0 causes no change, or -1 to restore the
-		default timeout.
-
-		The format used to set js_timeouts is
-		"<soft_stop_ms> <soft_stop_ms_cl> <hard_stop_ms_ss>
-		<hard_stop_ms_cl> <hard_stop_ms_dumping> <reset_ms_ss>
-		<reset_ms_cl> <reset_ms_dumping>"
-
-
-What:		/sys/class/misc/mali%u/device/lp_mem_pool_max_size
-Description:
-		This attribute is used to set the maximum number of large pages
-		memory pools that the driver can contain. Large pages are of
-		size 2MB. On read it displays all the max size of all memory
-		pools and can be used to modify each individual pools as well.
-
-What:		/sys/class/misc/mali%u/device/lp_mem_pool_size
-Description:
-		This attribute is used to set the number of large memory pages
-		which should be	populated, changing this value may cause
-		existing pages to be removed from the pool, or new pages to be
-		created and then added to the pool. On read it will provide
-		pool size for all available pools and we can modify individual
-		pool.
-
-What:		/sys/class/misc/mali%u/device/mem_pool_max_size
-Description:
-		This attribute is used to set the maximum number of small pages
-		for memory pools that the driver can contain. Here small pages
-		are of size 4KB. On read it will display the max size for all
-		available pools and allows us to set max size of
-		individual pools.
-
-What:		/sys/class/misc/mali%u/device/mem_pool_size
-Description:
-		This attribute is used to set the number of small memory pages
-		which should be populated, changing this value may cause
-		existing pages to be removed from the pool, or new pages to
-		be created and then added to the pool. On read it will provide
-		pool size for all available pools and we can modify individual
-		pool.
-
-What:		/sys/class/misc/mali%u/device/device/mempool/ctx_default_max_size
-Description:
-		This attribute is used to set maximum memory pool size for
-		all the memory pool so that the maximum amount of free memory
-		that each pool can hold is identical.
-
-What:		/sys/class/misc/mali%u/device/device/mempool/lp_max_size
-Description:
-		This attribute is used to set the maximum number of large pages
-		for all memory pools that the driver can contain.
-		Large pages are of size 2MB.
-
-What:		/sys/class/misc/mali%u/device/device/mempool/max_size
-Description:
-		This attribute is used to set the maximum number of small pages
-		for all the memory pools that the driver can contain.
-		Here small pages are of size 4KB.
-
 What:		/sys/class/misc/mali%u/device/pm_poweroff
 Description:
 		This attribute contains the current values, represented as the

Documentation/ABI/testing/sysfs-device-mali-coresight-source

@@ -1,15 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2023 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2017-2024 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
- * Foundation) and any use by you of this program is subject to the terms
- * of such GNU licence.
+ * Foundation, and any use by you of this program is subject to the terms
+ * of such GNU license.
  *
- * A copy of the licence is included with the program) and can also be obtained
- * from Free Software Foundation) Inc.) 51 Franklin Street) Fifth Floor)
- * Boston) MA  02110-1301) USA.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you can access it online at
+ * http://www.gnu.org/licenses/gpl-2.0.html.
  *
  */