public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Johan Jonker <jbx6244@gmail.com>
To: kever.yang@rock-chips.com
Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, heiko@sntech.de,
	peng.fan@nxp.com, jh80.chung@samsung.com, u-boot@lists.denx.de
Subject: [PATCH v5 03/13] rockchip: tpl: change call condition rockchip_stimer_init()
Date: Sat,  9 Apr 2022 18:55:04 +0200	[thread overview]
Message-ID: <20220409165514.19220-4-jbx6244@gmail.com> (raw)
In-Reply-To: <20220409165514.19220-1-jbx6244@gmail.com>

The Rockchip SoCs rk3066/rk3188 have no CONFIG_ROCKCHIP_STIMER_BASE
defined. Currently there's no exception in TPL. Make this more
generic and compile the code inside the function rockchip_stimer_init()
only when CONFIG_ROCKCHIP_STIMER_BASE is available.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---

Changed V5:
  reword
  remove IS_ENABLED
  remove include kconfig.h

Changed V3:
  use CONFIG_ROCKCHIP_STIMER

Changed V2:
  use IS_ENABLED
  add include kconfig.h
  move define location so that rockchip_stimer_init() is always
  visible to the compiler
---
 arch/arm/mach-rockchip/tpl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index 3c007bb450..7f43f58406 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -29,6 +29,7 @@
 
 __weak void rockchip_stimer_init(void)
 {
+#if defined(CONFIG_ROCKCHIP_STIMER_BASE)
 	/* If Timer already enabled, don't re-init it */
 	u32 reg = readl(CONFIG_ROCKCHIP_STIMER_BASE + TIMER_CONTROL_REG);
 
@@ -45,6 +46,7 @@ __weak void rockchip_stimer_init(void)
 	writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE + 4);
 	writel(TIMER_EN | TIMER_FMODE, CONFIG_ROCKCHIP_STIMER_BASE +
 	       TIMER_CONTROL_REG);
+#endif
 }
 
 void board_init_f(ulong dummy)
-- 
2.20.1


  parent reply	other threads:[~2022-04-09 16:56 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-09 16:55 [PATCH v5 00/13] Prepare RK3066 U-boot support Johan Jonker
2022-04-09 16:55 ` [PATCH v5 01/13] rockchip: move ROCKCHIP_STIMER_BASE to Kconfig Johan Jonker
2022-04-09 16:55 ` [PATCH v5 02/13] rockchip: spl: change call condition rockchip_stimer_init() Johan Jonker
2022-04-11  2:23   ` Kever Yang
2022-04-09 16:55 ` Johan Jonker [this message]
2022-04-11  2:23   ` [PATCH v5 03/13] rockchip: tpl: " Kever Yang
2022-04-09 16:55 ` [PATCH v5 04/13] rockchip: tpl: use IS_ENABLED for timer_init() call condition Johan Jonker
2022-04-09 16:55 ` [PATCH v5 05/13] rockchip: timer: add OF_PLATDATA support for dw-apb-timer Johan Jonker
2022-04-09 16:55 ` [PATCH v5 06/13] rockchip: timer: dw-apb-timer: fix whitespace in U_BOOT_DRIVER structure Johan Jonker
2022-04-09 16:55 ` [PATCH v5 07/13] rockchip: mmc: rockchip_dw_mmc: fix ciu clock index Johan Jonker
2022-04-09 16:55 ` [PATCH v5 08/13] rockchip: mmc: rockchip_dw_mmc: add rk3066/rk3188 support Johan Jonker
2022-04-11  2:24   ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 09/13] rockchip: serial: restyle the serial_rockchip.c driver Johan Jonker
2022-04-09 16:55 ` [PATCH v5 10/13] rockchip: serial: move driver alias to serial_rockchip.c Johan Jonker
2022-04-09 16:55 ` [PATCH v5 11/13] rockchip: serial: rename U_BOOT_DRIVER name to rockchip_uart Johan Jonker
2022-04-11  2:25   ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 12/13] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL Johan Jonker
2022-04-09 16:55 ` [PATCH v5 13/13] rockchip: serial: Kconfig: allow ROCKCHIP_SERIAL enabled in TPL Johan Jonker
2022-04-11  2:26   ` Kever Yang

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=20220409165514.19220-4-jbx6244@gmail.com \
    --to=jbx6244@gmail.com \
    --cc=heiko@sntech.de \
    --cc=jh80.chung@samsung.com \
    --cc=kever.yang@rock-chips.com \
    --cc=peng.fan@nxp.com \
    --cc=philipp.tomsich@vrull.eu \
    --cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox