diff mbox series

[v3,4/6] dt-bindings: Add HDA support for Tegra234

Message ID 20220216092240.26464-5-mkumard@nvidia.com (mailing list archive)
State New, archived
Headers show
Series Add Tegra234 HDA support | expand

Commit Message

Mohan Kumar Feb. 16, 2022, 9:22 a.m. UTC 
Add hda clocks, memory ,power and reset binding entries
for Tegra234.

Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
---
 include/dt-bindings/clock/tegra234-clock.h     | 4 ++++
 include/dt-bindings/memory/tegra234-mc.h       | 6 ++++++
 include/dt-bindings/power/tegra234-powergate.h | 9 +++++++++
 include/dt-bindings/reset/tegra234-reset.h     | 2 ++
 4 files changed, 21 insertions(+)
 create mode 100644 include/dt-bindings/power/tegra234-powergate.h

Comments

Thierry Reding Feb. 16, 2022, 3:38 p.m. UTC | #1 
On Wed, Feb 16, 2022 at 02:52:38PM +0530, Mohan Kumar wrote:
> Add hda clocks, memory ,power and reset binding entries
> for Tegra234.
> 
> Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
> ---
>  include/dt-bindings/clock/tegra234-clock.h     | 4 ++++
>  include/dt-bindings/memory/tegra234-mc.h       | 6 ++++++
>  include/dt-bindings/power/tegra234-powergate.h | 9 +++++++++
>  include/dt-bindings/reset/tegra234-reset.h     | 2 ++
>  4 files changed, 21 insertions(+)
>  create mode 100644 include/dt-bindings/power/tegra234-powergate.h

Actually it looks like I may need to pick this up as well to satisfy the
dependency from patch 6.

Takashi, any objections if I pick up patches 4 and 6 and you take the
remainder through your tree? I don't think there are any dependencies on
this patch 4 from patches 1-3 and 5.

Thierry
Takashi Iwai Feb. 16, 2022, 3:45 p.m. UTC | #2 
On Wed, 16 Feb 2022 16:38:06 +0100,
Thierry Reding wrote:
> 
> On Wed, Feb 16, 2022 at 02:52:38PM +0530, Mohan Kumar wrote:
> > Add hda clocks, memory ,power and reset binding entries
> > for Tegra234.
> > 
> > Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
> > ---
> >  include/dt-bindings/clock/tegra234-clock.h     | 4 ++++
> >  include/dt-bindings/memory/tegra234-mc.h       | 6 ++++++
> >  include/dt-bindings/power/tegra234-powergate.h | 9 +++++++++
> >  include/dt-bindings/reset/tegra234-reset.h     | 2 ++
> >  4 files changed, 21 insertions(+)
> >  create mode 100644 include/dt-bindings/power/tegra234-powergate.h
> 
> Actually it looks like I may need to pick this up as well to satisfy the
> dependency from patch 6.
> 
> Takashi, any objections if I pick up patches 4 and 6 and you take the
> remainder through your tree? I don't think there are any dependencies on
> this patch 4 from patches 1-3 and 5.

Sure, I'm fine with it.


thanks,

Takashi
Takashi Iwai Feb. 21, 2022, 9:59 a.m. UTC | #3 
On Wed, 16 Feb 2022 16:45:48 +0100,
Takashi Iwai wrote:
> 
> On Wed, 16 Feb 2022 16:38:06 +0100,
> Thierry Reding wrote:
> > 
> > On Wed, Feb 16, 2022 at 02:52:38PM +0530, Mohan Kumar wrote:
> > > Add hda clocks, memory ,power and reset binding entries
> > > for Tegra234.
> > > 
> > > Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
> > > ---
> > >  include/dt-bindings/clock/tegra234-clock.h     | 4 ++++
> > >  include/dt-bindings/memory/tegra234-mc.h       | 6 ++++++
> > >  include/dt-bindings/power/tegra234-powergate.h | 9 +++++++++
> > >  include/dt-bindings/reset/tegra234-reset.h     | 2 ++
> > >  4 files changed, 21 insertions(+)
> > >  create mode 100644 include/dt-bindings/power/tegra234-powergate.h
> > 
> > Actually it looks like I may need to pick this up as well to satisfy the
> > dependency from patch 6.
> > 
> > Takashi, any objections if I pick up patches 4 and 6 and you take the
> > remainder through your tree? I don't think there are any dependencies on
> > this patch 4 from patches 1-3 and 5.
> 
> Sure, I'm fine with it.

