diff mbox

[U-Boot] Tegra114: Add support for more clock sources for T1x4 periphs

Message ID 1381175257-9155-1-git-send-email-twarren@nvidia.com
State Superseded
Delegated to: Tom Warren
Headers show

Commit Message

Tom Warren Oct. 7, 2013, 7:47 p.m. UTC 
Some T1x4 peripherals can take up to 8 different clock
sources (parents), including 4 new ones that don't exist
on previous chips (PLLC2/C3/MEM2/SRC2). Expand clock/pll
code/tables to support these additional bits/sources.

Changes were made to some common code. Testing on T30/T20
showed no changes in periph clock sources/divisors.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Change-Id: I396169cd5732ad42aeddefa70fc43f79e969a70d
---
 arch/arm/cpu/tegra-common/clock.c                 |  52 ++-
 arch/arm/cpu/tegra114-common/clock.c              | 422 +++++++++++++---------
 arch/arm/cpu/tegra30-common/clock.c               |   6 -
 arch/arm/include/asm/arch-tegra/clk_rst.h         |   3 +
 arch/arm/include/asm/arch-tegra/clock.h           |  17 +
 arch/arm/include/asm/arch-tegra114/clock-tables.h | 178 +++++----
 6 files changed, 422 insertions(+), 256 deletions(-)

Comments

Stephen Warren Oct. 8, 2013, 9:08 p.m. UTC | #1 
On 10/07/2013 01:47 PM, Tom Warren wrote:
> Some T1x4 peripherals can take up to 8 different clock

I would like to avoid "x" in any Tegra naming. Downstream, we've abused
this by calling Tegra114 Tegra11x instead, and I'd like to completely
avoid anything like that abomination upstream. Can we simply say "114"
instead of "1x4" or "114" here. If the "x" really is a wildcard, let's
just write out 114/124 instead, although if such clocks also exist on
Tegra114, there's no need to even mention Tegra124 here, since the
statement is valid even for just Tegra114 alone.

> Change-Id: I396169cd5732ad42aeddefa70fc43f79e969a70d

Upstream doesn't want those.

> diff --git a/arch/arm/cpu/tegra-common/clock.c b/arch/arm/cpu/tegra-common/clock.c
> index 268fb91..c703c40 100644
> --- a/arch/arm/cpu/tegra-common/clock.c
> +++ b/arch/arm/cpu/tegra-common/clock.c
> @@ -304,13 +304,24 @@ static int adjust_periph_pll(enum periph_id periph_id, int source,
>  	/* work out the source clock and set it */
>  	if (source < 0)
>  		return -1;
> -	if (mux_bits == 4) {
> -		clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
> -			source << OUT_CLK_SOURCE4_SHIFT);

That implies 4 bits ...

> +	switch (mux_bits) {

> +	case MASK_BITS_29_28:
> +		clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
> +			source << OUT_CLK_SOURCE4_SHIFT);

... but that implies 2 bits (29, 28). There's some inconsistency in the
naming there.

Can't we use the OUT_CLK_SOURCE4_MASK macros instead of inventing new
MASK_BITS_29_28 macros, or something like that? Or perhaps simply store
the shift and mask values in per-clock data, so there's no need for
conditional code here.

> +int clock_periph_enable(enum periph_id periph_id, enum clock_id parent,
> +		int divisor)

This function doesn't seem to be used anywhere. What's it for?

> +{
> +	int mux_bits, divider_bits, source;
> +
> +	/* Assert reset and enable clock */
> +	reset_set_enable(periph_id, 1);
> +	clock_enable(periph_id);
> +
> +	/* work out the source clock and set it */
> +	source = get_periph_clock_source(periph_id, parent, &mux_bits,
> +					 &divider_bits);
> +
> +	assert(divisor >= 0);
> +	divisor = (divisor - 1) << 1;

Doesn't that assert need to be "> 0" not "> = 0" to avoid underflow in
the "- 1" operation?

> diff --git a/arch/arm/cpu/tegra114-common/clock.c b/arch/arm/cpu/tegra114-common/clock.c

> @@ -122,110 +160,120 @@ static enum clock_type_id clock_periph_type[PERIPHC_COUNT] = {

> -	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
...
> +	TYPE(PERIPHC_05h,	CLOCK_TYPE_NONE),

Isn't that an unrelated change? At least the need for this should be
mentioned in the commit description.

>  	/* 0x10 */
> -	TYPE(PERIPHC_CVE,	CLOCK_TYPE_PDCT),
...
> +	TYPE(PERIPHC_10h,	CLOCK_TYPE_NONE),

Why remove that clock?

> -	TYPE(PERIPHC_TVDAC,	CLOCK_TYPE_PDCT),
...
> +	TYPE(PERIPHC_25h,	CLOCK_TYPE_NONE),

Same here.

> -	TYPE(PERIPHC_SPEEDO,	CLOCK_TYPE_PCMT),
...
> +	TYPE(PERIPHC_55h,	CLOCK_TYPE_NONE),

And that. etc.
Tom Warren Oct. 15, 2013, 10:42 p.m. UTC | #2 
Stephen,


On Tue, Oct 8, 2013 at 2:08 PM, Stephen Warren <swarren@wwwdotorg.org>wrote:

> On 10/07/2013 01:47 PM, Tom Warren wrote:
> > Some T1x4 peripherals can take up to 8 different clock
>
> I would like to avoid "x" in any Tegra naming. Downstream, we've abused
> this by calling Tegra114 Tegra11x instead, and I'd like to completely
> avoid anything like that abomination upstream. Can we simply say "114"
> instead of "1x4" or "114" here. If the "x" really is a wildcard, let's
> just write out 114/124 instead, although if such clocks also exist on
> Tegra114, there's no need to even mention Tegra124 here, since the
> statement is valid even for just Tegra114 alone.
>

OK. I'll change T1x4 to T114 everywhere for this patch. Thanks.


>
> > Change-Id: I396169cd5732ad42aeddefa70fc43f79e969a70d
>
> Upstream doesn't want those.
>

Yeah, I was a bit hasty creating these patchsets and left in a bunch of
these. Removed.


>
> > diff --git a/arch/arm/cpu/tegra-common/clock.c
> b/arch/arm/cpu/tegra-common/clock.c
> > index 268fb91..c703c40 100644
> > --- a/arch/arm/cpu/tegra-common/clock.c
> > +++ b/arch/arm/cpu/tegra-common/clock.c
> > @@ -304,13 +304,24 @@ static int adjust_periph_pll(enum periph_id
> periph_id, int source,
> >       /* work out the source clock and set it */
> >       if (source < 0)
> >               return -1;
> > -     if (mux_bits == 4) {
> > -             clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
> > -                     source << OUT_CLK_SOURCE4_SHIFT);
>
> That implies 4 bits ...
>
> > +     switch (mux_bits) {
>
> > +     case MASK_BITS_29_28:
> > +             clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
> > +                     source << OUT_CLK_SOURCE4_SHIFT);
>
> ... but that implies 2 bits (29, 28). There's some inconsistency in the
> naming there.
>

I didn't do the original patch (this code has been in there for awhile -
I'm only adding the new clock sources table/periph clocks for T114+), so I
can't say why this naming was chosen. Perhaps you can run it down upstream
(or in our internal T30 repo) using git-blame and query the original author
(Jimmy, Allen, etc.).  Regardless, as far as I can tell, only
CLK_SOURCE_PWM uses bits 29:28, and may be a typo in the T30 TRM. T114+
have changed it to bits 31:29. All other periphs use 2-bit (31:30) and
3-bit (31:29) CLK_SRC fields (4 or 8 possible sources) in my searches of
the Tegra30/114/124 TRMs.  We've never set a clock source for PWM in any
version of U-Boot AFAICT.


> Can't we use the OUT_CLK_SOURCE4_MASK macros instead of inventing new
> MASK_BITS_29_28 macros, or something like that? Or perhaps simply store
> the shift and mask values in per-clock data, so there's no need for
> conditional code here.
>

No new macros here, just using the MASK bits in a switch statement, because
the 31:29 case wasn't covered. I'm loath to change it now since this is
only supposed to be a patch to add additional clock source tables that came
into being w/T114, and this is common code. I'll leave it as-is and if you
want to submit a cleanup patch later, I'll Ack it.


> > +int clock_periph_enable(enum periph_id periph_id, enum clock_id parent,
> > +             int divisor)
>
> This function doesn't seem to be used anywhere. What's it for?
>

Don't know, probably vestigial. I'll remove it in V2.


>
> > +{
> > +     int mux_bits, divider_bits, source;
> > +
> > +     /* Assert reset and enable clock */
> > +     reset_set_enable(periph_id, 1);
> > +     clock_enable(periph_id);
> > +
> > +     /* work out the source clock and set it */
> > +     source = get_periph_clock_source(periph_id, parent, &mux_bits,
> > +                                      &divider_bits);
> > +
> > +     assert(divisor >= 0);
> > +     divisor = (divisor - 1) << 1;
>
> Doesn't that assert need to be "> 0" not "> = 0" to avoid underflow in
> the "- 1" operation?
>

Looks like it should be, yes (again, I'm just porting work from the
internal U-Boot repo). I'll change it to ">0". Thanks.


>
> > diff --git a/arch/arm/cpu/tegra114-common/clock.c
> b/arch/arm/cpu/tegra114-common/clock.c
>
> > @@ -122,110 +160,120 @@ static enum clock_type_id
> clock_periph_type[PERIPHC_COUNT] = {
>
> > -     TYPE(PERIPHC_NONE,      CLOCK_TYPE_NONE),
> ...
> > +     TYPE(PERIPHC_05h,       CLOCK_TYPE_NONE),
>
> Isn't that an unrelated change? At least the need for this should be
> mentioned in the commit description.
>

The precedent in this file seemed to be to use a hex number suffix for
'empty' slots, so I replaced PERIPHC_NONE with PERIPHC_05h to be
consistent. Since I was removing clocks/regs that had been removed in the
T114 TRM (see below), this seemed a good time for it. I can add a note
about it in the commit msg.


>
> >       /* 0x10 */
> > -     TYPE(PERIPHC_CVE,       CLOCK_TYPE_PDCT),
> ...
> > +     TYPE(PERIPHC_10h,       CLOCK_TYPE_NONE),
>
> Why remove that clock?
>

It's no longer present in the T114 TRM.


>
> > -     TYPE(PERIPHC_TVDAC,     CLOCK_TYPE_PDCT),
> ...
> > +     TYPE(PERIPHC_25h,       CLOCK_TYPE_NONE),
>
> Same here.
>

Ditto.


>
> > -     TYPE(PERIPHC_SPEEDO,    CLOCK_TYPE_PCMT),
> ...
> > +     TYPE(PERIPHC_55h,       CLOCK_TYPE_NONE),
>
> And that. etc.
>
> And again, no longer present in the TRM.

Tom
Stephen Warren Oct. 16, 2013, 8:47 p.m. UTC | #3 
On 10/15/2013 04:42 PM, Tom Warren wrote:
> On Tue, Oct 8, 2013 at 2:08 PM, Stephen Warren <swarren@wwwdotorg.org
> <mailto:swarren@wwwdotorg.org>> wrote:

>     > diff --git a/arch/arm/cpu/tegra-common/clock.c
>     b/arch/arm/cpu/tegra-common/clock.c
>     > index 268fb91..c703c40 100644
>     > --- a/arch/arm/cpu/tegra-common/clock.c
>     > +++ b/arch/arm/cpu/tegra-common/clock.c
>     > @@ -304,13 +304,24 @@ static int adjust_periph_pll(enum periph_id
>     periph_id, int source,
>     >       /* work out the source clock and set it */
>     >       if (source < 0)
>     >               return -1;
>     > -     if (mux_bits == 4) {
>     > -             clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
>     > -                     source << OUT_CLK_SOURCE4_SHIFT);
> 
>     That implies 4 bits ...
> 
>     > +     switch (mux_bits) {
> 
>     > +     case MASK_BITS_29_28:
>     > +             clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
>     > +                     source << OUT_CLK_SOURCE4_SHIFT);
> 
>     ... but that implies 2 bits (29, 28). There's some inconsistency in the
>     naming there.
> 
> I didn't do the original patch (this code has been in there for awhile -
> I'm only adding the new clock sources table/periph clocks for T114+), so
> I can't say why this naming was chosen. Perhaps you can run it down
> upstream (or in our internal T30 repo) using git-blame and query the
> original author (Jimmy, Allen, etc.).

That's the job of the patch submitter, not the reviewer. It'd be best if
the original author upstreamed the patch; everyone needs to get fully
involved in upstreaming, rather than relying on others to do their work
for them.

>  Regardless, as far as I can tell,
> only CLK_SOURCE_PWM uses bits 29:28, and may be a typo in the T30 TRM.
> T114+ have changed it to bits 31:29. All other periphs use 2-bit (31:30)
> and 3-bit (31:29) CLK_SRC fields (4 or 8 possible sources) in my
> searches of the Tegra30/114/124 TRMs.  We've never set a clock source
> for PWM in any version of U-Boot AFAICT.
> 
> 
>     Can't we use the OUT_CLK_SOURCE4_MASK macros instead of inventing new
>     MASK_BITS_29_28 macros, or something like that? Or perhaps simply store
>     the shift and mask values in per-clock data, so there's no need for
>     conditional code here.
> 
> No new macros here, just using the MASK bits in a switch statement,

The patch adds the following, which doesn't look like it's named
consistently:

+#define OUT_CLK_SOURCE3_SHIFT	29
+#define OUT_CLK_SOURCE3_MASK	(7U << OUT_CLK_SOURCE3_SHIFT)

> because the 31:29 case wasn't covered. I'm loath to change it now since
> this is only supposed to be a patch to add additional clock source
> tables that came into being w/T114, and this is common code. I'll leave
> it as-is and if you want to submit a cleanup patch later, I'll Ack it.

>     > diff --git a/arch/arm/cpu/tegra114-common/clock.c
>     b/arch/arm/cpu/tegra114-common/clock.c
> 
>     > @@ -122,110 +160,120 @@ static enum clock_type_id
>     clock_periph_type[PERIPHC_COUNT] = {
> 
>     > -     TYPE(PERIPHC_NONE,      CLOCK_TYPE_NONE),
>     ...
>     > +     TYPE(PERIPHC_05h,       CLOCK_TYPE_NONE),
> 
>     Isn't that an unrelated change? At least the need for this should be
>     mentioned in the commit description.
> 
> 
> The precedent in this file seemed to be to use a hex number suffix for
> 'empty' slots, so I replaced PERIPHC_NONE with PERIPHC_05h to be
> consistent. Since I was removing clocks/regs that had been removed in
> the T114 TRM (see below), this seemed a good time for it. I can add a
> note about it in the commit msg.

The patch description talks about adding support for more clock sources,
not fixing bugs with existing clock sources. Those two things sound like
they should be different patches; one fix/cleanup, one new feature.
Then, each patch would be simpler.

Anyway, I'll take another look at V2 and put more detailed comments there.
diff mbox

Patch

diff --git a/arch/arm/cpu/tegra-common/clock.c b/arch/arm/cpu/tegra-common/clock.c
index 268fb91..c703c40 100644
--- a/arch/arm/cpu/tegra-common/clock.c
+++ b/arch/arm/cpu/tegra-common/clock.c
@@ -304,13 +304,24 @@  static int adjust_periph_pll(enum periph_id periph_id, int source,
 	/* work out the source clock and set it */
 	if (source < 0)
 		return -1;
-	if (mux_bits == 4) {
-		clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
-			source << OUT_CLK_SOURCE4_SHIFT);
-	} else {
+
+	switch (mux_bits) {
+	case MASK_BITS_31_30:
 		clrsetbits_le32(reg, OUT_CLK_SOURCE_MASK,
 			source << OUT_CLK_SOURCE_SHIFT);
+		break;
+
+	case MASK_BITS_31_29:
+		clrsetbits_le32(reg, OUT_CLK_SOURCE3_MASK,
+			source << OUT_CLK_SOURCE3_SHIFT);
+		break;
+
+	case MASK_BITS_29_28:
+		clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
+			source << OUT_CLK_SOURCE4_SHIFT);
+		break;
 	}
+
 	udelay(2);
 	return 0;
 }
@@ -561,3 +572,36 @@  void clock_init(void)
 	/* Do any special system timer/TSC setup */
 	arch_timer_init();
 }
+
+int clock_periph_enable(enum periph_id periph_id, enum clock_id parent,
+		int divisor)
+{
+	int mux_bits, divider_bits, source;
+
+	/* Assert reset and enable clock */
+	reset_set_enable(periph_id, 1);
+	clock_enable(periph_id);
+
+	/* work out the source clock and set it */
+	source = get_periph_clock_source(periph_id, parent, &mux_bits,
+					 &divider_bits);
+
+	assert(divisor >= 0);
+	divisor = (divisor - 1) << 1;
+	debug("%s: source %d, mux_bits %d, divider_bits %d, raw divisor = %x\n",
+		__func__, source, mux_bits, divider_bits, divisor);
+
+	if (adjust_periph_pll(periph_id, source, mux_bits, divisor))
+		return -1;
+
+	debug("%s: periph %d, parent=%d, reg=%p = %x\n", __func__,
+		periph_id, parent, get_periph_source_reg(periph_id),
+		readl(get_periph_source_reg(periph_id)));
+
+	/* wait for 2us */
+	udelay(2);
+
+	/* De-assert reset */
+	reset_set_enable(periph_id, 0);
+	return 0;
+}
diff --git a/arch/arm/cpu/tegra114-common/clock.c b/arch/arm/cpu/tegra114-common/clock.c
index 5c4305a..9bb6529 100644
--- a/arch/arm/cpu/tegra114-common/clock.c
+++ b/arch/arm/cpu/tegra114-common/clock.c
@@ -46,13 +46,22 @@  enum clock_type_id {
 	CLOCK_TYPE_MCPT,
 	CLOCK_TYPE_PCM,
 	CLOCK_TYPE_PCMT,
-	CLOCK_TYPE_PCMT16,
 	CLOCK_TYPE_PDCT,
 	CLOCK_TYPE_ACPT,
 	CLOCK_TYPE_ASPTE,
 	CLOCK_TYPE_PMDACD2T,
 	CLOCK_TYPE_PCST,
 
+	CLOCK_TYPE_PC2CC3M,
+	CLOCK_TYPE_PC2CC3S_T,
+	CLOCK_TYPE_PC2CC3M_T,
+	CLOCK_TYPE_PC2CC3M_T16,	/* PC2CC3M_T, but w/16-bit divisor (I2C) */
+	CLOCK_TYPE_MC2CC3P_A,
+	CLOCK_TYPE_M,
+	CLOCK_TYPE_MCPTM2C2C3,
+	CLOCK_TYPE_PC2CC3T_S,
+	CLOCK_TYPE_AC2CC3P_TS2,
+
 	CLOCK_TYPE_COUNT,
 	CLOCK_TYPE_NONE = -1,   /* invalid clock type */
 };
@@ -61,12 +70,6 @@  enum {
 	CLOCK_MAX_MUX   = 8     /* number of source options for each clock */
 };
 
-enum {
-	MASK_BITS_31_30	= 2,	/* num of bits used to specify clock source */
-	MASK_BITS_31_29,
-	MASK_BITS_29_28,
-};
-
 /*
  * Clock source mux for each clock type. This just converts our enum into
  * a list of mux sources for use by the code.
@@ -92,9 +95,6 @@  static enum clock_id clock_source[CLOCK_TYPE_COUNT][CLOCK_MAX_MUX+1] = {
 	{ CLK(PERIPH),	CLK(CGENERAL),	CLK(MEMORY),	CLK(OSC),
 		CLK(NONE),	CLK(NONE),	CLK(NONE),	CLK(NONE),
 		MASK_BITS_31_30},
-	{ CLK(PERIPH),	CLK(CGENERAL),	CLK(MEMORY),	CLK(OSC),
-		CLK(NONE),	CLK(NONE),	CLK(NONE),	CLK(NONE),
-		MASK_BITS_31_30},
 	{ CLK(PERIPH),	CLK(DISPLAY),	CLK(CGENERAL),	CLK(OSC),
 		CLK(NONE),	CLK(NONE),	CLK(NONE),	CLK(NONE),
 		MASK_BITS_31_30},
@@ -109,7 +109,45 @@  static enum clock_id clock_source[CLOCK_TYPE_COUNT][CLOCK_MAX_MUX+1] = {
 		MASK_BITS_31_29},
 	{ CLK(PERIPH),	CLK(CGENERAL),	CLK(SFROM32KHZ),	CLK(OSC),
 		CLK(NONE),	CLK(NONE),	CLK(NONE),	CLK(NONE),
-		MASK_BITS_29_28}
+		MASK_BITS_29_28},
+
+	/* Additional clock types on T114 */
+	/* CLOCK_TYPE_PC2CC3M */
+	{ CLK(PERIPH),	CLK(CGENERAL2),	CLK(CGENERAL),	CLK(CGENERAL3),
+		CLK(MEMORY),	CLK(NONE),	CLK(NONE),	CLK(NONE),
+		MASK_BITS_31_29},
+	/* CLOCK_TYPE_PC2CC3S_T */
+	{ CLK(PERIPH),	CLK(CGENERAL2),	CLK(CGENERAL),	CLK(CGENERAL3),
+		CLK(SFROM32KHZ), CLK(NONE),	CLK(OSC),	CLK(NONE),
+		MASK_BITS_31_29},
+	/* CLOCK_TYPE_PC2CC3M_T */
+	{ CLK(PERIPH),	CLK(CGENERAL2),	CLK(CGENERAL),	CLK(CGENERAL3),
+		CLK(MEMORY),	CLK(NONE),	CLK(OSC),	CLK(NONE),
+		MASK_BITS_31_29},
+	/* CLOCK_TYPE_PC2CC3M_T, w/16-bit divisor (I2C) */
+	{ CLK(PERIPH),	CLK(CGENERAL2),	CLK(CGENERAL),	CLK(CGENERAL3),
+		CLK(MEMORY),	CLK(NONE),	CLK(OSC),	CLK(NONE),
+		MASK_BITS_31_29},
+	/* CLOCK_TYPE_MC2CC3P_A */
+	{ CLK(MEMORY),	CLK(CGENERAL2),	CLK(CGENERAL),	CLK(CGENERAL3),
+		CLK(PERIPH),	CLK(NONE),	CLK(AUDIO),	CLK(NONE),
+		MASK_BITS_31_29},
+	/* CLOCK_TYPE_M */
+	{ CLK(MEMORY),		CLK(NONE),	CLK(NONE),	CLK(NONE),
+		CLK(NONE),	CLK(NONE),	CLK(NONE),	CLK(NONE),
+		MASK_BITS_31_30},
+	/* CLOCK_TYPE_MCPTM2C2C3 */
+	{ CLK(MEMORY),	CLK(CGENERAL),	CLK(PERIPH),	CLK(OSC),
+		CLK(MEMORY2),	CLK(CGENERAL2),	CLK(CGENERAL3),	CLK(NONE),
+		MASK_BITS_31_29},
+	/* CLOCK_TYPE_PC2CC3T_S */
+	{ CLK(PERIPH),	CLK(CGENERAL2),	CLK(CGENERAL),	CLK(CGENERAL3),
+		CLK(OSC),	CLK(NONE),	CLK(SFROM32KHZ), CLK(NONE),
+		MASK_BITS_31_29},
+	/* CLOCK_TYPE_AC2CC3P_TS2 */
+	{ CLK(AUDIO),	CLK(CGENERAL2),	CLK(CGENERAL),	CLK(CGENERAL3),
+		CLK(PERIPH),	CLK(NONE),	CLK(OSC),	CLK(SRC2),
+		MASK_BITS_31_29},
 };
 
 /*
@@ -122,110 +160,120 @@  static enum clock_type_id clock_periph_type[PERIPHC_COUNT] = {
 	TYPE(PERIPHC_I2S1,	CLOCK_TYPE_AXPT),
 	TYPE(PERIPHC_I2S2,	CLOCK_TYPE_AXPT),
 	TYPE(PERIPHC_SPDIF_OUT,	CLOCK_TYPE_AXPT),
-	TYPE(PERIPHC_SPDIF_IN,	CLOCK_TYPE_PCM),
-	TYPE(PERIPHC_PWM,	CLOCK_TYPE_PCST),  /* only PWM uses b29:28 */
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_SBC2,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_SBC3,	CLOCK_TYPE_PCMT),
+	TYPE(PERIPHC_SPDIF_IN,	CLOCK_TYPE_PC2CC3M),
+	TYPE(PERIPHC_PWM,	CLOCK_TYPE_PC2CC3S_T),
+	TYPE(PERIPHC_05h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_SBC2,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_SBC3,	CLOCK_TYPE_PC2CC3M_T),
 
 	/* 0x08 */
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_I2C1,	CLOCK_TYPE_PCMT16),
-	TYPE(PERIPHC_I2C5,	CLOCK_TYPE_PCMT16),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_SBC1,	CLOCK_TYPE_PCMT),
+	TYPE(PERIPHC_08h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_I2C1,	CLOCK_TYPE_PC2CC3M_T16),
+	TYPE(PERIPHC_I2C5,	CLOCK_TYPE_PC2CC3M_T16),
+	TYPE(PERIPHC_0bh,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_0ch,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_SBC1,	CLOCK_TYPE_PC2CC3M_T),
 	TYPE(PERIPHC_DISP1,	CLOCK_TYPE_PMDACD2T),
 	TYPE(PERIPHC_DISP2,	CLOCK_TYPE_PMDACD2T),
 
 	/* 0x10 */
-	TYPE(PERIPHC_CVE,	CLOCK_TYPE_PDCT),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_VI,	CLOCK_TYPE_MCPA),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_SDMMC1,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_SDMMC2,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_G3D,	CLOCK_TYPE_MCPA),
-	TYPE(PERIPHC_G2D,	CLOCK_TYPE_MCPA),
+	TYPE(PERIPHC_10h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_11h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_VI,	CLOCK_TYPE_MC2CC3P_A),
+	TYPE(PERIPHC_13h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_SDMMC1,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_SDMMC2,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_G3D,	CLOCK_TYPE_MC2CC3P_A),
+	TYPE(PERIPHC_G2D,	CLOCK_TYPE_MC2CC3P_A),
 
 	/* 0x18 */
