Skip to contentSkip to conversation

ARM: tegra: collection of enhancements/fixes

PATCH Applied Marcel Ziswiler 4 participants 26 messages Apr 10, 2015 – May 5, 2015

Subsystems (6)
Device tree bindings Arm (32-bit) ASoC Common clk +2 more subsystems
lore
Share & tools
lore

Marcel Ziswiler

author
#0 lore raw

cover ARM: tegra: collection of enhancements/fixes

From: Marcel Ziswiler <[email protected]>

This series is a set of patches accumulated over Easter ultimately bringing HDA audio to Tegra30 devices.

Marcel Ziswiler (9):
ARM: tegra: Cardhu device-tree comment spelling fix
ARM: tegra: fix hda2codec_2x clock name for Tegra30
Documentation: DT bindings: fix hda2codec_2x clock name for

    tegra30-hda

ARM: tegra: add Tegra30 HDA support
ARM: tegra: fix hda2codec_2x clock name in Tegra124 device tree
ARM: tegra: enable watchdog in defconfig
ARM: tegra: enable HDA in defconfig
ARM: tegra: colibri t30: activate stmpe811 touch controller
ARM: tegra: apalis t30: fix pin muxing and add HDA in device tree

 .../bindings/sound/nvidia,tegra30-hda.txt          |  8 ++--
 arch/arm/boot/dts/tegra124.dtsi                    |  4 +-
 arch/arm/boot/dts/tegra30-apalis-eval.dts          |  5 +++
 arch/arm/boot/dts/tegra30-apalis.dtsi              | 46 ++++++++++++++++------
 arch/arm/boot/dts/tegra30-cardhu.dtsi              |  2 +-
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts      |  4 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi             | 44 ++++++++++++++++++++-
 arch/arm/boot/dts/tegra30.dtsi                     | 15 +++++++
 arch/arm/configs/tegra_defconfig                   | 10 +++++
 drivers/clk/tegra/clk-tegra30.c                    |  2 +-
 10 files changed, 117 insertions(+), 23 deletions(-)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/9 ARM: tegra: Cardhu device-tree comment spelling fix

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -1
index a1b682e..6f86820 100644
@@ -12,7 +12,7 @@
  * tegra30-cardhu-a04.dts.
  * The identification of board is done in two ways, by looking the sticker
  * on PCB and by reading board id eeprom.
- * The stciker will have number like 600-81291-1000-002 C.3. In this 4th
+ * The sticker will have number like 600-81291-1000-002 C.3. In this 4th
  * number is the fab version like here it is 002 and hence fab version A02.
  * The (downstream internal) U-Boot of Cardhu display the board-id as
  * follows:
Signature · 1 line
1.9.3
#3 lore raw

Re: [PATCH 1/9] ARM: tegra: Cardhu device-tree comment spelling fix

Quoted 3 lines · Paul Walmsley

This patch is missing a commit message; please add one.

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches#n109

Yes, sorry. I vaguely recall having seen such oneline summary only trivial commits before but maybe that was in U-Boot and the Linux kernel mandates some higher standards. Will of course add them all in a v2.

#4 lore raw

Re: [PATCH 1/9] ARM: tegra: Cardhu device-tree comment spelling fix

In reply to Marcel Ziswiler
Quoted 6 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I added a short commit message and applied this.

Thanks,
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/c6639daa/attachment.sig>

author
#5 lore raw

