diff mbox

[U-Boot,RFC] mx53loco: Add 1GHz support

Message ID CAOMZO5A_-hm0hjX22URAXL4EkbCw=f+aXCWyzB+wLQKCT16Q=A@mail.gmail.com
State Changes Requested
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam March 16, 2012, 9:01 p.m. UTC 
On Fri, Mar 16, 2012 at 5:21 PM, Fabio Estevam <festevam@gmail.com> wrote:

> I would be glad to receive some suggestion in order to get the 1GHz frequency
> printed during the initial boot log.

If I print the frequency inside board_late_init() then I see the
correct reported CPU frequency:

U-Boot 2011.12-07170-g536d7cc-dirty (Mar 16 2012 - 17:53:26)

Board: MX53 LOCO
I2C:   ready
DRAM:  1 GiB
WARNING: Caches not enabled
MMC:   FSL_SDHC: 0, FSL_SDHC: 1
In:    serial
Out:   serial
Err:   serial
CPU:   Freescale i.MX53 family rev2.1 at 1000 MHz
Reset cause: POR
Net:   FEC
Warning: failed to set MAC address

Hit any key to stop autoboot:  0
MX53LOCO U-Boot >

And the patch now looks like:

Comments

Stefano Babic March 17, 2012, 8:23 a.m. UTC | #1 
Am 16/03/2012 22:01, schrieb Fabio Estevam:
> On Fri, Mar 16, 2012 at 5:21 PM, Fabio Estevam <festevam@gmail.com> wrote:
> 
>> I would be glad to receive some suggestion in order to get the 1GHz frequency
>> printed during the initial boot log.
> 
> If I print the frequency inside board_late_init() then I see the
> correct reported CPU frequency:
> 
> U-Boot 2011.12-07170-g536d7cc-dirty (Mar 16 2012 - 17:53:26)
> 
> Board: MX53 LOCO
> I2C:   ready
> DRAM:  1 GiB
> WARNING: Caches not enabled
> MMC:   FSL_SDHC: 0, FSL_SDHC: 1
> In:    serial
> Out:   serial
> Err:   serial
> CPU:   Freescale i.MX53 family rev2.1 at 1000 MHz
> Reset cause: POR
> Net:   FEC
> Warning: failed to set MAC address
> 
> Hit any key to stop autoboot:  0
> MX53LOCO U-Boot >
> 
> And the patch now looks like:
> 

I do not see pmic_dialog.c and where the constants for dialog are
definded. Have I missed another patch ?

Stefano
Fabio Estevam March 17, 2012, 2:30 p.m. UTC | #2 
On Sat, Mar 17, 2012 at 5:23 AM, stefano babic <sbabic@denx.de> wrote:

> I do not see pmic_dialog.c and where the constants for dialog are
> definded. Have I missed another patch ?

Sorry, I missed to do "git add" for these files. On this RFC I am
mainly interested in getting feedback about the reported CPU
frequency.

Would it be OK to delay printing the CPU info like that?

> U-Boot 2011.12-07170-g536d7cc-dirty (Mar 16 2012 - 17:53:26)
>
> Board: MX53 LOCO
> I2C:   ready
> DRAM:  1 GiB
> WARNING: Caches not enabled
> MMC:   FSL_SDHC: 0, FSL_SDHC: 1
> In:    serial
> Out:   serial
> Err:   serial
> CPU:   Freescale i.MX53 family rev2.1 at 1000 MHz
> Reset cause: POR
> Net:   FEC
> Warning: failed to set MAC address

I am printing CPU frequency inside board_late_init because in order to
run at 1GHz we need to setup the proper voltages for 1GHz operation,
change the ARM CPU clock to 1GHz and then print ut.

Let me know if this is OK and I will submita new version of this patch.

Thanks,

Fabio Estevam
Stefano Babic March 17, 2012, 3:42 p.m. UTC | #3 
Am 17/03/2012 15:30, schrieb Fabio Estevam:
> On Sat, Mar 17, 2012 at 5:23 AM, stefano babic <sbabic@denx.de> wrote:
> 

