All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jagan Teki <jagan@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 04/15] imx6: Add src_base structure define macro
Date: Fri, 27 Jan 2017 15:12:32 +0100	[thread overview]
Message-ID: <1485526363-3834-5-git-send-email-jagan@openedev.com> (raw)
In-Reply-To: <1485526363-3834-1-git-send-email-jagan@openedev.com>

Instead of initializing 'struct src' to SRC_BASE_ADDR on
every function better to have global define macro.

Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Jagan Teki <jagan@openedev.com>
---
 arch/arm/imx-common/init.c                  | 6 ++----
 arch/arm/imx-common/spl.c                   | 3 +--
 arch/arm/include/asm/arch-mx6/imx-regs.h    | 2 ++
 arch/arm/include/asm/imx-common/sys_proto.h | 4 +---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c
index 036ebb2..5b4f828 100644
--- a/arch/arm/imx-common/init.c
+++ b/arch/arm/imx-common/init.c
@@ -119,11 +119,9 @@ void boot_mode_apply(unsigned cfg_val)
 #if defined(CONFIG_MX6)
 u32 imx6_src_get_boot_mode(void)
 {
-	struct src *psrc = (struct src *)SRC_BASE_ADDR;
-
 	if (imx6_is_bmode_from_gpr9())
-		return readl(&psrc->gpr9);
+		return readl(&src_base->gpr9);
 	else
-		return readl(&psrc->sbmr1);
+		return readl(&src_base->sbmr1);
 }
 #endif
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
index 38789b2..4d73a67 100644
--- a/arch/arm/imx-common/spl.c
+++ b/arch/arm/imx-common/spl.c
@@ -19,8 +19,7 @@
 /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */
 u32 spl_boot_device(void)
 {
-	struct src *psrc = (struct src *)SRC_BASE_ADDR;
-	unsigned int bmode = readl(&psrc->sbmr2);
+	unsigned int bmode = readl(&src_base->sbmr2);
 	u32 reg = imx6_src_get_boot_mode();
 
 	/*
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h
index 6727c56..646013d 100644
--- a/arch/arm/include/asm/arch-mx6/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx6/imx-regs.h
@@ -473,6 +473,8 @@ struct src {
 	u32     gpr10;
 };
 
+#define src_base ((struct src *)SRC_BASE_ADDR)
+
 #define SRC_SCR_M4_ENABLE_OFFSET                22
 #define SRC_SCR_M4_ENABLE_MASK                  (1 << 22)
 #define SRC_SCR_M4C_NON_SCLR_RST_OFFSET         4
diff --git a/arch/arm/include/asm/imx-common/sys_proto.h b/arch/arm/include/asm/imx-common/sys_proto.h
index d0cf3f1..d149c9f 100644
--- a/arch/arm/include/asm/imx-common/sys_proto.h
+++ b/arch/arm/include/asm/imx-common/sys_proto.h
@@ -78,9 +78,7 @@ enum imx6_bmode {
 
 static inline u8 imx6_is_bmode_from_gpr9(void)
 {
-	struct src *psrc = (struct src *)SRC_BASE_ADDR;
-
-	return readl(&psrc->gpr10) & IMX6_SRC_GPR10_BMODE;
+	return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE;
 }
 
 u32 imx6_src_get_boot_mode(void);
-- 
1.9.1

  parent reply	other threads:[~2017-01-27 14:12 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-27 14:12 [U-Boot] [PATC v2 00/15] imx6: Engicam i.CoreM6/Is.IoT eMMC boot support Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 01/15] imx6: Add imx6_src_get_boot_mode Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 02/15] imx: spl: Update NAND bootmode detection bit Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 03/15] imx: Use IMX6_BMODE_* macros instead of numericals Jagan Teki
2017-01-27 15:18   ` Eric Nelson
2017-01-27 17:21     ` Jagan Teki
2017-01-27 17:29       ` Eric Nelson
2017-01-27 17:54         ` Jagan Teki
2017-01-27 18:10           ` Eric Nelson
2017-01-27 18:26             ` Jagan Teki
2017-01-27 14:12 ` Jagan Teki [this message]
2017-01-27 14:12 ` [U-Boot] [PATCH v2 05/15] imx6: isiotmx6ul: Update SPL board boot order for eMMC Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 06/15] i.MX6UL: isiot: Add eMMC boot support Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 07/15] i.MX6UL: isiot: Add modeboot env via board_late_init Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 08/15] i.MX6UL: isiot: Add mmc_late_init Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 09/15] i.MX6UL: isiot: Switch the mmc env based on devno Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 10/15] arm: dts: imx6qdl-icore-rqs: Add eMMC node Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 11/15] imx6: icorem6_rqs: Update SPL board boot order for eMMC Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 12/15] imx6: icorem6_rqs: Add eMMC boot support Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 13/15] i.MX6Q: icorem6_rqs: Add modeboot env via board_late_init Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 14/15] i.MX6Q: icorem6_rqs: Add mmc_late_init Jagan Teki
2017-01-27 14:12 ` [U-Boot] [PATCH v2 15/15] i.MX6Q: isiot: Switch the mmc env based on devno Jagan Teki

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=1485526363-3834-5-git-send-email-jagan@openedev.com \
    --to=jagan@openedev.com \
    --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.