PATCH 2/9 ARM: tegra: fix hda2codec_2x clock name for Tegra30

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 drivers/clk/tegra/clk-tegra30.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra30.c +1 -1
index 4b9d8bd..3d14ea5 100644
@@ -679,7 +679,7 @@ static struct tegra_devclk devclks[] __initdata = {
 	{ .dev_id = "tegra30-dam.1", .dt_id = TEGRA30_CLK_DAM1 },
 	{ .dev_id = "tegra30-dam.2", .dt_id = TEGRA30_CLK_DAM2 },
 	{ .con_id = "hda", .dev_id = "tegra30-hda", .dt_id = TEGRA30_CLK_HDA },
-	{ .con_id = "hda2codec", .dev_id = "tegra30-hda", .dt_id = TEGRA30_CLK_HDA2CODEC_2X },
+	{ .con_id = "hda2codec_2x", .dev_id = "tegra30-hda", .dt_id = TEGRA30_CLK_HDA2CODEC_2X },
 	{ .dev_id = "spi_tegra.0", .dt_id = TEGRA30_CLK_SBC1 },
 	{ .dev_id = "spi_tegra.1", .dt_id = TEGRA30_CLK_SBC2 },
 	{ .dev_id = "spi_tegra.2", .dt_id = TEGRA30_CLK_SBC3 },
Signature · 1 line
1.9.3
#6 lore raw

Re: [PATCH 2/9] ARM: tegra: fix hda2codec_2x clock name for Tegra30

Quoted 6 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 drivers/clk/tegra/clk-tegra30.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I think this isn't technically required because we're always getting the clocks via DT phandles. The whole devclks table should be obsolete since a couple of releases now, but might as well keep it correct until we've determined that it is safe to remove.

Added a short commit message and applied this for v4.2.

Thanks,
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/71df1047/attachment-0001.sig>

author
#7 lore raw

PATCH 3/9 Documentation: DT bindings: fix hda2codec_2x clock name for tegra30-hda

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix hda2codec_2x clock name in Tegra30 HDA controller device tree node documentation.
While at it also fix coma vs. semicolon issue.

Signed-off-by Marcel Ziswiler <[email protected]>
---
 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +4 -4
index 13e2ef4..5032efa 100644
@@ -8,10 +8,10 @@ Required properties:
 - interrupts : The interrupt from the HDA controller.
 - clocks : Must contain an entry for each required entry in clock-names.
   See ../clocks/clock-bindings.txt for details.
-- clock-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi
+- clock-names : Must include the following entries: hda, hda2codec_2x, hda2hdmi
 - resets : Must contain an entry for each entry in reset-names.
   See ../reset/reset.txt for details.
-- reset-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi
+- reset-names : Must include the following entries: hda, hda2codec_2x, hda2hdmi
 
 Example:
 

@@ -24,7 +24,7 @@ hda at 0,70030000 {
 		 <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;
 	clock-names = "hda", "hda2hdmi", "hda2codec_2x";
 	resets = <&tegra_car 125>, /* hda */
-		 <&tegra_car 128>; /* hda2hdmi */
-		 <&tegra_car 111>, /* hda2codec_2x */
+		 <&tegra_car 128>, /* hda2hdmi */
+		 <&tegra_car 111>; /* hda2codec_2x */
 	reset-names = "hda", "hda2hdmi", "hda2codec_2x";
 };
Signature · 1 line
1.9.3
#9 lore raw

Re: [PATCH 3/9] Documentation: DT bindings: fix hda2codec_2x clock name for tegra30-hda

In reply to Marcel Ziswiler
Quoted 10 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix hda2codec_2x clock name in Tegra30 HDA controller device tree node documentation.
While at it also fix coma vs. semicolon issue.

Signed-off-by Marcel Ziswiler <[email protected]>
---
 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Takashi,

This series contains a couple of patches to the Tegra HDA driver and I have a couple of outstanding patches myself. Would you be okay with me collecting the patches in a branch and send them to you as a pull request?

Thierry

Quoted 30 lines
Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +4 -4
index 13e2ef4..5032efa 100644
@@ -8,10 +8,10 @@ Required properties:
 - interrupts : The interrupt from the HDA controller.
 - clocks : Must contain an entry for each required entry in clock-names.
   See ../clocks/clock-bindings.txt for details.
-- clock-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi
+- clock-names : Must include the following entries: hda, hda2codec_2x, hda2hdmi
 - resets : Must contain an entry for each entry in reset-names.
   See ../reset/reset.txt for details.
-- reset-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi
+- reset-names : Must include the following entries: hda, hda2codec_2x, hda2hdmi
 
 Example:
 

@@ -24,7 +24,7 @@ hda at 0,70030000 {
 		 <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;
 	clock-names = "hda", "hda2hdmi", "hda2codec_2x";
 	resets = <&tegra_car 125>, /* hda */
-		 <&tegra_car 128>; /* hda2hdmi */
-		 <&tegra_car 111>, /* hda2codec_2x */
+		 <&tegra_car 128>, /* hda2hdmi */
+		 <&tegra_car 111>; /* hda2codec_2x */
 	reset-names = "hda", "hda2hdmi", "hda2codec_2x";
 };
Signature · 1 line
1.9.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/1e65e7b8/attachment-0001.sig>

author
#10 lore raw

PATCH 4/9 ARM: tegra: add Tegra30 HDA support

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add a device node for the HDA controller found on Tegra30.

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/boot/dts/tegra30.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/arm/boot/dts/tegra30.dtsi +15 -0
index db4810d..12a87aa 100644
@@ -640,6 +640,21 @@
 		reset-names = "fuse";
 	};
 
