[PATCH 0/5] DT fixes for Rockchip RK809 audio codec support

[PATCH 0/5] DT fixes for Rockchip RK809 audio codec support

[Cristian Ciocaltea]

Rockchip RK809 MFD provides a RK817 compatible audio codec, supported by
the rk817_codec driver.

This patch series fixes a few issues identified by dtbs_check for the
boards making use of the codec: rk3566-quartz64-b, k3566-roc-pc,
rk3568-evb1-v10, rk3568-lubancat-2, rk3568-odroid-m1, rk3568-rock-3a.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
Cristian Ciocaltea (5):
      dt-bindings: mfd: rk809: Use correct compatible in the example
      dt-bindings: mfd: rk809: Add missing audio codec properties
      arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-rock-3a
      arm64: dts: rockchip: Fix mic-in-differential usage on rk3566-roc-pc
      arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-evb1-v10

 .../devicetree/bindings/mfd/rockchip,rk809.yaml    | 38 ++++++++++++++++++----
 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts     |  2 +-
 arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts   |  2 +-
 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts    |  2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)
---
base-commit: 6906a84c482f098d31486df8dc98cead21cce2d0
change-id: 20240619-rk809-fixes-1e330758e1ff

[PATCH 1/5] dt-bindings: mfd: rk809: Use correct compatible in the example

[Cristian Ciocaltea]

The example is not able to actually test the schema since it uses a
wrong compatible 'rockchip,rk808' instead of 'rockchip,rk809'.

Use the correct compatible and drop the wrong properties in the
example section so that dt_binding_check passes.

Fixes: 6c38ca03406e ("dt-bindings: mfd: rk808: Convert bindings to yaml")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
 Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
index 839c0521f1e5..a327d73f3c43 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
@@ -126,11 +126,10 @@ examples:
         #address-cells = <1>;
         #size-cells = <0>;
 