-	TYPE(PERIPHC_NDFLASH,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_SDMMC4,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_VFIR,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_EPP,	CLOCK_TYPE_MCPA),
-	TYPE(PERIPHC_MPE,	CLOCK_TYPE_MCPA),
-	TYPE(PERIPHC_MIPI,	CLOCK_TYPE_PCMT),	/* MIPI base-band HSI */
-	TYPE(PERIPHC_UART1,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_UART2,	CLOCK_TYPE_PCMT),
+	TYPE(PERIPHC_NDFLASH,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_SDMMC4,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_VFIR,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_EPP,	CLOCK_TYPE_MC2CC3P_A),
+	TYPE(PERIPHC_MPE,	CLOCK_TYPE_M),
+	TYPE(PERIPHC_HSI,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_UART1,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_UART2,	CLOCK_TYPE_PC2CC3M_T),
 
 	/* 0x20 */
-	TYPE(PERIPHC_HOST1X,	CLOCK_TYPE_MCPA),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_TVO,	CLOCK_TYPE_PDCT),
+	TYPE(PERIPHC_HOST1X,	CLOCK_TYPE_MC2CC3P_A),
+	TYPE(PERIPHC_21h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_22h,	CLOCK_TYPE_NONE),
 	TYPE(PERIPHC_HDMI,	CLOCK_TYPE_PMDACD2T),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_TVDAC,	CLOCK_TYPE_PDCT),
-	TYPE(PERIPHC_I2C2,	CLOCK_TYPE_PCMT16),
-	TYPE(PERIPHC_EMC,	CLOCK_TYPE_MCPT),
+	TYPE(PERIPHC_24h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_25h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_I2C2,	CLOCK_TYPE_PC2CC3M_T16),
+	TYPE(PERIPHC_EMC,	CLOCK_TYPE_MCPTM2C2C3),
 
 	/* 0x28 */
-	TYPE(PERIPHC_UART3,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_VI,	CLOCK_TYPE_MCPA),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_SBC4,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_I2C3,	CLOCK_TYPE_PCMT16),
-	TYPE(PERIPHC_SDMMC3,	CLOCK_TYPE_PCMT),
+	TYPE(PERIPHC_UART3,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_29h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_VI_SENSOR,	CLOCK_TYPE_MC2CC3P_A),
+	TYPE(PERIPHC_2bh,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_2ch,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_SBC4,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_I2C3,	CLOCK_TYPE_PC2CC3M_T16),
+	TYPE(PERIPHC_SDMMC3,	CLOCK_TYPE_PC2CC3M_T),
 
 	/* 0x30 */
-	TYPE(PERIPHC_UART4,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_UART5,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_VDE,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_OWR,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_NOR,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_CSITE,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_I2S0,      CLOCK_TYPE_AXPT),
-	TYPE(PERIPHC_NONE,      CLOCK_TYPE_NONE),
-
-	/* 0x38h */  /* Jumps to reg offset 0x3B0h */
-	TYPE(PERIPHC_G3D2,      CLOCK_TYPE_MCPA),
-	TYPE(PERIPHC_MSELECT,   CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_TSENSOR,   CLOCK_TYPE_PCST),	/* s/b PCTS */
+	TYPE(PERIPHC_UART4,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_UART5,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_VDE,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_OWR,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_NOR,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_CSITE,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_I2S0,	CLOCK_TYPE_AXPT),
+	TYPE(PERIPHC_DTV,	CLOCK_TYPE_NONE),
+
+	/* 0x38 */
+	TYPE(PERIPHC_38h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_39h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_3ah,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_3bh,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_MSENC,	CLOCK_TYPE_MC2CC3P_A),
+	TYPE(PERIPHC_TSEC,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_3eh,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_OSC,	CLOCK_TYPE_NONE),
+
+	/* 0x40 */
+	TYPE(PERIPHC_G3D2,	CLOCK_TYPE_MC2CC3P_A),	/* start with 0x3b0 */
+	TYPE(PERIPHC_MSELECT,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_TSENSOR,	CLOCK_TYPE_PC2CC3T_S),
 	TYPE(PERIPHC_I2S3,	CLOCK_TYPE_AXPT),
 	TYPE(PERIPHC_I2S4,	CLOCK_TYPE_AXPT),
-	TYPE(PERIPHC_I2C4,	CLOCK_TYPE_PCMT16),
-	TYPE(PERIPHC_SBC5,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_SBC6,	CLOCK_TYPE_PCMT),
+	TYPE(PERIPHC_I2C4,	CLOCK_TYPE_PC2CC3M_T16),
+	TYPE(PERIPHC_SBC5,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_SBC6,	CLOCK_TYPE_PC2CC3M_T),
 
