* [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver device tree
@ 2013-08-14 20:27 Stephen Warren
2013-08-14 20:27 ` [PATCH 2/2] ARM: tegra: add Mic Jack to Cardhu " Stephen Warren
2013-08-15 15:37 ` [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver " Stephen Warren
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Warren @ 2013-08-14 20:27 UTC (permalink / raw)
To: Stephen Warren; +Cc: devicetree, linux-tegra, Stephen Warren
From: Stephen Warren <swarren@nvidia.com>
This enables the microphone input jack, and hence allows audio to be
captured as well as played back.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/boot/dts/tegra30-beaver.dts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 4f1f01c..08cad69 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -473,7 +473,9 @@
nvidia,audio-routing =
"Headphones", "HPOR",
- "Headphones", "HPOL";
+ "Headphones", "HPOL",
+ "Mic Jack", "MICBIAS1",
+ "IN2P", "Mic Jack";
nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,audio-codec = <&rt5640>;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: tegra: add Mic Jack to Cardhu device tree
2013-08-14 20:27 [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver device tree Stephen Warren
@ 2013-08-14 20:27 ` Stephen Warren
2013-08-14 21:37 ` Thierry Reding
2013-08-15 15:37 ` [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver " Stephen Warren
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Warren @ 2013-08-14 20:27 UTC (permalink / raw)
To: Stephen Warren; +Cc: devicetree, linux-tegra, Stephen Warren
From: Stephen Warren <swarren@nvidia.com>
This enables the microphone input jack, and hence allows audio to be
captured as well as played back.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/boot/dts/tegra114-dalmore.dts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 402c20b..45056a2 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -1193,7 +1193,9 @@
"Speakers", "SPORP",
"Speakers", "SPORN",
"Speakers", "SPOLP",
- "Speakers", "SPOLN";
+ "Speakers", "SPOLN",
+ "Mic Jack", "MICBIAS1",
+ "IN2P", "Mic Jack";
nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,audio-codec = <&rt5640>;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM: tegra: add Mic Jack to Cardhu device tree
2013-08-14 20:27 ` [PATCH 2/2] ARM: tegra: add Mic Jack to Cardhu " Stephen Warren
@ 2013-08-14 21:37 ` Thierry Reding
2013-08-14 21:44 ` Stephen Warren
0 siblings, 1 reply; 5+ messages in thread
From: Thierry Reding @ 2013-08-14 21:37 UTC (permalink / raw)
To: Stephen Warren; +Cc: devicetree, linux-tegra, Stephen Warren
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
On Wed, Aug 14, 2013 at 02:27:07PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> This enables the microphone input jack, and hence allows audio to be
> captured as well as played back.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> arch/arm/boot/dts/tegra114-dalmore.dts | 4 +++-
The commit subject says Cardhu, but you modify the Dalmore DTS here.
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM: tegra: add Mic Jack to Cardhu device tree
2013-08-14 21:37 ` Thierry Reding
@ 2013-08-14 21:44 ` Stephen Warren
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Warren @ 2013-08-14 21:44 UTC (permalink / raw)
To: Thierry Reding; +Cc: devicetree, linux-tegra, Stephen Warren
On 08/14/2013 03:37 PM, Thierry Reding wrote:
> On Wed, Aug 14, 2013 at 02:27:07PM -0600, Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> This enables the microphone input jack, and hence allows audio to
>> be captured as well as played back.
>>
>> Signed-off-by: Stephen Warren <swarren@nvidia.com> ---
>> arch/arm/boot/dts/tegra114-dalmore.dts | 4 +++-
>
> The commit subject says Cardhu, but you modify the Dalmore DTS
> here.
Yup. I'll fix that up when applying this.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver device tree
2013-08-14 20:27 [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver device tree Stephen Warren
2013-08-14 20:27 ` [PATCH 2/2] ARM: tegra: add Mic Jack to Cardhu " Stephen Warren
@ 2013-08-15 15:37 ` Stephen Warren
1 sibling, 0 replies; 5+ messages in thread
From: Stephen Warren @ 2013-08-15 15:37 UTC (permalink / raw)
To: Stephen Warren; +Cc: devicetree, linux-tegra, Stephen Warren
On 08/14/2013 02:27 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> This enables the microphone input jack, and hence allows audio to be
> captured as well as played back.
I've applied this series to Tegra's for-3.12/dt branch, with patch 2/2's
subject line fixed to s/Cardhu/Dalmore/.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-15 15:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14 20:27 [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver device tree Stephen Warren
2013-08-14 20:27 ` [PATCH 2/2] ARM: tegra: add Mic Jack to Cardhu " Stephen Warren
2013-08-14 21:37 ` Thierry Reding
2013-08-14 21:44 ` Stephen Warren
2013-08-15 15:37 ` [PATCH 1/2] ARM: tegra: add Mic Jack to Beaver " Stephen Warren
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).