-        rk808: pmic@1b {
-            compatible = "rockchip,rk808";
+        pmic@1b {
+            compatible = "rockchip,rk809";
             reg = <0x1b>;
             #clock-cells = <1>;
-            clock-output-names = "xin32k", "rk808-clkout2";
             interrupt-parent = <&gpio3>;
             interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
             pinctrl-names = "default";
@@ -146,9 +145,6 @@ examples:
             vcc7-supply = <&vcc_sysin>;
             vcc8-supply = <&vcc3v3_sys>;
             vcc9-supply = <&vcc_sysin>;
-            vcc10-supply = <&vcc_sysin>;
-            vcc11-supply = <&vcc_sysin>;
-            vcc12-supply = <&vcc3v3_sys>;
 
             regulators {
                 vdd_center: DCDC_REG1 {

-- 
2.45.2

Re: [PATCH 1/5] dt-bindings: mfd: rk809: Use correct compatible in the example

[Heiko Stübner]

Am Mittwoch, 19. Juni 2024, 13:23:30 CEST schrieb Cristian Ciocaltea:
> The example is not able to actually test the schema since it uses a
> wrong compatible 'rockchip,rk808' instead of 'rockchip,rk809'.
> 
> Use the correct compatible and drop the wrong properties in the
> example section so that dt_binding_check passes.
> 
> Fixes: 6c38ca03406e ("dt-bindings: mfd: rk808: Convert bindings to yaml")
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>

Reviewed-by: Heiko Stuebner <heiko@sntech.de>

Re: [PATCH 1/5] dt-bindings: mfd: rk809: Use correct compatible in the example

[Krzysztof Kozlowski]

On 19/06/2024 13:23, Cristian Ciocaltea wrote:
> The example is not able to actually test the schema since it uses a
> wrong compatible 'rockchip,rk808' instead of 'rockchip,rk809'.
> 
> Use the correct compatible and drop the wrong properties in the
> example section so that dt_binding_check passes.
> 
> Fixes: 6c38ca03406e ("dt-bindings: mfd: rk808: Convert bindings to yaml")
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

[PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Cristian Ciocaltea]

The RK809 MFD provides a RK817 compatible audio codec, supported by the
rk817_codec driver.

This has been already in use by several boards: rk3566-quartz64-b,
k3566-roc-pc, rk3568-evb1-v10, rk3568-lubancat-2, rk3568-odroid-m1,
rk3568-rock-3a.  However, dtbs_check fails for all of them:

  DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
  rk3568-rock-3a.dtb: pmic@20: '#sound-dai-cells', 'assigned-clock-parents', 'assigned-clocks', 'clock-names', 'clocks', 'codec' do not match any of the regexes: 'pinctrl-[0-9]+'
    from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#

Document the missing audio codec properties as found on the
rockchip,rk817 schema.

Fixes: 6c38ca03406e ("dt-bindings: mfd: rk808: Convert bindings to yaml")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
 .../devicetree/bindings/mfd/rockchip,rk809.yaml    | 30 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
index a327d73f3c43..cadfb5f1c631 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
@@ -12,7 +12,7 @@ maintainers:
 
 description: |
   Rockchip RK809 series PMIC. This device consists of an i2c controlled MFD
-  that includes regulators, an RTC, and power button.
+  that includes regulators, an RTC, a power button and an audio codec.
 
 properties:
   compatible:
@@ -93,6 +93,34 @@ properties:
         unevaluatedProperties: false
     unevaluatedProperties: false
 
+  clocks:
+    description:
+      The input clock for the audio codec.
+
+  clock-names:
+    description:
+      The clock name for the codec clock.
+    items:
+      - const: mclk
+
+  '#sound-dai-cells':
+    description:
+      Needed for the interpretation of sound dais.
+    const: 0
+
+  codec:
+    description: |
+      The child node for the codec to hold additional properties. If no
+      additional properties are required for the codec, this node can be
+      omitted.
+    type: object
+    additionalProperties: false
+    properties:
+      rockchip,mic-in-differential:
+        type: boolean
+        description:
+          Describes if the microphone uses differential mode.
+
 allOf:
   - if:
       properties:

-- 
2.45.2

Re: [PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Jonas Karlman]

Hi Cristian,

On 2024-06-19 13:23, Cristian Ciocaltea wrote:
> The RK809 MFD provides a RK817 compatible audio codec, supported by the
> rk817_codec driver.
> 
> This has been already in use by several boards: rk3566-quartz64-b,
> k3566-roc-pc, rk3568-evb1-v10, rk3568-lubancat-2, rk3568-odroid-m1,
> rk3568-rock-3a.  However, dtbs_check fails for all of them:
> 
>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>   rk3568-rock-3a.dtb: pmic@20: '#sound-dai-cells', 'assigned-clock-parents', 'assigned-clocks', 'clock-names', 'clocks', 'codec' do not match any of the regexes: 'pinctrl-[0-9]+'
>     from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
> 
> Document the missing audio codec properties as found on the
> rockchip,rk817 schema.

This is duplicate of "dt-bindings: mfd: rk809: Add audio codec properties"
part of "arm64: dts: rockchip: Add Radxa ROCK 3B" series.

https://lore.kernel.org/all/20240505134120.2828885-3-jonas@kwiboo.se/

A v2 of that series with fixes for reported issues is imminent.
How do you want me to preceded with such v2 series?

Regards,
Jonas

> 
> Fixes: 6c38ca03406e ("dt-bindings: mfd: rk808: Convert bindings to yaml")
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> ---
>  .../devicetree/bindings/mfd/rockchip,rk809.yaml    | 30 +++++++++++++++++++++-
>  1 file changed, 29 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
> index a327d73f3c43..cadfb5f1c631 100644
> --- a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
> +++ b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
> @@ -12,7 +12,7 @@ maintainers:
>  
>  description: |
>    Rockchip RK809 series PMIC. This device consists of an i2c controlled MFD
> -  that includes regulators, an RTC, and power button.
> +  that includes regulators, an RTC, a power button and an audio codec.
>  
>  properties:
>    compatible:
> @@ -93,6 +93,34 @@ properties:
>          unevaluatedProperties: false
>      unevaluatedProperties: false
>  
> +  clocks:
> +    description:
> +      The input clock for the audio codec.
> +
> +  clock-names:
> +    description:
> +      The clock name for the codec clock.
> +    items:
> +      - const: mclk
> +
> +  '#sound-dai-cells':
> +    description:
> +      Needed for the interpretation of sound dais.
> +    const: 0
> +
> +  codec:
> +    description: |
> +      The child node for the codec to hold additional properties. If no
> +      additional properties are required for the codec, this node can be
> +      omitted.
> +    type: object
> +    additionalProperties: false
> +    properties:
> +      rockchip,mic-in-differential:
> +        type: boolean
> +        description:
> +          Describes if the microphone uses differential mode.
> +
>  allOf:
>    - if:
>        properties:
> 

Re: [PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Cristian Ciocaltea]

Hi Jonas,

On 6/19/24 3:20 PM, Jonas Karlman wrote:
> Hi Cristian,
> 
> On 2024-06-19 13:23, Cristian Ciocaltea wrote:
>> The RK809 MFD provides a RK817 compatible audio codec, supported by the
>> rk817_codec driver.
>>
>> This has been already in use by several boards: rk3566-quartz64-b,
>> k3566-roc-pc, rk3568-evb1-v10, rk3568-lubancat-2, rk3568-odroid-m1,
>> rk3568-rock-3a.  However, dtbs_check fails for all of them:
>>
>>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>>   rk3568-rock-3a.dtb: pmic@20: '#sound-dai-cells', 'assigned-clock-parents', 'assigned-clocks', 'clock-names', 'clocks', 'codec' do not match any of the regexes: 'pinctrl-[0-9]+'
>>     from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
>>
>> Document the missing audio codec properties as found on the
>> rockchip,rk817 schema.
> 
> This is duplicate of "dt-bindings: mfd: rk809: Add audio codec properties"
> part of "arm64: dts: rockchip: Add Radxa ROCK 3B" series.
> 
> https://lore.kernel.org/all/20240505134120.2828885-3-jonas@kwiboo.se/
> 
> A v2 of that series with fixes for reported issues is imminent.
> How do you want me to preceded with such v2 series?

Oh, it seems both of us made the same mistake and wrongly assumed the
rockchip,rk817 schema is good enough to be used as a reference. :-)

Since both rockchip,rk817 and rockchip,rk809 files share most of the
content, I also think this might be a good opportunity to get them
merged into a single schema.

I can do this in v2, unless you prefer to handle it as part of your series.

Thanks,
Cristian

Re: [PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Jonas Karlman]

Hi Cristian,

On 2024-06-19 14:53, Cristian Ciocaltea wrote:
> Hi Jonas,
> 
> On 6/19/24 3:20 PM, Jonas Karlman wrote:
>> Hi Cristian,
>>
>> On 2024-06-19 13:23, Cristian Ciocaltea wrote:
>>> The RK809 MFD provides a RK817 compatible audio codec, supported by the
>>> rk817_codec driver.
>>>
>>> This has been already in use by several boards: rk3566-quartz64-b,
>>> k3566-roc-pc, rk3568-evb1-v10, rk3568-lubancat-2, rk3568-odroid-m1,
>>> rk3568-rock-3a.  However, dtbs_check fails for all of them:
>>>
>>>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>>>   rk3568-rock-3a.dtb: pmic@20: '#sound-dai-cells', 'assigned-clock-parents', 'assigned-clocks', 'clock-names', 'clocks', 'codec' do not match any of the regexes: 'pinctrl-[0-9]+'
>>>     from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
>>>
>>> Document the missing audio codec properties as found on the
>>> rockchip,rk817 schema.
>>
>> This is duplicate of "dt-bindings: mfd: rk809: Add audio codec properties"
>> part of "arm64: dts: rockchip: Add Radxa ROCK 3B" series.
>>
>> https://lore.kernel.org/all/20240505134120.2828885-3-jonas@kwiboo.se/
>>
>> A v2 of that series with fixes for reported issues is imminent.
>> How do you want me to preceded with such v2 series?
> 
> Oh, it seems both of us made the same mistake and wrongly assumed the
> rockchip,rk817 schema is good enough to be used as a reference. :-)

Hehe, yeah :-)

> 
> Since both rockchip,rk817 and rockchip,rk809 files share most of the
> content, I also think this might be a good opportunity to get them
> merged into a single schema.
> 
> I can do this in v2, unless you prefer to handle it as part of your series.

I was planning on sending the following, merging the schemas may also be
an option.

https://github.com/Kwiboo/linux-rockchip/compare/619509e6c853...next-20240618-rock-3b-orangepi-3b/

Main purpose of my series was to add ROCK 3B and also Orange Pi 3B,
fixing rockchip,rk809 binding is just a prerequisite.

If you want to merge the bindings, please do :-), I can wait a few more
days to send out a ROCK 3B + Orange Pi 3B v2 series.

