disable sdio0 vmmc and enable sound supply

geekerlw · Nov 19, 2016 · 5d50103 · 5d50103
1 parent 8c6357d
commit 5d50103
Showing 1 changed file with 52 additions and 3 deletions.
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -135,7 +135,7 @@
 		 */
 		reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
 	};
-
+/*
 	sound {
 		compatible = "simple-audio-card";
 		simple-audio-card,name = "SPDIF";
@@ -149,6 +149,36 @@
 		compatible = "linux,spdif-dit";
 		#sound-dai-cells = <0>;
 	};
+*/
+
+	sound_i2s {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "rockchip,firefly-codec";
+		simple-audio-card,mclk-fs = <512>;
+
+/*		simple-audio-card,dai-link@0 {
+			format = "i2s";
+			cpu {
+				sound-dai = <&i2s>;
+			};
+			codec {
+				sound-dai = <&hdmi>;
+			};
+		};
+*/
+//		simple-audio-card,dai-link@1 {
+		simple-audio-card,dai-link@0 {
+			format = "i2s";
+			cpu {
+				sound-dai = <&i2s>;
+			};
+
+			codec {
+				sound-dai = <&es8323>;
+			};
+		};
+	};	
 
 	vbat_wl: vcc_sys: vsys-regulator {
 		compatible = "regulator-fixed";
@@ -243,7 +273,7 @@
 		BT,wake_host_irq = <&gpio4 31 GPIO_ACTIVE_HIGH>;
 		status = "okay";
 	};
-
+/*  disable rkwifi 
 	wireless-wlan {
 		compatible = "wlan-platdata";
 		rockchip,grf = <&grf>;
@@ -252,6 +282,7 @@
 		WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
 		status = "okay";
 	};
+*/
 };
 
 &cpu0 {
@@ -293,10 +324,18 @@
 };
 
 &hdmi {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	#sound-dai-cells = <0>;
 	ddc-i2c-bus = <&i2c5>;
 	status = "okay";
 };
 
+&i2s  {
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
 &i2c0 {
 	clock-frequency = <400000>;
 	status = "okay";
@@ -446,6 +485,16 @@
 
 &i2c2 {
 	status = "okay";
+
+	es8323: es8323@10 {
+		compatible = "everest,es8323";
+		reg = <0x10>;
+		spk-con-gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+		hp-det-gpio = <&gpio7 15 GPIO_ACTIVE_HIGH>;
+		clock-names = "mclk";
+		clocks = <&cru SCLK_I2S0_OUT>;
+		#sound-dai-cells = <0>;
+	};
 };
 
 &i2c4 {
@@ -597,7 +646,7 @@
 	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk &sdio0_int>;
 	sd-uhs-sdr104;
 	supports-sdio;
-	vmmc-supply = <&vbat_wl>;
+	//vmmc-supply = <&vbat_wl>;
 	vqmmc-supply = <&vccio_wl>;
 	status = "okay";
 };