Skip to contentSkip to conversation

imx: mx7: discard unused global variable

PATCH Superseded Peng Fan 3 participants 7 messages Sep 14, 2015 – Sep 15, 2015

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Peng Fan

author
#0 lore raw

PATCH 1/4 imx: mx7: discard unused global variable

Discard unused global variable.

Cc Stefano Babic <[email protected]>
---
 arch/arm/cpu/armv7/mx7/soc.c | 2 --
 1 file changed, 2 deletions(-)
arch/arm/cpu/armv7/mx7/soc.c +0 -2
index 8d50149..af16ba7 100644
@@ -15,8 +15,6 @@
 #include <dm.h>
 #include <imx_thermal.h>
 
-struct src *src_reg = (struct src *)SRC_BASE_ADDR;
-
 #if defined(CONFIG_IMX_THERMAL)
 static const struct imx_thermal_plat imx7_thermal_plat = {
 	.regs = (void *)ANATOP_BASE_ADDR,
Signature · 1 line
1.8.4
author
#1 lore raw

PATCH 2/4 imx-common: wrap boot_mode_apply with CONFIG_CMD_BMODE

boot_mode_apply should be applied only with CONFIG_CMD_BMODE enabled.

Cc Stefano Babic <[email protected]>
---
 arch/arm/imx-common/init.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/imx-common/init.c +2 -0
index 56d5010..058cf79 100644
@@ -103,6 +103,7 @@ void init_src(void)
 	writel(val, &src_regs->scr);
 }
 
+#ifdef CONFIG_CMD_BMODE
 void boot_mode_apply(unsigned cfg_val)
 {
 	unsigned reg;
@@ -115,3 +116,4 @@ void boot_mode_apply(unsigned cfg_val)
 		reg &= ~(1 << 28);
 	writel(reg, &psrc->gpr10);
 }
+#endif
Signature · 1 line
1.8.4
author
#2 lore raw

PATCH 3/4 imx: mx7dsabresd: drop code for CONFIG_CMD_BMODE

In reply to Peng Fan

Since i.MX7D does not support warm reset, so boot_mode_apply actually will not work. Also we use outer pmic reset and drop internal reset signal, so drop boot mode code for 7dsabresd board.

Cc Stefano Babic <[email protected]>
Cc Adrian Alonso <[email protected]>
---
 board/freescale/mx7dsabresd/mx7dsabresd.c | 14 --------------
 include/configs/mx7dsabresd.h             |  2 --
 2 files changed, 16 deletions(-)
board/freescale/mx7dsabresd/mx7dsabresd.c +0 -14
index 6d88573..2b14fb6 100644
@@ -10,7 +10,6 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <common.h>
@@ -458,15 +457,6 @@ int board_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_CMD_BMODE
-static const struct boot_mode board_boot_modes[] = {
-	/* 4 bit bus width */
-	{"sd1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)},
-	{"emmc", MAKE_CFGVAL(0x10, 0x2a, 0x00, 0x00)},
-	{NULL,   0},
-};
-#endif
-
 #ifdef CONFIG_POWER
 #define I2C_PMIC	0
 int power_init_board(void)
@@ -501,10 +491,6 @@ int board_late_init(void)
 {
 	struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
 
-#ifdef CONFIG_CMD_BMODE
-	add_board_boot_modes(board_boot_modes);
-#endif
-
 #ifdef CONFIG_ENV_IS_IN_MMC
 	mmc_late_init();
 #endif
include/configs/mx7dsabresd.h +0 -2
index ec6e0a6..8231c04 100644
@@ -175,8 +175,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		0	/* user area */
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"  /* USDHC1 */
 
-#define CONFIG_CMD_BMODE
-
 /* USB Configs */
 #define CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
Signature · 1 line
1.8.4
reviewer
#3 lore raw

PATCH 3/4 imx: mx7dsabresd: drop code for CONFIG_CMD_BMODE

Hi Peng,

Quoted 3 lines · Peng Fan

Since i.MX7D does not support warm reset, so boot_mode_apply actually will not work. Also we use outer pmic reset and drop internal reset signal, so drop boot mode code for 7dsabresd board.

Booting via bmode is working fine here.

Regards,

Fabio Estevam

#4 lore raw

PATCH 3/4 imx: mx7dsabresd: drop code for CONFIG_CMD_BMODE

Hi Fabio,

Quoted 8 lines · Fabio Estevam

Hi Peng,

Quoted 3 lines · Peng Fan

Since i.MX7D does not support warm reset, so boot_mode_apply actually will not work. Also we use outer pmic reset and drop internal reset signal, so drop boot mode code for 7dsabresd board.

Booting via bmode is working fine here.

If boot from sd1, bmode sd1 work well. If boot from qspi1, bmode qspi work well. This is expected. If boot from qspi, but we use 'bmode sd1', this will not work. The reason that introduce bmode command is to boot from different media, but now we use wdog signal to trigger pmic reset, which means the SoC will be powered off and powered on. There is no reason to keep bmode. This patch needs my previous wdog patch set.

Regards,
Peng.

Quoted 4 lines

Regards,

Fabio Estevam

reviewer
#5 lore raw

PATCH 3/4 imx: mx7dsabresd: drop code for CONFIG_CMD_BMODE

Hi Peng,

Quoted 5 lines · Peng Fan

Hi Fabio,

Quoted 3 lines · Fabio Estevam

Hi Peng,

On Mon, Sep 14, 2015 at 6:08 AM, Peng Fan <[email protected]> wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Since i.MX7D does not support warm reset, so boot_mode_apply actually will not work. Also we use outer pmic reset and drop internal reset signal, so drop boot mode code for 7dsabresd board.

Booting via bmode is working fine here.

If boot from sd1, bmode sd1 work well. If boot from qspi1, bmode qspi work well. This is expected. If boot from qspi, but we use 'bmode sd1', this will not work.

Understood. I only booted from sd1 and did 'bmode sd1'.

Regards,

Fabio Estevam

author
#6 lore raw

PATCH 4/4 imx: fix coding style

In reply to Peng Fan

Fix coding style.

Cc Stefano Babic <[email protected]>
---
 arch/arm/cpu/armv7/mx7/soc.c | 2 +-
 arch/arm/imx-common/init.c   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/mx7/soc.c +1 -1
index af16ba7..2ed05ea 100644
@@ -79,7 +79,7 @@ u32 get_cpu_temp_grade(int *minc, int *maxc)
 	val &= 0x3;
 
 	if (minc && maxc) {
-		if ( val == TEMP_AUTOMOTIVE) {
+		if (val == TEMP_AUTOMOTIVE) {
 			*minc = -40;
 			*maxc = 125;
 		} else if (val == TEMP_INDUSTRIAL) {
arch/arm/imx-common/init.c +1 -2
index 058cf79..15dab1d 100644
@@ -44,8 +44,7 @@ void init_aips(void)
 	writel(0x00000000, &aips2->opacr3);
 	writel(0x00000000, &aips2->opacr4);
 
-	if (is_cpu_type(MXC_CPU_MX6SX) || is_soc_type(MXC_SOC_MX7))
-	{
+	if (is_cpu_type(MXC_CPU_MX6SX) || is_soc_type(MXC_SOC_MX7)) {
 		/*
 		 * Set all MPROTx to be non-bufferable, trusted for R/W,
 		 * not forced to user-mode.
Signature · 1 line
1.8.4