Please also include the vcc8/9 fix if you send a v2.

Regards,
Jonas

> 
> Thanks,
> Cristian

Re: [PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Cristian Ciocaltea]

On 6/19/24 6:05 PM, Jonas Karlman wrote:
> Hi Cristian,
> 
> On 2024-06-19 14:53, Cristian Ciocaltea wrote:
>> Hi Jonas,
>>
>> On 6/19/24 3:20 PM, Jonas Karlman wrote:
>>> Hi Cristian,
>>>
>>> On 2024-06-19 13:23, Cristian Ciocaltea wrote:
>>>> The RK809 MFD provides a RK817 compatible audio codec, supported by the
>>>> rk817_codec driver.
>>>>
>>>> This has been already in use by several boards: rk3566-quartz64-b,
>>>> k3566-roc-pc, rk3568-evb1-v10, rk3568-lubancat-2, rk3568-odroid-m1,
>>>> rk3568-rock-3a.  However, dtbs_check fails for all of them:
>>>>
>>>>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>>>>   rk3568-rock-3a.dtb: pmic@20: '#sound-dai-cells', 'assigned-clock-parents', 'assigned-clocks', 'clock-names', 'clocks', 'codec' do not match any of the regexes: 'pinctrl-[0-9]+'
>>>>     from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
>>>>
>>>> Document the missing audio codec properties as found on the
>>>> rockchip,rk817 schema.
>>>
>>> This is duplicate of "dt-bindings: mfd: rk809: Add audio codec properties"
>>> part of "arm64: dts: rockchip: Add Radxa ROCK 3B" series.
>>>
>>> https://lore.kernel.org/all/20240505134120.2828885-3-jonas@kwiboo.se/
>>>
>>> A v2 of that series with fixes for reported issues is imminent.
>>> How do you want me to preceded with such v2 series?
>>
>> Oh, it seems both of us made the same mistake and wrongly assumed the
>> rockchip,rk817 schema is good enough to be used as a reference. :-)
> 
> Hehe, yeah :-)
> 
>>
>> Since both rockchip,rk817 and rockchip,rk809 files share most of the
>> content, I also think this might be a good opportunity to get them
>> merged into a single schema.
>>
>> I can do this in v2, unless you prefer to handle it as part of your series.
> 
> I was planning on sending the following, merging the schemas may also be
> an option.
> 
> https://github.com/Kwiboo/linux-rockchip/compare/619509e6c853...next-20240618-rock-3b-orangepi-3b/
> 
> Main purpose of my series was to add ROCK 3B and also Orange Pi 3B,
> fixing rockchip,rk809 binding is just a prerequisite.
> 
> If you want to merge the bindings, please do :-), I can wait a few more
> days to send out a ROCK 3B + Orange Pi 3B v2 series.
> 
> Please also include the vcc8/9 fix if you send a v2.

