[PATCH 0/2] Add SW_MACHINE_COVER key

[PATCH 0/2] Add SW_MACHINE_COVER key

[Merlijn Wajer]

this series adds the sw_machine_cover key, and changes the nokia n900 dts to
expose the key via gpio-keys.

before, this gpio was used as card detect gpio, causing the card not to show up
if the phone was booted without cover, see this thread on linux-omap:

    n900: remove mmc1 "safety feature"? (was: re: mmc0 on nokia n900 on linux 5.4.18)

since there is no realistic use for using this gpio as card detect, instead
expose it to userspace via gpio-keys. there are no event type for machine covers
yet, so add that first.

the key should be 1 when the cover is closed, and 0 when the cover is open.

starting the nokia n900 with the cover removed, putting the cover in place:

    event: time 1581684523.415296, type 5 (ev_sw), code 16 (?), value 1

removing the cover again, exposing mmc1 and the battery:

    event: time 1581684529.413706, type 5 (ev_sw), code 16 (?), value 0

Merlijn Wajer (2):
  Input: add `SW_MACHINE_COVER`
  ARM: dts: n900: remove mmc1 card detect gpio

 arch/arm/boot/dts/omap3-n900.dts       | 12 ++++++++----
 include/linux/mod_devicetable.h        |  2 +-
 include/uapi/linux/input-event-codes.h |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

-- 
2.24.1

[PATCH 1/2] Input: add `SW_MACHINE_COVER`

[Merlijn Wajer]

This event code represents the state of a removable cover of a device.
Value 0 means that the cover is open or removed, value 1 means that the
cover is closed.

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
---
 include/linux/mod_devicetable.h        | 2 +-
 include/uapi/linux/input-event-codes.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 0754b8d71262..8a84f11bf124 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -318,7 +318,7 @@ struct pcmcia_device_id {
 #define INPUT_DEVICE_ID_LED_MAX		0x0f
 #define INPUT_DEVICE_ID_SND_MAX		0x07
 #define INPUT_DEVICE_ID_FF_MAX		0x7f
-#define INPUT_DEVICE_ID_SW_MAX		0x0f
+#define INPUT_DEVICE_ID_SW_MAX		0x10
 #define INPUT_DEVICE_ID_PROP_MAX	0x1f
 
 #define INPUT_DEVICE_ID_MATCH_BUS	1
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index b6a835d37826..0c2e27d28e0a 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -888,7 +888,8 @@
 #define SW_LINEIN_INSERT	0x0d  /* set = inserted */
 #define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
 #define SW_PEN_INSERTED		0x0f  /* set = pen inserted */
-#define SW_MAX			0x0f
+#define SW_MACHINE_COVER	0x10  /* set = cover closed */
+#define SW_MAX			0x10
 #define SW_CNT			(SW_MAX+1)
 
 /*
-- 
2.24.1

[PATCH 2/2] ARM: dts: n900: remove mmc1 card detect gpio

[Merlijn Wajer]

Instead, expose the key via the input framework, as SW_MACHINE_COVER

The chip-detect GPIO is actually detecting if the cover is closed.
Technically it's possible to use the SD card with open cover. The
only downside is risk of battery falling out and user being able
to physically remove the card.

The behaviour of SD card not being available when the device is
open is unexpected and creates more problems than it solves. There
is a high chance, that more people accidently break their rootfs
by opening the case without physically removing the card.

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 4089d97405c9..3dbcae3d60d2 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -105,6 +105,14 @@ proximity_sensor {
 			linux,code = <SW_FRONT_PROXIMITY>;
 			linux,can-disable;
 		};
+
+		machine_cover {
+			label = "Machine Cover";
+			gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* 160 */
+			linux,input-type = <EV_SW>;
+			linux,code = <SW_MACHINE_COVER>;
+			linux,can-disable;
+		};
 	};
 
 	isp1707: isp1707 {
@@ -819,10 +827,6 @@ &mmc1 {
 	pinctrl-0 = <&mmc1_pins>;
 	vmmc-supply = <&vmmc1>;
 	bus-width = <4>;
-	/* For debugging, it is often good idea to remove this GPIO.
-	   It means you can remove back cover (to reboot by removing
-	   battery) and still use the MMC card. */
-	cd-gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* 160 */
 };
 
 /* most boards use vaux3, only some old versions use vmmc2 instead */
-- 
2.24.1

Re: [PATCH 0/2] Add SW_MACHINE_COVER key

[Pavel Machek]

On Fri 2020-06-12 14:53:57, Merlijn Wajer wrote:
> this series adds the sw_machine_cover key, and changes the nokia n900 dts to
> expose the key via gpio-keys.
> 
> before, this gpio was used as card detect gpio, causing the card not to show up
> if the phone was booted without cover, see this thread on linux-omap:
> 
>     n900: remove mmc1 "safety feature"? (was: re: mmc0 on nokia n900 on linux 5.4.18)
> 
> since there is no realistic use for using this gpio as card detect, instead
> expose it to userspace via gpio-keys. there are no event type for machine covers
> yet, so add that first.
> 
> the key should be 1 when the cover is closed, and 0 when the cover is open.
> 
> starting the nokia n900 with the cover removed, putting the cover in place:
> 
>     event: time 1581684523.415296, type 5 (ev_sw), code 16 (?), value 1
> 
> removing the cover again, exposing mmc1 and the battery:
> 
>     event: time 1581684529.413706, type 5 (ev_sw), code 16 (?), value 0

Looks good to me.

Acked-by: Pavel Machek <pavel@ucw.cz>

									Pavel


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH 1/2] Input: add `SW_MACHINE_COVER`

