Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11f4706 authored Jan 16, 2017 by Olof Johansson

Merge tag 'imx-fixes-4.10-2' of...

Merge tag 'imx-fixes-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.10, 2nd round:
 - A couple of Nitrogen6 device tree fixes for audio codec probe
   failure, which is caused by that pinctrl setting for codec clock
   was not in the correct device node.

* tag 'imx-fixes-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init
  ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 64cbff44 37530e74

arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -319,8 +319,6 @@
		compatible = "fsl,imx6q-nitrogen6_max-sgtl5000",
		"fsl,imx-audio-sgtl5000";
		model = "imx6q-nitrogen6_max-sgtl5000";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_sgtl5000>;
		ssi-controller = <&ssi1>;
		audio-codec = <&codec>;
		audio-routing =
		@@ -402,6 +400,8 @@

		codec: sgtl5000@0a {
		compatible = "fsl,sgtl5000";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_sgtl5000>;
		reg = <0x0a>;
		clocks = <&clks IMX6QDL_CLK_CKO>;
		VDDA-supply = <&reg_2p5v>;

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -250,8 +250,6 @@
		compatible = "fsl,imx6q-nitrogen6_som2-sgtl5000",
		"fsl,imx-audio-sgtl5000";
		model = "imx6q-nitrogen6_som2-sgtl5000";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_sgtl5000>;
		ssi-controller = <&ssi1>;
		audio-codec = <&codec>;
		audio-routing =
		@@ -320,6 +318,8 @@

		codec: sgtl5000@0a {
		compatible = "fsl,sgtl5000";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_sgtl5000>;
		reg = <0x0a>;
		clocks = <&clks IMX6QDL_CLK_CKO>;
		VDDA-supply = <&reg_2p5v>;