Thanks for the pointers, got this finally merged in v2:

https://lore.kernel.org/lkml/20240622-rk809-fixes-v2-0-c0db420d3639@collabora.com/

Regards,
Cristian

Re: [PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Krzysztof Kozlowski]

On 19/06/2024 13:23, Cristian Ciocaltea wrote:
> The RK809 MFD provides a RK817 compatible audio codec, supported by the
> rk817_codec driver.
> 
> This has been already in use by several boards: rk3566-quartz64-b,
> k3566-roc-pc, rk3568-evb1-v10, rk3568-lubancat-2, rk3568-odroid-m1,
> rk3568-rock-3a.  However, dtbs_check fails for all of them:
> 
>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>   rk3568-rock-3a.dtb: pmic@20: '#sound-dai-cells', 'assigned-clock-parents', 'assigned-clocks', 'clock-names', 'clocks', 'codec' do not match any of the regexes: 'pinctrl-[0-9]+'
>     from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
> 
> Document the missing audio codec properties as found on the
> rockchip,rk817 schema.
> 
> Fixes: 6c38ca03406e ("dt-bindings: mfd: rk808: Convert bindings to yaml")
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> ---
>  .../devicetree/bindings/mfd/rockchip,rk809.yaml    | 30 +++++++++++++++++++++-
>  1 file changed, 29 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
> index a327d73f3c43..cadfb5f1c631 100644
> --- a/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
> +++ b/Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
> @@ -12,7 +12,7 @@ maintainers:
>  
>  description: |
>    Rockchip RK809 series PMIC. This device consists of an i2c controlled MFD
> -  that includes regulators, an RTC, and power button.
> +  that includes regulators, an RTC, a power button and an audio codec.
>  
>  properties:
>    compatible:
> @@ -93,6 +93,34 @@ properties:
>          unevaluatedProperties: false
>      unevaluatedProperties: false
>  
> +  clocks:
> +    description:
> +      The input clock for the audio codec.

