Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2f1f76 authored Jul 28, 2015 by Linus Walleij Committed by Olof Johansson Aug 11, 2015

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>

parent 98badfd3

arch/arm/boot/dts/ste-nomadik-nhk15.dts

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -83,6 +83,11 @@
	};		};

	i2c0 {		i2c0 {
			lis3lv02dl@1d {
			/* Accelerometer */
			compatible = "st,lis3lv02dl-accel";
			reg = <0x1d>;
			};
	stmpe0: stmpe2401@43 {		stmpe0: stmpe2401@43 {
	compatible = "st,stmpe2401";		compatible = "st,stmpe2401";
	reg = <0x43>;		reg = <0x43>;

arch/arm/boot/dts/ste-nomadik-s8815.dts

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 connected to the USB portions of the STw4811 only */
	gpio-i2c {		gpio-i2c {
	compatible = "i2c-gpio";		compatible = "i2c-gpio";

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -720,11 +720,6 @@
	compatible = "st,stw5095";		compatible = "st,stw5095";
	reg = <0x1a>;		reg = <0x1a>;
	};		};
	lis3lv02dl@1d {
	/* Accelerometer */
	compatible = "st,lis3lv02dl-accel";
	reg = <0x1d>;
	};
	};		};

	amba {		amba {