Skip to content

Commit

Permalink
ARM: nomadik: push accelerometer down to boards
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Walleij authored and Olof Johansson committed Aug 11, 2015
1 parent 98badfd commit 4f2f1f7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/ste-nomadik-nhk15.dts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@
};

i2c0 {
lis3lv02dl@1d {
/* Accelerometer */
compatible = "st,lis3lv02dl-accel";
reg = <0x1d>;
};
stmpe0: stmpe2401@43 {
compatible = "st,stmpe2401";
reg = <0x43>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/ste-nomadik-s8815.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 0 additions & 5 deletions arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -720,11 +720,6 @@
compatible = "st,stw5095";
reg = <0x1a>;
};
lis3lv02dl@1d {
/* Accelerometer */
compatible = "st,lis3lv02dl-accel";
reg = <0x1d>;
};
};

amba {
Expand Down

0 comments on commit 4f2f1f7

Please sign in to comment.