2016-10-25 16:49:03

by H. Nikolaus Schaller

[permalink] [raw]
Subject: [PATCH v2 0/2] DT Fixes for OMAP5 boards

This patch series adds DT nodes for:
* twl6040 enable jack_detection (e.g. OMAP5EVM)
* twl6037 gpadc for omap5 based boards (e.g. OMAP5EVM)


H. Nikolaus Schaller (2):
dts: omap5: baord-common: add phandle to reference Palmas gpadc
dts: omap5: baord-common: enable twl6040 headset jack detection

arch/arm/boot/dts/omap5-board-common.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--
2.7.3


2016-10-25 16:48:52

by H. Nikolaus Schaller

[permalink] [raw]
Subject: [PATCH v2 1/2] dts: omap5: baord-common: add phandle to reference Palmas gpadc

Will be needed for iio based drivers.

Signed-off-by: H. Nikolaus Schaller <[email protected]>
---
arch/arm/boot/dts/omap5-board-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 7500283..b04adee 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -415,7 +415,7 @@
ti,backup-battery-charge-high-current;
};

- gpadc {
+ gpadc: gpadc {
compatible = "ti,palmas-gpadc";
interrupts = <18 0
16 0
--
2.7.3

2016-10-25 16:49:07

by H. Nikolaus Schaller

[permalink] [raw]
Subject: [PATCH v2 2/2] dts: omap5: baord-common: enable twl6040 headset jack detection

Signed-off-by: H. Nikolaus Schaller <[email protected]>
---
arch/arm/boot/dts/omap5-board-common.dtsi | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index b04adee..91456b4 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -124,6 +124,7 @@
compatible = "ti,abe-twl6040";
ti,model = "omap5-uevm";

+ ti,jack_detection;
ti,mclk-freq = <19200000>;

ti,mcpdm = <&mcpdm>;
--
2.7.3

2016-10-25 16:54:15

by Peter Ujfalusi

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] dts: omap5: baord-common: enable twl6040 headset jack detection

On 10/25/2016 07:48 PM, H. Nikolaus Schaller wrote:
> Signed-off-by: H. Nikolaus Schaller <[email protected]>
> ---
> arch/arm/boot/dts/omap5-board-common.dtsi | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
> index b04adee..91456b4 100644
> --- a/arch/arm/boot/dts/omap5-board-common.dtsi
> +++ b/arch/arm/boot/dts/omap5-board-common.dtsi
> @@ -124,6 +124,7 @@
> compatible = "ti,abe-twl6040";
> ti,model = "omap5-uevm";
>
> + ti,jack_detection;

ti,jack-detection

> ti,mclk-freq = <19200000>;
>
> ti,mcpdm = <&mcpdm>;
>


--
Péter

2016-10-25 17:10:53

by Tony Lindgren

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] dts: omap5: baord-common: enable twl6040 headset jack detection

* Peter Ujfalusi <[email protected]> [161025 09:54]:
> On 10/25/2016 07:48 PM, H. Nikolaus Schaller wrote:
> > Signed-off-by: H. Nikolaus Schaller <[email protected]>
> > ---
> > arch/arm/boot/dts/omap5-board-common.dtsi | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
> > index b04adee..91456b4 100644
> > --- a/arch/arm/boot/dts/omap5-board-common.dtsi
> > +++ b/arch/arm/boot/dts/omap5-board-common.dtsi
> > @@ -124,6 +124,7 @@
> > compatible = "ti,abe-twl6040";
> > ti,model = "omap5-uevm";
> >
> > + ti,jack_detection;
>
> ti,jack-detection

Also subject has baord-common for both :)

Tony

2016-10-25 17:19:00

by H. Nikolaus Schaller

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] dts: omap5: baord-common: enable twl6040 headset jack detection


> Am 25.10.2016 um 18:51 schrieb Peter Ujfalusi <[email protected]>:
>
> On 10/25/2016 07:48 PM, H. Nikolaus Schaller wrote:
>> Signed-off-by: H. Nikolaus Schaller <[email protected]>
>> ---
>> arch/arm/boot/dts/omap5-board-common.dtsi | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
>> index b04adee..91456b4 100644
>> --- a/arch/arm/boot/dts/omap5-board-common.dtsi
>> +++ b/arch/arm/boot/dts/omap5-board-common.dtsi
>> @@ -124,6 +124,7 @@
>> compatible = "ti,abe-twl6040";
>> ti,model = "omap5-uevm";
>>
>> + ti,jack_detection;
>
> ti,jack-detection

Hm. Looks as if we have found another bug:
which one is correct?

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt#n15

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/sound/soc/omap/omap-abe-twl6040.c#n289

Should I add another patch?

>
>> ti,mclk-freq = <19200000>;
>>
>> ti,mcpdm = <&mcpdm>;
>>
>
>
> --
> Péter


2016-10-25 17:34:18

by Tony Lindgren

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] dts: omap5: baord-common: enable twl6040 headset jack detection

* H. Nikolaus Schaller <[email protected]> [161025 10:20]:
>
> > Am 25.10.2016 um 18:51 schrieb Peter Ujfalusi <[email protected]>:
> >
> > On 10/25/2016 07:48 PM, H. Nikolaus Schaller wrote:
> >> Signed-off-by: H. Nikolaus Schaller <[email protected]>
> >> ---
> >> arch/arm/boot/dts/omap5-board-common.dtsi | 1 +
> >> 1 file changed, 1 insertion(+)
> >>
> >> diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
> >> index b04adee..91456b4 100644
> >> --- a/arch/arm/boot/dts/omap5-board-common.dtsi
> >> +++ b/arch/arm/boot/dts/omap5-board-common.dtsi
> >> @@ -124,6 +124,7 @@
> >> compatible = "ti,abe-twl6040";
> >> ti,model = "omap5-uevm";
> >>
> >> + ti,jack_detection;
> >
> > ti,jack-detection
>
> Hm. Looks as if we have found another bug:
> which one is correct?
>
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt#n15
>
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/sound/soc/omap/omap-abe-twl6040.c#n289
>
> Should I add another patch?

We have parts of omap-abe-twl6040.txt, the driver and omap4-sdp.dts all
using ti,jack-detection. So omap-abe-twl6040.txt is wrong for the use
of ti,jack_detection.

Regards,

Tony