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

Commit ad77b791 authored Nov 28, 2014 by Arnd Bergmann

Merge tag 'imx-cleanup-3.19' of...

Merge tag 'imx-cleanup-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup

Pull "The i.MX cleanup for 3.19" from Shawn Guo:

 - Clean up reset handler for DT machines, since reset has been handled
   in watchdog driver
 - Remove unneeded .map_io hook for a couple of i.MX6 machines
 - A few small i.MX6 device tree source cleanups
 - Some random iomuxc and pllv3 code cleanup

* tag 'imx-cleanup-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx: Remove unneeded .map_io initialization
  ARM: dts: imx6qdl-sabresd: Fix the microphone route
  ARM: imx: refactor mxc_iomux_mode()
  ARM: imx: simplify clk_pllv3_prepare()
  ARM: imx6q: drop unnecessary semicolon
  ARM: imx: clean up machine mxc_arch_reset_init_dt reset init
  ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents c746dd25 b50e7df9

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -282,7 +282,6 @@
	};		};

	&ssi1 {		&ssi1 {
	fsl,mode = "i2s-slave";
	status = "okay";		status = "okay";
	};		};

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -287,7 +287,6 @@
	};		};

	&ssi1 {		&ssi1 {
	fsl,mode = "i2s-slave";
	status = "okay";		status = "okay";
	};		};

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -376,12 +376,10 @@
	};		};

	&ssi1 {		&ssi1 {
	fsl,mode = "i2s-slave";
	status = "okay";		status = "okay";
	};		};

	&ssi2 {		&ssi2 {
	fsl,mode = "i2s-slave";
	status = "okay";		status = "okay";
	};		};

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -308,7 +308,6 @@
	};		};

	&ssi1 {		&ssi1 {
	fsl,mode = "i2s-slave";
	status = "okay";		status = "okay";
	};		};

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

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -107,10 +107,8 @@
	"Headphone Jack", "HPOUTR",		"Headphone Jack", "HPOUTR",
	"Ext Spk", "SPKOUTL",		"Ext Spk", "SPKOUTL",
	"Ext Spk", "SPKOUTR",		"Ext Spk", "SPKOUTR",
	"MICBIAS", "AMIC",		"AMIC", "MICBIAS",
	"IN3R", "MICBIAS",		"IN3R", "AMIC";
	"DMIC", "MICBIAS",
	"DMICDAT", "DMIC";
	mux-int-port = <2>;		mux-int-port = <2>;
	mux-ext-port = <3>;		mux-ext-port = <3>;
	};		};
	@@ -179,7 +177,7 @@
	codec: wm8962@1a {		codec: wm8962@1a {
	compatible = "wlf,wm8962";		compatible = "wlf,wm8962";
	reg = <0x1a>;		reg = <0x1a>;
	clocks = <&clks 201>;		clocks = <&clks IMX6QDL_CLK_CKO>;
	DCVDD-supply = <&reg_audio>;		DCVDD-supply = <&reg_audio>;
	DBVDD-supply = <&reg_audio>;		DBVDD-supply = <&reg_audio>;
	AVDD-supply = <&reg_audio>;		AVDD-supply = <&reg_audio>;