Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0bde8afc3a76100eb9c72ab6059f00362278e407

Authored by Kishon Vijay Abraham I
1 parent 4b4f155d66
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

Revert "arm: dts: am335x-evm: add sleep states for i2c-1" 

This reverts commit 60a0cf7f99e85884a05bf2a661cea0f52a12dafe.

Fixes omap_i2c 4802a000.i2c: controller timed out on on
am335x-evm during suspend.

Reported-by: Russ Dill <russ.dill@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Showing 1 changed file with 3 additions and 11 deletions Side-by-side Diff

arch/arm/boot/dts/am335x-evm.dts
Diff comments   View file @ 0bde8af
... ... @@ -59,20 +59,13 @@
59 59 >;
60 60 };
61 61  
62   - i2c1_pins_default: pinmux_i2c1_pins {
  62 + i2c1_pins: pinmux_i2c1_pins {
63 63 pinctrl-single,pins = <
64 64 0x158 (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_d1.i2c1_sda */
65 65 0x15c (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_cs0.i2c1_scl */
66 66 >;
67 67 };
68 68  
69   - i2c1_pins_sleep: i2c1_pins_sleep {
70   - pinctrl-single,pins = <
71   - 0x158 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_d1.i2c1_sda */
72   - 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_cs0.i2c1_scl */
73   - >;
74   - };
75   -
76 69 uart0_pins: pinmux_uart0_pins {
77 70 pinctrl-single,pins = <
78 71 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
... ... @@ -365,9 +358,8 @@
365 358 };
366 359  
367 360 i2c1: i2c@4802a000 {
368   - pinctrl-names = "default", "sleep";
369   - pinctrl-0 = <&i2c1_pins_default>;
370   - pinctrl-1 = <&i2c1_pins_sleep>;
  361 + pinctrl-names = "default";
  362 + pinctrl-0 = <&i2c1_pins>;
371 363  
372 364 status = "okay";
373 365 clock-frequency = <100000>;