+	hda at 70030000 {
+		compatible = "nvidia,tegra30-hda";
+		reg = <0x70030000 0x10000>;
+		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&tegra_car TEGRA30_CLK_HDA>,
+		         <&tegra_car TEGRA30_CLK_HDA2HDMI>,
+			 <&tegra_car TEGRA30_CLK_HDA2CODEC_2X>;
+		clock-names = "hda", "hda2hdmi", "hda2codec_2x";
+		resets = <&tegra_car 125>, /* hda */
+			 <&tegra_car 128>, /* hda2hdmi */
+			 <&tegra_car 111>; /* hda2codec_2x */
+		reset-names = "hda", "hda2hdmi", "hda2codec_2x";
+		status = "disabled";
+	};
+
 	ahub at 70080000 {
 		compatible = "nvidia,tegra30-ahub";
 		reg = <0x70080000 0x200
Signature · 1 line
1.9.3
Applied
#11 lore raw

Re: [PATCH 4/9] ARM: tegra: add Tegra30 HDA support

Quoted 8 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add a device node for the HDA controller found on Tegra30.

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/boot/dts/tegra30.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Applied, thanks.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/ae35d720/attachment.sig>

author
#12 lore raw

PATCH 5/9 ARM: tegra: fix hda2codec_2x clock name in Tegra124 device tree

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/boot/dts/tegra124.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124.dtsi +2 -2
index fefec80..095d326 100644
@@ -620,11 +620,11 @@
 		clocks = <&tegra_car TEGRA124_CLK_HDA>,
 		         <&tegra_car TEGRA124_CLK_HDA2HDMI>,
 			 <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;
-		clock-names = "hda", "hda2hdmi", "hdacodec_2x";
+		clock-names = "hda", "hda2hdmi", "hda2codec_2x";
 		resets = <&tegra_car 125>, /* hda */
 			 <&tegra_car 128>, /* hda2hdmi */
 			 <&tegra_car 111>; /* hda2codec_2x */
-		reset-names = "hda", "hda2hdmi", "hdacodec_2x";
+		reset-names = "hda", "hda2hdmi", "hda2codec_2x";
 		status = "disabled";
 	};
Signature · 1 line
1.9.3
#14 lore raw

Re: [PATCH 5/9] ARM: tegra: fix hda2codec_2x clock name in Tegra124 device tree

In reply to Marcel Ziswiler
Quoted 6 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/boot/dts/tegra124.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

I have this exact commit locally in my tree, so I've just taken the commit message from that and applied this for v4.2.

Thanks,
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/d1449cd1/attachment.sig>

author
#15 lore raw

PATCH 6/9 ARM: tegra: enable watchdog in defconfig

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/configs/tegra_defconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/configs/tegra_defconfig +2 -0
index d199eb2..18047c4 100644
@@ -154,6 +154,8 @@ CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_SENSORS_LM90=y
 CONFIG_SENSORS_LM95245=y
+CONFIG_WATCHDOG=y
+CONFIG_TEGRA_WATCHDOG=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_SPI=y
Signature · 1 line
1.9.3
author
#16 lore raw

PATCH 7/9 ARM: tegra: enable HDA in defconfig

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/configs/tegra_defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/configs/tegra_defconfig +8 -0
index 18047c4..cdf9abb 100644
@@ -196,6 +196,14 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_DRIVERS is not set
+CONFIG_SND_HDA=y
+CONFIG_SND_HDA_TEGRA=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_GENERIC=y
 # CONFIG_SND_ARM is not set
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_USB is not set
Signature · 1 line
1.9.3
#18 lore raw

Re: [PATCH 7/9] ARM: tegra: enable HDA in defconfig

Quoted 9 lines · Paul Walmsley
Quoted 3 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>

This one is also missing a commit message; please add one.

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches#n109

defconfig updates are generally an exception to this rule. The reason is that I'll end up squashing them into a single commit anyway.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150414/b3ffa582/attachment-0001.sig>

#19 lore raw

Re: [PATCH 7/9] ARM: tegra: enable HDA in defconfig

In reply to Marcel Ziswiler
Quoted 6 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>
---
 arch/arm/configs/tegra_defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

I've squashed this into a single commit with the patch that enables watchdog support.

Thanks,
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/f289d2d2/attachment.sig>

author
#20 lore raw

PATCH 8/9 ARM: tegra: colibri t30: activate stmpe811 touch controller

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Activate STMPE811 touch controller as found on Colibri T30 modules. While at it change order of HDMI sub nodes as well to be more in line with Apalis T30.
While at it also update comment about supported module hardware versions.

Signed-off-by Marcel Ziswiler <[email protected]>

coli

---
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts |  4 +--
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 44 +++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +2 -2
index 4d3ddc5..d42c400 100644
@@ -55,7 +55,7 @@
 
 		/* M41T0M6 real time clock on carrier board */
 		rtc at 68 {
-			compatible = "stm,m41t00";
+			compatible = "st,m41t00";
 			reg = <0x68>;
 		};
 	};

@@ -84,7 +84,7 @@
 		};
 	};
 
-	sdhci at 78000200 {
+	sdmmc: sdhci at 78000200 {
 		status = "okay";
 		bus-width = <4>;
 		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
arch/arm/boot/dts/tegra30-colibri.dtsi +42 -2

64 lines not on this page · raw message

Signature · 1 line
1.9.3
#21 lore raw

Re: [PATCH 8/9] ARM: tegra: colibri t30: activate stmpe811 touch controller

Quoted 21 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Activate STMPE811 touch controller as found on Colibri T30 modules. While at it change order of HDMI sub nodes as well to be more in line with Apalis T30.
While at it also update comment about supported module hardware versions.

Signed-off-by Marcel Ziswiler <[email protected]>

coli

---
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts |  4 +--
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 44 +++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +0 -0
index 4d3ddc5..d42c400 100644

arch/arm/boot/dts/tegra30-colibri-eval-v3.dts line 61

Quoted 8 lines
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
@@ -55,7 +55,7 @@
 
 		/* M41T0M6 real time clock on carrier board */
 		rtc at 68 {
-			compatible = "stm,m41t00";
+			compatible = "st,m41t00";
 			reg = <0x68>;
 		};
 	};

This change isn't documented in the commit message.

arch/arm/boot/dts/tegra30-colibri-eval-v3.dts line 90

Quoted 9 lines
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
@@ -84,7 +84,7 @@
 		};
 	};
 
-	sdhci at 78000200 {
+	sdmmc: sdhci at 78000200 {
 		status = "okay";
 		bus-width = <4>;
 		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;

Do you actually need this label? I suspect not, and I would suspect that you don't need it on Apalis either, so I think a better patch would just remove it from Apalis as well.

Quoted 14 lines
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -1
index c4ed1be..5f7f4a0 100644
@@ -3,7 +3,7 @@
 
 /*
  * Toradex Colibri T30 Device Tree
- * Compatible for Revisions 1.1B/1.1C/1.1D
+ * Compatible for Revisions V1.1B, V1.1C, V1.1D, V1.1E; IT: V1.1A
  */
 / {
 	model = "Toradex Colibri T30";

arch/arm/boot/dts/tegra30-colibri.dtsi line 25

Quoted 9 lines
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -1
@@ -18,9 +18,9 @@
 			vdd-supply = <&sys_3v3_reg>;
 			pll-supply = <&vio_reg>;
 
+			nvidia,ddc-i2c-bus = <&hdmiddc>;
 			nvidia,hpd-gpio =
 				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
-			nvidia,ddc-i2c-bus = <&hdmiddc>;
 		};
 	};

There's too many changes crammed into this commit for my taste. Can you please separate these out into smaller commits and resend?

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/3e403087/attachment-0001.sig>

author
#22 lore raw

PATCH 9/9 ARM: tegra: apalis t30: fix pin muxing and add HDA in device tree

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix pin muxing, add digital audio aka HDA pin muxing and activate HDA driver.
Fix pu vs. gpio_pu pin muxing.
While at it also update comment about supported module hardware versions.
While at it also add an emmc label to the SDHCI node just like on Colibri T30.
While at it set the dr_mode of the primary USB EHCI instance to OTG as well.

Signed-off-by Marcel Ziswiler <[email protected]>

---
With all that it loads and detects our Realtek codec just fine as can be seen below but so far I have been unable to figure out how to actually get it to deliver some actual acoustics (;-p). Any input on any of this welcome.

[    8.496588] sound hdaudioC0D1: autoconfig for ALC898: line_outs=4 (0x14/0x16/
0x15/0x17/0x0) type:line
[    8.511715] sound hdaudioC0D1:    speaker_outs=0 (0x0/0x0/0x0/0x0/0x0)
[    8.524117] sound hdaudioC0D1:    hp_outs=1 (0x1b/0x0/0x0/0x0/0x0)
[    8.536163] sound hdaudioC0D1:    mono: mono_out=0x0
[    8.546995] sound hdaudioC0D1:    dig-out=0x1e/0x0
[    8.557650] sound hdaudioC0D1:    inputs:
[    8.567532] sound hdaudioC0D1:      Rear Mic=0x18
[    8.578108] sound hdaudioC0D1:      Front Mic=0x19
[    8.588767] sound hdaudioC0D1:      Line=0x1a
[    8.598992] sound hdaudioC0D1:      CD=0x1c
[   13.252853] input: tegra-hda Rear Mic as /devices/soc0/70030000.hda/sound/car
d0/input1
[   13.268130] input: tegra-hda Front Mic as /devices/soc0/70030000.hda/sound/ca
rd0/input2
[   13.283471] input: tegra-hda Line as /devices/soc0/70030000.hda/sound/card0/i
nput3
[   13.298377] input: tegra-hda Line Out Front as /devices/soc0/70030000.hda/sou
nd/card0/input4
[   13.314144] input: tegra-hda Line Out Surround as /devices/soc0/70030000.hda/
sound/card0/input5
[   13.330208] input: tegra-hda Line Out CLFE as /devices/soc0/70030000.hda/soun
d/card0/input6
[   13.345893] input: tegra-hda Line Out Side as /devices/soc0/70030000.hda/soun
d/card0/input7
[   13.361579] input: tegra-hda Front Headphone as /devices/soc0/70030000.hda/so
und/card0/input8
[   13.377476] input: tegra-hda HDMI/DP,pcm=3 as /devices/soc0/70030000.hda/soun

d/card0/input9

[   14.274781] ALSA device list:
[   14.287090]   #0: tegra-hda at 0x70038000 irq 345
 arch/arm/boot/dts/tegra30-apalis-eval.dts |  5 ++++
 arch/arm/boot/dts/tegra30-apalis.dtsi     | 46 +++++++++++++++++++++++--------
 2 files changed, 40 insertions(+), 11 deletions(-)
arch/arm/boot/dts/tegra30-apalis-eval.dts +5 -0
index 6236bde..37437c6 100644
@@ -126,6 +126,10 @@
 		};
 	};
 
