Unverified Commit 5757b316 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up v6.12-rc2 

This has fixes for several boards which help my testing a lot.
parents 5a56323a fac04efc

Documentation/ABI/testing/sysfs-class-watchdog

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ Description: 
		timeout when the pretimeout interrupt is delivered.  Pretimeout

		is an optional feature.



What:		/sys/class/watchdog/watchdogn/pretimeout_avaialable_governors

What:		/sys/class/watchdog/watchdogn/pretimeout_available_governors

Date:		February 2017

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

Documentation/arch/arm64/silicon-errata.rst

+3 −2
Original line number Diff line number Diff line
@@ -255,8 +255,9 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip08 SMMU PMCG | #162001800      | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip{08,09,10,10C| #162001900      | N/A                         |

|                | ,11} SMMU PMCG  |                 |                             |

| Hisilicon      | Hip{08,09,09A,10| #162001900      | N/A                         |

|                | ,10C,11}        |                 |                             |

|                | SMMU PMCG       |                 |                             |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip09           | #162100801      | HISILICON_ERRATUM_162100801 |

+----------------+-----------------+-----------------+-----------------------------+

Documentation/core-api/symbol-namespaces.rst

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to 
export all symbols defined in usb-common into the namespace USB_COMMON, add a

line like this to drivers/usb/common/Makefile::



	ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON

	ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'



That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A

symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation 
unit as preprocessor statement. The above example would then read::



	#undef  DEFAULT_SYMBOL_NAMESPACE

	#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON

	#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"



within the corresponding compilation unit before any EXPORT_SYMBOL macro is

used.
@@ -106,7 +106,7 @@ inspected with modinfo:: 
	[...]





It is advisable to add the MODULE_IMPORT_NS("") statement close to other module

It is advisable to add the MODULE_IMPORT_NS() statement close to other module

metadata definitions like MODULE_AUTHOR() or MODULE_LICENSE(). Refer to section

5. for a way to create missing import statements automatically.
@@ -128,7 +128,7 @@ enable loading regardless, but will emit a warning. 
Missing namespaces imports can easily be detected at build time. In fact,

modpost will emit a warning if a module uses a symbol from a namespace

without importing it.

MODULE_IMPORT_NS("") statements will usually be added at a definite location

MODULE_IMPORT_NS() statements will usually be added at a definite location

(along with other module meta data). To make the life of module authors (and

subsystem maintainers) easier, a script and make target is available to fixup

missing imports. Fixing missing imports can be done with::

Documentation/devicetree/bindings/power/mediatek,power-controller.yaml

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ patternProperties: 
            patternProperties:

              "^power-domain@[0-9a-f]+$":

                $ref: "#/$defs/power-domain-node"

                patternProperties:

                  "^power-domain@[0-9a-f]+$":

                    $ref: "#/$defs/power-domain-node"

                    unevaluatedProperties: false

                unevaluatedProperties: false

            unevaluatedProperties: false

        unevaluatedProperties: false

Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/watchdog/airoha,en7581-wdt.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Airoha EN7581 Watchdog Timer



maintainers:

  - Christian Marangi <ansuelsmth@gmail.com>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    const: airoha,en7581-wdt



  reg:

    maxItems: 1



  clocks:

    description: BUS clock (timer ticks at half the BUS clock)

    maxItems: 1



  clock-names:

    const: bus



required:

  - compatible

  - reg

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/en7523-clk.h>



    watchdog@1fbf0100 {

        compatible = "airoha,en7581-wdt";

        reg = <0x1fbf0100 0x3c>;



        clocks = <&scuclk EN7523_CLK_BUS>;

        clock-names = "bus";

    };