diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-07-28 02:11:36 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 15:29:59 +0200 |
| commit | 4f2f1f76dc8c5cb6528d7451de6eacdbf8fb0cbf (patch) | |
| tree | bb1f30ed91414ef040d8f1684f7628c1e491cf01 /arch/arm | |
| parent | 98badfd31ccb1448866b99cb6a64ad227d141d22 (diff) | |
| download | linux-stable-4f2f1f76dc8c5cb6528d7451de6eacdbf8fb0cbf.tar.gz linux-stable-4f2f1f76dc8c5cb6528d7451de6eacdbf8fb0cbf.tar.bz2 linux-stable-4f2f1f76dc8c5cb6528d7451de6eacdbf8fb0cbf.zip | |
ARM: nomadik: push accelerometer down to boards
The two Nomadik variants have the accelerometer mounted on
different I2C lines. Push the definition down to the top-level
board DTS files to get things right.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-nhk15.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-s8815.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index 9d888b0e75af..4a21c6492dbb 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts @@ -83,6 +83,11 @@ }; i2c0 { + lis3lv02dl@1d { + /* Accelerometer */ + compatible = "st,lis3lv02dl-accel"; + reg = <0x1d>; + }; stmpe0: stmpe2401@43 { compatible = "st,stmpe2401"; reg = <0x43>; diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 11b5e34150b8..35282c0105c6 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -105,6 +105,14 @@ }; }; + i2c1 { + lis3lv02dl@1d { + /* Accelerometer */ + compatible = "st,lis3lv02dl-accel"; + reg = <0x1d>; + }; + }; + /* GPIO I2C connected to the USB portions of the STw4811 only */ gpio-i2c { compatible = "i2c-gpio"; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index ce8936bebe5e..176e332fc0bd 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -720,11 +720,6 @@ compatible = "st,stw5095"; reg = <0x1a>; }; - lis3lv02dl@1d { - /* Accelerometer */ - compatible = "st,lis3lv02dl-accel"; - reg = <0x1d>; - }; }; amba { |