* [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1
@ 2019-06-21 14:49 Christophe Kerello
2019-06-21 14:49 ` [PATCH 1/4] ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c Christophe Kerello
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Christophe Kerello @ 2019-06-21 14:49 UTC (permalink / raw)
To: robh+dt, mark.rutland, alexandre.torgue, linux, olof, arnd
Cc: mcoquelin.stm32, linux-stm32, linux-kernel, devicetree,
linux-arm-kernel, Christophe Kerello
This patchset adds and enables FMC2 NAND controller used on
stm32mp157c-ev1.
Christophe Kerello (4):
ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c
ARM: dts: stm32: add FMC2 NAND controller pins muxing on
stm32mp157c-ev1
ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1
ARM: multi_v7_defconfig: add FMC2 NAND controller support
arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 44 +++++++++++++++++++++++++++++++
arch/arm/boot/dts/stm32mp157c-ev1.dts | 16 +++++++++++
arch/arm/boot/dts/stm32mp157c.dtsi | 19 +++++++++++++
arch/arm/configs/multi_v7_defconfig | 1 +
4 files changed, 80 insertions(+)
--
1.9.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c
2019-06-21 14:49 [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Christophe Kerello
@ 2019-06-21 14:49 ` Christophe Kerello
2019-07-24 16:38 ` Alexandre Torgue
2019-06-21 14:49 ` [PATCH 2/4] ARM: dts: stm32: add FMC2 NAND controller pins muxing on stm32mp157c-ev1 Christophe Kerello
` (3 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Christophe Kerello @ 2019-06-21 14:49 UTC (permalink / raw)
To: robh+dt, mark.rutland, alexandre.torgue, linux, olof, arnd
Cc: mcoquelin.stm32, linux-stm32, linux-kernel, devicetree,
linux-arm-kernel, Christophe Kerello
This patch adds FMC2 NAND controller support used by stm32mp157c SOC.
Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
---
arch/arm/boot/dts/stm32mp157c.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
index 0c4e6eb..f2bda28 100644
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
@@ -1239,6 +1239,25 @@
dma-requests = <48>;
};
+ fmc: nand-controller@58002000 {
+ compatible = "st,stm32mp15-fmc2";
+ reg = <0x58002000 0x1000>,
+ <0x80000000 0x1000>,
+ <0x88010000 0x1000>,
+ <0x88020000 0x1000>,
+ <0x81000000 0x1000>,
+ <0x89010000 0x1000>,
+ <0x89020000 0x1000>;
+ interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&mdma1 20 0x10 0x12000A02 0x0 0x0>,
+ <&mdma1 20 0x10 0x12000A08 0x0 0x0>,
+ <&mdma1 21 0x10 0x12000A0A 0x0 0x0>;
+ dma-names = "tx", "rx", "ecc";
+ clocks = <&rcc FMC_K>;
+ resets = <&rcc FMC_R>;
+ status = "disabled";
+ };
+
qspi: spi@58003000 {
compatible = "st,stm32f469-qspi";
reg = <0x58003000 0x1000>, <0x70000000 0x10000000>;
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] ARM: dts: stm32: add FMC2 NAND controller pins muxing on stm32mp157c-ev1
2019-06-21 14:49 [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Christophe Kerello
2019-06-21 14:49 ` [PATCH 1/4] ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c Christophe Kerello
@ 2019-06-21 14:49 ` Christophe Kerello
2019-06-21 14:49 ` [PATCH 3/4] ARM: dts: stm32: enable FMC2 NAND controller " Christophe Kerello
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Christophe Kerello @ 2019-06-21 14:49 UTC (permalink / raw)
To: robh+dt, mark.rutland, alexandre.torgue, linux, olof, arnd
Cc: mcoquelin.stm32, linux-stm32, linux-kernel, devicetree,
linux-arm-kernel, Christophe Kerello
This patch adds FMC2 NAND controller pins muxing used on stm32mp157c-ev1.
Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
---
arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 44 +++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
index df64701..c4f2b23 100644
--- a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
@@ -276,6 +276,50 @@
};
};
+ fmc_pins_a: fmc-0 {
+ pins1 {
+ pinmux = <STM32_PINMUX('D', 4, AF12)>, /* FMC_NOE */
+ <STM32_PINMUX('D', 5, AF12)>, /* FMC_NWE */
+ <STM32_PINMUX('D', 11, AF12)>, /* FMC_A16_FMC_CLE */
+ <STM32_PINMUX('D', 12, AF12)>, /* FMC_A17_FMC_ALE */
+ <STM32_PINMUX('D', 14, AF12)>, /* FMC_D0 */
+ <STM32_PINMUX('D', 15, AF12)>, /* FMC_D1 */
+ <STM32_PINMUX('D', 0, AF12)>, /* FMC_D2 */
+ <STM32_PINMUX('D', 1, AF12)>, /* FMC_D3 */
+ <STM32_PINMUX('E', 7, AF12)>, /* FMC_D4 */
+ <STM32_PINMUX('E', 8, AF12)>, /* FMC_D5 */
+ <STM32_PINMUX('E', 9, AF12)>, /* FMC_D6 */
+ <STM32_PINMUX('E', 10, AF12)>, /* FMC_D7 */
+ <STM32_PINMUX('G', 9, AF12)>; /* FMC_NE2_FMC_NCE */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <1>;
+ };
+ pins2 {
+ pinmux = <STM32_PINMUX('D', 6, AF12)>; /* FMC_NWAIT */
+ bias-pull-up;
+ };
+ };
+
+ fmc_sleep_pins_a: fmc-sleep-0 {
+ pins {
+ pinmux = <STM32_PINMUX('D', 4, ANALOG)>, /* FMC_NOE */
+ <STM32_PINMUX('D', 5, ANALOG)>, /* FMC_NWE */
+ <STM32_PINMUX('D', 11, ANALOG)>, /* FMC_A16_FMC_CLE */
+ <STM32_PINMUX('D', 12, ANALOG)>, /* FMC_A17_FMC_ALE */
+ <STM32_PINMUX('D', 14, ANALOG)>, /* FMC_D0 */
+ <STM32_PINMUX('D', 15, ANALOG)>, /* FMC_D1 */
+ <STM32_PINMUX('D', 0, ANALOG)>, /* FMC_D2 */
+ <STM32_PINMUX('D', 1, ANALOG)>, /* FMC_D3 */
+ <STM32_PINMUX('E', 7, ANALOG)>, /* FMC_D4 */
+ <STM32_PINMUX('E', 8, ANALOG)>, /* FMC_D5 */
+ <STM32_PINMUX('E', 9, ANALOG)>, /* FMC_D6 */
+ <STM32_PINMUX('E', 10, ANALOG)>, /* FMC_D7 */
+ <STM32_PINMUX('D', 6, ANALOG)>, /* FMC_NWAIT */
+ <STM32_PINMUX('G', 9, ANALOG)>; /* FMC_NE2_FMC_NCE */
+ };
+ };
+
i2c1_pins_a: i2c1-0 {
pins {
pinmux = <STM32_PINMUX('D', 12, AF5)>, /* I2C1_SCL */
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1
2019-06-21 14:49 [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Christophe Kerello
2019-06-21 14:49 ` [PATCH 1/4] ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c Christophe Kerello
2019-06-21 14:49 ` [PATCH 2/4] ARM: dts: stm32: add FMC2 NAND controller pins muxing on stm32mp157c-ev1 Christophe Kerello
@ 2019-06-21 14:49 ` Christophe Kerello
2019-06-21 14:49 ` [PATCH 4/4] ARM: multi_v7_defconfig: add FMC2 NAND controller support Christophe Kerello
2019-07-25 10:20 ` [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Alexandre Torgue
4 siblings, 0 replies; 7+ messages in thread
From: Christophe Kerello @ 2019-06-21 14:49 UTC (permalink / raw)
To: robh+dt, mark.rutland, alexandre.torgue, linux, olof, arnd
Cc: mcoquelin.stm32, linux-stm32, linux-kernel, devicetree,
linux-arm-kernel, Christophe Kerello
This patch enables FMC2 NAND controller used on stm32mp157c-ev1.
Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
---
arch/arm/boot/dts/stm32mp157c-ev1.dts | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index feb8f77..9ab25da 100644
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -157,6 +157,22 @@
};
};
+&fmc {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&fmc_pins_a>;
+ pinctrl-1 = <&fmc_sleep_pins_a>;
+ status = "okay";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ nand@0 {
+ reg = <0>;
+ nand-on-flash-bbt;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
+};
+
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] ARM: multi_v7_defconfig: add FMC2 NAND controller support
2019-06-21 14:49 [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Christophe Kerello
` (2 preceding siblings ...)
2019-06-21 14:49 ` [PATCH 3/4] ARM: dts: stm32: enable FMC2 NAND controller " Christophe Kerello
@ 2019-06-21 14:49 ` Christophe Kerello
2019-07-25 10:20 ` [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Alexandre Torgue
4 siblings, 0 replies; 7+ messages in thread
From: Christophe Kerello @ 2019-06-21 14:49 UTC (permalink / raw)
To: robh+dt, mark.rutland, alexandre.torgue, linux, olof, arnd
Cc: mcoquelin.stm32, linux-stm32, linux-kernel, devicetree,
linux-arm-kernel, Christophe Kerello
This patch adds FMC2 NAND controller support used by STM32MP SOCs.
Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e386f35..092255c 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -197,6 +197,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_BRCMNAND=y
CONFIG_MTD_NAND_VF610_NFC=y
CONFIG_MTD_NAND_DAVINCI=y
+CONFIG_MTD_NAND_STM32_FMC2=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/4] ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c
2019-06-21 14:49 ` [PATCH 1/4] ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c Christophe Kerello
@ 2019-07-24 16:38 ` Alexandre Torgue
0 siblings, 0 replies; 7+ messages in thread
From: Alexandre Torgue @ 2019-07-24 16:38 UTC (permalink / raw)
To: Christophe Kerello, robh+dt, mark.rutland, linux, olof, arnd
Cc: mcoquelin.stm32, linux-stm32, linux-kernel, devicetree, linux-arm-kernel
Hi Christophe
On 6/21/19 4:49 PM, Christophe Kerello wrote:
> This patch adds FMC2 NAND controller support used by stm32mp157c SOC.
>
> Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
> ---
> arch/arm/boot/dts/stm32mp157c.dtsi | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
> index 0c4e6eb..f2bda28 100644
> --- a/arch/arm/boot/dts/stm32mp157c.dtsi
> +++ b/arch/arm/boot/dts/stm32mp157c.dtsi
> @@ -1239,6 +1239,25 @@
> dma-requests = <48>;
> };
>
> + fmc: nand-controller@58002000 {
> + compatible = "st,stm32mp15-fmc2";
> + reg = <0x58002000 0x1000>,
> + <0x80000000 0x1000>,
> + <0x88010000 0x1000>,
> + <0x88020000 0x1000>,
> + <0x81000000 0x1000>,
> + <0x89010000 0x1000>,
> + <0x89020000 0x1000>;
> + interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
> + dmas = <&mdma1 20 0x10 0x12000A02 0x0 0x0>,
> + <&mdma1 20 0x10 0x12000A08 0x0 0x0>,
> + <&mdma1 21 0x10 0x12000A0A 0x0 0x0>;
Please, don't use capital letter here.
> + dma-names = "tx", "rx", "ecc";
> + clocks = <&rcc FMC_K>;
> + resets = <&rcc FMC_R>;
> + status = "disabled";
> + };
> +
> qspi: spi@58003000 {
> compatible = "st,stm32f469-qspi";
> reg = <0x58003000 0x1000>, <0x70000000 0x10000000>;
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1
2019-06-21 14:49 [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Christophe Kerello
` (3 preceding siblings ...)
2019-06-21 14:49 ` [PATCH 4/4] ARM: multi_v7_defconfig: add FMC2 NAND controller support Christophe Kerello
@ 2019-07-25 10:20 ` Alexandre Torgue
4 siblings, 0 replies; 7+ messages in thread
From: Alexandre Torgue @ 2019-07-25 10:20 UTC (permalink / raw)
To: Christophe Kerello, robh+dt, mark.rutland, linux, olof, arnd
Cc: mcoquelin.stm32, linux-stm32, linux-kernel, devicetree, linux-arm-kernel
Hi Christophe
On 6/21/19 4:49 PM, Christophe Kerello wrote:
> This patchset adds and enables FMC2 NAND controller used on
> stm32mp157c-ev1.
>
> Christophe Kerello (4):
> ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c
> ARM: dts: stm32: add FMC2 NAND controller pins muxing on
> stm32mp157c-ev1
> ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1
> ARM: multi_v7_defconfig: add FMC2 NAND controller support
>
> arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 44 +++++++++++++++++++++++++++++++
> arch/arm/boot/dts/stm32mp157c-ev1.dts | 16 +++++++++++
> arch/arm/boot/dts/stm32mp157c.dtsi | 19 +++++++++++++
> arch/arm/configs/multi_v7_defconfig | 1 +
> 4 files changed, 80 insertions(+)
>
Series applied on stm32-next.
Note, I changed capital letter in patch1 directly (As I responded late).
Regards
Alex
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-07-25 10:21 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-21 14:49 [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Christophe Kerello
2019-06-21 14:49 ` [PATCH 1/4] ARM: dts: stm32: add FMC2 NAND controller support on stm32mp157c Christophe Kerello
2019-07-24 16:38 ` Alexandre Torgue
2019-06-21 14:49 ` [PATCH 2/4] ARM: dts: stm32: add FMC2 NAND controller pins muxing on stm32mp157c-ev1 Christophe Kerello
2019-06-21 14:49 ` [PATCH 3/4] ARM: dts: stm32: enable FMC2 NAND controller " Christophe Kerello
2019-06-21 14:49 ` [PATCH 4/4] ARM: multi_v7_defconfig: add FMC2 NAND controller support Christophe Kerello
2019-07-25 10:20 ` [PATCH 0/4] ARM: dts: stm32: enable FMC2 NAND controller on stm32mp157c-ev1 Alexandre Torgue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).