Hi Fabio,

>> I do not see pmic_dialog.c and where the constants for dialog are
>> definded. Have I missed another patch ?
> 
> Sorry, I missed to do "git add" for these files. On this RFC I am
> mainly interested in getting feedback about the reported CPU
> frequency.
> 
> Would it be OK to delay printing the CPU info like that?

Personally, I think it is more important that the printed values *are*
correct rather than the output has always the same format. IMHO it is ok
if the CPU info is printed later, as you suggest. And we cannot do as
usual because we need I2C to set the CPU voltage, and I2C is not
initialized before relocation.

However, this is an exception in U-Boot, and I have added Wolfgang in CC
to let him know we want to change slightly the default output format, at
least for this board.

> 
>> U-Boot 2011.12-07170-g536d7cc-dirty (Mar 16 2012 - 17:53:26)
>>
>> Board: MX53 LOCO
>> I2C:   ready
>> DRAM:  1 GiB
>> WARNING: Caches not enabled
>> MMC:   FSL_SDHC: 0, FSL_SDHC: 1
>> In:    serial
>> Out:   serial
>> Err:   serial
>> CPU:   Freescale i.MX53 family rev2.1 at 1000 MHz
>> Reset cause: POR
>> Net:   FEC
>> Warning: failed to set MAC address
> 
> I am printing CPU frequency inside board_late_init because in order to
> run at 1GHz we need to setup the proper voltages for 1GHz operation,
> change the ARM CPU clock to 1GHz and then print ut.
> 
> Let me know if this is OK and I will submita new version of this patch.

No problem on my side, and we are fixing a real issue (CPU working with
800 instead of 1000 Mhz).

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/imx-common/cpu.c
b/arch/arm/cpu/armv7/imx-common/cpu.c
index 1e30ae5..1df29aa 100644
--- a/arch/arm/cpu/armv7/imx-common/cpu.c
+++ b/arch/arm/cpu/armv7/imx-common/cpu.c
@@ -34,7 +34,7 @@ 
 #include <fsl_esdhc.h>
 #endif

-static char *get_reset_cause(void)
+char *get_reset_cause(void)
 {
 	u32 cause;
 	struct src *src_regs = (struct src *)SRC_BASE_ADDR;
diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h
b/arch/arm/include/asm/arch-mx5/sys_proto.h
index 13d12ee..54a8918 100644
--- a/arch/arm/include/asm/arch-mx5/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx5/sys_proto.h
@@ -35,5 +35,6 @@  void set_chipselect_size(int const);
  */

 int fecmxc_initialize(bd_t *bis);
+char *get_reset_cause(void);

 #endif
diff --git a/board/freescale/mx53loco/mx53loco.c
b/board/freescale/mx53loco/mx53loco.c
index d736141..fbb2d63 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -35,6 +35,8 @@ 
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/gpio.h>
+#include <pmic.h>
+#include <dialog_pmic.h>

 DECLARE_GLOBAL_DATA_PTR;

@@ -290,6 +292,70 @@  int board_mmc_init(bd_t *bis)
 }
 #endif

