~hc/RK356X_SDK_RELEASE.git

..	..	@@ -75,17 +75,15 @@
75	75	};
76	76
77	77	rk817-sound {
78		- compatible = "simple-audio-card";
79		- simple-audio-card,format = "i2s";
80		- simple-audio-card,name = "rockchip,rk817-codec";
81		- simple-audio-card,mclk-fs = <256>;
82		-
83		- simple-audio-card,cpu {
84		- sound-dai = <&i2s1_8ch>;
85		- };
86		- simple-audio-card,codec {
87		- sound-dai = <&rk817_codec>;
88		- };
	78	+ compatible = "rockchip,multicodecs-card";
	79	+ rockchip,card-name = "rockchip-rk817";
	80	+ hp-det-gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
	81	+ rockchip,format = "i2s";
	82	+ rockchip,mclk-fs = <256>;
	83	+ rockchip,cpu = <&i2s1_8ch>;
	84	+ rockchip,codec = <&rk817_codec>;
	85	+ pinctrl-names = "default";
	86	+ pinctrl-0 = <&hp_det>;
89	87	};
90	88
91	89	sdio_pwrseq: sdio-pwrseq {
..	..	@@ -231,7 +229,7 @@
231	229	status = "okay";
232	230
233	231	vdd_cpu: tcs4525@1c {
234		- compatible = "tcs,tcs452x";
	232	+ compatible = "tcs,tcs4525";
235	233	reg = <0x1c>;
236	234	vin-supply = <&vccsys>;
237	235	regulator-compatible = "fan53555-reg";
..	..	@@ -783,12 +781,12 @@
783	781
784	782	soc_slppin_gpio: soc_slppin_gpio {
785	783	rockchip,pins =
786		- <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
	784	+ <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
787	785	};
788	786
789	787	soc_slppin_slp: soc_slppin_slp {
790	788	rockchip,pins =
791		- <0 RK_PA2 1 &pcfg_pull_up>;
	789	+ <0 RK_PA2 1 &pcfg_pull_none>;
792	790	};
793	791
794	792	soc_slppin_rst: soc_slppin_rst {
..	..	@@ -865,7 +863,8 @@
865	863
866	864	&sdhci {
867	865	bus-width = <8>;
868		- supports-emmc;
	866	+ no-sdio;
	867	+ no-sd;
869	868	non-removable;
870	869	keep-power-in-suspend;
871	870	max-frequency = <200000000>;
..	..	@@ -874,7 +873,8 @@
874	873
875	874	&sdmmc0 {
876	875	max-frequency = <50000000>;
877		- supports-sd;
	876	+ no-sdio;
	877	+ no-mmc;
878	878	bus-width = <4>;
879	879	cap-mmc-highspeed;
880	880	cap-sd-highspeed;
..	..	@@ -889,7 +889,8 @@
889	889
890	890	&sdmmc1 {
891	891	max-frequency = <150000000>;
892		- supports-sdio;
	892	+ no-sd;
	893	+ no-mmc;
893	894	bus-width = <4>;
894	895	disable-wp;
895	896	cap-sd-highspeed;