Instead, maxItems. Or items with description.

> +
> +  clock-names:
> +    description:
> +      The clock name for the codec clock.

Drop description.

> +    items:
> +      - const: mclk
> +
> +  '#sound-dai-cells':
> +    description:
> +      Needed for the interpretation of sound dais.

Description looks redundant, drop.

> +    const: 0
> +
> +  codec:
> +    description: |

Do not need '|' unless you need to preserve formatting.

> +      The child node for the codec to hold additional properties. If no
> +      additional properties are required for the codec, this node can be
> +      omitted.

Useless description. Say something hardware relevant, not about DTS syntax.

> +    type: object
> +    additionalProperties: false
> +    properties:
> +      rockchip,mic-in-differential:
> +        type: boolean
> +        description:
> +          Describes if the microphone uses differential mode.

No resources? Then it goes to parent.

> +
>  allOf:

Add $ref to dai-common.yaml.

>    - if:
>        properties:
> 

Best regards,
Krzysztof

Re: [PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Krzysztof Kozlowski]

On 21/06/2024 12:16, Krzysztof Kozlowski wrote:
>> +    type: object
>> +    additionalProperties: false
>> +    properties:
>> +      rockchip,mic-in-differential:
>> +        type: boolean
>> +        description:
>> +          Describes if the microphone uses differential mode.
> 
> No resources? Then it goes to parent.

Ah, I missed explanation in commit msg, this was already since few
years. It's fine.


Best regards,
Krzysztof

Re: [PATCH 2/5] dt-bindings: mfd: rk809: Add missing audio codec properties

[Cristian Ciocaltea]

Hi Krzysztof,

On 6/21/24 1:18 PM, Krzysztof Kozlowski wrote:
> On 21/06/2024 12:16, Krzysztof Kozlowski wrote:
>>> +    type: object
>>> +    additionalProperties: false
>>> +    properties:
>>> +      rockchip,mic-in-differential:
>>> +        type: boolean
>>> +        description:
>>> +          Describes if the microphone uses differential mode.
>>
>> No resources? Then it goes to parent.
> 
> Ah, I missed explanation in commit msg, this was already since few
> years. It's fine.

