Unverified Commit c2561572 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: codecs: lpass-macro: complete sm6115 support 

Merge series from Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>:

This patch series fixes SM6115 lpass codec macro support and adding
missing dt-bindings to complete support for SM6115.

SM6115 lpass codec macro support is added partially and broken to some
extent, Fix this broken support and add complete lpass macro support for
this SoC.
parents 6402ddf3 8ff3dcb0

Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.yaml

+1 −1
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/ti,twl4030-gpio.yaml#

$id: http://devicetree.org/schemas/gpio/ti,twl4030-gpio.yaml#

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



title: TI TWL4030 GPIO controller

Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml

+18 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
    oneOf:

      - enum:

          - qcom,sc7280-lpass-rx-macro

          - qcom,sm6115-lpass-rx-macro

          - qcom,sm8250-lpass-rx-macro

          - qcom,sm8450-lpass-rx-macro

          - qcom,sm8550-lpass-rx-macro
@@ -81,6 +82,23 @@ allOf: 
                - const: npl

                - const: fsgen



  - if:

      properties:

        compatible:

          enum:

            - qcom,sm6115-lpass-rx-macro

    then:

      properties:

        clocks:

          minItems: 4

          maxItems: 4

        clock-names:

          items:

            - const: mclk

            - const: npl

            - const: dcodec

            - const: fsgen



  - if:

      properties:

        compatible:

Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml

+35 −14
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
    oneOf:

      - enum:

          - qcom,sc7280-lpass-va-macro

          - qcom,sm6115-lpass-va-macro

          - qcom,sm8250-lpass-va-macro

          - qcom,sm8450-lpass-va-macro

          - qcom,sm8550-lpass-va-macro
@@ -42,11 +43,7 @@ properties: 


  clock-names:

    minItems: 1

    items:

      - const: mclk

      - const: macro

      - const: dcodec

      - const: npl

    maxItems: 4



  clock-output-names:

    maxItems: 1
@@ -91,16 +88,33 @@ allOf: 
          clocks:

            maxItems: 1

          clock-names:

            maxItems: 1

            items:

              - const: mclk

      else:

        properties:

          clocks:

            minItems: 3

            maxItems: 3

          clock-names:

            items:

              - const: mclk

              - const: macro

              - const: dcodec

  - if:

      properties:

        compatible:

          contains:

            const: qcom,sm6115-lpass-va-macro

    then:

      properties:

        clocks:

          minItems: 3

          maxItems: 3



        clock-names:

          items:

            - const: mclk

            - const: dcodec

            - const: npl

  - if:

      properties:

        compatible:
@@ -112,8 +126,10 @@ allOf: 
          minItems: 3

          maxItems: 3

        clock-names:

          minItems: 3

          maxItems: 3

          items:

            - const: mclk

            - const: macro

            - const: dcodec



  - if:

      properties:
@@ -128,8 +144,11 @@ allOf: 
          minItems: 4

          maxItems: 4

        clock-names:

          minItems: 4

          maxItems: 4

          items:

            - const: mclk

            - const: macro

            - const: dcodec

            - const: npl



  - if:

      properties:
@@ -143,8 +162,10 @@ allOf: 
          minItems: 3

          maxItems: 3

        clock-names:

          minItems: 3

          maxItems: 3

          items:

            - const: mclk

            - const: macro

            - const: dcodec



unevaluatedProperties: false

Documentation/firmware-guide/acpi/i2c-muxes.rst

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }
@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -4819,6 +4819,7 @@ F: drivers/net/dsa/b53/* 
F:	drivers/net/dsa/bcm_sf2*

F:	include/linux/dsa/brcm.h

F:	include/linux/platform_data/b53.h

F:	net/dsa/tag_brcm.c









BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE









M:	Florian Fainelli <florian.fainelli@broadcom.com>








@@ -12522,6 +12523,7 @@ F:	include/linux/avf/virtchnl.h







F:	include/linux/net/intel/*/

















INTEL ETHERNET PROTOCOL DRIVER FOR RDMA









M:	Krzysztof Czurylo <krzysztof.czurylo@intel.com>









M:	Tatyana Nikolova <tatyana.e.nikolova@intel.com>









L:	linux-rdma@vger.kernel.org









S:	Supported








@@ -12862,7 +12864,8 @@ F:	tools/testing/selftests/sgx/*







K:	\bSGX_

















INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER









M:	Daniel Scally <djrscally@gmail.com>









M:	Daniel Scally <dan.scally@ideasonboard.com>









M:	Sakari Ailus <sakari.ailus@linux.intel.com>









S:	Maintained









F:	drivers/platform/x86/intel/int3472/









F:	include/linux/platform_data/x86/int3472.h








@@ -20161,6 +20164,7 @@ R:	Alexander Shishkin <alexander.shishkin@linux.intel.com>







R:	Jiri Olsa <jolsa@kernel.org>









R:	Ian Rogers <irogers@google.com>









R:	Adrian Hunter <adrian.hunter@intel.com>









R:	James Clark <james.clark@linaro.org>









L:	linux-perf-users@vger.kernel.org









L:	linux-kernel@vger.kernel.org









S:	Supported