From: Hui Liu <[email protected]>
The Volume Down & Power buttons are controlled by the PMIC via
the PON hardware, and the Volume Up is connected to a PMIC gpio.
Enable the necessary hardware and setup the GPIO state for the
Volume Up gpio key.
Signed-off-by: Hui Liu <[email protected]>
---
Changes in v4:
- Switch the order of "pinctrl-0" and "pinctrl-names".
- Update "volume_up" to "Volume_up".
- Remove "linux,input-type", because the default value is 1(EV_KEY).
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Update the commit more concise and explicit.
- remove "power-source" property and update the numeric value to defined
name for "qcom,drive-strength".
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Update the commit description.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 41 ++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index acf145d1d97c..12e162613ed0 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -9,7 +9,9 @@
#define PM7250B_SID 8
#define PM7250B_SID1 9
+#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include "sc7280.dtsi"
#include "pm7250b.dtsi"
@@ -39,6 +41,22 @@ chosen {
stdout-path = "serial0:115200n8";
};
+ gpio-keys {
+ compatible = "gpio-keys";
+
+ pinctrl-0 = <&key_vol_up_default>;
+ pinctrl-names = "default";
+
+ key-volume-up {
+ label = "Volume_up";
+ gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_VOLUMEUP>;
+ wakeup-source;
+ debounce-interval = <15>;
+ linux,can-disable;
+ };
+ };
+
reserved-memory {
xbl_mem: xbl@80700000 {
reg = <0x0 0x80700000 0x0 0x100000>;
@@ -421,6 +439,16 @@ vreg_bob_3p296: bob {
};
};
+&pm7325_gpios {
+ key_vol_up_default: key-vol-up-state {
+ pins = "gpio6";
+ function = "normal";
+ input-enable;
+ bias-pull-up;
+ qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
+ };
+};
+
&pm8350c_pwm {
status = "okay";
@@ -448,6 +476,19 @@ led@3 {
};
};
+&pmk8350_pon {
+ status = "okay";
+};
+
+&pon_pwrkey {
+ status = "okay";
+};
+
+&pon_resin {
+ linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
+};
+
&qupv3_id_0 {
status = "okay";
};
---
base-commit: 23e11d0318521e8693459b0e4d23aec614b3b68b
change-id: 20240206-gpio-keys-138bbd850298
Best regards,
--
Hui Liu <[email protected]>
On 3/4/24 08:09, Hui Liu via B4 Relay wrote:
> From: Hui Liu <[email protected]>
>
> The Volume Down & Power buttons are controlled by the PMIC via
> the PON hardware, and the Volume Up is connected to a PMIC gpio.
>
> Enable the necessary hardware and setup the GPIO state for the
> Volume Up gpio key.
>
> Signed-off-by: Hui Liu <[email protected]>
> ---
[...]
> +&pmk8350_pon {
> + status = "okay";
> +};
This device is already enabled
Konrad
On 3/6/2024 5:20 AM, Konrad Dybcio wrote:
>
>
> On 3/4/24 08:09, Hui Liu via B4 Relay wrote:
>> From: Hui Liu <[email protected]>
>>
>> The Volume Down & Power buttons are controlled by the PMIC via
>> the PON hardware, and the Volume Up is connected to a PMIC gpio.
>>
>> Enable the necessary hardware and setup the GPIO state for the
>> Volume Up gpio key.
>>
>> Signed-off-by: Hui Liu <[email protected]>
>> ---
>
> [...]
>
>
>> +&pmk8350_pon {
>> + status = "okay";
>> +};
>
> This device is already enabled
Hi Konrad,
The status is not set in pmk8350.dtsi, so I thought we should set it for
"okay" manually. Do you think so?
Thanks,
Hui
>
> Konrad
On 06/03/2024 04:02, hui liu wrote:
>
>
> On 3/6/2024 5:20 AM, Konrad Dybcio wrote:
>>
>>
>> On 3/4/24 08:09, Hui Liu via B4 Relay wrote:
>>> From: Hui Liu <[email protected]>
>>>
>>> The Volume Down & Power buttons are controlled by the PMIC via
>>> the PON hardware, and the Volume Up is connected to a PMIC gpio.
>>>
>>> Enable the necessary hardware and setup the GPIO state for the
>>> Volume Up gpio key.
>>>
>>> Signed-off-by: Hui Liu <[email protected]>
>>> ---
>>
>> [...]
>>
>>
>>> +&pmk8350_pon {
>>> + status = "okay";
>>> +};
>>
>> This device is already enabled
> Hi Konrad,
>
> The status is not set in pmk8350.dtsi, so I thought we should set it for
> "okay" manually. Do you think so?
No.
Best regards,
Krzysztof
On Wed, 6 Mar 2024 at 05:02, hui liu <[email protected]> wrote:
>
>
>
> On 3/6/2024 5:20 AM, Konrad Dybcio wrote:
> >
> >
> > On 3/4/24 08:09, Hui Liu via B4 Relay wrote:
> >> From: Hui Liu <[email protected]>
> >>
> >> The Volume Down & Power buttons are controlled by the PMIC via
> >> the PON hardware, and the Volume Up is connected to a PMIC gpio.
> >>
> >> Enable the necessary hardware and setup the GPIO state for the
> >> Volume Up gpio key.
> >>
> >> Signed-off-by: Hui Liu <[email protected]>
> >> ---
> >
> > [...]
> >
> >
> >> +&pmk8350_pon {
> >> + status = "okay";
> >> +};
> >
> > This device is already enabled
> Hi Konrad,
>
> The status is not set in pmk8350.dtsi, so I thought we should set it for
> "okay" manually. Do you think so?
What is the default device status if there is no status property?
--
With best wishes
Dmitry
On 3/6/2024 3:56 PM, Dmitry Baryshkov wrote:
> On Wed, 6 Mar 2024 at 05:02, hui liu <[email protected]> wrote:
>>
>>
>>
>> On 3/6/2024 5:20 AM, Konrad Dybcio wrote:
>>>
>>>
>>> On 3/4/24 08:09, Hui Liu via B4 Relay wrote:
>>>> From: Hui Liu <[email protected]>
>>>>
>>>> The Volume Down & Power buttons are controlled by the PMIC via
>>>> the PON hardware, and the Volume Up is connected to a PMIC gpio.
>>>>
>>>> Enable the necessary hardware and setup the GPIO state for the
>>>> Volume Up gpio key.
>>>>
>>>> Signed-off-by: Hui Liu <[email protected]>
>>>> ---
>>>
>>> [...]
>>>
>>>
>>>> +&pmk8350_pon {
>>>> + status = "okay";
>>>> +};
>>>
>>> This device is already enabled
>> Hi Konrad,
>>
>> The status is not set in pmk8350.dtsi, so I thought we should set it for
>> "okay" manually. Do you think so?
>
> What is the default device status if there is no status property?
The default status is okay.
OK, I will update it, remove the status configuration.
Thanks,
Hui
>
>