+	hda at 70030000 {
+		status = "okay";
+	};
+
 	sd1: sdhci at 78000000 {
 		status = "okay";
 		bus-width = <4>;

@@ -149,6 +153,7 @@
 
 	usb-phy at 7d000000 {
 		status = "okay";
+		dr_mode = "otg";
 		vbus-supply = <&usbo1_vbus_reg>;
 	};
arch/arm/boot/dts/tegra30-apalis.dtsi +35 -11

94 lines not on this page · raw message

Signature · 1 line
1.9.3
#23 lore raw

Re: [PATCH 9/9] ARM: tegra: apalis t30: fix pin muxing and add HDA in device tree

Quoted 12 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix pin muxing, add digital audio aka HDA pin muxing and activate HDA driver.
Fix pu vs. gpio_pu pin muxing.
While at it also update comment about supported module hardware versions.
While at it also add an emmc label to the SDHCI node just like on Colibri T30.
While at it set the dr_mode of the primary USB EHCI instance to OTG as well.

Quoted 1 line
Signed-off-by Marcel Ziswiler <[email protected]>

Same as for patch 8/9, please split these up into smaller patches that do one thing each. And again, I'm not sure adding an emmc label just for consistency here is worth it. If it's never used there's no need to have it.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150505/3912c70f/attachment.sig>

#24 lore raw
In reply to Marcel Ziswiler
Quoted 17 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This series is a set of patches accumulated over Easter ultimately bringing HDA audio to Tegra30 devices.

Marcel Ziswiler (9):
ARM: tegra: Cardhu device-tree comment spelling fix
ARM: tegra: fix hda2codec_2x clock name for Tegra30
Documentation: DT bindings: fix hda2codec_2x clock name for

    tegra30-hda

ARM: tegra: add Tegra30 HDA support
ARM: tegra: fix hda2codec_2x clock name in Tegra124 device tree
ARM: tegra: enable watchdog in defconfig
ARM: tegra: enable HDA in defconfig
ARM: tegra: colibri t30: activate stmpe811 touch controller
ARM: tegra: apalis t30: fix pin muxing and add HDA in device tree

Quoted 11 lines
 .../bindings/sound/nvidia,tegra30-hda.txt          |  8 ++--
 arch/arm/boot/dts/tegra124.dtsi                    |  4 +-
 arch/arm/boot/dts/tegra30-apalis-eval.dts          |  5 +++
 arch/arm/boot/dts/tegra30-apalis.dtsi              | 46 ++++++++++++++++------
 arch/arm/boot/dts/tegra30-cardhu.dtsi              |  2 +-
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts      |  4 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi             | 44 ++++++++++++++++++++-
 arch/arm/boot/dts/tegra30.dtsi                     | 15 +++++++
 arch/arm/configs/tegra_defconfig                   | 10 +++++
 drivers/clk/tegra/clk-tegra30.c                    |  2 +-
 10 files changed, 117 insertions(+), 23 deletions(-)

This duplicates a lot of a series that I've been carrying locally for quite some time but never got around to posting publicly. Sorry about that. I'll rebase what I have on top of this and then take this for v4.2.

Thanks,
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150414/9f1e4e50/attachment.sig>

author
#25 lore raw
Quoted 4 lines · Thierry Reding

This duplicates a lot of a series that I've been carrying locally for quite some time but never got around to posting publicly. Sorry about that. I'll rebase what I have on top of this and then take this for v4.2.

OK, thanks Thierry.

Two questions:

A) You don't think it would make sense to get any of this applied sooner than v4.2?

B) I would not need to post a second version of this series then?

I just noticed that patch 8 is actually missing the pinmux entry for the touch interrupt which mandates a second version thereof. Or should I just send a fix for that as a separate patch later?

BTW: I also noticed another regression with the following two patches causing a hard freeze on our Apalis/Colibri T30 modules upon starting X using a plain fbdev driver. This does not happen if I revert those two commits but it also does not happen if I disable X startup. Do you have any idea what might cause this?

a9fe46
ARM: tegra: Add memory controller support for Tegra30

6d9adf
ARM: tegra: Enable IOMMU for display controllers on Tegra30