Merge pull request torvalds#238 from Radxa-Alvin/linux-5.10-gen-rkr4.1

Changes:
  * Radxa CM3I IO: add i2s1 audio

Signed-off-by: Stephen Chen <stephen@radxa.com>

arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i-io.dts

@@ -201,6 +201,21 @@
  status = "okay";
 };
 
+&i2s1_8ch {
+ status = "okay";
+};
+
+&rk809_sound {
+ simple-audio-card,hp-det-gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hp_det>;
+ status = "okay";
+};
+
+&rk809_codec {
+ status = "okay";
+};
+
 &combphy2_psq {
  status = "okay";
 };
@@ -299,4 +314,11 @@
  rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
  };
  };
+
+ headphone {
+ hp_det: hp-det {
+ rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+
 };