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

This project is archived. Its data is read-only.

Commit 5bdfba29 authored Sep 14, 2012 by Shawn Guo

i2c: imx: remove cpu_is_xxx by using platform_device_id



This is some amount of work left/forgot from device tree conversion.
Instead of checking cpu_is_xxx to determine the controller type, the
driver should use platform_device_id, which should match the device
tree compatible string.

The patch changes the driver to use platform_device_id rather than
cpu_is_xxx to determine the controller type/version.  It also updates
the platform code and device tree source accordingly.

As the result, mach/hardware.h inclusion gets removed from the driver.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: linux-i2c@vger.kernel.org

parent 88199463

Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -12,13 +12,13 @@ Optional properties:
		Examples:

		i2c@83fc4000 { /* I2C2 on i.MX51 */
		compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
		reg = <0x83fc4000 0x4000>;
		interrupts = <63>;
		};

		i2c@70038000 { /* HS-I2C on i.MX51 */
		compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
		reg = <0x70038000 0x4000>;
		interrupts = <64>;
		clock-frequency = <400000>;

arch/arm/boot/dts/imx27.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@
		i2c1: i2c@10012000 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx27-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx27-i2c", "fsl,imx21-i2c";
		reg = <0x10012000 0x1000>;
		interrupts = <12>;
		status = "disabled";
		@@ -205,7 +205,7 @@
		i2c2: i2c@1001d000 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx27-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx27-i2c", "fsl,imx21-i2c";
		reg = <0x1001d000 0x1000>;
		interrupts = <1>;
		status = "disabled";

arch/arm/boot/dts/imx51.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@
		i2c@83fc4000 { /* I2C2 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
		reg = <0x83fc4000 0x4000>;
		interrupts = <63>;
		status = "disabled";
		@@ -386,7 +386,7 @@
		i2c@83fc8000 { /* I2C1 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
		reg = <0x83fc8000 0x4000>;
		interrupts = <62>;
		status = "disabled";

arch/arm/boot/dts/imx53.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -432,7 +432,7 @@
		i2c@53fec000 { /* I2C3 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx53-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx53-i2c", "fsl,imx21-i2c";
		reg = <0x53fec000 0x4000>;
		interrupts = <64>;
		status = "disabled";
		@@ -488,7 +488,7 @@
		i2c@63fc4000 { /* I2C2 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx53-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx53-i2c", "fsl,imx21-i2c";
		reg = <0x63fc4000 0x4000>;
		interrupts = <63>;
		status = "disabled";
		@@ -497,7 +497,7 @@
		i2c@63fc8000 { /* I2C1 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx53-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx53-i2c", "fsl,imx21-i2c";
		reg = <0x63fc8000 0x4000>;
		interrupts = <62>;
		status = "disabled";

arch/arm/boot/dts/imx6q.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -882,7 +882,7 @@
		i2c@021a0000 { /* I2C1 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
		reg = <0x021a0000 0x4000>;
		interrupts = <0 36 0x04>;
		clocks = <&clks 125>;
		@@ -892,7 +892,7 @@
		i2c@021a4000 { /* I2C2 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
		reg = <0x021a4000 0x4000>;
		interrupts = <0 37 0x04>;
		clocks = <&clks 126>;
		@@ -902,7 +902,7 @@
		i2c@021a8000 { /* I2C3 */
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c";
		compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
		reg = <0x021a8000 0x4000>;
		interrupts = <0 38 0x04>;
		clocks = <&clks 127>;