linux-kernel - [PATCH 2/2] am33xx: DT convert I2C from OMAP to am33xx names

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <1348070880-23390-3-git-send-email-panto@antoniou-consulting.com>
Date:	Wed, 19 Sep 2012 19:08:00 +0300
From:	Pantelis Antoniou <panto@...oniou-consulting.com>
To:	Shubhrajyoti D <shubhrajyoti@...com>
Cc:	linux-omap@...r.kernel.org, linux-kernel@...r.kernel.org,
	Matt Porter <mporter@...com>,
	Koen Kooi <koen@...inion.thruhere.net>,
	Benoit Cousson <b-cousson@...com>,
	Tony Lindgren <tony@...mide.com>,
	Pantelis Antoniou <panto@...oniou-consulting.com>
Subject: [PATCH 2/2] am33xx: DT convert I2C from OMAP to am33xx names

On OMAP the TRM names I2C instances as i2c1, i2c2, etc.
On the am33xx's it is i2c0, i2c1, etc.

Use am33xx naming everywhere; the only exception is the hwmod names,
which we don't want to mess with right now.

Signed-off-by: Pantelis Antoniou <panto@...oniou-consulting.com>
---
 arch/arm/boot/dts/am335x-bone.dts | 8 ++++----
 arch/arm/boot/dts/am335x-evm.dts  | 2 +-
 arch/arm/boot/dts/am33xx.dtsi     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index ce19ea0..553b901 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -25,7 +25,7 @@
 	};
 
 	am3358_pinmux: pinmux@...10800 {
-		i2c3_pins: pinmux_i2c3_pins {
+		i2c2_pins: pinmux_i2c2_pins {
 			pinctrl-single,pins = <
 				0x178 0x73 	/* uart1_ctsn.i2c2_sda, SLEWCTRL_SLOW | INPUT_PULLUP | MODE3 */
 				0x17c 0x73	/* uart1_rtsn.i2c2_scl, SLEWCTRL_SLOW | INPUT_PULLUP | MODE3 */
@@ -39,7 +39,7 @@
 			status = "okay";
 		};
 
-		i2c1: i2c@...0b000 {
+		i2c0: i2c@...0b000 {
 			status = "okay";
 			clock-frequency = <400000>;
 
@@ -54,10 +54,10 @@
 
 		};
 
-		i2c3: i2c@...9c000 {
+		i2c2: i2c@...9c000 {
 			status = "okay";
 			pinctrl-names = "default";
-			pinctrl-0 = <&i2c3_pins>;
+			pinctrl-0 = <&i2c2_pins>;
 
 			clock-frequency = <100000>;
 
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 4707cda..19706bc 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -29,7 +29,7 @@
 			status = "okay";
 		};
 
-		i2c1: i2c@...0b000 {
+		i2c0: i2c@...0b000 {
 			status = "okay";
 			clock-frequency = <400000>;
 
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 2c18d31..5ed9287 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -194,7 +194,7 @@
 			status = "disabled";
 		};
 
-		i2c1: i2c@...0b000 {
+		i2c0: i2c@...0b000 {
 			compatible = "ti,omap4-i2c";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -205,7 +205,7 @@
 			status = "disabled";
 		};
 
-		i2c2: i2c@...2a000 {
+		i2c1: i2c@...2a000 {
 			compatible = "ti,omap4-i2c";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -216,7 +216,7 @@
 			status = "disabled";
 		};
 
-		i2c3: i2c@...9c000 {
+		i2c2: i2c@...9c000 {
 			compatible = "ti,omap4-i2c";
 			#address-cells = <1>;
 			#size-cells = <0>;
-- 
1.7.12

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/