+static void setup_iomux_i2c(void)
+{
+	/* I2C1 SDA */
+	mxc_request_iomux(MX53_PIN_CSI0_D8,
+		IOMUX_CONFIG_ALT5 | IOMUX_CONFIG_SION);
+	mxc_iomux_set_input(MX53_I2C1_IPP_SDA_IN_SELECT_INPUT,
+		INPUT_CTL_PATH0);
+	mxc_iomux_set_pad(MX53_PIN_CSI0_D8,
+		PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH |
+		PAD_CTL_100K_PU | PAD_CTL_PKE_ENABLE |
+		PAD_CTL_PUE_PULL |
+		PAD_CTL_ODE_OPENDRAIN_ENABLE);
+	/* I2C1 SCL */
+	mxc_request_iomux(MX53_PIN_CSI0_D9,
+		IOMUX_CONFIG_ALT5 | IOMUX_CONFIG_SION);
+	mxc_iomux_set_input(MX53_I2C1_IPP_SCL_IN_SELECT_INPUT,
+		INPUT_CTL_PATH0);
+	mxc_iomux_set_pad(MX53_PIN_CSI0_D9,
+		PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH |
+		PAD_CTL_100K_PU | PAD_CTL_PKE_ENABLE |
+		PAD_CTL_PUE_PULL |
+		PAD_CTL_ODE_OPENDRAIN_ENABLE);
+}
+
+static void power_init(void)
+{
+	unsigned int val, ret;
+	struct pmic *p;
+
+	pmic_init();
+	p = get_pmic();
+
+	/* Set VDDA to 1.25V */
+	val = DA9052_BUCKCORE_BCOREEN | DA_BUCKCORE_VBCORE_1_250V;
+	ret = pmic_reg_write(p, DA9053_BUCKCORE_REG, val);
+	if (!ret)
+		return;
+
+	pmic_reg_read(p, DA9053_SUPPLY_REG, &val);
+	val |= DA9052_SUPPLY_VBCOREGO;
+	pmic_reg_write(p, DA9053_SUPPLY_REG, val);
+	/* Set Vcc peripheral to 1.35V */
+	pmic_reg_write(p, 0x2f, 0x62);
+	pmic_reg_write(p, 0x3c, 0x62);
+}
+
+static void clock_init(void)
+{
+	int ret;
+	u32 ref_clk = CONFIG_SYS_MX5_HCLK;
+	/*
+	 * After increasing voltage to 1.25V, we can switch
+	 * CPU clock to 1GHz and DDR to 400MHz safely
+	 */
+	ret = mxc_set_clock(ref_clk, 1000, MXC_ARM_CLK);
+	if (ret)
+		printf("CPU:   Switch CPU clock to 1GHZ failed\n");
+
+	ret = mxc_set_clock(ref_clk, 400, MXC_PERIPH_CLK);
+	ret |= mxc_set_clock(ref_clk, 400, MXC_DDR_CLK);
+	if (ret)
+		printf("CPU:   Switch DDR clock to 400MHz failed\n");
+}
+
 int board_early_init_f(void)
 {
 	setup_iomux_uart();
@@ -305,6 +371,33 @@  int board_init(void)
 	return 0;
 }

+int print_cpuinfo(void)
+{
+	u32 cpurev;
+
+	cpurev = get_cpu_rev();
+	printf("CPU:   Freescale i.MX%x family rev%d.%d at %d MHz\n",
+		(cpurev & 0xFF000) >> 12,
+		(cpurev & 0x000F0) >> 4,
+		(cpurev & 0x0000F) >> 0,
+		mxc_get_clock(MXC_ARM_CLK) / 1000000);
+	printf("Reset cause: %s\n", get_reset_cause());
+	return 0;
+}
+
+#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
+{
+#ifdef CONFIG_I2C_MXC
+	setup_iomux_i2c();
+	power_init();
+	clock_init();
+#endif
+	print_cpuinfo();
+	return 0;
+}
+#endif
+
 int checkboard(void)
 {
 	puts("Board: MX53 LOCO\n");
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index a709707..6511713 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -39,6 +39,7 @@  COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
 COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
 COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
 COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o
+COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o

 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 34a4edd..143b078 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -27,7 +27,6 @@ 

 #define CONFIG_SYS_MX5_HCLK	24000000
 #define CONFIG_SYS_MX5_CLK32		32768
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

 #define CONFIG_MACH_TYPE	MACH_TYPE_MX53_LOCO
@@ -42,6 +41,7 @@ 
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)

 #define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MXC_GPIO

 #define CONFIG_MXC_UART
@@ -85,6 +85,19 @@ 
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0

+/* I2C Configs */
+#define CONFIG_HARD_I2C
+#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C_MX53_PORT1
+#define CONFIG_SYS_I2C_SPEED		100000
+#define CONFIG_SYS_I2C_SLAVE		0xfe
+
+/* PMIC Controller */
+#define CONFIG_PMIC
+#define CONFIG_PMIC_I2C
+#define CONFIG_DIALOG_PMIC
+#define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
+
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1