Re: [U-Boot] [PATCH 1/7] omap5: add qspi support

2013-07-11 Thread Sourav Poddar

On Wednesday 10 July 2013 06:53 PM, Nishanth Menon wrote:

On Wed, Jul 10, 2013 at 6:25 AM, Sourav Poddarsourav.pod...@ti.com  wrote:

From: Matt Portermpor...@ti.com

Add QSPI definitions and clock configuration support.


OMAP54xx does not have QSPI. DRA7 has QSPI?


Yes.

Signed-off-by: Matt Portermpor...@ti.com
Signed-off-by: Sourav Poddarsourav.pod...@ti.com
---
  arch/arm/cpu/armv7/omap5/hw_data.c |7 ++-
  arch/arm/cpu/armv7/omap5/prcm-regs.c   |1 +
  arch/arm/include/asm/arch-omap5/omap.h |3 +++
  arch/arm/include/asm/arch-omap5/spl.h  |1 +
  arch/arm/include/asm/omap_common.h |1 +
  5 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c 
b/arch/arm/cpu/armv7/omap5/hw_data.c
index 9374c6a..046ce44 100644
--- a/arch/arm/cpu/armv7/omap5/hw_data.c
+++ b/arch/arm/cpu/armv7/omap5/hw_data.c
@@ -186,7 +186,7 @@ static const struct dpll_params 
per_dpll_params_768mhz_es2[NUM_SYS_CLKS] = {

  static const struct dpll_params per_dpll_params_768mhz_dra7xx[NUM_SYS_CLKS] = 
{
 {32, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 12 MHz   */
-   {96, 4, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 20 MHz   */
+   {96, 4, 4, 1, 3, 4, 4, 2, -1, -1, -1, -1},  /* 20 MHz   */

is this a separate fix?


Ahh..it can be send as a seperate fix actually. Will change.

 {160, 6, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},/* 16.8 MHz */
 {20, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 19.2 MHz */
 {192, 12, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},   /* 26 MHz   */
@@ -423,6 +423,7 @@ void enable_basic_clocks(void)
 (*prcm)-cm_wkup_wdtimer2_clkctrl,
 (*prcm)-cm_l4per_uart3_clkctrl,
 (*prcm)-cm_l4per_i2c1_clkctrl,
+   (*prcm)-cm_l4per_qspi_clkctrl,
 0
 };

@@ -451,6 +452,10 @@ void enable_basic_clocks(void)
  clk_modules_explicit_en_essential,
  1);

+#ifdef CONFIG_TI_QSPI
+   setbits_le32((*prcm)-cm_l4per_qspi_clkctrl, (124));
+#endif
+
 /* Enable SCRM OPT clocks for PER and CORE dpll */
 setbits_le32((*prcm)-cm_wkupaon_scrm_clkctrl,
 OPTFCLKEN_SCRM_PER_MASK);
diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c 
b/arch/arm/cpu/armv7/omap5/prcm-regs.c
index 331117c..debc56b 100644
--- a/arch/arm/cpu/armv7/omap5/prcm-regs.c
+++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c
@@ -926,6 +926,7 @@ struct prcm_regs const dra7xx_prcm = {
 .cm_l4per_gpio8_clkctrl = 0x4a009818,
 .cm_l4per_mmcsd3_clkctrl= 0x4a009820,
 .cm_l4per_mmcsd4_clkctrl= 0x4a009828,
+   .cm_l4per_qspi_clkctrl  = 0x4a009838,
 .cm_l4per_uart1_clkctrl = 0x4a009840,
 .cm_l4per_uart2_clkctrl = 0x4a009848,
 .cm_l4per_uart3_clkctrl = 0x4a009850,
diff --git a/arch/arm/include/asm/arch-omap5/omap.h 
b/arch/arm/include/asm/arch-omap5/omap.h
index e7d79fc..d2c4930 100644
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -67,6 +67,9 @@
  /* GPMC */
  #define OMAP54XX_GPMC_BASE 0x5000

+/* QSPI */
+#define QSPI_BASE  0x4B30
+
  /*
   * Hardware Register Details
   */
diff --git a/arch/arm/include/asm/arch-omap5/spl.h 
b/arch/arm/include/asm/arch-omap5/spl.h
index d4d353c..8905cb8 100644
--- a/arch/arm/include/asm/arch-omap5/spl.h
+++ b/arch/arm/include/asm/arch-omap5/spl.h
@@ -31,6 +31,7 @@
  #define BOOT_DEVICE_MMC15
  #define BOOT_DEVICE_MMC26
  #define BOOT_DEVICE_MMC2_2 7
+#define BOOT_DEVICE_SPI10

why not 8?


  #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
  #define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2_2
diff --git a/arch/arm/include/asm/omap_common.h 
b/arch/arm/include/asm/omap_common.h
index fa28358..c8d4619 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -279,6 +279,7 @@ struct prcm_regs {
 u32 cm_l4per_mmcsd4_clkctrl;
 u32 cm_l4per_msprohg_clkctrl;
 u32 cm_l4per_slimbus2_clkctrl;
+   u32 cm_l4per_qspi_clkctrl;
 u32 cm_l4per_uart1_clkctrl;
 u32 cm_l4per_uart2_clkctrl;
 u32 cm_l4per_uart3_clkctrl;
--
1.7.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH 1/7] omap5: add qspi support

2013-07-11 Thread Sourav Poddar

On Wednesday 10 July 2013 07:10 PM, Lokesh Vutla wrote:

On Wednesday 10 July 2013 04:55 PM, Sourav Poddar wrote:

From: Matt Portermpor...@ti.com

Add QSPI definitions and clock configuration support.

Signed-off-by: Matt Portermpor...@ti.com
Signed-off-by: Sourav Poddarsourav.pod...@ti.com
---
  arch/arm/cpu/armv7/omap5/hw_data.c |7 ++-
  arch/arm/cpu/armv7/omap5/prcm-regs.c   |1 +
  arch/arm/include/asm/arch-omap5/omap.h |3 +++
  arch/arm/include/asm/arch-omap5/spl.h  |1 +
  arch/arm/include/asm/omap_common.h |1 +
  5 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c 
b/arch/arm/cpu/armv7/omap5/hw_data.c
index 9374c6a..046ce44 100644
--- a/arch/arm/cpu/armv7/omap5/hw_data.c
+++ b/arch/arm/cpu/armv7/omap5/hw_data.c
@@ -186,7 +186,7 @@ static const struct dpll_params 
per_dpll_params_768mhz_es2[NUM_SYS_CLKS] = {

  static const struct dpll_params per_dpll_params_768mhz_dra7xx[NUM_SYS_CLKS] = 
{
{32, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 12 MHz   */
-   {96, 4, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 20 MHz   */
+   {96, 4, 4, 1, 3, 4, 4, 2, -1, -1, -1, -1},  /* 20 MHz   */
{160, 6, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},/* 16.8 MHz */
{20, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 19.2 MHz */
{192, 12, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},   /* 26 MHz   */
@@ -423,6 +423,7 @@ void enable_basic_clocks(void)
(*prcm)-cm_wkup_wdtimer2_clkctrl,
(*prcm)-cm_l4per_uart3_clkctrl,
(*prcm)-cm_l4per_i2c1_clkctrl,
+   (*prcm)-cm_l4per_qspi_clkctrl,

Keep this also under CONFIG_TI_QSPI because we should enable QSPI clocks
only if support is available.


Ok.

Thanks,
Lokesh

0
};

@@ -451,6 +452,10 @@ void enable_basic_clocks(void)
 clk_modules_explicit_en_essential,
 1);

+#ifdef CONFIG_TI_QSPI
+   setbits_le32((*prcm)-cm_l4per_qspi_clkctrl, (124));
+#endif
+
/* Enable SCRM OPT clocks for PER and CORE dpll */
setbits_le32((*prcm)-cm_wkupaon_scrm_clkctrl,
OPTFCLKEN_SCRM_PER_MASK);
diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c 
b/arch/arm/cpu/armv7/omap5/prcm-regs.c
index 331117c..debc56b 100644
--- a/arch/arm/cpu/armv7/omap5/prcm-regs.c
+++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c
@@ -926,6 +926,7 @@ struct prcm_regs const dra7xx_prcm = {
.cm_l4per_gpio8_clkctrl = 0x4a009818,
.cm_l4per_mmcsd3_clkctrl= 0x4a009820,
.cm_l4per_mmcsd4_clkctrl= 0x4a009828,
+   .cm_l4per_qspi_clkctrl  = 0x4a009838,
.cm_l4per_uart1_clkctrl = 0x4a009840,
.cm_l4per_uart2_clkctrl = 0x4a009848,
.cm_l4per_uart3_clkctrl = 0x4a009850,
diff --git a/arch/arm/include/asm/arch-omap5/omap.h 
b/arch/arm/include/asm/arch-omap5/omap.h
index e7d79fc..d2c4930 100644
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -67,6 +67,9 @@
  /* GPMC */
  #define OMAP54XX_GPMC_BASE0x5000

+/* QSPI */
+#define QSPI_BASE  0x4B30
+
  /*
   * Hardware Register Details
   */
diff --git a/arch/arm/include/asm/arch-omap5/spl.h 
b/arch/arm/include/asm/arch-omap5/spl.h
index d4d353c..8905cb8 100644
--- a/arch/arm/include/asm/arch-omap5/spl.h
+++ b/arch/arm/include/asm/arch-omap5/spl.h
@@ -31,6 +31,7 @@
  #define BOOT_DEVICE_MMC15
  #define BOOT_DEVICE_MMC26
  #define BOOT_DEVICE_MMC2_27
+#define BOOT_DEVICE_SPI10

  #define MMC_BOOT_DEVICES_STARTBOOT_DEVICE_MMC1
  #define MMC_BOOT_DEVICES_END  BOOT_DEVICE_MMC2_2
diff --git a/arch/arm/include/asm/omap_common.h 
b/arch/arm/include/asm/omap_common.h
index fa28358..c8d4619 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -279,6 +279,7 @@ struct prcm_regs {
u32 cm_l4per_mmcsd4_clkctrl;
u32 cm_l4per_msprohg_clkctrl;
u32 cm_l4per_slimbus2_clkctrl;
+   u32 cm_l4per_qspi_clkctrl;
u32 cm_l4per_uart1_clkctrl;
u32 cm_l4per_uart2_clkctrl;
u32 cm_l4per_uart3_clkctrl;



___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH 1/7] omap5: add qspi support

2013-07-11 Thread Sourav Poddar

On Wednesday 10 July 2013 07:13 PM, Tom Rini wrote:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 07/10/2013 09:23 AM, Nishanth Menon wrote:

On Wed, Jul 10, 2013 at 6:25 AM, Sourav Poddar
sourav.pod...@ti.com  wrote:

From: Matt Portermpor...@ti.com

I think it's good form to update folks addresses, Matt is now
matt.por...@linaro.org


Add QSPI definitions and clock configuration support.

[snip]

diff --git a/arch/arm/include/asm/arch-omap5/spl.h
b/arch/arm/include/asm/arch-omap5/spl.h index d4d353c..8905cb8
100644 --- a/arch/arm/include/asm/arch-omap5/spl.h +++
b/arch/arm/include/asm/arch-omap5/spl.h @@ -31,6 +31,7 @@
#define BOOT_DEVICE_MMC15 #define BOOT_DEVICE_MMC2
6 #define BOOT_DEVICE_MMC2_2 7 +#define BOOT_DEVICE_SPI 10

why not 8?

This is the value ROM passes when we boot here.  What I would like to
know is, is this really SPI or QSPI_1 or QSPI_4 ?  I suspect it's
QSPI_1.  And yes, we want to be precise here because while DRA7
doesn't have McSPI AM437x will, along with QSPI.


Yes, its QSPI1.
Will explicitl define it as QSPI91/4) in next version.
- -- 
Tom

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJR3WURAAoJENk4IS6UOR1W9aQP/jEBoyQKtU7n+B6aAMY5b5U4
FF54lAfRvJZfUaRVDCLmLMF+87Obx6ctQ95SogkKbsNmc5TxbDy7dBfd7G3++5ZG
ivYQcEv9MKi/kGgJ0UZejc2J4e+QbQbymvnVqHG2mKJnMjRSdeuQG7UUGGIRQeA7
/VwR4cZuNqVrcejlglrBrwxr5PdA1f/cMCr1Dp4PhiHzxG+YYbiS4EVmnT+GNXmL
RfZuy2TzjAir7brn4Y6sQ2fcHu2qXIzO6U/a16ZawfwB8089Zj4FMvP20IugsIyU
drZhaJ3jY+leTCW1Wq5BZ1s2IJ7eaIqW4kbCSif9sPqxqM1lwJdqFJAdY8eGUWD/
c7cpJxkyLvleK0WFZDVraljIXoY7SMiTpnjYU5M+ASV43s+fFSl3f0VnZLuQtkkW
+nFQeF1FdRDUd32jFDOzCuEeJbiPpy3mJLn60ND1r56VPQweroVBE3AetavzYDA0
K40Q3o/vXBLPyl2IELLOK5hpESWVlXasgMUOsNSfqpxGblh9ea5sXZ/Nvk8hjdmm
ViVXk5lqNvmZzYzu0znRmLEg3ucuyYif0IOh/IOb97mAjR8KX0iCavw42RI5ympb
E6d4is/Ap3x67BMBiEquRVWYmXv78Mr0o6LEhgayxM9rrT38uJyaGgIXlszia0xE
QIqgV1U808hJVFMMnAK+
=EY5D
-END PGP SIGNATURE-


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 1/7] omap5: add qspi support

2013-07-10 Thread Sourav Poddar
From: Matt Porter mpor...@ti.com

Add QSPI definitions and clock configuration support.

Signed-off-by: Matt Porter mpor...@ti.com
Signed-off-by: Sourav Poddar sourav.pod...@ti.com
---
 arch/arm/cpu/armv7/omap5/hw_data.c |7 ++-
 arch/arm/cpu/armv7/omap5/prcm-regs.c   |1 +
 arch/arm/include/asm/arch-omap5/omap.h |3 +++
 arch/arm/include/asm/arch-omap5/spl.h  |1 +
 arch/arm/include/asm/omap_common.h |1 +
 5 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c 
b/arch/arm/cpu/armv7/omap5/hw_data.c
index 9374c6a..046ce44 100644
--- a/arch/arm/cpu/armv7/omap5/hw_data.c
+++ b/arch/arm/cpu/armv7/omap5/hw_data.c
@@ -186,7 +186,7 @@ static const struct dpll_params 
per_dpll_params_768mhz_es2[NUM_SYS_CLKS] = {
 
 static const struct dpll_params per_dpll_params_768mhz_dra7xx[NUM_SYS_CLKS] = {
{32, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 12 MHz   */
-   {96, 4, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 20 MHz   */
+   {96, 4, 4, 1, 3, 4, 4, 2, -1, -1, -1, -1},  /* 20 MHz   */
{160, 6, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},/* 16.8 MHz */
{20, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 19.2 MHz */
{192, 12, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},   /* 26 MHz   */
@@ -423,6 +423,7 @@ void enable_basic_clocks(void)
(*prcm)-cm_wkup_wdtimer2_clkctrl,
(*prcm)-cm_l4per_uart3_clkctrl,
(*prcm)-cm_l4per_i2c1_clkctrl,
+   (*prcm)-cm_l4per_qspi_clkctrl,
0
};
 
@@ -451,6 +452,10 @@ void enable_basic_clocks(void)
 clk_modules_explicit_en_essential,
 1);
 
+#ifdef CONFIG_TI_QSPI
+   setbits_le32((*prcm)-cm_l4per_qspi_clkctrl, (124));
+#endif
+
/* Enable SCRM OPT clocks for PER and CORE dpll */
setbits_le32((*prcm)-cm_wkupaon_scrm_clkctrl,
OPTFCLKEN_SCRM_PER_MASK);
diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c 
b/arch/arm/cpu/armv7/omap5/prcm-regs.c
index 331117c..debc56b 100644
--- a/arch/arm/cpu/armv7/omap5/prcm-regs.c
+++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c
@@ -926,6 +926,7 @@ struct prcm_regs const dra7xx_prcm = {
.cm_l4per_gpio8_clkctrl = 0x4a009818,
.cm_l4per_mmcsd3_clkctrl= 0x4a009820,
.cm_l4per_mmcsd4_clkctrl= 0x4a009828,
+   .cm_l4per_qspi_clkctrl  = 0x4a009838,
.cm_l4per_uart1_clkctrl = 0x4a009840,
.cm_l4per_uart2_clkctrl = 0x4a009848,
.cm_l4per_uart3_clkctrl = 0x4a009850,
diff --git a/arch/arm/include/asm/arch-omap5/omap.h 
b/arch/arm/include/asm/arch-omap5/omap.h
index e7d79fc..d2c4930 100644
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -67,6 +67,9 @@
 /* GPMC */
 #define OMAP54XX_GPMC_BASE 0x5000
 
+/* QSPI */
+#define QSPI_BASE  0x4B30
+
 /*
  * Hardware Register Details
  */
diff --git a/arch/arm/include/asm/arch-omap5/spl.h 
b/arch/arm/include/asm/arch-omap5/spl.h
index d4d353c..8905cb8 100644
--- a/arch/arm/include/asm/arch-omap5/spl.h
+++ b/arch/arm/include/asm/arch-omap5/spl.h
@@ -31,6 +31,7 @@
 #define BOOT_DEVICE_MMC15
 #define BOOT_DEVICE_MMC26
 #define BOOT_DEVICE_MMC2_2 7
+#define BOOT_DEVICE_SPI10
 
 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
 #define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2_2
diff --git a/arch/arm/include/asm/omap_common.h 
b/arch/arm/include/asm/omap_common.h
index fa28358..c8d4619 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -279,6 +279,7 @@ struct prcm_regs {
u32 cm_l4per_mmcsd4_clkctrl;
u32 cm_l4per_msprohg_clkctrl;
u32 cm_l4per_slimbus2_clkctrl;
+   u32 cm_l4per_qspi_clkctrl;
u32 cm_l4per_uart1_clkctrl;
u32 cm_l4per_uart2_clkctrl;
u32 cm_l4per_uart3_clkctrl;
-- 
1.7.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH 1/7] omap5: add qspi support

2013-07-10 Thread Nishanth Menon
On Wed, Jul 10, 2013 at 6:25 AM, Sourav Poddar sourav.pod...@ti.com wrote:
 From: Matt Porter mpor...@ti.com

 Add QSPI definitions and clock configuration support.


OMAP54xx does not have QSPI. DRA7 has QSPI?

 Signed-off-by: Matt Porter mpor...@ti.com
 Signed-off-by: Sourav Poddar sourav.pod...@ti.com
 ---
  arch/arm/cpu/armv7/omap5/hw_data.c |7 ++-
  arch/arm/cpu/armv7/omap5/prcm-regs.c   |1 +
  arch/arm/include/asm/arch-omap5/omap.h |3 +++
  arch/arm/include/asm/arch-omap5/spl.h  |1 +
  arch/arm/include/asm/omap_common.h |1 +
  5 files changed, 12 insertions(+), 1 deletions(-)

 diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c 
 b/arch/arm/cpu/armv7/omap5/hw_data.c
 index 9374c6a..046ce44 100644
 --- a/arch/arm/cpu/armv7/omap5/hw_data.c
 +++ b/arch/arm/cpu/armv7/omap5/hw_data.c
 @@ -186,7 +186,7 @@ static const struct dpll_params 
 per_dpll_params_768mhz_es2[NUM_SYS_CLKS] = {

  static const struct dpll_params per_dpll_params_768mhz_dra7xx[NUM_SYS_CLKS] 
 = {
 {32, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 12 MHz   */
 -   {96, 4, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 20 MHz   */
 +   {96, 4, 4, 1, 3, 4, 4, 2, -1, -1, -1, -1},  /* 20 MHz   */

is this a separate fix?

 {160, 6, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},/* 16.8 MHz */
 {20, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 19.2 MHz */
 {192, 12, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},   /* 26 MHz   */
 @@ -423,6 +423,7 @@ void enable_basic_clocks(void)
 (*prcm)-cm_wkup_wdtimer2_clkctrl,
 (*prcm)-cm_l4per_uart3_clkctrl,
 (*prcm)-cm_l4per_i2c1_clkctrl,
 +   (*prcm)-cm_l4per_qspi_clkctrl,
 0
 };

 @@ -451,6 +452,10 @@ void enable_basic_clocks(void)
  clk_modules_explicit_en_essential,
  1);

 +#ifdef CONFIG_TI_QSPI
 +   setbits_le32((*prcm)-cm_l4per_qspi_clkctrl, (124));
 +#endif
 +
 /* Enable SCRM OPT clocks for PER and CORE dpll */
 setbits_le32((*prcm)-cm_wkupaon_scrm_clkctrl,
 OPTFCLKEN_SCRM_PER_MASK);
 diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c 
 b/arch/arm/cpu/armv7/omap5/prcm-regs.c
 index 331117c..debc56b 100644
 --- a/arch/arm/cpu/armv7/omap5/prcm-regs.c
 +++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c
 @@ -926,6 +926,7 @@ struct prcm_regs const dra7xx_prcm = {
 .cm_l4per_gpio8_clkctrl = 0x4a009818,
 .cm_l4per_mmcsd3_clkctrl= 0x4a009820,
 .cm_l4per_mmcsd4_clkctrl= 0x4a009828,
 +   .cm_l4per_qspi_clkctrl  = 0x4a009838,
 .cm_l4per_uart1_clkctrl = 0x4a009840,
 .cm_l4per_uart2_clkctrl = 0x4a009848,
 .cm_l4per_uart3_clkctrl = 0x4a009850,
 diff --git a/arch/arm/include/asm/arch-omap5/omap.h 
 b/arch/arm/include/asm/arch-omap5/omap.h
 index e7d79fc..d2c4930 100644
 --- a/arch/arm/include/asm/arch-omap5/omap.h
 +++ b/arch/arm/include/asm/arch-omap5/omap.h
 @@ -67,6 +67,9 @@
  /* GPMC */
  #define OMAP54XX_GPMC_BASE 0x5000

 +/* QSPI */
 +#define QSPI_BASE  0x4B30
 +
  /*
   * Hardware Register Details
   */
 diff --git a/arch/arm/include/asm/arch-omap5/spl.h 
 b/arch/arm/include/asm/arch-omap5/spl.h
 index d4d353c..8905cb8 100644
 --- a/arch/arm/include/asm/arch-omap5/spl.h
 +++ b/arch/arm/include/asm/arch-omap5/spl.h
 @@ -31,6 +31,7 @@
  #define BOOT_DEVICE_MMC15
  #define BOOT_DEVICE_MMC26
  #define BOOT_DEVICE_MMC2_2 7
 +#define BOOT_DEVICE_SPI10

why not 8?


  #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
  #define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2_2
 diff --git a/arch/arm/include/asm/omap_common.h 
 b/arch/arm/include/asm/omap_common.h
 index fa28358..c8d4619 100644
 --- a/arch/arm/include/asm/omap_common.h
 +++ b/arch/arm/include/asm/omap_common.h
 @@ -279,6 +279,7 @@ struct prcm_regs {
 u32 cm_l4per_mmcsd4_clkctrl;
 u32 cm_l4per_msprohg_clkctrl;
 u32 cm_l4per_slimbus2_clkctrl;
 +   u32 cm_l4per_qspi_clkctrl;
 u32 cm_l4per_uart1_clkctrl;
 u32 cm_l4per_uart2_clkctrl;
 u32 cm_l4per_uart3_clkctrl;
 --
 1.7.1

 ___
 U-Boot mailing list
 U-Boot@lists.denx.de
 http://lists.denx.de/mailman/listinfo/u-boot
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH 1/7] omap5: add qspi support

2013-07-10 Thread Lokesh Vutla
On Wednesday 10 July 2013 04:55 PM, Sourav Poddar wrote:
 From: Matt Porter mpor...@ti.com
 
 Add QSPI definitions and clock configuration support.
 
 Signed-off-by: Matt Porter mpor...@ti.com
 Signed-off-by: Sourav Poddar sourav.pod...@ti.com
 ---
  arch/arm/cpu/armv7/omap5/hw_data.c |7 ++-
  arch/arm/cpu/armv7/omap5/prcm-regs.c   |1 +
  arch/arm/include/asm/arch-omap5/omap.h |3 +++
  arch/arm/include/asm/arch-omap5/spl.h  |1 +
  arch/arm/include/asm/omap_common.h |1 +
  5 files changed, 12 insertions(+), 1 deletions(-)
 
 diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c 
 b/arch/arm/cpu/armv7/omap5/hw_data.c
 index 9374c6a..046ce44 100644
 --- a/arch/arm/cpu/armv7/omap5/hw_data.c
 +++ b/arch/arm/cpu/armv7/omap5/hw_data.c
 @@ -186,7 +186,7 @@ static const struct dpll_params 
 per_dpll_params_768mhz_es2[NUM_SYS_CLKS] = {
  
  static const struct dpll_params per_dpll_params_768mhz_dra7xx[NUM_SYS_CLKS] 
 = {
   {32, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 12 MHz   */
 - {96, 4, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 20 MHz   */
 + {96, 4, 4, 1, 3, 4, 4, 2, -1, -1, -1, -1},  /* 20 MHz   */
   {160, 6, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},/* 16.8 MHz */
   {20, 0, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1}, /* 19.2 MHz */
   {192, 12, 4, 1, 3, 4, 10, 2, -1, -1, -1, -1},   /* 26 MHz   */
 @@ -423,6 +423,7 @@ void enable_basic_clocks(void)
   (*prcm)-cm_wkup_wdtimer2_clkctrl,
   (*prcm)-cm_l4per_uart3_clkctrl,
   (*prcm)-cm_l4per_i2c1_clkctrl,
 + (*prcm)-cm_l4per_qspi_clkctrl,
Keep this also under CONFIG_TI_QSPI because we should enable QSPI clocks
only if support is available.

Thanks,
Lokesh
   0
   };
  
 @@ -451,6 +452,10 @@ void enable_basic_clocks(void)
clk_modules_explicit_en_essential,
1);
  
 +#ifdef CONFIG_TI_QSPI
 + setbits_le32((*prcm)-cm_l4per_qspi_clkctrl, (124));
 +#endif
 +
   /* Enable SCRM OPT clocks for PER and CORE dpll */
   setbits_le32((*prcm)-cm_wkupaon_scrm_clkctrl,
   OPTFCLKEN_SCRM_PER_MASK);
 diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c 
 b/arch/arm/cpu/armv7/omap5/prcm-regs.c
 index 331117c..debc56b 100644
 --- a/arch/arm/cpu/armv7/omap5/prcm-regs.c
 +++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c
 @@ -926,6 +926,7 @@ struct prcm_regs const dra7xx_prcm = {
   .cm_l4per_gpio8_clkctrl = 0x4a009818,
   .cm_l4per_mmcsd3_clkctrl= 0x4a009820,
   .cm_l4per_mmcsd4_clkctrl= 0x4a009828,
 + .cm_l4per_qspi_clkctrl  = 0x4a009838,
   .cm_l4per_uart1_clkctrl = 0x4a009840,
   .cm_l4per_uart2_clkctrl = 0x4a009848,
   .cm_l4per_uart3_clkctrl = 0x4a009850,
 diff --git a/arch/arm/include/asm/arch-omap5/omap.h 
 b/arch/arm/include/asm/arch-omap5/omap.h
 index e7d79fc..d2c4930 100644
 --- a/arch/arm/include/asm/arch-omap5/omap.h
 +++ b/arch/arm/include/asm/arch-omap5/omap.h
 @@ -67,6 +67,9 @@
  /* GPMC */
  #define OMAP54XX_GPMC_BASE   0x5000
  
 +/* QSPI */
 +#define QSPI_BASE0x4B30
 +
  /*
   * Hardware Register Details
   */
 diff --git a/arch/arm/include/asm/arch-omap5/spl.h 
 b/arch/arm/include/asm/arch-omap5/spl.h
 index d4d353c..8905cb8 100644
 --- a/arch/arm/include/asm/arch-omap5/spl.h
 +++ b/arch/arm/include/asm/arch-omap5/spl.h
 @@ -31,6 +31,7 @@
  #define BOOT_DEVICE_MMC15
  #define BOOT_DEVICE_MMC26
  #define BOOT_DEVICE_MMC2_2   7
 +#define BOOT_DEVICE_SPI  10
  
  #define MMC_BOOT_DEVICES_START   BOOT_DEVICE_MMC1
  #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2_2
 diff --git a/arch/arm/include/asm/omap_common.h 
 b/arch/arm/include/asm/omap_common.h
 index fa28358..c8d4619 100644
 --- a/arch/arm/include/asm/omap_common.h
 +++ b/arch/arm/include/asm/omap_common.h
 @@ -279,6 +279,7 @@ struct prcm_regs {
   u32 cm_l4per_mmcsd4_clkctrl;
   u32 cm_l4per_msprohg_clkctrl;
   u32 cm_l4per_slimbus2_clkctrl;
 + u32 cm_l4per_qspi_clkctrl;
   u32 cm_l4per_uart1_clkctrl;
   u32 cm_l4per_uart2_clkctrl;
   u32 cm_l4per_uart3_clkctrl;
 

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH 1/7] omap5: add qspi support

2013-07-10 Thread Tom Rini
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 07/10/2013 09:23 AM, Nishanth Menon wrote:
 On Wed, Jul 10, 2013 at 6:25 AM, Sourav Poddar 
 sourav.pod...@ti.com wrote:
 From: Matt Porter mpor...@ti.com

I think it's good form to update folks addresses, Matt is now
matt.por...@linaro.org

 Add QSPI definitions and clock configuration support.
[snip]
 diff --git a/arch/arm/include/asm/arch-omap5/spl.h 
 b/arch/arm/include/asm/arch-omap5/spl.h index d4d353c..8905cb8 
 100644 --- a/arch/arm/include/asm/arch-omap5/spl.h +++ 
 b/arch/arm/include/asm/arch-omap5/spl.h @@ -31,6 +31,7 @@
 #define BOOT_DEVICE_MMC15 #define BOOT_DEVICE_MMC2
 6 #define BOOT_DEVICE_MMC2_2 7 +#define BOOT_DEVICE_SPI 10
 
 why not 8?

This is the value ROM passes when we boot here.  What I would like to
know is, is this really SPI or QSPI_1 or QSPI_4 ?  I suspect it's
QSPI_1.  And yes, we want to be precise here because while DRA7
doesn't have McSPI AM437x will, along with QSPI.

- -- 
Tom
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJR3WURAAoJENk4IS6UOR1W9aQP/jEBoyQKtU7n+B6aAMY5b5U4
FF54lAfRvJZfUaRVDCLmLMF+87Obx6ctQ95SogkKbsNmc5TxbDy7dBfd7G3++5ZG
ivYQcEv9MKi/kGgJ0UZejc2J4e+QbQbymvnVqHG2mKJnMjRSdeuQG7UUGGIRQeA7
/VwR4cZuNqVrcejlglrBrwxr5PdA1f/cMCr1Dp4PhiHzxG+YYbiS4EVmnT+GNXmL
RfZuy2TzjAir7brn4Y6sQ2fcHu2qXIzO6U/a16ZawfwB8089Zj4FMvP20IugsIyU
drZhaJ3jY+leTCW1Wq5BZ1s2IJ7eaIqW4kbCSif9sPqxqM1lwJdqFJAdY8eGUWD/
c7cpJxkyLvleK0WFZDVraljIXoY7SMiTpnjYU5M+ASV43s+fFSl3f0VnZLuQtkkW
+nFQeF1FdRDUd32jFDOzCuEeJbiPpy3mJLn60ND1r56VPQweroVBE3AetavzYDA0
K40Q3o/vXBLPyl2IELLOK5hpESWVlXasgMUOsNSfqpxGblh9ea5sXZ/Nvk8hjdmm
ViVXk5lqNvmZzYzu0znRmLEg3ucuyYif0IOh/IOb97mAjR8KX0iCavw42RI5ympb
E6d4is/Ap3x67BMBiEquRVWYmXv78Mr0o6LEhgayxM9rrT38uJyaGgIXlszia0xE
QIqgV1U808hJVFMMnAK+
=EY5D
-END PGP SIGNATURE-
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot