Skip to contentSkip to conversation

n900 device tree: cleanup, add camera flash

PATCH In review Pavel Machek 4 participants 7 messages Oct 11, 2016 – Jan 5, 2017 Device tree bindings

lore
Share & tools
lore

Pavel Machek

author
#0 lore raw

PATCH 1/1 n900 device tree: cleanup, add camera flash

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 <[email protected]>
arch/arm/boot/dts/omap3-n900.dts +18 -1
index bfffd6c..ca9fe8c 100644
@@ -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 at 60 {
 		compatible = "ti,tpa6130a2";
 		reg = <0x60>;

@@ -669,6 +670,22 @@
 
 		ti,usb-charger-detection = <&isp1707>;
 	};
+
+	adp1653: led-controller at 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 {
Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161011/b5958bee/attachment.sig>
#1 lore raw
Quoted 14 lines · On Tuesday 11 October 2016 09:54:17 Pavel Machek wrote:
arch/arm/boot/dts/omap3-n900.dts +9 -0
@@ -669,6 +670,22 @@
 
 		ti,usb-charger-detection = <&isp1707>;
 	};
+
+	adp1653: led-controller at 30 {
+		compatible = "adi,adp1653";
+		reg = <0x30>;
+		gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* 88 */
+
+		flash {
+			flash-timeout-us = <500000>;
+			flash-max-microamp = <320000>;

arch/arm/boot/dts/omap3-n900.dts line 691

Quoted 10 lines
arch/arm/boot/dts/omap3-n900.dts +7 -0
+			max-microamp = <50000>;
+		};
+
+		indicator {
+			max-microamp = <17500>;
+		};
+	};
 };
 
 &i2c3 {

This part of patch is already in mainline kernel, isn't?

Signature · 2 lines
Pali Roh?r
pali.rohar at gmail.com
author
#2 lore raw
Quoted 23 lines · Pali Roh?r
Quoted 22 lines · On Tuesday 11 October 2016 09:54:17 Pavel Machek wrote:
arch/arm/boot/dts/omap3-n900.dts +16 -0
@@ -669,6 +670,22 @@
 
 		ti,usb-charger-detection = <&isp1707>;
 	};
+
+	adp1653: led-controller at 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>;
+		};
+	};
 };
Quoted 4 lines

Review line 691

Quoted 2 lines
(quoted diff) +0 -0
 &i2c3 {

This part of patch is already in mainline kernel, isn't?

Oops, sorry about that. Disregard the patch.
Pavel

Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161011/89240514/attachment-0001.sig>
author
#3 lore raw

PATCH 1/1 n900 device tree: cleanup

In reply to Pavel Machek

Fix GPIO comment to be consistent with rest of file and add comment what tpa6130 is.

Signed-off-by Pavel Machek <[email protected]>
arch/arm/boot/dts/omap3-n900.dts +2 -1
index bfffd6c..ca9fe8c 100644
@@ -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 at 60 {
 		compatible = "ti,tpa6130a2";
 		reg = <0x60>;
Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161011/d5839fd2/attachment.sig>
Reviewed-by on v1 1/1
#4 lore raw

Re: [PATCH] n900 device tree: cleanup

Hi Tony,

It looks like this fell through the cracks. Apart from inconsistent patch subject:

Reviewed-by Sebastian Reichel <[email protected]>

-- Sebastian

Quoted 19 lines · Pavel Machek

Fix GPIO comment to be consistent with rest of file and add comment what tpa6130 is.

Signed-off-by Pavel Machek <[email protected]>
arch/arm/boot/dts/omap3-n900.dts +1 -1
index bfffd6c..ca9fe8c 100644
@@ -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>;

arch/arm/boot/dts/omap3-n900.dts line 643

Quoted 7 lines
arch/arm/boot/dts/omap3-n900.dts +1 -0
@@ -637,6 +637,7 @@
 		reg = <0x55>;
 	};
 
+	/* Stereo headphone amplifier */
 	tpa6130a2: tpa6130a2 at 60 {
 		compatible = "ti,tpa6130a2";
 		reg = <0x60>;

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161207/6681dd12/attachment.sig>

#5 lore raw

Re: [PATCH] n900 device tree: cleanup

Quoted 6 lines · 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 <[email protected]>

Fine for me too. Reviewed-By: Pali Roh?r <[email protected]>

Quoted 38 lines

-- Sebastian

Quoted 35 lines · Pavel Machek

Fix GPIO comment to be consistent with rest of file and add comment what tpa6130 is.

Signed-off-by Pavel Machek <[email protected]>
(quoted diff) +0 -0

b/arch/arm/boot/dts/omap3-n900.dts index bfffd6c..ca9fe8c 100644

arch/arm/boot/dts/omap3-n900.dts +1 -1
@@ -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 */
arch/arm/boot/dts/omap3-n900.dts +1 -0
 			linux,default-trigger = "default-on";
 			pinctrl-names = "default";
 			pinctrl-0 = <&debug_leds>;

@@ -637,6 +637,7 @@
 
 		reg = <0x55>;
 
 	};
 
+	/* Stereo headphone amplifier */
arch/arm/boot/dts/omap3-n900.dts +0 -0
 	tpa6130a2: tpa6130a2 at 60 {
 
 		compatible = "ti,tpa6130a2";
 		reg = <0x60>;
Signature · 9 lines
Pali Roh?r
pali.rohar at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161214/38ca0953/attachment.sig>
#6 lore raw

Re: [PATCH] n900 device tree: cleanup

Quoted 9 lines · Pali Roh?r
Quoted 6 lines · 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 <[email protected]>

Fine for me too. Reviewed-By: Pali Roh?r <[email protected]>

Fixing subject line to use "ARM: dts: n900: cleanup" and applying into omap-for-v4.11/dt.

Tony