Unverified Commit 446967a4 authored by Mark Brown's avatar Mark Brown
Browse files

Enable I2S support for RK3588/RK3588S SoCs 

Merge series from Cristian Ciocaltea <cristian.ciocaltea@collabora.com>:

There are five I2S/PCM/TDM controllers and two I2S/PCM controllers embedded
in the RK3588 and RK3588S SoCs. Furthermore, RK3588 provides four additional
I2S/PCM/TDM controllers.

This patch series adds the required device tree nodes to support all the above.

Additionally, it enables analog audio support for the Rock 5B SBC, which has
been used to test both audio playback and recording.
parents be7a2dad 0e6c3761

Documentation/devicetree/bindings/sound/everest,es8316.yaml

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ properties: 
    items:

      - const: mclk



  port:

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false



  "#sound-dai-cells":

    const: 0

Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml

+7 −0
Original line number Diff line number Diff line
@@ -86,6 +86,13 @@ properties: 
        - tx-m

        - rx-m



  port:

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false



  power-domains:

    maxItems: 1



  rockchip,grf:

    $ref: /schemas/types.yaml#/definitions/phandle

    description:

Documentation/devicetree/bindings/sound/rockchip-i2s.yaml

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ properties: 
              - rockchip,rk3366-i2s

              - rockchip,rk3368-i2s

              - rockchip,rk3399-i2s

              - rockchip,rk3588-i2s

              - rockchip,rv1126-i2s

          - const: rockchip,rk3066-i2s
@@ -82,6 +83,10 @@ properties: 
  resets:

    maxItems: 2



  port:

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false



  rockchip,capture-channels:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 2

sound/soc/rockchip/rockchip_i2s.c

+1 −0
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ static const struct of_device_id rockchip_i2s_match[] __maybe_unused = { 
	{ .compatible = "rockchip,rk3366-i2s", },

	{ .compatible = "rockchip,rk3368-i2s", },

	{ .compatible = "rockchip,rk3399-i2s", .data = &rk3399_i2s_pins },

	{ .compatible = "rockchip,rk3588-i2s", },

	{ .compatible = "rockchip,rv1126-i2s", },

	{},

};