Browse Source

starfive(multimedia): fix the starfive dts warning and some build warning

Signed-off-by: sw.multimedia <sw.multimedia@starfivetech.com>
sw.multimedia 2 years ago
parent
commit
7953298227

+ 1 - 0
arch/riscv/dts/jh7100-beaglev-starlight.dts

@@ -526,6 +526,7 @@
 
 		port {
 			tda998x_0_input: endpoint {
+				remote-endpoint = <&hdmi_out>;
 			};
 		};
 	};

+ 10 - 4
arch/riscv/dts/jh7100.dtsi

@@ -567,14 +567,14 @@
 
 			ports {
 				port@0 {
-					endpoint {
+					hdmi_out:endpoint {
 						remote-endpoint = <&tda998x_0_input>;
 						//remote-endpoint = <&dsi_out_port>;
 					};
 				};
 
 				port@1 {
-					endpoint {
+					hdmi_input0:endpoint {
 						remote-endpoint = <&crtc_0_out>;
 					};
 				};
@@ -585,7 +585,8 @@
 		crtc: crtc@12000000 {
 			compatible = "starfive,jh7100-crtc";
 			status = "okay";
-
+			#address-cells = <1>;
+			#size-cells = <0>;
 			interrupt-parent = <&plic>;
 			interrupts = <101>, <103>;
 			interrupt-names = "lcdc_irq", "vpp1_irq";
@@ -618,6 +619,7 @@
 			port: port@0 {
 				reg = <0>;
 				crtc_0_out: endpoint {
+				remote-endpoint = <&hdmi_input0>;
 				};
 			};
 		};
@@ -729,6 +731,8 @@
 				// 	"isp1_mipi_ctrl";
 
 			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
 				port@0 {
 					reg = <0>;
 
@@ -1008,7 +1012,9 @@
 		sound:snd-card{
 			compatible = "simple-audio-card";
 			simple-audio-card,name = "Starfive-Multi-Sound-Card";
-			
+			#address-cells = <1>;
+			#size-cells = <0>;
+
 			/* pwmdac */
 			simple-audio-card,dai-link@0 {
 				reg = <0>;

+ 10 - 2
board/starfive/jh7100/jh7100.c

@@ -512,7 +512,7 @@ INIT_FUNC_DEF(i2sdac0)
 	_SWITCH_CLOCK_clk_i2sdac_bclk_SOURCE_clk_i2sdac_bclk_iopad_;
 	_SWITCH_CLOCK_clk_i2sdac_lrclk_SOURCE_clk_i2sdac_lrclk_iopad_;
 }
-
+#if 0
 INIT_FUNC_DEF(i2sdac1)
 {
 	//vic_i2s1_reset_clk_enable;
@@ -551,6 +551,7 @@ INIT_FUNC_DEF(i2sdac16k)
 	_CLEAR_RESET_audio_rst_gen_rstn_apb_i2sdac16k_;
 	_CLEAR_RESET_audio_rst_gen_rstn_i2sdac16k_srst_;
 }
+#endif
 
 INIT_FUNC_DEF(pdm2i2s)
 {
@@ -1247,6 +1248,7 @@ int board_ac108_init(void)
 	#endif
 
 	INIT_FUNC_CALL(i2sgpiorx);
+	return 0;
 }
 
 int board_wm8960_init(void)
@@ -1264,22 +1266,26 @@ int board_wm8960_init(void)
 	SET_GPIO_2_doen_HIGH;
 
 	INIT_FUNC_CALL(i2sgpiorx);
+	return 0;
 }
 
 int board_vad_init(void)
 {
 	INIT_FUNC_CALL(pdm);
 	INIT_FUNC_CALL(pmd2vad);
+	return 0;
 }
 
 int board_pwmdac_init(void)
 {
 	INIT_FUNC_CALL(pwmdac);
+	return 0;
 }
 
 int board_spdif_init(void)
 {
 	INIT_FUNC_CALL(spdif);
+	return 0;
 }
 
 int board_pdm_init(void)
@@ -1288,6 +1294,7 @@ int board_pdm_init(void)
 	INIT_FUNC_CALL(pdm);
 	INIT_FUNC_CALL(i2svad);
 	INIT_FUNC_CALL(pdm2i2s);
+	return 0;
 }
 
 int board_audio_init(void)
@@ -1305,6 +1312,7 @@ int board_audio_init(void)
 	#endif
 
 	board_pwmdac_init();
+	return 0;
 }
 
 /*init system GPIO*/
@@ -1533,4 +1541,4 @@ int board_init(void)
 #endif
 
 	return ret;
-}
+}