Unverified Commit 0ae74775 authored by Mark Brown's avatar Mark Brown
Browse files

regmap: Merge up fixes 

We need these to get the i.MX8 boards working in CI again.
parents a8bd7789 c3f38fa6

.mailmap

+5 −4
Original line number Diff line number Diff line
@@ -337,10 +337,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org> 
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>

Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>

Kees Cook <keescook@chromium.org> <kees@outflux.net>

Kees Cook <keescook@chromium.org> <kees@ubuntu.com>

Kees Cook <kees@kernel.org> <kees.cook@canonical.com>

Kees Cook <kees@kernel.org> <keescook@chromium.org>

Kees Cook <kees@kernel.org> <keescook@google.com>

Kees Cook <kees@kernel.org> <kees@outflux.net>

Kees Cook <kees@kernel.org> <kees@ubuntu.com>

Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Documentation/admin-guide/kernel-parameters.txt

+22 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,28 @@ 
				Format:

				<bus_id>,<clkrate>



	i2c_touchscreen_props= [HW,ACPI,X86]

			Set device-properties for ACPI-enumerated I2C-attached

			touchscreen, to e.g. fix coordinates of upside-down

			mounted touchscreens. If you need this option please

			submit a drivers/platform/x86/touchscreen_dmi.c patch

			adding a DMI quirk for this.



			Format:

			<ACPI_HW_ID>:<prop_name>=<val>[:prop_name=val][:...]

			Where <val> is one of:

			Omit "=<val>" entirely	Set a boolean device-property

			Unsigned number		Set a u32 device-property

			Anything else		Set a string device-property



			Examples (split over multiple lines):

			i2c_touchscreen_props=GDIX1001:touchscreen-inverted-x:

			touchscreen-inverted-y



			i2c_touchscreen_props=MSSL1680:touchscreen-size-x=1920:

			touchscreen-size-y=1080:touchscreen-inverted-y:

			firmware-name=gsl1680-vendor-model.fw:silead,home-button



	i8042.debug	[HW] Toggle i8042 debug mode

	i8042.unmask_kbd_data

			[HW] Enable printing of interrupt data from the KBD port

Documentation/arch/riscv/uabi.rst

+3 −1
Original line number Diff line number Diff line
@@ -65,4 +65,6 @@ the extension, or may have deliberately removed it from the listing. 
Misaligned accesses

-------------------



Misaligned accesses are supported in userspace, but they may perform poorly.
 
Misaligned scalar accesses are supported in userspace, but they may perform

poorly.  Misaligned vector accesses are only supported if the Zicclsm extension

is supported.

Documentation/core-api/swiotlb.rst

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ alignment larger than PAGE_SIZE. 


Dynamic swiotlb

---------------

When CONFIG_DYNAMIC_SWIOTLB is enabled, swiotlb can do on-demand expansion of

When CONFIG_SWIOTLB_DYNAMIC is enabled, swiotlb can do on-demand expansion of

the amount of memory available for allocation as bounce buffers. If a bounce

buffer request fails due to lack of available space, an asynchronous background

task is kicked off to allocate memory from general system memory and turn it

Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml

+9 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 


  managers:

    type: object

    additionalProperties: false

    description:

      List of the PD69208T4/PD69204T4/PD69208M PSE managers. Each manager

      have 4 or 8 physical ports according to the chip version. No need to
@@ -47,8 +48,9 @@ properties: 
      - "#size-cells"



    patternProperties:

      "^manager@0[0-9a-b]$":

      "^manager@[0-9a-b]$":

        type: object

        additionalProperties: false

        description:

          PD69208T4/PD69204T4/PD69208M PSE manager exposing 4 or 8 physical

          ports.
@@ -69,9 +71,14 @@ properties: 
        patternProperties:

          '^port@[0-7]$':

            type: object

            additionalProperties: false



            properties:

              reg:

                maxItems: 1



            required:

              - reg

            additionalProperties: false



        required:

          - reg