-	/* 0x40 */
-	TYPE(PERIPHC_AUDIO,	CLOCK_TYPE_ACPT),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_DAM0,	CLOCK_TYPE_ACPT),
-	TYPE(PERIPHC_DAM1,	CLOCK_TYPE_ACPT),
-	TYPE(PERIPHC_DAM2,	CLOCK_TYPE_ACPT),
-	TYPE(PERIPHC_HDA2CODEC2X, CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_ACTMON,	CLOCK_TYPE_PCST),	/* MASK 31:30 */
+	/* 0x48 */
+	TYPE(PERIPHC_AUDIO,	CLOCK_TYPE_AC2CC3P_TS2),
+	TYPE(PERIPHC_49h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_DAM0,	CLOCK_TYPE_AC2CC3P_TS2),
+	TYPE(PERIPHC_DAM1,	CLOCK_TYPE_AC2CC3P_TS2),
+	TYPE(PERIPHC_DAM2,	CLOCK_TYPE_AC2CC3P_TS2),
+	TYPE(PERIPHC_HDA2CODEC2X, CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_ACTMON,	CLOCK_TYPE_PC2CC3S_T),
 	TYPE(PERIPHC_EXTPERIPH1, CLOCK_TYPE_ASPTE),
 
-	/* 0x48 */
+	/* 0x50 */
 	TYPE(PERIPHC_EXTPERIPH2, CLOCK_TYPE_ASPTE),
 	TYPE(PERIPHC_EXTPERIPH3, CLOCK_TYPE_ASPTE),
-	TYPE(PERIPHC_NANDSPEED,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_I2CSLOW,	CLOCK_TYPE_PCST),	/* MASK 31:30 */
+	TYPE(PERIPHC_NANDSPEED,	CLOCK_TYPE_PC2CC3M_T),
+	TYPE(PERIPHC_I2CSLOW,	CLOCK_TYPE_PC2CC3S_T),
 	TYPE(PERIPHC_SYS,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_SPEEDO,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-
-	/* 0x50 */
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_NONE,	CLOCK_TYPE_NONE),
-	TYPE(PERIPHC_SATAOOB,	CLOCK_TYPE_PCMT),	/* offset 0x420h */
+	TYPE(PERIPHC_55h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_56h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_57h,	CLOCK_TYPE_NONE),
+
+	/* 0x58 */
+	TYPE(PERIPHC_58h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_59h,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_5ah,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_5bh,	CLOCK_TYPE_NONE),
+	TYPE(PERIPHC_SATAOOB,	CLOCK_TYPE_PCMT),
 	TYPE(PERIPHC_SATA,	CLOCK_TYPE_PCMT),
-	TYPE(PERIPHC_HDA,	CLOCK_TYPE_PCMT),
+	TYPE(PERIPHC_HDA,	CLOCK_TYPE_PC2CC3M_T),
 };
 
 /*
@@ -244,7 +292,7 @@  static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
 	NONE(COP),
 	NONE(TRIGSYS),
 	NONE(RESERVED3),
-	NONE(RTC),
+	NONE(RESERVED4),
 	NONE(TMR),
 	PERIPHC_UART1,
 	PERIPHC_UART2,	/* and vfir 0x68 */
@@ -252,7 +300,7 @@  static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
 	/* 8 */
 	NONE(GPIO),
 	PERIPHC_SDMMC2,
-	NONE(SPDIF),		/* 0x08 and 0x0c, unclear which to use */
+	PERIPHC_SPDIF_IN,
 	PERIPHC_I2S1,
 	PERIPHC_I2C1,
 	PERIPHC_NDFLASH,
@@ -291,7 +339,7 @@  static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
 
 	/* 40 */
 	NONE(KFUSE),
-	NONE(SBC1),	/* SBC1, 0x34, is this SPI1? */
+	NONE(SBC1),		/* SBC1, SPI1 */
 	PERIPHC_NOR,
 	NONE(RESERVED43),
 	PERIPHC_SBC2,
@@ -301,16 +349,16 @@  static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
 
 	/* 48 */
 	NONE(DSI),
-	PERIPHC_TVO,	/* also CVE 0x40 */
-	PERIPHC_MIPI,
+	NONE(RESERVED49),
+	PERIPHC_HSI,
 	PERIPHC_HDMI,
 	NONE(CSI),
-	PERIPHC_TVDAC,
+	NONE(RESERVED53),
 	PERIPHC_I2C2,
 	PERIPHC_UART3,
 
 	/* 56 */
-	NONE(RESERVED56),
+	NONE(MIPI_CAL),
 	PERIPHC_EMC,
 	NONE(USB2),
 	NONE(USB3),
@@ -320,7 +368,7 @@  static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
 	NONE(BSEV),
 
 	/* Upper word 95:64 */
-	PERIPHC_SPEEDO,
+	NONE(RESERVED64),
 	PERIPHC_UART4,
 	PERIPHC_UART5,
 	PERIPHC_I2C3,
@@ -335,41 +383,41 @@  static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
 	NONE(PCIEXCLK),
 	NONE(AVPUCQ),
 	NONE(RESERVED76),
-	NONE(RESERVED77),
-	NONE(RESERVED78),
+	NONE(TRACECLKIN),
+	NONE(SOC_THERM),
 	NONE(DTV),
 
 	/* 80 */
 	PERIPHC_NANDSPEED,
 	PERIPHC_I2CSLOW,
 	NONE(DSIB),
-	NONE(RESERVED83),
-	NONE(IRAMA),
-	NONE(IRAMB),
-	NONE(IRAMC),
-	NONE(IRAMD),
+	PERIPHC_TSEC,
+	NONE(RESERVED84),
+	NONE(RESERVED85),
+	NONE(RESERVED86),
+	NONE(EMUCIF),
 
 	/* 88 */
-	NONE(CRAM2),
-	NONE(RESERVED89),
-	NONE(MDOUBLER),
-	NONE(RESERVED91),
-	NONE(SUSOUT),
+	NONE(RESERVED88),
+	NONE(XUSB_HOST),
+	NONE(RESERVED90),
+	PERIPHC_MSENC,
+	NONE(RESERVED92),
 	NONE(RESERVED93),
 	NONE(RESERVED94),
-	NONE(RESERVED95),
+	NONE(XUSB_DEV),
 
 	/* V word: 31:0 */
 	NONE(CPUG),
 	NONE(CPULP),
 	PERIPHC_G3D2,
 	PERIPHC_MSELECT,
-	PERIPHC_TSENSOR,
+	NONE(V_RESERVED4),
 	PERIPHC_I2S3,
 	PERIPHC_I2S4,
 	PERIPHC_I2C4,
 
-	/* 08 */
+	/* 104 */
 	PERIPHC_SBC5,
 	PERIPHC_SBC6,
 	PERIPHC_AUDIO,
@@ -379,63 +427,63 @@  static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
 	PERIPHC_DAM2,
 	PERIPHC_HDA2CODEC2X,
 
-	/* 16 */
+	/* 112 */
 	NONE(ATOMICS),
-	NONE(RESERVED17),
-	NONE(RESERVED18),
-	NONE(RESERVED19),
-	NONE(RESERVED20),
-	NONE(RESERVED21),
-	NONE(RESERVED22),
+	NONE(V_RESERVED17),
+	NONE(V_RESERVED18),
+	NONE(V_RESERVED19),
+	NONE(V_RESERVED20),
+	NONE(V_RESERVED21),
+	NONE(V_RESERVED22),
 	PERIPHC_ACTMON,
 
-	/* 24 */
-	NONE(RESERVED24),
-	NONE(RESERVED25),
-	NONE(RESERVED26),
-	NONE(RESERVED27),
+	/* 120 */
+	NONE(V_RESERVED24),
+	NONE(V_RESERVED25),
+	NONE(V_RESERVED26),
+	NONE(V_RESERVED27),
 	PERIPHC_SATA,
 	PERIPHC_HDA,
