[U-Boot] [v2 0/6] stv0991: enable cadence qspi controller & spi flash
This patchset enables cadence qspi controller for stv0991 soc, saves environment in spi flash & moves CONFIG_OF in the defconfig file.
In fact it clubs two patchsets submitted earlier: - [PATCH 0/3] stv0991: enable cadence qspi controller & spi flash - [PATCH 0/3] stv0991: spi env & configs related board changes
Changed in v2: - remove checkpatch.pl error from patch "stv0991: configure clock..." - clubbed two patchsets mentioned above.
Vikas Manocha (6): stv0991: enable saving enrironment in spi flash stv0991: move OF_CONTROL config to defconfig stv0991: remove define CONFIG_OF_SEPARATE from board file stv0991: configure clock & pad muxing for qspi stv0991: enable cadence qspi controller & spi flash stv0991: configure device tree for cadence qspi & flash
arch/arm/cpu/armv7/stv0991/clock.c | 4 ++- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 +++ arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 ++++++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 ++ board/st/stv0991/stv0991.c | 8 +++++ configs/stv0991_defconfig | 1 + include/configs/stv0991.h | 25 +++++++++++--- 9 files changed, 98 insertions(+), 5 deletions(-)
Signed-off-by: Vikas Manocha vikas.manocha@st.com ---
Changed in v2: None
include/configs/stv0991.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index d8f51d8..fe5b2fe 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -23,7 +23,9 @@ #define PHYS_SDRAM_1_SIZE 0x00198000
#define CONFIG_ENV_SIZE 0x10000 -#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE +#define CONFIG_ENV_OFFSET 0x30000 #define CONFIG_ENV_ADDR \ (PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE) #define CONFIG_SYS_MAXARGS 16 @@ -62,7 +64,6 @@ #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */
#include "config_cmd_default.h" -#undef CONFIG_CMD_SAVEENV
#define CONFIG_SYS_MEMTEST_START 0x0000 #define CONFIG_SYS_MEMTEST_END 1024*1024
Signed-off-by: Vikas Manocha vikas.manocha@st.com ---
Changed in v2: None
configs/stv0991_defconfig | 1 + include/configs/stv0991.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig index f8ec5db..1d47178 100644 --- a/configs/stv0991_defconfig +++ b/configs/stv0991_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_ETH_DESIGNWARE=y +CONFIG_OF_CONTROL=y diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index fe5b2fe..1d010c1 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -77,6 +77,5 @@ #define CONFIG_BOOTCOMMAND "go 0x40040000"
#define CONFIG_OF_SEPARATE -#define CONFIG_OF_CONTROL #define CONFIG_OF_LIBFDT #endif /* __CONFIG_H */
CONFIG_OF_SEPARATE is default define with CONFIG_OF_CONTROL, removing this define from the board file to avoid multiple definition warning.
Signed-off-by: Vikas Manocha vikas.manocha@st.com ---
Changed in v2: None
include/configs/stv0991.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 1d010c1..18f4eee 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -76,6 +76,5 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "go 0x40040000"
-#define CONFIG_OF_SEPARATE #define CONFIG_OF_LIBFDT #endif /* __CONFIG_H */
stv0991 has cadence qspi controller for flash interfacing, this patch configures the device pads & clock for the controller.
Signed-off-by: Vikas Manocha vikas.manocha@st.com ---
Changed in v2: - removed checkpatch.pl error.
arch/arm/cpu/armv7/stv0991/clock.c | 4 +++- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 +++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 +++++++++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 ++ board/st/stv0991/stv0991.c | 8 ++++++++ 6 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv7/stv0991/clock.c b/arch/arm/cpu/armv7/stv0991/clock.c index 70b8a8d..26c0d36 100644 --- a/arch/arm/cpu/armv7/stv0991/clock.c +++ b/arch/arm/cpu/armv7/stv0991/clock.c @@ -33,7 +33,9 @@ void clock_setup(int peripheral) /* Clock selection for ethernet tx_clk & rx_clk*/ writel((readl(&stv0991_cgu_regs->eth_ctrl) & ETH_CLK_MASK) | ETH_CLK_CTRL, &stv0991_cgu_regs->eth_ctrl); - + break; + case QSPI_CLOCK_CFG: + writel(QSPI_CLK_CTRL, &stv0991_cgu_regs->qspi_freq); break; default: break; diff --git a/arch/arm/cpu/armv7/stv0991/pinmux.c b/arch/arm/cpu/armv7/stv0991/pinmux.c index 1d086a2..24c67fa 100644 --- a/arch/arm/cpu/armv7/stv0991/pinmux.c +++ b/arch/arm/cpu/armv7/stv0991/pinmux.c @@ -55,6 +55,11 @@ int stv0991_pinmux_config(int peripheral) ETH_M_VDD_CFG, &stv0991_creg->vdd_pad1);
break; + case QSPI_CS_CLK_PAD: + writel((readl(&stv0991_creg->mux13) & FLASH_CS_NC_MASK) | + CFG_FLASH_CS_NC, &stv0991_creg->mux13); + writel((readl(&stv0991_creg->mux13) & FLASH_CLK_MASK) | + CFG_FLASH_CLK, &stv0991_creg->mux13); default: break; } diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h index ddcbb57..f0045f3 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h @@ -113,4 +113,19 @@ struct stv0991_cgu_regs {
#define ETH_CLK_CTRL (ETH_CLK_RX_EXT_PHY << RX_CLK_SHIFT \ | ETH_CLK_TX_EXT_PHY) +/* CGU qspi clock */ +#define DIV_HCLK1_SHIFT 9 +#define DIV_CRYP_SHIFT 6 +#define MDIV_QSPI_SHIFT 3 + +#define CLK_QSPI_OSC 0 +#define CLK_QSPI_MCLK 1 +#define CLK_QSPI_PLL1 2 +#define CLK_QSPI_PLL2 3 + +#define QSPI_CLK_CTRL (3 << DIV_HCLK1_SHIFT \ + | 1 << DIV_CRYP_SHIFT \ + | 0 << MDIV_QSPI_SHIFT \ + | CLK_QSPI_OSC) + #endif diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h index c804eb5..737c952 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h @@ -49,6 +49,15 @@ struct stv0991_creg { u32 vdd_comp1; /* offset 0x400 */ };
+/* CREG MUX 13 register */ +#define FLASH_CS_NC_SHIFT 4 +#define FLASH_CS_NC_MASK ~(7 << FLASH_CS_NC_SHIFT) +#define CFG_FLASH_CS_NC (0 << FLASH_CS_NC_SHIFT) + +#define FLASH_CLK_SHIFT 0 +#define FLASH_CLK_MASK ~(7 << FLASH_CLK_SHIFT) +#define CFG_FLASH_CLK (0 << FLASH_CLK_SHIFT) + /* CREG MUX 12 register */ #define GPIOC_30_MUX_SHIFT 24 #define GPIOC_30_MUX_MASK ~(1 << GPIOC_30_MUX_SHIFT) diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_periph.h b/arch/arm/include/asm/arch-stv0991/stv0991_periph.h index f728c83..725da83 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_periph.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_periph.h @@ -18,6 +18,7 @@ enum periph_id { UART_GPIOC_30_31 = 0, UART_GPIOB_16_17, ETH_GPIOB_10_31_C_0_4, + QSPI_CS_CLK_PAD, PERIPH_ID_I2C0, PERIPH_ID_I2C1, PERIPH_ID_I2C2, @@ -39,6 +40,7 @@ enum periph_id { enum periph_clock { UART_CLOCK_CFG = 0, ETH_CLOCK_CFG, + QSPI_CLOCK_CFG, };
#endif /* __ASM_ARM_ARCH_PERIPH_H */ diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c index 09f973f..add1ce1 100644 --- a/board/st/stv0991/stv0991.c +++ b/board/st/stv0991/stv0991.c @@ -55,12 +55,20 @@ int board_eth_enable(void) return 0; }
+int board_qspi_enable(void) +{ + stv0991_pinmux_config(QSPI_CS_CLK_PAD); + clock_setup(QSPI_CLOCK_CFG); + return 0; +} + /* * Miscellaneous platform dependent initialisations */ int board_init(void) { board_eth_enable(); + board_qspi_enable(); return 0; }
This patch does all the board configurations required to use the qspi controller & attached spi flash memory.
Signed-off-by: Vikas Manocha vikas.manocha@st.com ---
Changed in v2: None
include/configs/stv0991.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 18f4eee..669f012 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -77,4 +77,22 @@ #define CONFIG_BOOTCOMMAND "go 0x40040000"
#define CONFIG_OF_LIBFDT + +/* ++ * QSPI support ++ */ +#ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ +#define CONFIG_DM_SPI +#define CONFIG_CADENCE_QSPI +#define CONFIG_CQSPI_DECODER 0 +#define CONFIG_CQSPI_REF_CLK ((30/4)/2)*1000*1000 +#define CONFIG_CMD_SPI + +#define CONFIG_SPI_FLASH /* SPI flash subsystem */ +#define CONFIG_SPI_FLASH_STMICRO /* Micron/Numonyx flash */ +#define CONFIG_SPI_FLASH_WINBOND /* WINBOND */ +#define CONFIG_CMD_SF +#define CONFIG_DM_SPI_FLASH +#endif + #endif /* __CONFIG_H */
This patch add the device tree entry for qspi controller & spi flash memory.
Signed-off-by: Vikas Manocha vikas.manocha@st.com ---
Changed in v2: None
arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
diff --git a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts index b25c48b..3b1efca 100644 --- a/arch/arm/dts/stv0991.dts +++ b/arch/arm/dts/stv0991.dts @@ -20,4 +20,38 @@ reg = <0x80406000 0x1000>; clock = <2700000>; }; + + aliases { + spi0 = "/spi@80203000"; /* QSPI */ + }; + + qspi: spi@80203000 { + compatible = "cadence,qspi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x80203000 0x100>, + <0x40000000 0x1000000>; + clocks = <3750000>; + ext-decoder = <0>; /* external decoder */ + num-cs = <4>; + fifo-depth = <256>; + bus-num = <0>; + status = "okay"; + + flash0: n25q32@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + reg = <0>; /* chip select */ + spi-max-frequency = <50000000>; + m25p,fast-read; + page-size = <256>; + block-size = <16>; /* 2^16, 64KB */ + read-delay = <4>; /* delay value in read data capture register */ + tshsl-ns = <50>; + tsd2d-ns = <50>; + tchsh-ns = <4>; + tslch-ns = <4>; + }; + }; };
On 25 June 2015 at 04:36, Vikas Manocha vikas.manocha@st.com wrote:
This patch add the device tree entry for qspi controller & spi flash memory.
Signed-off-by: Vikas Manocha vikas.manocha@st.com
Changed in v2: None
arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
diff --git a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts index b25c48b..3b1efca 100644 --- a/arch/arm/dts/stv0991.dts +++ b/arch/arm/dts/stv0991.dts @@ -20,4 +20,38 @@ reg = <0x80406000 0x1000>; clock = <2700000>; };
aliases {spi0 = "/spi@80203000"; /* QSPI */};qspi: spi@80203000 {compatible = "cadence,qspi";#address-cells = <1>;#size-cells = <0>;reg = <0x80203000 0x100>,<0x40000000 0x1000000>;clocks = <3750000>;ext-decoder = <0>; /* external decoder */num-cs = <4>;fifo-depth = <256>;bus-num = <0>;status = "okay";flash0: n25q32@0 {#address-cells = <1>;#size-cells = <1>;compatible = "spi-flash";reg = <0>; /* chip select */spi-max-frequency = <50000000>;m25p,fast-read;page-size = <256>;block-size = <16>; /* 2^16, 64KB */read-delay = <4>; /* delay value in read data capture register */tshsl-ns = <50>;tsd2d-ns = <50>;tchsh-ns = <4>;tslch-ns = <4>;};};};
This node requires documentation under doc/device-tree-bindings/spi/ And also please remove any unneeded attributes/properties with in this qspi node.
thanks!
On 25 June 2015 at 04:36, Vikas Manocha vikas.manocha@st.com wrote:
This patchset enables cadence qspi controller for stv0991 soc, saves environment in spi flash & moves CONFIG_OF in the defconfig file.
In fact it clubs two patchsets submitted earlier:
- [PATCH 0/3] stv0991: enable cadence qspi controller & spi flash
- [PATCH 0/3] stv0991: spi env & configs related board changes
I'm OK, with this series and commented about v2, 6/6
Please rebase all these 6 patches + 3 patches on to u-boot-spi/next-dev [1] [PATCH v2 0/3] spi: cadence_qspi: sram depth from DT & fix for FIFO
So send all 9 patches with fix on v2, 6/6 at once.
[1] http://git.denx.de/?p=u-boot/u-boot-spi.git;a=shortlog;h=refs/heads/next-dev
Changed in v2:
- remove checkpatch.pl error from patch "stv0991: configure clock..."
- clubbed two patchsets mentioned above.
Vikas Manocha (6): stv0991: enable saving enrironment in spi flash stv0991: move OF_CONTROL config to defconfig stv0991: remove define CONFIG_OF_SEPARATE from board file stv0991: configure clock & pad muxing for qspi stv0991: enable cadence qspi controller & spi flash stv0991: configure device tree for cadence qspi & flash
arch/arm/cpu/armv7/stv0991/clock.c | 4 ++- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 +++ arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 ++++++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 ++ board/st/stv0991/stv0991.c | 8 +++++ configs/stv0991_defconfig | 1 + include/configs/stv0991.h | 25 +++++++++++--- 9 files changed, 98 insertions(+), 5 deletions(-)
thanks!
Thanks Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Sunday, June 28, 2015 3:57 AM To: Vikas MANOCHA Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [v2 0/6] stv0991: enable cadence qspi controller & spi flash
On 25 June 2015 at 04:36, Vikas Manocha vikas.manocha@st.com wrote:
This patchset enables cadence qspi controller for stv0991 soc, saves environment in spi flash & moves CONFIG_OF in the defconfig file.
In fact it clubs two patchsets submitted earlier:
- [PATCH 0/3] stv0991: enable cadence qspi controller & spi flash
- [PATCH 0/3] stv0991: spi env & configs related board changes
I'm OK, with this series and commented about v2, 6/6
Please rebase all these 6 patches
Ok, I will rebase these 6 on u-boot-spi/next-dev, add doc as per your v2, 6/6 comment & send the v3.
- 3 patches on to u-boot-spi/next-dev [1]
[PATCH v2 0/3] spi: cadence_qspi: sram depth from DT & fix for FIFO
I checked these 3 patches & can be applied to spi-next-dev without any modification.
Rgds, Vikas
So send all 9 patches with fix on v2, 6/6 at once.
[1] http://git.denx.de/?p=u-boot/u-boot- spi.git;a=shortlog;h=refs/heads/next-dev
Changed in v2:
- remove checkpatch.pl error from patch "stv0991: configure clock..."
- clubbed two patchsets mentioned above.
Vikas Manocha (6): stv0991: enable saving enrironment in spi flash stv0991: move OF_CONTROL config to defconfig stv0991: remove define CONFIG_OF_SEPARATE from board file stv0991: configure clock & pad muxing for qspi stv0991: enable cadence qspi controller & spi flash stv0991: configure device tree for cadence qspi & flash
arch/arm/cpu/armv7/stv0991/clock.c | 4 ++- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 +++ arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 ++++++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 ++ board/st/stv0991/stv0991.c | 8 +++++ configs/stv0991_defconfig | 1 + include/configs/stv0991.h | 25 +++++++++++--- 9 files changed, 98 insertions(+), 5 deletions(-)
thanks!
Jagan | openedev.
On 29 June 2015 at 23:14, Vikas MANOCHA vikas.manocha@st.com wrote:
Thanks Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Sunday, June 28, 2015 3:57 AM To: Vikas MANOCHA Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [v2 0/6] stv0991: enable cadence qspi controller & spi flash
On 25 June 2015 at 04:36, Vikas Manocha vikas.manocha@st.com wrote:
This patchset enables cadence qspi controller for stv0991 soc, saves environment in spi flash & moves CONFIG_OF in the defconfig file.
In fact it clubs two patchsets submitted earlier:
- [PATCH 0/3] stv0991: enable cadence qspi controller & spi flash
- [PATCH 0/3] stv0991: spi env & configs related board changes
I'm OK, with this series and commented about v2, 6/6
Please rebase all these 6 patches
Ok, I will rebase these 6 on u-boot-spi/next-dev, add doc as per your v2, 6/6 comment & send the v3.
- 3 patches on to u-boot-spi/next-dev [1]
[PATCH v2 0/3] spi: cadence_qspi: sram depth from DT & fix for FIFO
I checked these 3 patches & can be applied to spi-next-dev without any modification.
I wasn't able to apply these 3 at-lest - please rebase all 9 against this branch and send.
So send all 9 patches with fix on v2, 6/6 at once.
[1] http://git.denx.de/?p=u-boot/u-boot- spi.git;a=shortlog;h=refs/heads/next-dev
Changed in v2:
- remove checkpatch.pl error from patch "stv0991: configure clock..."
- clubbed two patchsets mentioned above.
Vikas Manocha (6): stv0991: enable saving enrironment in spi flash stv0991: move OF_CONTROL config to defconfig stv0991: remove define CONFIG_OF_SEPARATE from board file stv0991: configure clock & pad muxing for qspi stv0991: enable cadence qspi controller & spi flash stv0991: configure device tree for cadence qspi & flash
arch/arm/cpu/armv7/stv0991/clock.c | 4 ++- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 +++ arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 ++++++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 ++ board/st/stv0991/stv0991.c | 8 +++++ configs/stv0991_defconfig | 1 + include/configs/stv0991.h | 25 +++++++++++--- 9 files changed, 98 insertions(+), 5 deletions(-)
thanks!
Hi Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Monday, June 29, 2015 11:15 AM To: Vikas MANOCHA Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [v2 0/6] stv0991: enable cadence qspi controller & spi flash
On 29 June 2015 at 23:14, Vikas MANOCHA vikas.manocha@st.com wrote:
Thanks Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Sunday, June 28, 2015 3:57 AM To: Vikas MANOCHA Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [v2 0/6] stv0991: enable cadence qspi controller & spi flash
On 25 June 2015 at 04:36, Vikas Manocha vikas.manocha@st.com
wrote:
This patchset enables cadence qspi controller for stv0991 soc, saves environment in spi flash & moves CONFIG_OF in the defconfig
file.
In fact it clubs two patchsets submitted earlier:
- [PATCH 0/3] stv0991: enable cadence qspi controller & spi flash
- [PATCH 0/3] stv0991: spi env & configs related board changes
I'm OK, with this series and commented about v2, 6/6
Please rebase all these 6 patches
Ok, I will rebase these 6 on u-boot-spi/next-dev, add doc as per your v2,
6/6 comment & send the v3.
- 3 patches on to u-boot-spi/next-dev [1]
[PATCH v2 0/3] spi: cadence_qspi: sram depth from DT & fix for FIFO
I checked these 3 patches & can be applied to spi-next-dev without any
modification.
I wasn't able to apply these 3 at-lest - please rebase all 9 against this branch and send.
You are right, I will rebase these 3 also & send the v3 for them. Also about your comment on stv0991 patchset v2, 6/6 of adding binding doc : It is more relevant for the cadence_qspi. Do you mind if I add this binding document as 4th patch in this patchset ?
Rgds, Vikas
So send all 9 patches with fix on v2, 6/6 at once.
[1] http://git.denx.de/?p=u-boot/u-boot- spi.git;a=shortlog;h=refs/heads/next-dev
Changed in v2:
- remove checkpatch.pl error from patch "stv0991: configure clock..."
- clubbed two patchsets mentioned above.
Vikas Manocha (6): stv0991: enable saving enrironment in spi flash stv0991: move OF_CONTROL config to defconfig stv0991: remove define CONFIG_OF_SEPARATE from board file stv0991: configure clock & pad muxing for qspi stv0991: enable cadence qspi controller & spi flash stv0991: configure device tree for cadence qspi & flash
arch/arm/cpu/armv7/stv0991/clock.c | 4 ++- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 +++ arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 ++++++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 ++ board/st/stv0991/stv0991.c | 8 +++++ configs/stv0991_defconfig | 1 + include/configs/stv0991.h | 25 +++++++++++--- 9 files changed, 98 insertions(+), 5 deletions(-)
thanks!
Jagan | openedev.
On 30 June 2015 at 00:26, Vikas MANOCHA vikas.manocha@st.com wrote:
Hi Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Monday, June 29, 2015 11:15 AM To: Vikas MANOCHA Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [v2 0/6] stv0991: enable cadence qspi controller & spi flash
On 29 June 2015 at 23:14, Vikas MANOCHA vikas.manocha@st.com wrote:
Thanks Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Sunday, June 28, 2015 3:57 AM To: Vikas MANOCHA Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [v2 0/6] stv0991: enable cadence qspi controller & spi flash
On 25 June 2015 at 04:36, Vikas Manocha vikas.manocha@st.com
wrote:
This patchset enables cadence qspi controller for stv0991 soc, saves environment in spi flash & moves CONFIG_OF in the defconfig
file.
In fact it clubs two patchsets submitted earlier:
- [PATCH 0/3] stv0991: enable cadence qspi controller & spi flash
- [PATCH 0/3] stv0991: spi env & configs related board changes
I'm OK, with this series and commented about v2, 6/6
Please rebase all these 6 patches
Ok, I will rebase these 6 on u-boot-spi/next-dev, add doc as per your v2,
6/6 comment & send the v3.
- 3 patches on to u-boot-spi/next-dev [1]
[PATCH v2 0/3] spi: cadence_qspi: sram depth from DT & fix for FIFO
I checked these 3 patches & can be applied to spi-next-dev without any
modification.
I wasn't able to apply these 3 at-lest - please rebase all 9 against this branch and send.
You are right, I will rebase these 3 also & send the v3 for them. Also about your comment on stv0991 patchset v2, 6/6 of adding binding doc : It is more relevant for the cadence_qspi. Do you mind if I add this binding document as 4th patch in this patchset ?
Sure, send them all at once.
So send all 9 patches with fix on v2, 6/6 at once.
[1] http://git.denx.de/?p=u-boot/u-boot- spi.git;a=shortlog;h=refs/heads/next-dev
Changed in v2:
- remove checkpatch.pl error from patch "stv0991: configure clock..."
- clubbed two patchsets mentioned above.
Vikas Manocha (6): stv0991: enable saving enrironment in spi flash stv0991: move OF_CONTROL config to defconfig stv0991: remove define CONFIG_OF_SEPARATE from board file stv0991: configure clock & pad muxing for qspi stv0991: enable cadence qspi controller & spi flash stv0991: configure device tree for cadence qspi & flash
arch/arm/cpu/armv7/stv0991/clock.c | 4 ++- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 +++ arch/arm/dts/stv0991.dts | 34 ++++++++++++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 ++++++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 ++ board/st/stv0991/stv0991.c | 8 +++++ configs/stv0991_defconfig | 1 + include/configs/stv0991.h | 25 +++++++++++--- 9 files changed, 98 insertions(+), 5 deletions(-)
thanks!
participants (3)
-
Jagan Teki -
Vikas MANOCHA -
Vikas Manocha