All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiko Stuebner <heiko@sntech.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/2] rockchip: rk3188: fix early uart setup
Date: Mon,  8 Oct 2018 13:01:57 +0200	[thread overview]
Message-ID: <20181008110157.26533-2-heiko@sntech.de> (raw)
In-Reply-To: <20181008110157.26533-1-heiko@sntech.de>

Commit 7a6d7d3e1279 ("rockchip: pinctrl: rk3188: Move the iomux definitions
into pinctrl-driver") moved the iomux settings out of the grf header
to prevent conflicts with the iomux definitions of other rockchip socs.

This also breaks the early uart setup, as the iomux for uart2 are needed.
To fix that just put the tiny amount of needed iomux definitions next to
the early uart code.

Fixes: 7a6d7d3e1279 ("rockchip: pinctrl: rk3188: Move the iomux definitions into pinctrl-driver")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/mach-rockchip/rk3188-board-spl.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c
index 4a810ef696..33982f066f 100644
--- a/arch/arm/mach-rockchip/rk3188-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3188-board-spl.c
@@ -103,6 +103,16 @@ void board_init_f(ulong dummy)
 
 	/* Example code showing how to enable the debug UART on RK3188 */
 #ifdef EARLY_UART
+	enum {
+		GPIO1B1_SHIFT		= 2,
+		GPIO1B1_MASK		= 3,
+		GPIO1B1_UART2_SOUT	= 1,
+
+		GPIO1B0_SHIFT		= 0,
+		GPIO1B0_MASK		= 3,
+		GPIO1B0_UART2_SIN	= 1,
+	};
+
 	/* Enable early UART on the RK3188 */
 	rk_clrsetreg(&grf->gpio1b_iomux,
 		     GPIO1B1_MASK << GPIO1B1_SHIFT |
-- 
2.18.0

  reply	other threads:[~2018-10-08 11:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-08 11:01 [U-Boot] [PATCH 1/2] rockchip: rk3188: add support for usb-uart functionality Heiko Stuebner
2018-10-08 11:01 ` Heiko Stuebner [this message]
2018-11-14 20:46   ` [U-Boot] [U-Boot,2/2] rockchip: rk3188: fix early uart setup Philipp Tomsich
2018-11-14 23:35   ` Philipp Tomsich
2018-11-12 15:51 ` [U-Boot] [PATCH 1/2] rockchip: rk3188: add support for usb-uart functionality Heiko Stuebner
2018-11-14 20:46 ` [U-Boot] [U-Boot, " Philipp Tomsich
2018-11-14 23:35 ` Philipp Tomsich
2018-11-15  9:40   ` Philipp Tomsich

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=20181008110157.26533-2-heiko@sntech.de \
    --to=heiko@sntech.de \
    --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.