From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752263AbcJKIEB (ORCPT ); Tue, 11 Oct 2016 04:04:01 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:39901 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770AbcJKID6 (ORCPT ); Tue, 11 Oct 2016 04:03:58 -0400 Date: Tue, 11 Oct 2016 09:54:17 +0200 From: Pavel Machek To: pali.rohar@gmail.com, sre@kernel.org, kernel list , linux-arm-kernel , linux-omap@vger.kernel.org, tony@atomide.com, khilman@kernel.org, aaro.koskinen@iki.fi, ivo.g.dimitrov.75@gmail.com, patrikbachan@gmail.com, serge@hallyn.com, bcousson@baylibre.com, robh+dt@kernel.org, mark.rutland@arm.com, devicetree@vger.kernel.org Subject: [PATCH] n900 device tree: cleanup, add camera flash Message-ID: <20161011075416.GA22453@amd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qMm9M+Fa2AknHoGS" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Fix GPIO comment to be consistent with rest of file, add comment what tpa6130 is, and addd support for adp1653 camera flash. Signed-off-by: Pavel Machek diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n90= 0.dts index bfffd6c..ca9fe8c 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -47,7 +47,7 @@ compatible =3D "gpio-leds"; heartbeat { label =3D "debug::sleep"; - gpios =3D <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio162 */ + gpios =3D <&gpio6 2 GPIO_ACTIVE_HIGH>; /* 162 */ linux,default-trigger =3D "default-on"; pinctrl-names =3D "default"; pinctrl-0 =3D <&debug_leds>; @@ -637,6 +637,7 @@ reg =3D <0x55>; }; =20 + /* Stereo headphone amplifier */ tpa6130a2: tpa6130a2@60 { compatible =3D "ti,tpa6130a2"; reg =3D <0x60>; @@ -669,6 +670,22 @@ =20 ti,usb-charger-detection =3D <&isp1707>; }; + + adp1653: led-controller@30 { + compatible =3D "adi,adp1653"; + reg =3D <0x30>; + gpios =3D <&gpio3 24 GPIO_ACTIVE_HIGH>; /* 88 */ + + flash { + flash-timeout-us =3D <500000>; + flash-max-microamp =3D <320000>; + max-microamp =3D <50000>; + }; + + indicator { + max-microamp =3D <17500>; + }; + }; }; =20 &i2c3 { --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --qMm9M+Fa2AknHoGS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlf8mqgACgkQMOfwapXb+vJjKQCggYtXGtMwbJjmSSSUMd6Xi3J6 gykAnRuUM76hdwgGt3XcxsKvXYNHfDAq =sCGm -----END PGP SIGNATURE----- --qMm9M+Fa2AknHoGS--