-	NONE(RESERVED30),
-	NONE(RESERVED31),
+	NONE(V_RESERVED30),
+	NONE(V_RESERVED31),
 
 	/* W word: 31:0 */
 	NONE(HDA2HDMICODEC),
-	NONE(RESERVED1_SATACOLD),
-	NONE(RESERVED2_PCIERX0),
-	NONE(RESERVED3_PCIERX1),
-	NONE(RESERVED4_PCIERX2),
-	NONE(RESERVED5_PCIERX3),
-	NONE(RESERVED6_PCIERX4),
-	NONE(RESERVED7_PCIERX5),
-
-	/* 40 */
+	NONE(SATACOLD),
+	NONE(W_RESERVED2),
+	NONE(W_RESERVED3),
+	NONE(W_RESERVED4),
+	NONE(W_RESERVED5),
+	NONE(W_RESERVED6),
+	NONE(W_RESERVED7),
+
+	/* 136 */
 	NONE(CEC),
-	NONE(PCIE2_IOBIST),
-	NONE(EMC_IOBIST),
-	NONE(HDMI_IOBIST),
-	NONE(SATA_IOBIST),
-	NONE(MIPI_IOBIST),
-	NONE(EMC1_IOBIST),
-	NONE(XUSB),
-
-	/* 48 */
-	NONE(CILAB),
-	NONE(CILCD),
-	NONE(CILE),
-	NONE(DSIA_LP),
-	NONE(DSIB_LP),
-	NONE(RESERVED21_ENTROPY),
-	NONE(RESERVED22_W),
-	NONE(RESERVED23_W),
-
-	/* 56 */
-	NONE(RESERVED24_W),
+	NONE(W_RESERVED9),
+	NONE(W_RESERVED10),
+	NONE(W_RESERVED11),
+	NONE(W_RESERVED12),
+	NONE(W_RESERVED13),
+	NONE(XUSB_PADCTL),
+	NONE(W_RESERVED15),
+
+	/* 144 */
+	NONE(W_RESERVED16),
+	NONE(W_RESERVED17),
+	NONE(W_RESERVED18),
+	NONE(W_RESERVED19),
+	NONE(W_RESERVED20),
+	NONE(ENTROPY),
+	NONE(W_RESERVED22),
+	NONE(W_RESERVED23),
+
+	/* 152 */
+	NONE(W_RESERVED24),
 	NONE(AMX0),
 	NONE(ADX0),
 	NONE(DVFS),
 	NONE(XUSB_SS),
-	NONE(EMC_DLL),
+	NONE(W_RESERVED29),
 	NONE(MC1),
 	NONE(EMC1),
 };
