[PATCH 0/9] ARM: tegra: collection of enhancements/fixes

[PATCH 0/9] ARM: tegra: collection of enhancements/fixes

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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(-)

-- 
1.9.3

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index a1b682e..6f86820 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -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:
-- 
1.9.3

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

[Paul Walmsley]

On Fri, 10 Apr 2015, Marcel Ziswiler wrote:

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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


- Paul

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

[Marcel Ziswiler]

On Fri, 2015-04-10 at 22:18 +0000, Paul Walmsley wrote:
> 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.

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:35:56PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>  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>

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 drivers/clk/tegra/clk-tegra30.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
index 4b9d8bd..3d14ea5 100644
--- a/drivers/clk/tegra/clk-tegra30.c
+++ b/drivers/clk/tegra/clk-tegra30.c
@@ -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 },
-- 
1.9.3

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:35:57PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>  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>

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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 <marcel.ziswiler@toradex.com>
---
 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
index 13e2ef4..5032efa 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
@@ -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";
 };
-- 
1.9.3

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

[Paul Walmsley]

On Fri, 10 Apr 2015, Marcel Ziswiler wrote:

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> 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 <marcel.ziswiler@toradex.com>

Reviewed-by: Paul Walmsley <paul@pwsan.com>

against the Tegra K1 TRM v03p


- Paul

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:35:58PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> 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 <marcel.ziswiler@toradex.com>
> ---
>  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

> diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
> index 13e2ef4..5032efa 100644
> --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
> +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
> @@ -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";
>  };
> -- 
> 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>

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 arch/arm/boot/dts/tegra30.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index db4810d..12a87aa 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -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
-- 
1.9.3

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:35:59PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Add a device node for the HDA controller found on Tegra30.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>  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>

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 arch/arm/boot/dts/tegra124.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index fefec80..095d326 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -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";
 	};
 
-- 
1.9.3

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

[Paul Walmsley]

On Fri, 10 Apr 2015, Marcel Ziswiler wrote:

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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



- Paul

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:36:00PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>  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>

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 arch/arm/configs/tegra_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index d199eb2..18047c4 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -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
-- 
1.9.3

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 arch/arm/configs/tegra_defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 18047c4..cdf9abb 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -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
-- 
1.9.3

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

[Paul Walmsley]

On Fri, 10 Apr 2015, Marcel Ziswiler wrote:

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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

- Paul

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 10:18:44PM +0000, Paul Walmsley wrote:
> On Fri, 10 Apr 2015, Marcel Ziswiler wrote:
> 
> > From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > 
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> 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>

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:36:02PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>  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>

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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 <marcel.ziswiler@toradex.com>

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(-)

diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 4d3ddc5..d42c400 100644
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -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>;
diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index c4ed1be..5f7f4a0 100644
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -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";
@@ -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>;
 		};
 	};
 
@@ -295,6 +295,46 @@
 			};
 		};
 
+		/* STMPE811 touch screen controller */
+		stmpe811 at 41 {
+			compatible = "st,stmpe811";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x41>;
+			interrupts = <TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
+			interrupt-parent = <&gpio>;
+			interrupt-controller;
+			id = <0>;
+			blocks = <0x5>;
+			irq-trigger = <0x1>;
+
+			stmpe_touchscreen {
+				compatible = "st,stmpe-ts";
+				reg = <0>;
+				/* 3.25 MHz ADC clock speed */
+				st,adc-freq = <1>;
+				/* 8 sample average control */
+				st,ave-ctrl = <3>;
+				/* 7 length fractional part in z */
+				st,fraction-z = <7>;
+				/*
+				 * 50 mA typical 80 mA max touchscreen drivers
+				 * current limit value
+				 */
+				st,i-drive = <1>;
+				/* 12-bit ADC */
+				st,mod-12b = <1>;
+				/* internal ADC reference */
+				st,ref-sel = <0>;
+				/* ADC converstion time: 80 clocks */
+				st,sample-time = <4>;
+				/* 1 ms panel driver settling time */
+				st,settling = <3>;
+				/* 5 ms touch detect interrupt delay */
+				st,touch-det-delay = <5>;
+			};
+		};
+
 		/*
 		 * LM95245 temperature sensor
 		 * Note: OVERT_N directly connected to PMIC PWRDN
-- 
1.9.3

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:36:03PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> 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 <marcel.ziswiler@toradex.com>
> 
> 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(-)
> 
> diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
> index 4d3ddc5..d42c400 100644
> --- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
> +++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
> @@ -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.

> @@ -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.

> diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
> index c4ed1be..5f7f4a0 100644
> --- a/arch/arm/boot/dts/tegra30-colibri.dtsi
> +++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
> @@ -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";
> @@ -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>

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

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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 <marcel.ziswiler@toradex.com>
---
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(-)

diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
index 6236bde..37437c6 100644
--- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -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>;
 	};
 
diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index a5446cb..e6bac82 100644
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -2,7 +2,7 @@
 
 /*
  * Toradex Apalis T30 Device Tree
- * Compatible for Revisions 1GB: V1.0A; 2GB: V1.0B, V1.0C
+ * Compatible for Revisions 1GB: V1.0A, V1.1A; 1GB IT: V1.1A; 2GB: V1.0B, V1.0C, V1.0E, V1.1A
  */
 / {
 	model = "Toradex Apalis T30";
@@ -65,7 +65,7 @@
 			/* BKL1_PWM_EN#, disable TPS65911 PMIC PWM backlight */
 			uart3_cts_n_pa1 {
 				nvidia,pins =	"uart3_cts_n_pa1";
-				nvidia,function = "rsvd1";
+				nvidia,function = "rsvd2";
 				nvidia,pull = <TEGRA_PIN_PULL_UP>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
@@ -108,6 +108,30 @@
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
 
+			/* Apalis Digital Audio */
+			clk1_req_pee2 {
+				nvidia,pins =	"clk1_req_pee2";
+				nvidia,function = "hda";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
+			clk2_out_pw5 {
+				nvidia,pins = "clk2_out_pw5";
+				nvidia,function = "extperiph2";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			dap1_fs_pn0 {
+				nvidia,pins =	"dap1_fs_pn0",
+						"dap1_din_pn1",
+						"dap1_dout_pn2",
+						"dap1_sclk_pn3";
+				nvidia,function = "hda";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
+
 			/* Apalis I2C3 */
 			cam_i2c_scl_pbb1 {
 				nvidia,pins = "cam_i2c_scl_pbb1",
@@ -151,32 +175,32 @@
 			};
 
 			/* Apalis PWM1 */
-			gpio_pu6 {
-				nvidia,pins =	"gpio_pu6";
+			pu6 {
+				nvidia,pins =	"pu6";
 				nvidia,function = "pwm3";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
 			/* Apalis PWM2 */
-			gpio_pu5 {
-				nvidia,pins =	"gpio_pu5";
+			pu5 {
+				nvidia,pins =	"pu5";
 				nvidia,function = "pwm2";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
 			/* Apalis PWM3 */
-			gpio_pu4 {
-				nvidia,pins =	"gpio_pu4";
+			pu4 {
+				nvidia,pins =	"pu4";
 				nvidia,function = "pwm1";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
 			/* Apalis PWM4 */
-			gpio_pu3 {
-				nvidia,pins =	"gpio_pu3";
+			pu3 {
+				nvidia,pins =	"pu3";
 				nvidia,function = "pwm0";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
@@ -635,7 +659,7 @@
 		nvidia,sys-clock-req-active-high;
 	};
 
-	sdhci at 78000600 {
+	emmc: sdhci at 78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
-- 
1.9.3

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

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:36:04PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> 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 <marcel.ziswiler@toradex.com>

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>

[PATCH 0/9] ARM: tegra: collection of enhancements/fixes

[Thierry Reding]

On Fri, Apr 10, 2015 at 11:35:55PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> 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(-)

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>

[PATCH 0/9] ARM: tegra: collection of enhancements/fixes

[Marcel Ziswiler]

On Tue, 2015-04-14 at 14:52 +0200, Thierry Reding wrote:
> 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