Now I merged patches 1, 2, 3 and 5 to sound.git tree for-next branch.


thanks,

Takashi
Rob Herring Feb. 24, 2022, 7:31 p.m. UTC | #4 
On Wed, Feb 16, 2022 at 02:52:38PM +0530, Mohan Kumar wrote:
> Add hda clocks, memory ,power and reset binding entries
> for Tegra234.
> 
> Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
> ---
>  include/dt-bindings/clock/tegra234-clock.h     | 4 ++++
>  include/dt-bindings/memory/tegra234-mc.h       | 6 ++++++
>  include/dt-bindings/power/tegra234-powergate.h | 9 +++++++++
>  include/dt-bindings/reset/tegra234-reset.h     | 2 ++
>  4 files changed, 21 insertions(+)
>  create mode 100644 include/dt-bindings/power/tegra234-powergate.h
> 
> diff --git a/include/dt-bindings/clock/tegra234-clock.h b/include/dt-bindings/clock/tegra234-clock.h
> index 2529e7ec0bf4..2ab651916127 100644
> --- a/include/dt-bindings/clock/tegra234-clock.h
> +++ b/include/dt-bindings/clock/tegra234-clock.h
> @@ -64,4 +64,8 @@
>  #define TEGRA234_CLK_PLLC4			237U
>  /** @brief 32K input clock provided by PMIC */
>  #define TEGRA234_CLK_CLK_32K			289U
> +/** @brief CLK_RST_CONTROLLER_AZA2XBITCLK_OUT_SWITCH_DIVIDER switch divider output (aza_2xbitclk) */
> +#define TEGRA234_CLK_AZA_2XBIT			457U
> +/** @brief aza_2xbitclk / 2 (aza_bitclk) */
> +#define TEGRA234_CLK_AZA_BIT			458U
>  #endif
> diff --git a/include/dt-bindings/memory/tegra234-mc.h b/include/dt-bindings/memory/tegra234-mc.h
> index 2662f70c15c6..c42fe61fba5e 100644
> --- a/include/dt-bindings/memory/tegra234-mc.h
> +++ b/include/dt-bindings/memory/tegra234-mc.h
> @@ -7,6 +7,8 @@
>  #define TEGRA234_SID_INVALID		0x00
>  #define TEGRA234_SID_PASSTHROUGH	0x7f
>  
> +/* NISO0 stream IDs */
> +#define TEGRA234_SID_HDA		0x03
>  
>  /* NISO1 stream IDs */
>  #define TEGRA234_SID_SDMMC4	0x02
> @@ -16,6 +18,10 @@
>   * memory client IDs
>   */
>  
> +/* High-definition audio (HDA) read clients */
> +#define TEGRA234_MEMORY_CLIENT_HDAR 0x15
> +/* High-definition audio (HDA) write clients */
> +#define TEGRA234_MEMORY_CLIENT_HDAW 0x35
>  /* sdmmcd memory read client */
>  #define TEGRA234_MEMORY_CLIENT_SDMMCRAB 0x63
>  /* sdmmcd memory write client */
> diff --git a/include/dt-bindings/power/tegra234-powergate.h b/include/dt-bindings/power/tegra234-powergate.h
> new file mode 100644
> index 000000000000..3c5575a51296
> --- /dev/null
> +++ b/include/dt-bindings/power/tegra234-powergate.h
> @@ -0,0 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0 */

Dual license please.