I mentioned in one of the previous messages that both rockchip,rk817 and
rockchip,rk809 files share most of the content, and I'd like to take
this opportunity to merge them into a single schema.

If there are no objections, I'm ready to send v2 with this change.

Thanks for reviewing!

Cristian

[PATCH 3/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-rock-3a

[Cristian Ciocaltea]

The 'mic-in-differential' DT property supported by the RK809/RK817 audio
codec driver is actually valid if prefixed with 'rockchip,':

  DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
  rk3568-rock-3a.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#

Make use of the correct property name.

Fixes: a84ffd2ef1ff ("arm64: dts: rockchip: Fix mic-in-differential usage on rock-3a")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index ebdedea15ad1..0b54dfe92d6e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -533,7 +533,7 @@ regulator-state-mem {
 		};
 
 		codec {
-			mic-in-differential;
+			rockchip,mic-in-differential;
 		};
 	};
 };

-- 
2.45.2

Re: [PATCH 3/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-rock-3a

[Jonas Karlman]

Hi Cristian,

On 2024-06-19 13:23, Cristian Ciocaltea wrote:
> The 'mic-in-differential' DT property supported by the RK809/RK817 audio
> codec driver is actually valid if prefixed with 'rockchip,':
> 
>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>   rk3568-rock-3a.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
> 	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
> 
> Make use of the correct property name.
> 
> Fixes: a84ffd2ef1ff ("arm64: dts: rockchip: Fix mic-in-differential usage on rock-3a")
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> ---
>  arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
> index ebdedea15ad1..0b54dfe92d6e 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
> @@ -533,7 +533,7 @@ regulator-state-mem {
>  		};
>  
>  		codec {
> -			mic-in-differential;
> +			rockchip,mic-in-differential;

If I understand the schematics correctly, only one wire is connected so
this board cannot really use differential signaling, and this should
probably instead be dropped.

Regards,
Jonas

>  		};
>  	};
>  };
> 

