Skip to contentSkip to conversation

clock_am43xx:Set the MAC clock to /5 for OPP100

PATCH In review Tom Rini 2 participants 4 messages Feb 11, 2015 – Feb 17, 2015

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 clock_am43xx:Set the MAC clock to /5 for OPP100

From: Steve Kipisz <[email protected]>

When EMAC is in the boot order, the boot ROM sets OPP50 and the MAC clock is set to /2. SPL needs to change it to /5 for Ethernet to generate the correct txclk. This patch sets it correctly.

---
 arch/arm/cpu/armv7/am33xx/clock_am43xx.c |    3 +++
 arch/arm/include/asm/arch-am33xx/cpu.h   |    2 ++
 2 files changed, 5 insertions(+)
arch/arm/cpu/armv7/am33xx/clock_am43xx.c +3 -0
index 31188c8..529a119 100644
@@ -118,4 +118,7 @@ void enable_basic_clocks(void)
 
 	/* Select the Master osc clk as Timer2 clock source */
 	writel(0x1, &cmdpll->clktimer2clk);
+
+	/* For OPP100 the mac clock should be /5. */
+	writel(0x4, &cmdpll->clkselmacclk);
 }
arch/arm/include/asm/arch-am33xx/cpu.h +2 -0
index b94b56c..523d22e 100644
@@ -400,6 +400,8 @@ struct prm_device_inst {
 struct cm_dpll {
 	unsigned int resv1;
 	unsigned int clktimer2clk;	/* offset 0x04 */
+	unsigned int resv2[11];
+	unsigned int clkselmacclk;	/* offset 0x34 */ 
 };
 #endif /* CONFIG_AM43XX */
 
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/1 qspi: dra7x: enable quad mode read for ti-qspi driver

From: Ravi Babu <[email protected]>

This patch enables QUAD read mode for qspi to improve the read performace while loading the binaries from qspi.

---
 drivers/spi/ti_qspi.c        |    7 +++++++
 include/configs/dra7xx_evm.h |    1 +
 2 files changed, 8 insertions(+)
drivers/spi/ti_qspi.c +7 -0
index 857b604..3356c0f 100644
@@ -109,10 +109,17 @@ static void ti_spi_setup_spi_register(struct ti_qspi_slave *qslave)
 	slave->op_mode_rx = 8;
 #endif
 
+#ifdef CONFIG_QSPI_QUAD_SUPPORT
+	memval |= (QSPI_CMD_READ_QUAD | QSPI_SETUP0_NUM_A_BYTES |
+			QSPI_SETUP0_NUM_D_BYTES_8_BITS |
+			QSPI_SETUP0_READ_QUAD | QSPI_CMD_WRITE |
+			QSPI_NUM_DUMMY_BITS);
+#else
 	memval |= QSPI_CMD_READ | QSPI_SETUP0_NUM_A_BYTES |
 			QSPI_SETUP0_NUM_D_BYTES_NO_BITS |
 			QSPI_SETUP0_READ_NORMAL | QSPI_CMD_WRITE |
 			QSPI_NUM_DUMMY_BITS;
+#endif
 
 	writel(memval, &qslave->base->setup0);
 }
include/configs/dra7xx_evm.h +1 -0
index dee2b11..8fe0e6c 100644
@@ -77,6 +77,7 @@
 #define CONFIG_TI_SPI_MMAP
 #define CONFIG_SF_DEFAULT_SPEED                48000000
 #define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_3
+#define CONFIG_QSPI_QUAD_SUPPORT
 
 /*
  * Default to using SPI for environment, etc.
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 qspi: dra7x: enable quad mode read for ti-qspi driver

Quoted 46 lines · Tom Rini

From: Ravi Babu <[email protected]>

This patch enables QUAD read mode for qspi to improve the read performace while loading the binaries from qspi.

---
 drivers/spi/ti_qspi.c        |    7 +++++++
 include/configs/dra7xx_evm.h |    1 +
 2 files changed, 8 insertions(+)
drivers/spi/ti_qspi.c +7 -0
index 857b604..3356c0f 100644
@@ -109,10 +109,17 @@ static void ti_spi_setup_spi_register(struct ti_qspi_slave *qslave)
        slave->op_mode_rx = 8;
 #endif
 
+#ifdef CONFIG_QSPI_QUAD_SUPPORT
+       memval |= (QSPI_CMD_READ_QUAD | QSPI_SETUP0_NUM_A_BYTES |
+                       QSPI_SETUP0_NUM_D_BYTES_8_BITS |
+                       QSPI_SETUP0_READ_QUAD | QSPI_CMD_WRITE |
+                       QSPI_NUM_DUMMY_BITS);
+#else
        memval |= QSPI_CMD_READ | QSPI_SETUP0_NUM_A_BYTES |
                        QSPI_SETUP0_NUM_D_BYTES_NO_BITS |
                        QSPI_SETUP0_READ_NORMAL | QSPI_CMD_WRITE |
                        QSPI_NUM_DUMMY_BITS;
+#endif
 
        writel(memval, &qslave->base->setup0);
 }
include/configs/dra7xx_evm.h +1 -1
index dee2b11..8fe0e6c 100644
@@ -77,6 +77,7 @@
 #define CONFIG_TI_SPI_MMAP
 #define CONFIG_SF_DEFAULT_SPEED                48000000
 #define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_3
+#define CONFIG_QSPI_QUAD_SUPPORT
 
 /*
  * Default to using SPI for environment, etc.
--
Quoted 2 lines

1.7.9.5

Applied to u-boot-spi/master

thanks!

Signature · 1 line
Jagan.
author
#3 lore raw
In reply to Tom Rini
Quoted 7 lines · Tom Rini

From: Steve Kipisz <[email protected]>

When EMAC is in the boot order, the boot ROM sets OPP50 and the MAC clock is set to /2. SPL needs to change it to /5 for Ethernet to generate the correct txclk. This patch sets it correctly.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150217/1fbe861d/attachment.sig>