* [PATCH] n900 device tree: cleanup, add camera flash
@ 2016-10-11 7:54 Pavel Machek
2016-10-11 8:01 ` Pali Rohár
2016-10-11 8:12 ` [PATCH] n900 device tree: cleanup Pavel Machek
0 siblings, 2 replies; 7+ messages in thread
From: Pavel Machek @ 2016-10-11 7:54 UTC (permalink / raw)
To: pali.rohar, sre, kernel list, linux-arm-kernel, linux-omap, tony,
khilman, aaro.koskinen, ivo.g.dimitrov.75, patrikbachan, serge,
bcousson, robh+dt, mark.rutland, devicetree
[-- Attachment #1.1: Type: text/plain, Size: 1394 bytes --]
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 <pavel@ucw.cz>
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.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 = "gpio-leds";
heartbeat {
label = "debug::sleep";
- gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio162 */
+ gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* 162 */
linux,default-trigger = "default-on";
pinctrl-names = "default";
pinctrl-0 = <&debug_leds>;
@@ -637,6 +637,7 @@
reg = <0x55>;
};
+ /* Stereo headphone amplifier */
tpa6130a2: tpa6130a2@60 {
compatible = "ti,tpa6130a2";
reg = <0x60>;
@@ -669,6 +670,22 @@
ti,usb-charger-detection = <&isp1707>;
};
+
+ adp1653: led-controller@30 {
+ compatible = "adi,adp1653";
+ reg = <0x30>;
+ gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* 88 */
+
+ flash {
+ flash-timeout-us = <500000>;
+ flash-max-microamp = <320000>;
+ max-microamp = <50000>;
+ };
+
+ indicator {
+ max-microamp = <17500>;
+ };
+ };
};
&i2c3 {
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] n900 device tree: cleanup, add camera flash
2016-10-11 7:54 [PATCH] n900 device tree: cleanup, add camera flash Pavel Machek
@ 2016-10-11 8:01 ` Pali Rohár
2016-10-11 8:10 ` Pavel Machek
2016-10-11 8:12 ` [PATCH] n900 device tree: cleanup Pavel Machek
1 sibling, 1 reply; 7+ messages in thread
From: Pali Rohár @ 2016-10-11 8:01 UTC (permalink / raw)
To: Pavel Machek
Cc: sre, kernel list, linux-arm-kernel, linux-omap, tony, khilman,
aaro.koskinen, ivo.g.dimitrov.75, patrikbachan, serge, bcousson,
robh+dt, mark.rutland, devicetree
On Tuesday 11 October 2016 09:54:17 Pavel Machek wrote:
> @@ -669,6 +670,22 @@
>
> ti,usb-charger-detection = <&isp1707>;
> };
> +
> + adp1653: led-controller@30 {
> + compatible = "adi,adp1653";
> + reg = <0x30>;
> + gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* 88 */
> +
> + flash {
> + flash-timeout-us = <500000>;
> + flash-max-microamp = <320000>;
> + max-microamp = <50000>;
> + };
> +
> + indicator {
> + max-microamp = <17500>;
> + };
> + };
> };
>
> &i2c3 {
>
This part of patch is already in mainline kernel, isn't?
--
Pali Rohár
pali.rohar@gmail.com
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] n900 device tree: cleanup, add camera flash
2016-10-11 8:01 ` Pali Rohár
@ 2016-10-11 8:10 ` Pavel Machek
0 siblings, 0 replies; 7+ messages in thread
From: Pavel Machek @ 2016-10-11 8:10 UTC (permalink / raw)
To: Pali Rohár
Cc: mark.rutland, devicetree, ivo.g.dimitrov.75, khilman, tony,
aaro.koskinen, sre, kernel list, robh+dt, bcousson, linux-omap,
patrikbachan, linux-arm-kernel, serge
[-- Attachment #1.1: Type: text/plain, Size: 880 bytes --]
On Tue 2016-10-11 10:01:39, Pali Rohár wrote:
> On Tuesday 11 October 2016 09:54:17 Pavel Machek wrote:
> > @@ -669,6 +670,22 @@
> >
> > ti,usb-charger-detection = <&isp1707>;
> > };
> > +
> > + adp1653: led-controller@30 {
> > + compatible = "adi,adp1653";
> > + reg = <0x30>;
> > + gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* 88 */
> > +
> > + flash {
> > + flash-timeout-us = <500000>;
> > + flash-max-microamp = <320000>;
> > + max-microamp = <50000>;
> > + };
> > +
> > + indicator {
> > + max-microamp = <17500>;
> > + };
> > + };
> > };
> >
> > &i2c3 {
> >
>
> This part of patch is already in mainline kernel, isn't?
Oops, sorry about that. Disregard the patch.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] n900 device tree: cleanup
2016-10-11 7:54 [PATCH] n900 device tree: cleanup, add camera flash Pavel Machek
2016-10-11 8:01 ` Pali Rohár
@ 2016-10-11 8:12 ` Pavel Machek
2016-12-07 3:10 ` Sebastian Reichel
1 sibling, 1 reply; 7+ messages in thread
From: Pavel Machek @ 2016-10-11 8:12 UTC (permalink / raw)
To: pali.rohar, sre, kernel list, linux-arm-kernel, linux-omap, tony,
khilman, aaro.koskinen, ivo.g.dimitrov.75, patrikbachan, serge,
bcousson, robh+dt, mark.rutland, devicetree
[-- Attachment #1.1: Type: text/plain, Size: 944 bytes --]
Fix GPIO comment to be consistent with rest of file and add comment what
tpa6130 is.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.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 = "gpio-leds";
heartbeat {
label = "debug::sleep";
- gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio162 */
+ gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* 162 */
linux,default-trigger = "default-on";
pinctrl-names = "default";
pinctrl-0 = <&debug_leds>;
@@ -637,6 +637,7 @@
reg = <0x55>;
};
+ /* Stereo headphone amplifier */
tpa6130a2: tpa6130a2@60 {
compatible = "ti,tpa6130a2";
reg = <0x60>;
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] n900 device tree: cleanup
2016-10-11 8:12 ` [PATCH] n900 device tree: cleanup Pavel Machek
@ 2016-12-07 3:10 ` Sebastian Reichel
2016-12-14 12:28 ` Pali Rohár
0 siblings, 1 reply; 7+ messages in thread
From: Sebastian Reichel @ 2016-12-07 3:10 UTC (permalink / raw)
To: Pavel Machek
Cc: pali.rohar, kernel list, linux-arm-kernel, linux-omap, tony,
khilman, aaro.koskinen, ivo.g.dimitrov.75, patrikbachan, serge,
bcousson, robh+dt, mark.rutland, devicetree
[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]
Hi Tony,
It looks like this fell through the cracks. Apart from inconsistent
patch subject:
Reviewed-By: Sebastian Reichel <sre@kernel.org>
-- Sebastian
On Tue, Oct 11, 2016 at 10:12:43AM +0200, Pavel Machek wrote:
> Fix GPIO comment to be consistent with rest of file and add comment what
> tpa6130 is.
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.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 = "gpio-leds";
> heartbeat {
> label = "debug::sleep";
> - gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio162 */
> + gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* 162 */
> linux,default-trigger = "default-on";
> pinctrl-names = "default";
> pinctrl-0 = <&debug_leds>;
> @@ -637,6 +637,7 @@
> reg = <0x55>;
> };
>
> + /* Stereo headphone amplifier */
> tpa6130a2: tpa6130a2@60 {
> compatible = "ti,tpa6130a2";
> reg = <0x60>;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] n900 device tree: cleanup
2016-12-07 3:10 ` Sebastian Reichel
@ 2016-12-14 12:28 ` Pali Rohár
2017-01-05 16:15 ` Tony Lindgren
0 siblings, 1 reply; 7+ messages in thread
From: Pali Rohár @ 2016-12-14 12:28 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Tony Lindgren, Pavel Machek, kernel list, linux-arm-kernel,
linux-omap-u79uwXL29TY76Z2rM5mHXA, khilman-DgEjT+Ai2ygdnm+yROfE0A,
aaro.koskinen-X3B1VOXEql0,
ivo.g.dimitrov.75-Re5JQEeQqe8AvxtiuMwx3w,
patrikbachan-Re5JQEeQqe8AvxtiuMwx3w, serge-A9i7LUbDfNHQT0dZR+AlfA,
bcousson-rdvid1DuHRBWk0Htik3J/w, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
mark.rutland-5wv7dgnIgG8, devicetree-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: Text/Plain, Size: 1500 bytes --]
On Wednesday 07 December 2016 04:10:48 Sebastian Reichel wrote:
> Hi Tony,
>
> It looks like this fell through the cracks. Apart from inconsistent
> patch subject:
>
> Reviewed-By: Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Fine for me too. Reviewed-By: Pali Rohár <pali.rohar-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> -- Sebastian
>
> On Tue, Oct 11, 2016 at 10:12:43AM +0200, Pavel Machek wrote:
> > Fix GPIO comment to be consistent with rest of file and add comment
> > what tpa6130 is.
> >
> > Signed-off-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> >
> > diff --git a/arch/arm/boot/dts/omap3-n900.dts
> > b/arch/arm/boot/dts/omap3-n900.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 = "gpio-leds";
> > heartbeat {
> >
> > label = "debug::sleep";
> >
> > - gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio162 */
> > + gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* 162 */
> >
> > linux,default-trigger = "default-on";
> > pinctrl-names = "default";
> > pinctrl-0 = <&debug_leds>;
> >
> > @@ -637,6 +637,7 @@
> >
> > reg = <0x55>;
> >
> > };
> >
> > + /* Stereo headphone amplifier */
> >
> > tpa6130a2: tpa6130a2@60 {
> >
> > compatible = "ti,tpa6130a2";
> > reg = <0x60>;
--
Pali Rohár
pali.rohar-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] n900 device tree: cleanup
2016-12-14 12:28 ` Pali Rohár
@ 2017-01-05 16:15 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2017-01-05 16:15 UTC (permalink / raw)
To: Pali Rohár
Cc: Sebastian Reichel, Pavel Machek, kernel list, linux-arm-kernel,
linux-omap, khilman, aaro.koskinen, ivo.g.dimitrov.75,
patrikbachan, serge, bcousson, robh+dt, mark.rutland, devicetree
* Pali Rohár <pali.rohar@gmail.com> [161214 04:28]:
> On Wednesday 07 December 2016 04:10:48 Sebastian Reichel wrote:
> > Hi Tony,
> >
> > It looks like this fell through the cracks. Apart from inconsistent
> > patch subject:
> >
> > Reviewed-By: Sebastian Reichel <sre@kernel.org>
>
> Fine for me too. Reviewed-By: Pali Rohár <pali.rohar@gmail.com>
Fixing subject line to use "ARM: dts: n900: cleanup" and applying into
omap-for-v4.11/dt.
Tony
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-01-05 16:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-11 7:54 [PATCH] n900 device tree: cleanup, add camera flash Pavel Machek
2016-10-11 8:01 ` Pali Rohár
2016-10-11 8:10 ` Pavel Machek
2016-10-11 8:12 ` [PATCH] n900 device tree: cleanup Pavel Machek
2016-12-07 3:10 ` Sebastian Reichel
2016-12-14 12:28 ` Pali Rohár
2017-01-05 16:15 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).