Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 259e43844c46abe545214d0d5c9a538422d2e69a

Authored by Linus Walleij
Committed by Olof Johansson
1 parent e3db2217f3
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

ARM: nomadik: fix up leftover device tree pins 

We altered the device tree bindings for the Nomadik family of
pin controllers to be standard, this file was merged out-of-order
so we missed fixing this. Fix it up.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

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

arch/arm/boot/dts/ste-nomadik-nhk15.dts
Diff comments   View file @ 259e438
... ... @@ -25,11 +25,11 @@
25 25 stmpe2401_1 {
26 26 stmpe2401_1_nhk_mode: stmpe2401_1_nhk {
27 27 nhk_cfg1 {
28   - ste,pins = "GPIO76_B20"; // IRQ line
  28 + pins = "GPIO76_B20"; // IRQ line
29 29 ste,input = <0>;
30 30 };
31 31 nhk_cfg2 {
32   - ste,pins = "GPIO77_B8"; // reset line
  32 + pins = "GPIO77_B8"; // reset line
33 33 ste,output = <1>;
34 34 };
35 35 };
36 36  
... ... @@ -37,11 +37,11 @@
37 37 stmpe2401_2 {
38 38 stmpe2401_2_nhk_mode: stmpe2401_2_nhk {
39 39 nhk_cfg1 {
40   - ste,pins = "GPIO78_A8"; // IRQ line
  40 + pins = "GPIO78_A8"; // IRQ line
41 41 ste,input = <0>;
42 42 };
43 43 nhk_cfg2 {
44   - ste,pins = "GPIO79_C9"; // reset line
  44 + pins = "GPIO79_C9"; // reset line
45 45 ste,output = <1>;
46 46 };
47 47 };