Merge pull request #70 from ivanivanivanivanivanivan/khadas-vims-4.9.y

Khadas vims 4.9.y

Author: numbqq

arch/arm64/boot/dts/amlogic/kvim3_linux.dts

@@ -1069,10 +1069,10 @@
 				<GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
 		interrupt-names = "irq_spdifin";
-		pinctrl-names = "spdif_pins",
-					"spdif_pins_mute";
-		pinctrl-0 = <&spdifout>;
-		pinctrl-1 = <&spdifout_a_mute>;
+//		pinctrl-names = "spdif_pins",
+//					"spdif_pins_mute";
+//		pinctrl-0 = <&spdifout>;
+//		pinctrl-1 = <&spdifout_a_mute>;
 		status = "okay";
 	};
 	aml_spdif_b: spdif_b {

arch/arm64/boot/dts/amlogic/kvim3l_linux.dts

@@ -1283,10 +1283,10 @@
 				<GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
 		interrupt-names = "irq_spdifin";
-		pinctrl-names = "spdif_pins",
-						"spdif_pins_mute";
-		pinctrl-0 = <&spdifout>;/* bob remove &spdifin*/
-		pinctrl-1 = <&spdifout_a_mute>;
+//		pinctrl-names = "spdif_pins",
+//						"spdif_pins_mute";
+//		pinctrl-0 = <&spdifout>;/* bob remove &spdifin*/
+//		pinctrl-1 = <&spdifout_a_mute>;
 
 		/*spdif clk tuning enable*/
 		clk_tuning_enable = <1>;

arch/arm64/boot/dts/amlogic/overlays/kvim3/Makefile

@@ -12,7 +12,7 @@ dtbo-y += uart3.dtbo \
 		  can.dtbo \
 		  mpu6050-i2c.dtbo \
 		  ext_board.dtbo \
-		  spdifin.dtbo
+		  spdif.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

…t/dts/amlogic/overlays/kvim3/spdifin.dts …oot/dts/amlogic/overlays/kvim3/spdif.dtsarch/arm64/boot/dts/amlogic/overlays/kvim3/spdifin.dts renamed to arch/arm64/boot/dts/amlogic/overlays/kvim3/spdif.dts arch/arm64/boot/dts/amlogic/overlays/kvim3/spdifin.dts renamed to arch/arm64/boot/dts/amlogic/overlays/kvim3/spdif.dts

@@ -27,7 +27,10 @@
 		target = <&aml_spdif>;
 
 		__overlay__ {
+			pinctrl-names = "spdif_pins",
+				"spdif_pins_mute";
 			pinctrl-0 = <&spdifout &spdifin>;
+			pinctrl-1 = <&spdifout_a_mute>;
 		};
 	};
 

arch/arm64/boot/dts/amlogic/overlays/kvim3l/Makefile

@@ -11,7 +11,7 @@ dtbo-y += uart3.dtbo \
 		  can.dtbo \
 		  mpu6050-i2c.dtbo \
 		  ext_board.dtbo \
-		  spdifin.dtbo
+		  spdif.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

…/dts/amlogic/overlays/kvim3l/spdifin.dts …ot/dts/amlogic/overlays/kvim3l/spdif.dtsarch/arm64/boot/dts/amlogic/overlays/kvim3l/spdifin.dts renamed to arch/arm64/boot/dts/amlogic/overlays/kvim3l/spdif.dts arch/arm64/boot/dts/amlogic/overlays/kvim3l/spdifin.dts renamed to arch/arm64/boot/dts/amlogic/overlays/kvim3l/spdif.dts

@@ -27,7 +27,10 @@
 		target = <&aml_spdif>;
 
 		__overlay__ {
+			pinctrl-names = "spdif_pins",
+						"spdif_pins_mute";
 			pinctrl-0 = <&spdifout &spdifin>;
+			pinctrl-1 = <&spdifout_a_mute>;
 		};
 	};