@@ -510,7 +558,7 @@  int get_periph_clock_source(enum periph_id periph_id,
 
 	*mux_bits = clock_source[type][CLOCK_MAX_MUX];
 
-	if (type == CLOCK_TYPE_PCMT16)
+	if (type == CLOCK_TYPE_PC2CC3M_T16)
 		*divider_bits = 16;
 	else
 		*divider_bits = 8;
@@ -583,21 +631,61 @@  enum periph_id clk_id_to_periph_id(int clk_id)
 
 	switch (clk_id) {
 	case PERIPH_ID_RESERVED3:
+	case PERIPH_ID_RESERVED4:
 	case PERIPH_ID_RESERVED16:
-	case PERIPH_ID_RESERVED24:
+	case PERIPH_ID_RESERVED25:
 	case PERIPH_ID_RESERVED35:
+	case PERIPH_ID_RESERVED36:
+	case PERIPH_ID_RESERVED38:
+	case PERIPH_ID_RESERVED39:
 	case PERIPH_ID_RESERVED43:
 	case PERIPH_ID_RESERVED45:
-	case PERIPH_ID_RESERVED56:
+	case PERIPH_ID_RESERVED49:
+	case PERIPH_ID_RESERVED53:
+	case PERIPH_ID_RESERVED64:
 	case PERIPH_ID_RESERVED76:
-	case PERIPH_ID_RESERVED77:
-	case PERIPH_ID_RESERVED78:
-	case PERIPH_ID_RESERVED83:
-	case PERIPH_ID_RESERVED89:
-	case PERIPH_ID_RESERVED91:
+	case PERIPH_ID_RESERVED84:
+	case PERIPH_ID_RESERVED85:
+	case PERIPH_ID_RESERVED86:
+	case PERIPH_ID_RESERVED88:
+	case PERIPH_ID_RESERVED90:
+	case PERIPH_ID_RESERVED92:
 	case PERIPH_ID_RESERVED93:
 	case PERIPH_ID_RESERVED94:
-	case PERIPH_ID_RESERVED95:
+	case PERIPH_ID_V_RESERVED4:
+	case PERIPH_ID_V_RESERVED17:
+	case PERIPH_ID_V_RESERVED18:
+	case PERIPH_ID_V_RESERVED19:
+	case PERIPH_ID_V_RESERVED20:
+	case PERIPH_ID_V_RESERVED21:
+	case PERIPH_ID_V_RESERVED22:
+	case PERIPH_ID_V_RESERVED24:
+	case PERIPH_ID_V_RESERVED25:
+	case PERIPH_ID_V_RESERVED26:
+	case PERIPH_ID_V_RESERVED27:
+	case PERIPH_ID_V_RESERVED30:
+	case PERIPH_ID_V_RESERVED31:
+	case PERIPH_ID_W_RESERVED2:
+	case PERIPH_ID_W_RESERVED3:
+	case PERIPH_ID_W_RESERVED4:
+	case PERIPH_ID_W_RESERVED5:
+	case PERIPH_ID_W_RESERVED6:
+	case PERIPH_ID_W_RESERVED7:
+	case PERIPH_ID_W_RESERVED9:
+	case PERIPH_ID_W_RESERVED10:
+	case PERIPH_ID_W_RESERVED11:
+	case PERIPH_ID_W_RESERVED12:
+	case PERIPH_ID_W_RESERVED13:
+	case PERIPH_ID_W_RESERVED15:
+	case PERIPH_ID_W_RESERVED16:
+	case PERIPH_ID_W_RESERVED17:
+	case PERIPH_ID_W_RESERVED18:
+	case PERIPH_ID_W_RESERVED19:
+	case PERIPH_ID_W_RESERVED20:
+	case PERIPH_ID_W_RESERVED22:
+	case PERIPH_ID_W_RESERVED23:
+	case PERIPH_ID_W_RESERVED24:
+	case PERIPH_ID_W_RESERVED29:
 		return PERIPH_ID_NONE;
 	default:
 		return clk_id;
diff --git a/arch/arm/cpu/tegra30-common/clock.c b/arch/arm/cpu/tegra30-common/clock.c
index 74bd22b..89c3529 100644
--- a/arch/arm/cpu/tegra30-common/clock.c
+++ b/arch/arm/cpu/tegra30-common/clock.c
@@ -60,12 +60,6 @@  enum {
 	CLOCK_MAX_MUX   = 8     /* number of source options for each clock */
 };
 
-enum {
-	MASK_BITS_31_30 = 2,    /* num of bits used to specify clock source */
-	MASK_BITS_31_29,
-	MASK_BITS_29_28,
-};
-
 /*
  * Clock source mux for each clock type. This just converts our enum into
  * a list of mux sources for use by the code.
diff --git a/arch/arm/include/asm/arch-tegra/clk_rst.h b/arch/arm/include/asm/arch-tegra/clk_rst.h
index 074b3bc..5f52d60 100644
--- a/arch/arm/include/asm/arch-tegra/clk_rst.h
+++ b/arch/arm/include/asm/arch-tegra/clk_rst.h
@@ -236,6 +236,9 @@  enum {
 #define OUT_CLK_SOURCE_SHIFT	30
 #define OUT_CLK_SOURCE_MASK	(3U << OUT_CLK_SOURCE_SHIFT)
 
+#define OUT_CLK_SOURCE3_SHIFT	29
+#define OUT_CLK_SOURCE3_MASK	(7U << OUT_CLK_SOURCE3_SHIFT)
+
 #define OUT_CLK_SOURCE4_SHIFT	28
 #define OUT_CLK_SOURCE4_MASK	(15U << OUT_CLK_SOURCE4_SHIFT)
 
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h
index c3174bd..9495179 100644
--- a/arch/arm/include/asm/arch-tegra/clock.h
+++ b/arch/arm/include/asm/arch-tegra/clock.h
@@ -20,6 +20,12 @@  enum clock_osc_freq {
 	CLOCK_OSC_FREQ_COUNT,
 };
 
+enum {
+	MASK_BITS_31_30 = 2,	/* num of bits used to specify clock source */
+	MASK_BITS_31_29,
+	MASK_BITS_29_28,
+};
+
 #include <asm/arch/clock-tables.h>
 /* PLL stabilization delay in usec */
 #define CLOCK_PLL_STABLE_DELAY_US 300
@@ -305,4 +311,15 @@  int clock_set_rate(enum clock_id clkid, u32 n, u32 m, u32 p, u32 cpcon);
 /* SoC-specific TSC init */
 void arch_timer_init(void);
 
+/**
+ * Enable a peripheral clock with a certain clock source/divisor
+ *
+ * @param periph_id     peripheral to enable/change
+ * @param src           PLL id of required parent clock
+ * @param divisor       required integer divisor (not 7.1)
+ * @return 0 if ok
+ *        -1 on error (bad divisor, etc.).
+ */
+int clock_periph_enable(enum periph_id pid, int src, int divisor);
+
 #endif  /* _TEGRA_CLOCK_H_ */
diff --git a/arch/arm/include/asm/arch-tegra114/clock-tables.h b/arch/arm/include/asm/arch-tegra114/clock-tables.h
index d8fa0e1..19b8acf 100644
--- a/arch/arm/include/asm/arch-tegra114/clock-tables.h
+++ b/arch/arm/include/asm/arch-tegra114/clock-tables.h
@@ -40,7 +40,17 @@  enum clock_id {
 	CLOCK_ID_OSC,
 
 	CLOCK_ID_COUNT,	/* number of PLLs */
-	CLOCK_ID_DISPLAY2,	/* placeholder */
+
+	/*
+	 * These are clock ids that are used in table clock_source[][]
+	 * but will not be assigned as a clock source for any peripheral.
+	 */
+	CLOCK_ID_DISPLAY2,
+	CLOCK_ID_CGENERAL2,
+	CLOCK_ID_CGENERAL3,
+	CLOCK_ID_MEMORY2,
+	CLOCK_ID_SRC2,
+
 	CLOCK_ID_NONE = -1,
 };
 
@@ -53,7 +63,7 @@  enum periph_id {
 	PERIPH_ID_COP,
 	PERIPH_ID_TRIGSYS,
 	PERIPH_ID_RESERVED3,
-	PERIPH_ID_RTC,
+	PERIPH_ID_RESERVED4,
 	PERIPH_ID_TMR,
 	PERIPH_ID_UART1,
 	PERIPH_ID_UART2,
@@ -80,7 +90,7 @@  enum periph_id {
 
 	/* 24 */
 	PERIPH_ID_3D,
-	PERIPH_ID_RESERVED24,
+	PERIPH_ID_RESERVED25,
 	PERIPH_ID_DISP2,
 	PERIPH_ID_DISP1,
 	PERIPH_ID_HOST1X,
@@ -93,10 +103,10 @@  enum periph_id {
 	PERIPH_ID_AHBDMA,
 	PERIPH_ID_APBDMA,
 	PERIPH_ID_RESERVED35,
-	PERIPH_ID_KBC,
+	PERIPH_ID_RESERVED36,
 	PERIPH_ID_STAT_MON,
-	PERIPH_ID_PMC,
-	PERIPH_ID_FUSE,
+	PERIPH_ID_RESERVED38,
+	PERIPH_ID_RESERVED39,
 
 	/* 40 */
 	PERIPH_ID_KFUSE,
@@ -110,16 +120,16 @@  enum periph_id {
 
 	/* 48 */
 	PERIPH_ID_DSI,
-	PERIPH_ID_TVO,
-	PERIPH_ID_MIPI,
+	PERIPH_ID_RESERVED49,
+	PERIPH_ID_HSI,
 	PERIPH_ID_HDMI,
 	PERIPH_ID_CSI,
-	PERIPH_ID_TVDAC,
+	PERIPH_ID_RESERVED53,
 	PERIPH_ID_I2C2,
 	PERIPH_ID_UART3,
 
 	/* 56 */
-	PERIPH_ID_RESERVED56,
+	PERIPH_ID_MIPI_CAL,
 	PERIPH_ID_EMC,
 	PERIPH_ID_USB2,
 	PERIPH_ID_USB3,
@@ -129,7 +139,7 @@  enum periph_id {
 	PERIPH_ID_BSEV,
 
 	/* Upper word 95:64 (DEVICES_U) */
-	PERIPH_ID_SPEEDO,
+	PERIPH_ID_RESERVED64,
 	PERIPH_ID_UART4,
 	PERIPH_ID_UART5,
 	PERIPH_ID_I2C3,
@@ -144,29 +154,29 @@  enum periph_id {
 	PERIPH_ID_PCIEXCLK,
 	PERIPH_ID_AVPUCQ,
 	PERIPH_ID_RESERVED76,
-	PERIPH_ID_RESERVED77,
-	PERIPH_ID_RESERVED78,
+	PERIPH_ID_TRACECLKIN,
+	PERIPH_ID_SOC_THERM,
 	PERIPH_ID_DTV,
 
 	/* 80 */
 	PERIPH_ID_NANDSPEED,
 	PERIPH_ID_I2CSLOW,
 	PERIPH_ID_DSIB,
-	PERIPH_ID_RESERVED83,
-	PERIPH_ID_IRAMA,
-	PERIPH_ID_IRAMB,
-	PERIPH_ID_IRAMC,
-	PERIPH_ID_IRAMD,
+	PERIPH_ID_TSEC,
+	PERIPH_ID_RESERVED84,
+	PERIPH_ID_RESERVED85,
+	PERIPH_ID_RESERVED86,
+	PERIPH_ID_EMUCIF,
 
 	/* 88 */
-	PERIPH_ID_CRAM2,
-	PERIPH_ID_RESERVED89,
-	PERIPH_ID_MDOUBLER,
-	PERIPH_ID_RESERVED91,
-	PERIPH_ID_SUSOUT,
+	PERIPH_ID_RESERVED88,
+	PERIPH_ID_XUSB_HOST,
+	PERIPH_ID_RESERVED90,
+	PERIPH_ID_MSENC,
+	PERIPH_ID_RESERVED92,
 	PERIPH_ID_RESERVED93,
 	PERIPH_ID_RESERVED94,
-	PERIPH_ID_RESERVED95,
+	PERIPH_ID_XUSB_DEV,
 
 	PERIPH_ID_VW_FIRST,
 	/* V word: 31:0 */
@@ -174,7 +184,7 @@  enum periph_id {
 	PERIPH_ID_CPULP,
 	PERIPH_ID_3D2,
 	PERIPH_ID_MSELECT,
-	PERIPH_ID_TSENSOR,
+	PERIPH_ID_V_RESERVED4,
 	PERIPH_ID_I2S3,
 	PERIPH_ID_I2S4,
 	PERIPH_ID_I2C4,
@@ -191,61 +201,61 @@  enum periph_id {
 
 	/* 112 */
 	PERIPH_ID_ATOMICS,
-	PERIPH_ID_EX_RESERVED17,
-	PERIPH_ID_EX_RESERVED18,
-	PERIPH_ID_EX_RESERVED19,
-	PERIPH_ID_EX_RESERVED20,
-	PERIPH_ID_EX_RESERVED21,
-	PERIPH_ID_EX_RESERVED22,
+	PERIPH_ID_V_RESERVED17,
+	PERIPH_ID_V_RESERVED18,
+	PERIPH_ID_V_RESERVED19,
+	PERIPH_ID_V_RESERVED20,
+	PERIPH_ID_V_RESERVED21,
+	PERIPH_ID_V_RESERVED22,
 	PERIPH_ID_ACTMON,
 
 	/* 120 */
-	PERIPH_ID_EX_RESERVED24,
-	PERIPH_ID_EX_RESERVED25,
-	PERIPH_ID_EX_RESERVED26,
-	PERIPH_ID_EX_RESERVED27,
+	PERIPH_ID_V_RESERVED24,
+	PERIPH_ID_V_RESERVED25,
+	PERIPH_ID_V_RESERVED26,
+	PERIPH_ID_V_RESERVED27,
 	PERIPH_ID_SATA,
 	PERIPH_ID_HDA,
-	PERIPH_ID_EX_RESERVED30,
-	PERIPH_ID_EX_RESERVED31,
+	PERIPH_ID_V_RESERVED30,
+	PERIPH_ID_V_RESERVED31,
 
 	/* W word: 31:0 */
 	PERIPH_ID_HDA2HDMICODEC,
-	PERIPH_ID_RESERVED1_SATACOLD,
-	PERIPH_ID_RESERVED2_PCIERX0,
-	PERIPH_ID_RESERVED3_PCIERX1,
-	PERIPH_ID_RESERVED4_PCIERX2,
-	PERIPH_ID_RESERVED5_PCIERX3,
-	PERIPH_ID_RESERVED6_PCIERX4,
-	PERIPH_ID_RESERVED7_PCIERX5,
+	PERIPH_ID_SATACOLD,
+	PERIPH_ID_W_RESERVED2,
+	PERIPH_ID_W_RESERVED3,
+	PERIPH_ID_W_RESERVED4,
+	PERIPH_ID_W_RESERVED5,
+	PERIPH_ID_W_RESERVED6,
+	PERIPH_ID_W_RESERVED7,
 
 	/* 136 */
 	PERIPH_ID_CEC,
-	PERIPH_ID_PCIE2_IOBIST,
-	PERIPH_ID_EMC_IOBIST,
-	PERIPH_ID_HDMI_IOBIST,
-	PERIPH_ID_SATA_IOBIST,
-	PERIPH_ID_MIPI_IOBIST,
-	PERIPH_ID_EMC1_IOBIST,
-	PERIPH_ID_XUSB,
+	PERIPH_ID_W_RESERVED9,
+	PERIPH_ID_W_RESERVED10,
+	PERIPH_ID_W_RESERVED11,
+	PERIPH_ID_W_RESERVED12,
+	PERIPH_ID_W_RESERVED13,
+	PERIPH_ID_XUSB_PADCTL,
+	PERIPH_ID_W_RESERVED15,
 
 	/* 144 */
-	PERIPH_ID_CILAB,
-	PERIPH_ID_CILCD,
-	PERIPH_ID_CILE,
-	PERIPH_ID_DSIA_LP,
-	PERIPH_ID_DSIB_LP,
-	PERIPH_ID_RESERVED21_ENTROPY,
-	PERIPH_ID_RESERVED22_W,
-	PERIPH_ID_RESERVED23_W,
+	PERIPH_ID_W_RESERVED16,
+	PERIPH_ID_W_RESERVED17,
+	PERIPH_ID_W_RESERVED18,
+	PERIPH_ID_W_RESERVED19,
+	PERIPH_ID_W_RESERVED20,
+	PERIPH_ID_ENTROPY,
+	PERIPH_ID_W_RESERVED22,
+	PERIPH_ID_W_RESERVED23,
 
 	/* 152 */
-	PERIPH_ID_RESERVED24_W,
+	PERIPH_ID_W_RESERVED24,
 	PERIPH_ID_AMX0,
 	PERIPH_ID_ADX0,
 	PERIPH_ID_DVFS,
 	PERIPH_ID_XUSB_SS,
-	PERIPH_ID_EMC_DLL,
+	PERIPH_ID_W_RESERVED29,
 	PERIPH_ID_MC1,
 	PERIPH_ID_EMC1,
 
@@ -290,7 +300,7 @@  enum periphc_internal_id {
 	PERIPHC_DISP2,
 
 	/* 0x10 */
-	PERIPHC_CVE,
+	PERIPHC_10h,
 	PERIPHC_11h,
 	PERIPHC_VI,
 	PERIPHC_13h,
@@ -305,17 +315,17 @@  enum periphc_internal_id {
 	PERIPHC_VFIR,
 	PERIPHC_EPP,
 	PERIPHC_MPE,
-	PERIPHC_MIPI,
+	PERIPHC_HSI,
 	PERIPHC_UART1,
 	PERIPHC_UART2,
 
 	/* 0x20 */
 	PERIPHC_HOST1X,
 	PERIPHC_21h,
-	PERIPHC_TVO,
+	PERIPHC_22h,
 	PERIPHC_HDMI,
 	PERIPHC_24h,
-	PERIPHC_TVDAC,
+	PERIPHC_25h,
 	PERIPHC_I2C2,
 	PERIPHC_EMC,
 
@@ -337,10 +347,20 @@  enum periphc_internal_id {
 	PERIPHC_NOR,
 	PERIPHC_CSITE,
 	PERIPHC_I2S0,
-	PERIPHC_37h,
+	PERIPHC_DTV,
 
-	PERIPHC_VW_FIRST,
 	/* 0x38 */
+	PERIPHC_38h,
+	PERIPHC_39h,
+	PERIPHC_3ah,
+	PERIPHC_3bh,
+	PERIPHC_MSENC,
+	PERIPHC_TSEC,
+	PERIPHC_3eh,
+	PERIPHC_OSC,
+
+	PERIPHC_VW_FIRST,
+	/* 0x40 */
 	PERIPHC_G3D2 = PERIPHC_VW_FIRST,
 	PERIPHC_MSELECT,
 	PERIPHC_TSENSOR,
@@ -350,9 +370,9 @@  enum periphc_internal_id {
 	PERIPHC_SBC5,
 	PERIPHC_SBC6,
 
-	/* 0x40 */
+	/* 0x48 */
 	PERIPHC_AUDIO,
-	PERIPHC_41h,
+	PERIPHC_49h,
 	PERIPHC_DAM0,
 	PERIPHC_DAM1,
 	PERIPHC_DAM2,
@@ -360,21 +380,21 @@  enum periphc_internal_id {
 	PERIPHC_ACTMON,
 	PERIPHC_EXTPERIPH1,
 
-	/* 0x48 */
+	/* 0x50 */
 	PERIPHC_EXTPERIPH2,
 	PERIPHC_EXTPERIPH3,
 	PERIPHC_NANDSPEED,
 	PERIPHC_I2CSLOW,
 	PERIPHC_SYS,
-	PERIPHC_SPEEDO,
-	PERIPHC_4eh,
-	PERIPHC_4fh,
-
-	/* 0x50 */
-	PERIPHC_50h,
-	PERIPHC_51h,
-	PERIPHC_52h,
-	PERIPHC_53h,
+	PERIPHC_55h,
+	PERIPHC_56h,
+	PERIPHC_57h,
+
+	/* 0x58 */
+	PERIPHC_58h,
+	PERIPHC_59h,
+	PERIPHC_5ah,
+	PERIPHC_5bh,
 	PERIPHC_SATAOOB,
 	PERIPHC_SATA,
 	PERIPHC_HDA,