V1 -> V2: rebase to qcom/for-next
V2 -> V3: rename tri-state-key to alert-slider, fix DTS warnings,
add SND_PROFILE_* identifiers to input-event-codes.h
V3 -> V4: DTS: use default debounce-interval, order alphabetically
Gergo Koteles (3):
Input: gpio-keys - add support for linux,input-value DTS property
Input: add ABS_SND_PROFILE
arm64: dts: qcom: sdm845-oneplus: add alert-slider
Documentation/input/event-codes.rst | 6 +++
.../boot/dts/qcom/sdm845-oneplus-common.dtsi | 39 ++++++++++++++++++-
drivers/hid/hid-debug.c | 1 +
drivers/input/keyboard/gpio_keys.c | 3 ++
include/uapi/linux/input-event-codes.h | 9 +++++
5 files changed, 56 insertions(+), 2 deletions(-)
base-commit: 02ac8d2a011b630481d959298a1cc76ca0717f3e
--
2.39.2
Allows setting the value of EV_ABS events from DTS.
This property is included in the gpio-keys.yaml scheme, but was only
implemented for gpio-keys-polled.
Signed-off-by: Gergo Koteles <[email protected]>
---
drivers/input/keyboard/gpio_keys.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 5496482a38c1..c42f86ad0766 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -770,6 +770,9 @@ gpio_keys_get_devtree_pdata(struct device *dev)
&button->type))
button->type = EV_KEY;
+ fwnode_property_read_u32(child, "linux,input-value",
+ (u32 *)&button->value);
+
button->wakeup =
fwnode_property_read_bool(child, "wakeup-source") ||
/* legacy name */
--
2.39.2
ABS_SND_PROFILE used to describe the state of a multi-value sound profile
switch. This will be used for the alert-slider on OnePlus phones or other
phones.
Profile values added as SND_PROFLE_(SILENT|VIBRATE|RING) identifiers
to input-event-codes.h so they can be used from DTS.
Signed-off-by: Gergo Koteles <[email protected]>
---
Documentation/input/event-codes.rst | 6 ++++++
drivers/hid/hid-debug.c | 1 +
include/uapi/linux/input-event-codes.h | 9 +++++++++
3 files changed, 16 insertions(+)
diff --git a/Documentation/input/event-codes.rst b/Documentation/input/event-codes.rst
index b4557462edd7..d43336e64d6a 100644
--- a/Documentation/input/event-codes.rst
+++ b/Documentation/input/event-codes.rst
@@ -241,6 +241,12 @@ A few EV_ABS codes have special meanings:
emitted only when the selected profile changes, indicating the newly
selected profile value.
+* ABS_SND_PROFILE:
+
+ - Used to describe the state of a multi-value sound profile switch.
+ An event is emitted only when the selected profile changes,
+ indicating the newly selected profile value.
+
* ABS_MT_<name>:
- Used to describe multitouch input events. Please see
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index e213bdde543a..76fb2ecbbc51 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1018,6 +1018,7 @@ static const char *absolutes[ABS_CNT] = {
[ABS_DISTANCE] = "Distance", [ABS_TILT_X] = "XTilt",
[ABS_TILT_Y] = "YTilt", [ABS_TOOL_WIDTH] = "ToolWidth",
[ABS_VOLUME] = "Volume", [ABS_PROFILE] = "Profile",
+ [ABS_SND_PROFILE] = "SoundProfile",
[ABS_MISC] = "Misc",
[ABS_MT_TOUCH_MAJOR] = "MTMajor",
[ABS_MT_TOUCH_MINOR] = "MTMinor",
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 022a520e31fc..e8d5ee027b40 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -866,6 +866,7 @@
#define ABS_VOLUME 0x20
#define ABS_PROFILE 0x21
+#define ABS_SND_PROFILE 0x22
#define ABS_MISC 0x28
@@ -974,4 +975,12 @@
#define SND_MAX 0x07
#define SND_CNT (SND_MAX+1)
+/*
+ * ABS_SND_PROFILE values
+ */
+
+#define SND_PROFILE_SILENT 0x00
+#define SND_PROFILE_VIBRATE 0x01
+#define SND_PROFILE_RING 0x02
+
#endif
--
2.39.2
The alert-slider is a tri-state sound profile switch found on the OnePlus 6,
Android maps the states to "silent", "vibrate" and "ring". Expose them as
ABS_SND_PROFILE events.
The previous GPIO numbers were wrong. Update them to the correct
ones.
Co-developed-by: Caleb Connolly <[email protected]>
Signed-off-by: Caleb Connolly <[email protected]>
Signed-off-by: Gergo Koteles <[email protected]>
---
.../boot/dts/qcom/sdm845-oneplus-common.dtsi | 39 ++++++++++++++++++-
1 file changed, 37 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 64638ea94db7..7567f5cf6e3f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -20,6 +20,41 @@
/delete-node/ &rmtfs_mem;
/ {
+ alert-slider {
+ compatible = "gpio-keys";
+ label = "Alert slider";
+
+ pinctrl-0 = <&alert_slider_default>;
+ pinctrl-names = "default";
+
+ switch-top {
+ label = "Silent";
+ linux,input-type = <EV_ABS>;
+ linux,code = <ABS_SND_PROFILE>;
+ linux,input-value = <SND_PROFILE_SILENT>;
+ gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;
+ linux,can-disable;
+ };
+
+ switch-middle {
+ label = "Vibrate";
+ linux,input-type = <EV_ABS>;
+ linux,code = <ABS_SND_PROFILE>;
+ linux,input-value = <SND_PROFILE_VIBRATE>;
+ gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
+ linux,can-disable;
+ };
+
+ switch-bottom {
+ label = "Ring";
+ linux,input-type = <EV_ABS>;
+ linux,code = <ABS_SND_PROFILE>;
+ linux,input-value = <SND_PROFILE_RING>;
+ gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
+ linux,can-disable;
+ };
+ };
+
aliases {
serial0 = &uart9;
serial1 = &uart6;
@@ -753,8 +788,8 @@ &usb_1_hsphy {
&tlmm {
gpio-reserved-ranges = <0 4>, <81 4>;
- tri_state_key_default: tri-state-key-default-state {
- pins = "gpio40", "gpio42", "gpio26";
+ alert_slider_default: alert-slider-default-state {
+ pins = "gpio126", "gpio52", "gpio24";
function = "gpio";
drive-strength = <2>;
bias-disable;
--
2.39.2
On 22.02.2023 01:10, Gergo Koteles wrote:
> The alert-slider is a tri-state sound profile switch found on the OnePlus 6,
> Android maps the states to "silent", "vibrate" and "ring". Expose them as
> ABS_SND_PROFILE events.
> The previous GPIO numbers were wrong. Update them to the correct
> ones.
>
> Co-developed-by: Caleb Connolly <[email protected]>
> Signed-off-by: Caleb Connolly <[email protected]>
> Signed-off-by: Gergo Koteles <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>
Konrad
> .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 39 ++++++++++++++++++-
> 1 file changed, 37 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> index 64638ea94db7..7567f5cf6e3f 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> @@ -20,6 +20,41 @@
> /delete-node/ &rmtfs_mem;
>
> / {
> + alert-slider {
> + compatible = "gpio-keys";
> + label = "Alert slider";
> +
> + pinctrl-0 = <&alert_slider_default>;
> + pinctrl-names = "default";
> +
> + switch-top {
> + label = "Silent";
> + linux,input-type = <EV_ABS>;
> + linux,code = <ABS_SND_PROFILE>;
> + linux,input-value = <SND_PROFILE_SILENT>;
> + gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;
> + linux,can-disable;
> + };
> +
> + switch-middle {
> + label = "Vibrate";
> + linux,input-type = <EV_ABS>;
> + linux,code = <ABS_SND_PROFILE>;
> + linux,input-value = <SND_PROFILE_VIBRATE>;
> + gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
> + linux,can-disable;
> + };
> +
> + switch-bottom {
> + label = "Ring";
> + linux,input-type = <EV_ABS>;
> + linux,code = <ABS_SND_PROFILE>;
> + linux,input-value = <SND_PROFILE_RING>;
> + gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
> + linux,can-disable;
> + };
> + };
> +
> aliases {
> serial0 = &uart9;
> serial1 = &uart6;
> @@ -753,8 +788,8 @@ &usb_1_hsphy {
> &tlmm {
> gpio-reserved-ranges = <0 4>, <81 4>;
>
> - tri_state_key_default: tri-state-key-default-state {
> - pins = "gpio40", "gpio42", "gpio26";
> + alert_slider_default: alert-slider-default-state {
> + pins = "gpio126", "gpio52", "gpio24";
> function = "gpio";
> drive-strength = <2>;
> bias-disable;
On 22.02.2023 01:10, Gergo Koteles wrote:
> Allows setting the value of EV_ABS events from DTS.
> This property is included in the gpio-keys.yaml scheme, but was only
> implemented for gpio-keys-polled.
>
> Signed-off-by: Gergo Koteles <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>
Konrad
> drivers/input/keyboard/gpio_keys.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
> index 5496482a38c1..c42f86ad0766 100644
> --- a/drivers/input/keyboard/gpio_keys.c
> +++ b/drivers/input/keyboard/gpio_keys.c
> @@ -770,6 +770,9 @@ gpio_keys_get_devtree_pdata(struct device *dev)
> &button->type))
> button->type = EV_KEY;
>
> + fwnode_property_read_u32(child, "linux,input-value",
> + (u32 *)&button->value);
> +
> button->wakeup =
> fwnode_property_read_bool(child, "wakeup-source") ||
> /* legacy name */
On Wed, Feb 22, 2023 at 01:10:33AM +0100, Gergo Koteles wrote:
> ABS_SND_PROFILE used to describe the state of a multi-value sound profile
> switch. This will be used for the alert-slider on OnePlus phones or other
> phones.
>
> Profile values added as SND_PROFLE_(SILENT|VIBRATE|RING) identifiers
> to input-event-codes.h so they can be used from DTS.
>
> Signed-off-by: Gergo Koteles <[email protected]>
> ---
> Documentation/input/event-codes.rst | 6 ++++++
> drivers/hid/hid-debug.c | 1 +
> include/uapi/linux/input-event-codes.h | 9 +++++++++
> 3 files changed, 16 insertions(+)
>
> diff --git a/Documentation/input/event-codes.rst b/Documentation/input/event-codes.rst
> index b4557462edd7..d43336e64d6a 100644
> --- a/Documentation/input/event-codes.rst
> +++ b/Documentation/input/event-codes.rst
> @@ -241,6 +241,12 @@ A few EV_ABS codes have special meanings:
> emitted only when the selected profile changes, indicating the newly
> selected profile value.
>
> +* ABS_SND_PROFILE:
> +
> + - Used to describe the state of a multi-value sound profile switch.
> + An event is emitted only when the selected profile changes,
> + indicating the newly selected profile value.
> +
> * ABS_MT_<name>:
>
> - Used to describe multitouch input events. Please see
> diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
> index e213bdde543a..76fb2ecbbc51 100644
> --- a/drivers/hid/hid-debug.c
> +++ b/drivers/hid/hid-debug.c
> @@ -1018,6 +1018,7 @@ static const char *absolutes[ABS_CNT] = {
> [ABS_DISTANCE] = "Distance", [ABS_TILT_X] = "XTilt",
> [ABS_TILT_Y] = "YTilt", [ABS_TOOL_WIDTH] = "ToolWidth",
> [ABS_VOLUME] = "Volume", [ABS_PROFILE] = "Profile",
> + [ABS_SND_PROFILE] = "SoundProfile",
> [ABS_MISC] = "Misc",
> [ABS_MT_TOUCH_MAJOR] = "MTMajor",
> [ABS_MT_TOUCH_MINOR] = "MTMinor",
> diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> index 022a520e31fc..e8d5ee027b40 100644
> --- a/include/uapi/linux/input-event-codes.h
> +++ b/include/uapi/linux/input-event-codes.h
> @@ -866,6 +866,7 @@
>
> #define ABS_VOLUME 0x20
> #define ABS_PROFILE 0x21
> +#define ABS_SND_PROFILE 0x22
>
> #define ABS_MISC 0x28
>
> @@ -974,4 +975,12 @@
> #define SND_MAX 0x07
> #define SND_CNT (SND_MAX+1)
>
> +/*
> + * ABS_SND_PROFILE values
> + */
> +
> +#define SND_PROFILE_SILENT 0x00
> +#define SND_PROFILE_VIBRATE 0x01
> +#define SND_PROFILE_RING 0x02
The patch looks good to me, bu I'd need these header file additions in
order to merge the dts patch. Could I get an ack and take it through the
Qualocmm tree, or could you pick it up for 6.4, and then I can merge the
dts change after that?
Regards,
Bjorn
> +
> #endif
> --
> 2.39.2
>
On 07/04/2023 18:11, Bjorn Andersson wrote:
> On Wed, Feb 22, 2023 at 01:10:33AM +0100, Gergo Koteles wrote:
>> ABS_SND_PROFILE used to describe the state of a multi-value sound profile
>> switch. This will be used for the alert-slider on OnePlus phones or other
>> phones.
>>
>> Profile values added as SND_PROFLE_(SILENT|VIBRATE|RING) identifiers
>> to input-event-codes.h so they can be used from DTS.
>>
>> Signed-off-by: Gergo Koteles <[email protected]>
>> ---
>> Documentation/input/event-codes.rst | 6 ++++++
>> drivers/hid/hid-debug.c | 1 +
>> include/uapi/linux/input-event-codes.h | 9 +++++++++
>> 3 files changed, 16 insertions(+)
>>
>> diff --git a/Documentation/input/event-codes.rst b/Documentation/input/event-codes.rst
>> index b4557462edd7..d43336e64d6a 100644
>> --- a/Documentation/input/event-codes.rst
>> +++ b/Documentation/input/event-codes.rst
>> @@ -241,6 +241,12 @@ A few EV_ABS codes have special meanings:
>> emitted only when the selected profile changes, indicating the newly
>> selected profile value.
>>
...
>>
>> +/*
>> + * ABS_SND_PROFILE values
>> + */
>> +
>> +#define SND_PROFILE_SILENT 0x00
>> +#define SND_PROFILE_VIBRATE 0x01
>> +#define SND_PROFILE_RING 0x02
>
> The patch looks good to me, bu I'd need these header file additions in
> order to merge the dts patch. Could I get an ack and take it through the
> Qualocmm tree, or could you pick it up for 6.4, and then I can merge the
> dts change after that?
Bump, I think this might have gotten lost.
>
> Regards,
> Bjorn
>
>> +
>> #endif
>> --
>> 2.39.2
>>
--
Kind Regards,
Caleb