* [PATCH] arm64: dts: sun50i-pinephone: add led flash
@ 2020-07-25 11:08 Luca Weiss
2020-07-29 12:34 ` Maxime Ripard
0 siblings, 1 reply; 3+ messages in thread
From: Luca Weiss @ 2020-07-25 11:08 UTC (permalink / raw)
To: linux-arm-kernel
Cc: ~postmarketos/upstreaming, Luca Weiss, Rob Herring,
Maxime Ripard, Chen-Yu Tsai, devicetree, linux-kernel
All revisions of the PinePhone have an SGM3140 LED flash. The gpios were
swapped on v1.0 of the board but this was fixed in later revisions.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
.../boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts | 5 +++++
.../boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts | 5 +++++
.../boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts | 5 +++++
.../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 11 +++++++++++
4 files changed, 26 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
index 0c42272106afa..b579b03d4e026 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
@@ -9,3 +9,8 @@ / {
model = "Pine64 PinePhone Developer Batch (1.0)";
compatible = "pine64,pinephone-1.0", "allwinner,sun50i-a64";
};
+
+&sgm3140 {
+ flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
+ enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
index 3e99a87e9ce52..8552587aac248 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
@@ -28,3 +28,8 @@ &backlight {
num-interpolated-steps = <50>;
default-brightness-level = <400>;
};
+
+&sgm3140 {
+ flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
+ enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
index a9f5b670c9b82..ec77715ba4a2a 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
@@ -38,3 +38,8 @@ &lis3mdl {
interrupt-parent = <&pio>;
interrupts = <1 1 IRQ_TYPE_EDGE_RISING>; /* PB1 */
};
+
+&sgm3140 {
+ flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
+ enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index 25150aba749dc..e0bc1bcc1c1f3 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -60,6 +60,17 @@ vibrator {
enable-gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */
vcc-supply = <®_dcdc1>;
};
+
+ sgm3140: led-controller {
+ compatible = "sgmicro,sgm3140";
+ vin-supply = <®_dcdc1>;
+
+ sgm3140_flash: led {
+ function = LED_FUNCTION_FLASH;
+ color = <LED_COLOR_ID_WHITE>;
+ flash-max-timeout-us = <250000>;
+ };
+ };
};
&codec {
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: sun50i-pinephone: add led flash
2020-07-25 11:08 [PATCH] arm64: dts: sun50i-pinephone: add led flash Luca Weiss
@ 2020-07-29 12:34 ` Maxime Ripard
2020-07-29 16:23 ` Luca Weiss
0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2020-07-29 12:34 UTC (permalink / raw)
To: Luca Weiss
Cc: linux-arm-kernel, ~postmarketos/upstreaming, Rob Herring,
Chen-Yu Tsai, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3062 bytes --]
Hi!
On Sat, Jul 25, 2020 at 01:08:12PM +0200, Luca Weiss wrote:
> All revisions of the PinePhone have an SGM3140 LED flash. The gpios were
> swapped on v1.0 of the board but this was fixed in later revisions.
>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
> .../boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts | 5 +++++
> .../boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts | 5 +++++
> .../boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts | 5 +++++
> .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 11 +++++++++++
> 4 files changed, 26 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
> index 0c42272106afa..b579b03d4e026 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
> @@ -9,3 +9,8 @@ / {
> model = "Pine64 PinePhone Developer Batch (1.0)";
> compatible = "pine64,pinephone-1.0", "allwinner,sun50i-a64";
> };
> +
> +&sgm3140 {
> + flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> + enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> +};
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
> index 3e99a87e9ce52..8552587aac248 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
> @@ -28,3 +28,8 @@ &backlight {
> num-interpolated-steps = <50>;
> default-brightness-level = <400>;
> };
> +
> +&sgm3140 {
> + flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> + enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> +};
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
> index a9f5b670c9b82..ec77715ba4a2a 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
> @@ -38,3 +38,8 @@ &lis3mdl {
> interrupt-parent = <&pio>;
> interrupts = <1 1 IRQ_TYPE_EDGE_RISING>; /* PB1 */
> };
> +
> +&sgm3140 {
> + flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> + enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> +};
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
> index 25150aba749dc..e0bc1bcc1c1f3 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
> @@ -60,6 +60,17 @@ vibrator {
> enable-gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */
> vcc-supply = <®_dcdc1>;
> };
> +
> + sgm3140: led-controller {
The nodes should be ordered by node-name here
> + compatible = "sgmicro,sgm3140";
> + vin-supply = <®_dcdc1>;
> +
> + sgm3140_flash: led {
What do you need the label for?
Thanks!
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: sun50i-pinephone: add led flash
2020-07-29 12:34 ` Maxime Ripard
@ 2020-07-29 16:23 ` Luca Weiss
0 siblings, 0 replies; 3+ messages in thread
From: Luca Weiss @ 2020-07-29 16:23 UTC (permalink / raw)
To: Maxime Ripard
Cc: linux-arm-kernel, ~postmarketos/upstreaming, Rob Herring,
Chen-Yu Tsai, devicetree, linux-kernel
Hi Maxime,
On Mittwoch, 29. Juli 2020 14:34:44 CEST Maxime Ripard wrote:
> Hi!
>
> On Sat, Jul 25, 2020 at 01:08:12PM +0200, Luca Weiss wrote:
> > All revisions of the PinePhone have an SGM3140 LED flash. The gpios were
> > swapped on v1.0 of the board but this was fixed in later revisions.
> >
> > Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> > ---
> >
> > .../boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts | 5 +++++
> > .../boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts | 5 +++++
> > .../boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts | 5 +++++
> > .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 11 +++++++++++
> > 4 files changed, 26 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
> > b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts index
> > 0c42272106afa..b579b03d4e026 100644
> > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
> > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
> > @@ -9,3 +9,8 @@ / {
> >
> > model = "Pine64 PinePhone Developer Batch (1.0)";
> > compatible = "pine64,pinephone-1.0", "allwinner,sun50i-a64";
> >
> > };
> >
> > +
> > +&sgm3140 {
> > + flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> > + enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> > +};
> > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
> > b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts index
> > 3e99a87e9ce52..8552587aac248 100644
> > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
> > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
> > @@ -28,3 +28,8 @@ &backlight {
> >
> > num-interpolated-steps = <50>;
> > default-brightness-level = <400>;
> >
> > };
> >
> > +
> > +&sgm3140 {
> > + flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> > + enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> > +};
> > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
> > b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts index
> > a9f5b670c9b82..ec77715ba4a2a 100644
> > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
> > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
> > @@ -38,3 +38,8 @@ &lis3mdl {
> >
> > interrupt-parent = <&pio>;
> > interrupts = <1 1 IRQ_TYPE_EDGE_RISING>; /* PB1 */
> >
> > };
> >
> > +
> > +&sgm3140 {
> > + flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> > + enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> > +};
> > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
> > b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index
> > 25150aba749dc..e0bc1bcc1c1f3 100644
> > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
> > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
> > @@ -60,6 +60,17 @@ vibrator {
> >
> > enable-gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */
> > vcc-supply = <®_dcdc1>;
> >
> > };
> >
> > +
> > + sgm3140: led-controller {
>
> The nodes should be ordered by node-name here
Will update the patch, forgot about that.
> > + compatible = "sgmicro,sgm3140";
> > + vin-supply = <®_dcdc1>;
> > +
> > + sgm3140_flash: led {
>
> What do you need the label for?
The label will be used for connecting the flash to the rear camera (which
hasn't been upstreamed yet) using:
flash-leds = <&sgm3140_flash>;
Hope that clears it up.
>
> Thanks!
> Maxime
Regards
Luca
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-29 16:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-25 11:08 [PATCH] arm64: dts: sun50i-pinephone: add led flash Luca Weiss
2020-07-29 12:34 ` Maxime Ripard
2020-07-29 16:23 ` Luca Weiss
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).