From: Richard Genoud <richard.genoud@gmail.com>
Date: Wed, 20 Mar 2013 11:22:54 +0000 (+0100)
Subject: ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcd
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=62a870cbc9d9839aef18ff6702d18994c1973961;p=deliverable%2Flinux.git

ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcd

On at91sam9x5ek, macb0 is enabled, so it conflicts with i2c2 (PB4)
same for i2c1, (conflicts with LCD).
Moreover, only i2c0 is used on this board.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 8a7cf1d9cf5d..1128565e62bd 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -61,14 +61,6 @@
 				status = "okay";
 			};
 
-			i2c1: i2c@f8014000 {
-				status = "okay";
-			};
-
-			i2c2: i2c@f8018000 {
-				status = "okay";
-			};
-
 			pinctrl@fffff400 {
 				mmc0 {
 					pinctrl_board_mmc0: mmc0-board {