Commit 87f9260b authored by Russell King's avatar Russell King
Browse files

ARM: dts: fix spdif pinmux configuration 



The spdif pinmux configuration must be connected to the spdif device to
take effect, not the spdif-transmitter.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 38dbfb59

arch/arm/boot/dts/imx6dl-hummingboard.dts

+3 −7
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ reg_usbotg_vbus: usb-otg-vbus { 
		};

	};



	codec: spdif-transmitter {

		compatible = "linux,spdif-dit";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_hummingboard_spdif>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";
@@ -111,7 +105,7 @@ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 
		};



		pinctrl_hummingboard_spdif: hummingboard-spdif {

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;

		};



		pinctrl_hummingboard_usbh1_vbus: hummingboard-usbh1-vbus {
@@ -142,6 +136,8 @@ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059 
};



&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_spdif>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

+3 −7
Original line number Diff line number Diff line
@@ -46,12 +46,6 @@ reg_usbotg_vbus: usb-otg-vbus { 
		};

	};



	codec: spdif-transmitter {

		compatible = "linux,spdif-dit";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_cubox_i_spdif>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";
@@ -89,7 +83,7 @@ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 
		};



		pinctrl_cubox_i_spdif: cubox-i-spdif {

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;

			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;

		};



		pinctrl_cubox_i_usbh1_vbus: cubox-i-usbh1-vbus {
@@ -121,6 +115,8 @@ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059 
};



&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cubox_i_spdif>;

	status = "okay";

};