* [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor
@ 2020-04-05 17:32 Stephan Gerhold
2020-04-05 17:32 ` [PATCH 2/2] ARM: defconfig: u8500: Enable CONFIG_GP2AP002 Stephan Gerhold
2020-04-14 9:10 ` [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor Linus Walleij
0 siblings, 2 replies; 5+ messages in thread
From: Stephan Gerhold @ 2020-04-05 17:32 UTC (permalink / raw)
To: Linus Walleij
Cc: Mark Rutland, devicetree, Stephan Gerhold, linux-kernel,
Rob Herring, ~postmarketos/upstreaming, linux-arm-kernel
samsung-golden has the same sharp,gp2ap002s00f proximity sensor
that is also used in samsung-skomer.
A driver was added for it in
commit 97d642e23037 ("iio: light: Add a driver for Sharp GP2AP002x00F").
Now that it was merged we can add an entry for it in the device tree
for samsung-golden.
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
.../arm/boot/dts/ste-ux500-samsung-golden.dts | 35 +++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 313f0ab16866..0e9e33f4ca3c 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -146,6 +146,32 @@ uart@80007000 {
pinctrl-1 = <&u2rxtx_c_1_sleep>;
};
+ i2c@80004000 {
+ status = "okay";
+
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&i2c0_a_1_default>;
+ pinctrl-1 = <&i2c0_a_1_sleep>;
+
+ proximity@44 {
+ compatible = "sharp,gp2ap002s00f";
+ reg = <0x44>;
+
+ /* GPIO146 (PS_INT) */
+ interrupt-parent = <&gpio4>;
+ interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
+
+ vdd-supply = <&ab8500_ldo_aux1_reg>;
+ vio-supply = <&ab8500_ldo_aux8_reg>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&proximity_default>;
+
+ sharp,proximity-far-hysteresis = <0x40>;
+ sharp,proximity-close-hysteresis = <0x0f>;
+ };
+ };
+
i2c@80128000 {
status = "okay";
@@ -375,6 +401,15 @@ golden_cfg1 {
};
};
+ proximity {
+ proximity_default: proximity_default {
+ golden_cfg1 {
+ pins = "GPIO146_D13"; /* PS_INT */
+ ste,config = <&gpio_in_nopull>;
+ };
+ };
+ };
+
imu {
imu_default: imu_default {
golden_cfg1 {
--
2.26.0
_______________________________________________
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] 5+ messages in thread* [PATCH 2/2] ARM: defconfig: u8500: Enable CONFIG_GP2AP002
2020-04-05 17:32 [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor Stephan Gerhold
@ 2020-04-05 17:32 ` Stephan Gerhold
2020-04-14 9:08 ` Linus Walleij
2020-04-14 9:10 ` [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor Linus Walleij
1 sibling, 1 reply; 5+ messages in thread
From: Stephan Gerhold @ 2020-04-05 17:32 UTC (permalink / raw)
To: Linus Walleij
Cc: Mark Rutland, devicetree, Stephan Gerhold, linux-kernel,
Rob Herring, ~postmarketos/upstreaming, linux-arm-kernel
sharp,gp2ap002s00f is used as a proximity sensor in
samsung-golden and samsung-skomer.
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
arch/arm/configs/u8500_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 0fd2726cf1c1..9387481f93a5 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -125,6 +125,7 @@ CONFIG_IIO_ST_ACCEL_3AXIS=y
CONFIG_IIO_ST_GYRO_3AXIS=y
CONFIG_INV_MPU6050_I2C=y
CONFIG_BH1780=y
+CONFIG_GP2AP002=y
CONFIG_AK8974=y
CONFIG_IIO_ST_MAGN_3AXIS=y
CONFIG_IIO_HRTIMER_TRIGGER=y
--
2.26.0
_______________________________________________
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] 5+ messages in thread
* Re: [PATCH 2/2] ARM: defconfig: u8500: Enable CONFIG_GP2AP002
2020-04-05 17:32 ` [PATCH 2/2] ARM: defconfig: u8500: Enable CONFIG_GP2AP002 Stephan Gerhold
@ 2020-04-14 9:08 ` Linus Walleij
2020-04-14 9:43 ` Stephan Gerhold
0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2020-04-14 9:08 UTC (permalink / raw)
To: Stephan Gerhold
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org, Rob Herring,
~postmarketos/upstreaming, Linux ARM
On Sun, Apr 5, 2020 at 7:34 PM Stephan Gerhold <stephan@gerhold.net> wrote:
> sharp,gp2ap002s00f is used as a proximity sensor in
> samsung-golden and samsung-skomer.
>
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Ooops I saw now that I already had this in my "Skomer and misc"
enablement patch. (rebasing my trees today).
I can put this in front of that patch and take it out of mine if you
prefer stepwise enablement.
Yours,
Linus Walleij
_______________________________________________
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] 5+ messages in thread
* Re: [PATCH 2/2] ARM: defconfig: u8500: Enable CONFIG_GP2AP002
2020-04-14 9:08 ` Linus Walleij
@ 2020-04-14 9:43 ` Stephan Gerhold
0 siblings, 0 replies; 5+ messages in thread
From: Stephan Gerhold @ 2020-04-14 9:43 UTC (permalink / raw)
To: Linus Walleij
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org, Rob Herring,
~postmarketos/upstreaming, Linux ARM
On Tue, Apr 14, 2020 at 11:08:38AM +0200, Linus Walleij wrote:
> On Sun, Apr 5, 2020 at 7:34 PM Stephan Gerhold <stephan@gerhold.net> wrote:
>
> > sharp,gp2ap002s00f is used as a proximity sensor in
> > samsung-golden and samsung-skomer.
> >
> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
>
> Ooops I saw now that I already had this in my "Skomer and misc"
> enablement patch. (rebasing my trees today).
>
> I can put this in front of that patch and take it out of mine if you
> prefer stepwise enablement.
>
Do you mean the "ARM: defconfig: u8500: Enable new drivers for ux500"
patch? It doesn't matter which commit/patch adds it, as long as it ends
up in the u8500_defconfig :)
Thanks,
Stephan
_______________________________________________
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] 5+ messages in thread
* Re: [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor
2020-04-05 17:32 [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor Stephan Gerhold
2020-04-05 17:32 ` [PATCH 2/2] ARM: defconfig: u8500: Enable CONFIG_GP2AP002 Stephan Gerhold
@ 2020-04-14 9:10 ` Linus Walleij
1 sibling, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2020-04-14 9:10 UTC (permalink / raw)
To: Stephan Gerhold
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel@vger.kernel.org, Rob Herring,
~postmarketos/upstreaming, Linux ARM
On Sun, Apr 5, 2020 at 7:34 PM Stephan Gerhold <stephan@gerhold.net> wrote:
> samsung-golden has the same sharp,gp2ap002s00f proximity sensor
> that is also used in samsung-skomer.
>
> A driver was added for it in
> commit 97d642e23037 ("iio: light: Add a driver for Sharp GP2AP002x00F").
>
> Now that it was merged we can add an entry for it in the device tree
> for samsung-golden.
>
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Patch applied!
Yours,
Linus Walleij
_______________________________________________
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] 5+ messages in thread
end of thread, other threads:[~2020-04-14 9:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-05 17:32 [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor Stephan Gerhold
2020-04-05 17:32 ` [PATCH 2/2] ARM: defconfig: u8500: Enable CONFIG_GP2AP002 Stephan Gerhold
2020-04-14 9:08 ` Linus Walleij
2020-04-14 9:43 ` Stephan Gerhold
2020-04-14 9:10 ` [PATCH 1/2] ARM: dts: ux500: samsung-golden: Add proximity sensor Linus Walleij
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).