All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 05/11] tegra: Correct tegra124 clock name
Date: Thu, 27 Dec 2018 13:24:40 -0700	[thread overview]
Message-ID: <20181227202446.229042-6-sjg@chromium.org> (raw)
In-Reply-To: <20181227202446.229042-1-sjg@chromium.org>

The first clock type appears to have and incorrect setting for out of the
mux outputs. It should be CLK_M, not OSC. Fix it and its only user.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/arm/mach-tegra/tegra124/clock.c | 2 +-
 board/nvidia/nyan-big/nyan-big.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index 3bd6cf2afff..70916ea3c18 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -71,7 +71,7 @@ enum {
  */
 #define CLK(x) CLOCK_ID_ ## x
 static enum clock_id clock_source[CLOCK_TYPE_COUNT][CLOCK_MAX_MUX+1] = {
-	{ CLK(AUDIO),	CLK(XCPU),	CLK(PERIPH),	CLK(OSC),
+	{ CLK(AUDIO),	CLK(XCPU),	CLK(PERIPH),	CLK(CLK_M),
 		CLK(NONE),	CLK(NONE),	CLK(NONE),	CLK(NONE),
 		MASK_BITS_31_30},
 	{ CLK(MEMORY),	CLK(CGENERAL),	CLK(PERIPH),	CLK(AUDIO),
diff --git a/board/nvidia/nyan-big/nyan-big.c b/board/nvidia/nyan-big/nyan-big.c
index ff5c67de985..3c7bfead249 100644
--- a/board/nvidia/nyan-big/nyan-big.c
+++ b/board/nvidia/nyan-big/nyan-big.c
@@ -121,7 +121,7 @@ static void enable_required_clocks(void)
 int nvidia_board_init(void)
 {
 	clock_start_periph_pll(PERIPH_ID_EXTPERIPH1, CLOCK_ID_OSC, 12000000);
-	clock_start_periph_pll(PERIPH_ID_I2S1, CLOCK_ID_OSC, 1500000);
+	clock_start_periph_pll(PERIPH_ID_I2S1, CLOCK_ID_CLK_M, 1500000);
 
 	/* For external MAX98090 audio codec */
 	clock_external_output(1);
-- 
2.20.1.415.g653613c723-goog

  parent reply	other threads:[~2018-12-27 20:24 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-27 20:24 [U-Boot] [PATCH 00/11] sound: Add sound support for Nyan Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 01/11] misc: Allow child devices Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 02/11] sound: samsung: Fix 'regiter' typo Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 03/11] sound: i2s: Tidy up a few comments Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 04/11] sound: Allow audio codecs to be used by other SoCs Simon Glass
2018-12-27 20:24 ` Simon Glass [this message]
2018-12-27 20:24 ` [U-Boot] [PATCH 06/11] tegra: Add a delay in clock_start_periph_pll() Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 07/11] tegra: sound: Add an audio hub driver Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 08/11] tegra: sound: Add an I2S driver Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 09/11] sound: tegra: Add a sound driver Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 10/11] tegra: nyan-big: Enable sound Simon Glass
2018-12-27 20:24 ` [U-Boot] [PATCH 11/11] tegra: nyan: Add a README Simon Glass
2019-01-20 20:32 ` [U-Boot] [PATCH 00/11] sound: Add sound support for Nyan Simon Glass
2019-01-20 21:46   ` Tom Warren
2019-01-21 23:43     ` Simon Glass
2019-02-08  4:14       ` Simon Glass
2019-02-08  9:50         ` Jon Hunter
2019-03-31  2:01           ` Simon Glass
2019-01-21 23:42 ` [U-Boot] [PATCH 04/11] sound: Allow audio codecs to be used by other SoCs sjg at google.com
2019-01-21 23:42 ` [U-Boot] [PATCH 03/11] sound: i2s: Tidy up a few comments sjg at google.com
2019-01-21 23:42 ` [U-Boot] [PATCH 02/11] sound: samsung: Fix 'regiter' typo sjg at google.com
2019-01-21 23:42 ` [U-Boot] [PATCH 01/11] misc: Allow child devices sjg at google.com

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181227202446.229042-6-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.