> +/* Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. */
> +
> +#ifndef __ABI_MACH_T234_POWERGATE_T234_H_
> +#define __ABI_MACH_T234_POWERGATE_T234_H_
> +
> +#define TEGRA234_POWER_DOMAIN_DISP	3U
> +
> +#endif
> diff --git a/include/dt-bindings/reset/tegra234-reset.h b/include/dt-bindings/reset/tegra234-reset.h
> index ba390b86361d..178e73a687f0 100644
> --- a/include/dt-bindings/reset/tegra234-reset.h
> +++ b/include/dt-bindings/reset/tegra234-reset.h
> @@ -10,6 +10,8 @@
>   * @brief Identifiers for Resets controllable by firmware
>   * @{
>   */
> +#define TEGRA234_RESET_HDA			20U
> +#define TEGRA234_RESET_HDACODEC			21U
>  #define TEGRA234_RESET_I2C1			24U
>  #define TEGRA234_RESET_I2C2			29U
>  #define TEGRA234_RESET_I2C3			30U
> -- 
> 2.17.1
> 
>
Thierry Reding Feb. 25, 2022, 12:51 p.m. UTC | #5 
On Thu, Feb 24, 2022 at 01:31:41PM -0600, Rob Herring wrote:
> On Wed, Feb 16, 2022 at 02:52:38PM +0530, Mohan Kumar wrote:
> > Add hda clocks, memory ,power and reset binding entries
> > for Tegra234.
> > 
> > Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
> > ---
> >  include/dt-bindings/clock/tegra234-clock.h     | 4 ++++
> >  include/dt-bindings/memory/tegra234-mc.h       | 6 ++++++
> >  include/dt-bindings/power/tegra234-powergate.h | 9 +++++++++
> >  include/dt-bindings/reset/tegra234-reset.h     | 2 ++
> >  4 files changed, 21 insertions(+)
> >  create mode 100644 include/dt-bindings/power/tegra234-powergate.h
> > 
> > diff --git a/include/dt-bindings/clock/tegra234-clock.h b/include/dt-bindings/clock/tegra234-clock.h
> > index 2529e7ec0bf4..2ab651916127 100644
> > --- a/include/dt-bindings/clock/tegra234-clock.h
> > +++ b/include/dt-bindings/clock/tegra234-clock.h
> > @@ -64,4 +64,8 @@
> >  #define TEGRA234_CLK_PLLC4			237U
> >  /** @brief 32K input clock provided by PMIC */
> >  #define TEGRA234_CLK_CLK_32K			289U
> > +/** @brief CLK_RST_CONTROLLER_AZA2XBITCLK_OUT_SWITCH_DIVIDER switch divider output (aza_2xbitclk) */
> > +#define TEGRA234_CLK_AZA_2XBIT			457U
> > +/** @brief aza_2xbitclk / 2 (aza_bitclk) */
> > +#define TEGRA234_CLK_AZA_BIT			458U
> >  #endif
> > diff --git a/include/dt-bindings/memory/tegra234-mc.h b/include/dt-bindings/memory/tegra234-mc.h
> > index 2662f70c15c6..c42fe61fba5e 100644
> > --- a/include/dt-bindings/memory/tegra234-mc.h
> > +++ b/include/dt-bindings/memory/tegra234-mc.h
> > @@ -7,6 +7,8 @@
> >  #define TEGRA234_SID_INVALID		0x00
> >  #define TEGRA234_SID_PASSTHROUGH	0x7f
> >  
> > +/* NISO0 stream IDs */
> > +#define TEGRA234_SID_HDA		0x03
> >  
> >  /* NISO1 stream IDs */
> >  #define TEGRA234_SID_SDMMC4	0x02
> > @@ -16,6 +18,10 @@
> >   * memory client IDs
> >   */
> >  
> > +/* High-definition audio (HDA) read clients */
> > +#define TEGRA234_MEMORY_CLIENT_HDAR 0x15
> > +/* High-definition audio (HDA) write clients */
> > +#define TEGRA234_MEMORY_CLIENT_HDAW 0x35
> >  /* sdmmcd memory read client */
> >  #define TEGRA234_MEMORY_CLIENT_SDMMCRAB 0x63
> >  /* sdmmcd memory write client */
> > diff --git a/include/dt-bindings/power/tegra234-powergate.h b/include/dt-bindings/power/tegra234-powergate.h
> > new file mode 100644
> > index 000000000000..3c5575a51296
> > --- /dev/null
> > +++ b/include/dt-bindings/power/tegra234-powergate.h
> > @@ -0,0 +1,9 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> 
> Dual license please.

We've got a bunch of similar files in this directory that are not
dual licensed. These files originally are part of the BPMP firmware
tree, so I'll check with the owners if relicensing would be possible.
If so, I think we should be able to relicense all of those header files.

Thierry
diff mbox series

Patch

diff --git a/include/dt-bindings/clock/tegra234-clock.h b/include/dt-bindings/clock/tegra234-clock.h
index 2529e7ec0bf4..2ab651916127 100644
--- a/include/dt-bindings/clock/tegra234-clock.h
+++ b/include/dt-bindings/clock/tegra234-clock.h
@@ -64,4 +64,8 @@ 
 #define TEGRA234_CLK_PLLC4			237U
 /** @brief 32K input clock provided by PMIC */
 #define TEGRA234_CLK_CLK_32K			289U
+/** @brief CLK_RST_CONTROLLER_AZA2XBITCLK_OUT_SWITCH_DIVIDER switch divider output (aza_2xbitclk) */
+#define TEGRA234_CLK_AZA_2XBIT			457U
+/** @brief aza_2xbitclk / 2 (aza_bitclk) */
+#define TEGRA234_CLK_AZA_BIT			458U
 #endif
diff --git a/include/dt-bindings/memory/tegra234-mc.h b/include/dt-bindings/memory/tegra234-mc.h
index 2662f70c15c6..c42fe61fba5e 100644
--- a/include/dt-bindings/memory/tegra234-mc.h
+++ b/include/dt-bindings/memory/tegra234-mc.h
@@ -7,6 +7,8 @@ 
 #define TEGRA234_SID_INVALID		0x00
 #define TEGRA234_SID_PASSTHROUGH	0x7f
 
+/* NISO0 stream IDs */
+#define TEGRA234_SID_HDA		0x03
 
 /* NISO1 stream IDs */
 #define TEGRA234_SID_SDMMC4	0x02
@@ -16,6 +18,10 @@ 
  * memory client IDs
  */
 
+/* High-definition audio (HDA) read clients */
+#define TEGRA234_MEMORY_CLIENT_HDAR 0x15
+/* High-definition audio (HDA) write clients */
+#define TEGRA234_MEMORY_CLIENT_HDAW 0x35
 /* sdmmcd memory read client */
 #define TEGRA234_MEMORY_CLIENT_SDMMCRAB 0x63
 /* sdmmcd memory write client */
diff --git a/include/dt-bindings/power/tegra234-powergate.h b/include/dt-bindings/power/tegra234-powergate.h
new file mode 100644
index 000000000000..3c5575a51296
--- /dev/null
+++ b/include/dt-bindings/power/tegra234-powergate.h
@@ -0,0 +1,9 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. */
+
+#ifndef __ABI_MACH_T234_POWERGATE_T234_H_
+#define __ABI_MACH_T234_POWERGATE_T234_H_
+
+#define TEGRA234_POWER_DOMAIN_DISP	3U
+
+#endif
diff --git a/include/dt-bindings/reset/tegra234-reset.h b/include/dt-bindings/reset/tegra234-reset.h
index ba390b86361d..178e73a687f0 100644
--- a/include/dt-bindings/reset/tegra234-reset.h
+++ b/include/dt-bindings/reset/tegra234-reset.h
@@ -10,6 +10,8 @@ 
  * @brief Identifiers for Resets controllable by firmware
  * @{
  */
+#define TEGRA234_RESET_HDA			20U
+#define TEGRA234_RESET_HDACODEC			21U
 #define TEGRA234_RESET_I2C1			24U
 #define TEGRA234_RESET_I2C2			29U
 #define TEGRA234_RESET_I2C3			30U