[Pavel Machek]

On Fri 2020-06-12 14:53:58, Merlijn Wajer wrote:
> This event code represents the state of a removable cover of a device.
> Value 0 means that the cover is open or removed, value 1 means that the
> cover is closed.
> 
> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Acked-by: Tony Lindgren 
> <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> ---

Dmitry, can we get some kind of comment here, or better yet can we get you to apply this?

Thanks,
										Pavel
> +++ b/include/linux/mod_devicetable.h
> @@ -318,7 +318,7 @@ struct pcmcia_device_id {
>  #define INPUT_DEVICE_ID_LED_MAX		0x0f
>  #define INPUT_DEVICE_ID_SND_MAX		0x07
>  #define INPUT_DEVICE_ID_FF_MAX		0x7f
> -#define INPUT_DEVICE_ID_SW_MAX		0x0f
> +#define INPUT_DEVICE_ID_SW_MAX		0x10
>  #define INPUT_DEVICE_ID_PROP_MAX	0x1f
>  
>  #define INPUT_DEVICE_ID_MATCH_BUS	1
> diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> index b6a835d37826..0c2e27d28e0a 100644
> --- a/include/uapi/linux/input-event-codes.h
> +++ b/include/uapi/linux/input-event-codes.h
> @@ -888,7 +888,8 @@
>  #define SW_LINEIN_INSERT	0x0d  /* set = inserted */
>  #define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
>  #define SW_PEN_INSERTED		0x0f  /* set = pen inserted */
> -#define SW_MAX			0x0f
> +#define SW_MACHINE_COVER	0x10  /* set = cover closed */
> +#define SW_MAX			0x10
>  #define SW_CNT			(SW_MAX+1)
>  
>  /*
> -- 
> 2.24.1

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH 1/2] Input: add `SW_MACHINE_COVER`

[Merlijn Wajer]

[-- Attachment #1.1: Type: text/plain, Size: 1105 bytes --]

Hi,

Looks like we're blocking on this input patch.

On 16/06/2020 12:50, Pavel Machek wrote:
> On Fri 2020-06-12 14:53:58, Merlijn Wajer wrote:
>> This event code represents the state of a removable cover of a device.
>> Value 0 means that the cover is open or removed, value 1 means that the
>> cover is closed.
>>
>> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Acked-by: Tony Lindgren 
>> <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> ---
> 
> Dmitry, can we get some kind of comment here, or better yet can we get you to apply this?

This is part of a patch series to resolve problems with the Nokia N900
not booting when the cover is removed (making the cover be the card
detect was also just weird IMHO). Just removing the card-detect from the
DTS is fine, but it was suggested that we expose the data instead as
input event. And that's gotten no response for about four months.

Should we just drop the feature and only remove the cd-gpios line from
the DTS, assuming upstream doesn't want this SW_MACHINE_COVER code?

Merlijn


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

input maintainer -- are you there? was Re: [PATCH 1/2] Input: add `SW_MACHINE_COVER`

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1554 bytes --]

Hi!

> Looks like we're blocking on this input patch.
> 
> On 16/06/2020 12:50, Pavel Machek wrote:
> > On Fri 2020-06-12 14:53:58, Merlijn Wajer wrote:
> >> This event code represents the state of a removable cover of a device.
> >> Value 0 means that the cover is open or removed, value 1 means that the
> >> cover is closed.
> >>
> >> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Acked-by: Tony Lindgren 
> >> <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> ---
> > 
> > Dmitry, can we get some kind of comment here, or better yet can we get you to apply this?
> 
> This is part of a patch series to resolve problems with the Nokia N900
> not booting when the cover is removed (making the cover be the card
> detect was also just weird IMHO). Just removing the card-detect from the
> DTS is fine, but it was suggested that we expose the data instead as
> input event. And that's gotten no response for about four months.
> 
> Should we just drop the feature and only remove the cd-gpios line from
> the DTS, assuming upstream doesn't want this SW_MACHINE_COVER code?

I believe series is good, lets keep it. Changing now will only delay
it a bit more. Let me try to get Dmitry's attention...

If that does not work, we can get Linus' attention :-).

If that does not work, umm, there are some other options.

Best regards,
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: input maintainer -- are you there? was Re: [PATCH 1/2] Input: add `SW_MACHINE_COVER`

[Dmitry Torokhov]

On Mon, Jun 29, 2020 at 03:36:44PM +0200, Pavel Machek wrote:
> Hi!
> 
> > Looks like we're blocking on this input patch.
> > 
> > On 16/06/2020 12:50, Pavel Machek wrote:
> > > On Fri 2020-06-12 14:53:58, Merlijn Wajer wrote:
> > >> This event code represents the state of a removable cover of a device.
> > >> Value 0 means that the cover is open or removed, value 1 means that the
> > >> cover is closed.
> > >>
> > >> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Acked-by: Tony Lindgren 
> > >> <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> ---
> > > 
> > > Dmitry, can we get some kind of comment here, or better yet can we get you to apply this?
> > 
> > This is part of a patch series to resolve problems with the Nokia N900
> > not booting when the cover is removed (making the cover be the card
> > detect was also just weird IMHO). Just removing the card-detect from the
> > DTS is fine, but it was suggested that we expose the data instead as
> > input event. And that's gotten no response for about four months.
> > 
> > Should we just drop the feature and only remove the cd-gpios line from
> > the DTS, assuming upstream doesn't want this SW_MACHINE_COVER code?
> 
> I believe series is good, lets keep it. Changing now will only delay
> it a bit more. Let me try to get Dmitry's attention...
> 
> If that does not work, we can get Linus' attention :-).
> 
> If that does not work, umm, there are some other options.

Sorry, am really swamped the last couple months. I can pick up the input
code, do you want me to pick up DTS as well?

Thanks.


-- 
Dmitry

Re: input maintainer -- are you there? was Re: [PATCH 1/2] Input: add `SW_MACHINE_COVER`

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 2040 bytes --]

Hi!

> > > Looks like we're blocking on this input patch.
> > > 
> > > On 16/06/2020 12:50, Pavel Machek wrote:
> > > > On Fri 2020-06-12 14:53:58, Merlijn Wajer wrote:
> > > >> This event code represents the state of a removable cover of a device.
> > > >> Value 0 means that the cover is open or removed, value 1 means that the
> > > >> cover is closed.
> > > >>
> > > >> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Acked-by: Tony Lindgren 
> > > >> <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> ---
> > > > 
> > > > Dmitry, can we get some kind of comment here, or better yet can we get you to apply this?
> > > 
> > > This is part of a patch series to resolve problems with the Nokia N900
> > > not booting when the cover is removed (making the cover be the card
> > > detect was also just weird IMHO). Just removing the card-detect from the
> > > DTS is fine, but it was suggested that we expose the data instead as
> > > input event. And that's gotten no response for about four months.
> > > 
> > > Should we just drop the feature and only remove the cd-gpios line from
> > > the DTS, assuming upstream doesn't want this SW_MACHINE_COVER code?
> > 
> > I believe series is good, lets keep it. Changing now will only delay
> > it a bit more. Let me try to get Dmitry's attention...
> > 
> > If that does not work, we can get Linus' attention :-).
> > 
> > If that does not work, umm, there are some other options.
> 
> Sorry, am really swamped the last couple months. I can pick up the input
> code, do you want me to pick up DTS as well?

No problem, sorry for being pushy.

If you could pick up just the input one-liner, that would be best. It
is not risky.

OMAP people will take care of the DTS, I believe, and we can iterate
if it does not work at the first try.

Best regards,
								Pavel

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: input maintainer -- are you there? was Re: [PATCH 1/2] Input: add `SW_MACHINE_COVER`

[Tony Lindgren]

* Pavel Machek <pavel@ucw.cz> [200630 17:59]:
> Hi!
> 
> > > > Looks like we're blocking on this input patch.
> > > > 
> > > > On 16/06/2020 12:50, Pavel Machek wrote:
> > > > > On Fri 2020-06-12 14:53:58, Merlijn Wajer wrote:
> > > > >> This event code represents the state of a removable cover of a device.
> > > > >> Value 0 means that the cover is open or removed, value 1 means that the
> > > > >> cover is closed.
> > > > >>
> > > > >> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Acked-by: Tony Lindgren 
> > > > >> <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> ---
> > > > > 
> > > > > Dmitry, can we get some kind of comment here, or better yet can we get you to apply this?
> > > > 
> > > > This is part of a patch series to resolve problems with the Nokia N900
> > > > not booting when the cover is removed (making the cover be the card
> > > > detect was also just weird IMHO). Just removing the card-detect from the
> > > > DTS is fine, but it was suggested that we expose the data instead as
> > > > input event. And that's gotten no response for about four months.
> > > > 
> > > > Should we just drop the feature and only remove the cd-gpios line from
> > > > the DTS, assuming upstream doesn't want this SW_MACHINE_COVER code?
> > > 
> > > I believe series is good, lets keep it. Changing now will only delay
> > > it a bit more. Let me try to get Dmitry's attention...
> > > 
> > > If that does not work, we can get Linus' attention :-).
> > > 
> > > If that does not work, umm, there are some other options.
> > 
> > Sorry, am really swamped the last couple months. I can pick up the input
> > code, do you want me to pick up DTS as well?
> 
> No problem, sorry for being pushy.
> 
> If you could pick up just the input one-liner, that would be best. It
> is not risky.
> 
> OMAP people will take care of the DTS, I believe, and we can iterate
> if it does not work at the first try.

I already acked the dts change a while back, please just queue them
together. Or if you want me to pick it up, please set up an immutable
branch for me against v5.8-rc1 to also merge in :)

Regards,

Tony

Re: [PATCH 0/2] Add SW_MACHINE_COVER key

[Dmitry Torokhov]

On Fri, Jun 12, 2020 at 02:53:57PM +0200, Merlijn Wajer wrote:

Applied, thank you.

-- 
Dmitry