projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2ecb2e
)
ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcd
author
Richard Genoud
<richard.genoud@gmail.com>
Wed, 20 Mar 2013 11:22:54 +0000
(12:22 +0100)
committer
Nicolas Ferre
<nicolas.ferre@atmel.com>
Thu, 21 Mar 2013 15:07:15 +0000
(16:07 +0100)
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>
arch/arm/boot/dts/at91sam9x5ek.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/at91sam9x5ek.dtsi
b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 8a7cf1d9cf5db6f71ee002725151a6d968da40fa..1128565e62bd2aee1db88a557480b64d76e1bfc7 100644
(file)
--- 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 {