Re: [PATCH 3/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-rock-3a

[Cristian Ciocaltea]

Hi Jonas,

On 6/19/24 3:22 PM, Jonas Karlman wrote:
> Hi Cristian,
> 
> On 2024-06-19 13:23, Cristian Ciocaltea wrote:
>> The 'mic-in-differential' DT property supported by the RK809/RK817 audio
>> codec driver is actually valid if prefixed with 'rockchip,':
>>
>>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>>   rk3568-rock-3a.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
>> 	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
>>
>> Make use of the correct property name.
>>
>> Fixes: a84ffd2ef1ff ("arm64: dts: rockchip: Fix mic-in-differential usage on rock-3a")
>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
>> ---
>>  arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>> index ebdedea15ad1..0b54dfe92d6e 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>> @@ -533,7 +533,7 @@ regulator-state-mem {
>>  		};
>>  
>>  		codec {
>> -			mic-in-differential;
>> +			rockchip,mic-in-differential;
> 
> If I understand the schematics correctly, only one wire is connected so
> this board cannot really use differential signaling, and this should
> probably instead be dropped.

Thanks for pointing this out, I will drop it in v2.

Regards,
Cristian

Re: [PATCH 3/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-rock-3a

[Cristian Ciocaltea]

On 6/19/24 3:56 PM, Cristian Ciocaltea wrote:
> Hi Jonas,
> 
> On 6/19/24 3:22 PM, Jonas Karlman wrote:
>> Hi Cristian,
>>
>> On 2024-06-19 13:23, Cristian Ciocaltea wrote:
>>> The 'mic-in-differential' DT property supported by the RK809/RK817 audio
>>> codec driver is actually valid if prefixed with 'rockchip,':
>>>
>>>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>>>   rk3568-rock-3a.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
>>> 	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
>>>
>>> Make use of the correct property name.
>>>
>>> Fixes: a84ffd2ef1ff ("arm64: dts: rockchip: Fix mic-in-differential usage on rock-3a")
>>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
>>> ---
>>>  arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>> index ebdedea15ad1..0b54dfe92d6e 100644
>>> --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>> @@ -533,7 +533,7 @@ regulator-state-mem {
>>>  		};
>>>  
>>>  		codec {
>>> -			mic-in-differential;
>>> +			rockchip,mic-in-differential;
>>
>> If I understand the schematics correctly, only one wire is connected so
>> this board cannot really use differential signaling, and this should
>> probably instead be dropped.
> 
> Thanks for pointing this out, I will drop it in v2.

I've also checked the schematics which indicate the PMIC RK809 CODEC
receives both MIC1_INN and MIC1_INP signals; the former comes from the
Jack input, while the latter is generated by the SLM42Q3AT MEMS Microphone.

However, I'm not sure the Mic presence on the board is dependent on the
HW revision - on REV V1.3 the "NC_" prefix under U24 component label
suggests it is not connected.  So maybe we should keep the property?!

Cristian

Re: [PATCH 3/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-rock-3a

[Jonas Karlman]

Hi Cristian,

On 2024-06-21 03:23, Cristian Ciocaltea wrote:
> On 6/19/24 3:56 PM, Cristian Ciocaltea wrote:
>> Hi Jonas,
>>
>> On 6/19/24 3:22 PM, Jonas Karlman wrote:
>>> Hi Cristian,
>>>
>>> On 2024-06-19 13:23, Cristian Ciocaltea wrote:
>>>> The 'mic-in-differential' DT property supported by the RK809/RK817 audio
>>>> codec driver is actually valid if prefixed with 'rockchip,':
>>>>
>>>>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>>>>   rk3568-rock-3a.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
>>>> 	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
>>>>
>>>> Make use of the correct property name.
>>>>
>>>> Fixes: a84ffd2ef1ff ("arm64: dts: rockchip: Fix mic-in-differential usage on rock-3a")
>>>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
>>>> ---
>>>>  arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>>> index ebdedea15ad1..0b54dfe92d6e 100644
>>>> --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>>> @@ -533,7 +533,7 @@ regulator-state-mem {
>>>>  		};
>>>>  
>>>>  		codec {
>>>> -			mic-in-differential;
>>>> +			rockchip,mic-in-differential;
>>>
>>> If I understand the schematics correctly, only one wire is connected so
>>> this board cannot really use differential signaling, and this should
>>> probably instead be dropped.
>>
>> Thanks for pointing this out, I will drop it in v2.
> 
> I've also checked the schematics which indicate the PMIC RK809 CODEC
> receives both MIC1_INN and MIC1_INP signals; the former comes from the
> Jack input, while the latter is generated by the SLM42Q3AT MEMS Microphone.
> 
> However, I'm not sure the Mic presence on the board is dependent on the
> HW revision - on REV V1.3 the "NC_" prefix under U24 component label
> suggests it is not connected.  So maybe we should keep the property?!

There is no such mic on the board, at least on the rev 1.3 that I have.

This prop should be used to indicate that the attached microphone uses
differential signaling, e.g. should have its two output signals
connected to both INP(+) and INN(-).

The SLM42Q3AT or the single wire from headphone jack indicate that a
single-ended microphone is/can be used/wired on this board.

The current use of non-working mic-in-differential was wrong, adding
the rockchip,mic-in-differential would change behavior and wrongly
describe hw of this board.

Regards,
Jonas

> 
> Cristian

Re: [PATCH 3/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-rock-3a

[Cristian Ciocaltea]

On 6/21/24 9:58 AM, Jonas Karlman wrote:
> Hi Cristian,
> 
> On 2024-06-21 03:23, Cristian Ciocaltea wrote:
>> On 6/19/24 3:56 PM, Cristian Ciocaltea wrote:
>>> Hi Jonas,
>>>
>>> On 6/19/24 3:22 PM, Jonas Karlman wrote:
>>>> Hi Cristian,
>>>>
>>>> On 2024-06-19 13:23, Cristian Ciocaltea wrote:
>>>>> The 'mic-in-differential' DT property supported by the RK809/RK817 audio
>>>>> codec driver is actually valid if prefixed with 'rockchip,':
>>>>>
>>>>>   DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
>>>>>   rk3568-rock-3a.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
>>>>> 	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
>>>>>
>>>>> Make use of the correct property name.
>>>>>
>>>>> Fixes: a84ffd2ef1ff ("arm64: dts: rockchip: Fix mic-in-differential usage on rock-3a")
>>>>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
>>>>> ---
>>>>>  arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +-
>>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>>>> index ebdedea15ad1..0b54dfe92d6e 100644
>>>>> --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>>>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
>>>>> @@ -533,7 +533,7 @@ regulator-state-mem {
>>>>>  		};
>>>>>  
>>>>>  		codec {
>>>>> -			mic-in-differential;
>>>>> +			rockchip,mic-in-differential;
>>>>
>>>> If I understand the schematics correctly, only one wire is connected so
>>>> this board cannot really use differential signaling, and this should
>>>> probably instead be dropped.
>>>
>>> Thanks for pointing this out, I will drop it in v2.
>>
>> I've also checked the schematics which indicate the PMIC RK809 CODEC
>> receives both MIC1_INN and MIC1_INP signals; the former comes from the
>> Jack input, while the latter is generated by the SLM42Q3AT MEMS Microphone.
>>
>> However, I'm not sure the Mic presence on the board is dependent on the
>> HW revision - on REV V1.3 the "NC_" prefix under U24 component label
>> suggests it is not connected.  So maybe we should keep the property?!
> 
> There is no such mic on the board, at least on the rev 1.3 that I have.
> 
> This prop should be used to indicate that the attached microphone uses
> differential signaling, e.g. should have its two output signals
> connected to both INP(+) and INN(-).
> 
> The SLM42Q3AT or the single wire from headphone jack indicate that a
> single-ended microphone is/can be used/wired on this board.
> 
> The current use of non-working mic-in-differential was wrong, adding
> the rockchip,mic-in-differential would change behavior and wrongly
> describe hw of this board.

Thanks a lot for the clarifications! I dropped this in v2.

Regards,
Cristian

[PATCH 4/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3566-roc-pc

[Cristian Ciocaltea]

The 'mic-in-differential' DT property supported by the RK809/RK817 audio
codec driver is actually valid if prefixed with 'rockchip,':

  DTC_CHK arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dtb
  rk3566-roc-pc.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#

Make use of the correct property name.

Fixes: a8e35c4bebe4 ("arm64: dts: rockchip: add audio nodes to rk3566-roc-pc")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
index 63eea27293fe..67e7801bd489 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
@@ -269,7 +269,7 @@ rk809: pmic@20 {
 		vcc9-supply = <&vcc3v3_sys>;
 
 		codec {
-			mic-in-differential;
+			rockchip,mic-in-differential;
 		};
 
 		regulators {

-- 
2.45.2

[PATCH 5/5] arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-evb1-v10

[Cristian Ciocaltea]

The 'mic-in-differential' DT property supported by the RK809/RK817 audio
codec driver is actually valid if prefixed with 'rockchip,':

  DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dtb

  rk3568-evb1-v10.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
	from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#

Make use of the correct property name.

Fixes: 3e4c629ca680 ("arm64: dts: rockchip: enable rk809 audio codec on the rk3568 evb1-v10")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
index 19f8fc369b13..8c3ab07d3807 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
@@ -475,7 +475,7 @@ regulator-state-mem {
 		};
 
 		codec {
-			mic-in-differential;
+			rockchip,mic-in-differential;
 		};
 	};
 };

-- 
2.45.2