2020-09-04 13:57:33

by Christophe Kerello

Subject: [PATCH 0/2] add FMC2 EBI controller support

This patchset enables FMC2 EBI support on STM32MP1 SOCs.

Christophe Kerello (2):
ARM: multi_v7_defconfig: add FMC2 EBI controller support
ARM: dts: stm32: add FMC2 EBI support for stm32mp157c

arch/arm/boot/dts/stm32mp151.dtsi | 43 +++++++++++++++++++++++------------
arch/arm/boot/dts/stm32mp157c-ev1.dts | 16 +++++++------
arch/arm/configs/multi_v7_defconfig | 1 +
3 files changed, 39 insertions(+), 21 deletions(-)

--
1.9.1

2020-09-04 14:08:06

by Christophe Kerello

Subject: [PATCH 2/2] ARM: dts: stm32: add FMC2 EBI support for stm32mp157c

This patch adds FMC2 External Bus Interface support on stm32mp157c.

Signed-off-by: Christophe Kerello <[email protected]>
---
arch/arm/boot/dts/stm32mp151.dtsi | 43 +++++++++++++++++++++++------------
arch/arm/boot/dts/stm32mp157c-ev1.dts | 16 +++++++------
2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/arch/arm/boot/dts/stm32mp151.dtsi b/arch/arm/boot/dts/stm32mp151.dtsi
index bfe2902..4fd7572 100644
--- a/arch/arm/boot/dts/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/stm32mp151.dtsi
@@ -1302,23 +1302,38 @@
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";
+ fmc: memory-controller@58002000 {
+ #address-cells = <2>;
+ #size-cells = <1>;
+ compatible = "st,stm32mp1-fmc2-ebi";
+ reg = <0x58002000 0x1000>;
clocks = <&rcc FMC_K>;
resets = <&rcc FMC_R>;
status = "disabled";
+
+ ranges = <0 0 0x60000000 0x04000000>, /* EBI CS 1 */
+ <1 0 0x64000000 0x04000000>, /* EBI CS 2 */
+ <2 0 0x68000000 0x04000000>, /* EBI CS 3 */
+ <3 0 0x6c000000 0x04000000>, /* EBI CS 4 */
+ <4 0 0x80000000 0x10000000>; /* NAND */
+
+ nand-controller@4,0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "st,stm32mp1-fmc2-nfc";
+ reg = <4 0x00000000 0x1000>,
+ <4 0x08010000 0x1000>,
+ <4 0x08020000 0x1000>,
+ <4 0x01000000 0x1000>,
+ <4 0x09010000 0x1000>,
+ <4 0x09020000 0x1000>;
+ interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&mdma1 20 0x2 0x12000a02 0x0 0x0>,
+ <&mdma1 20 0x2 0x12000a08 0x0 0x0>,
+ <&mdma1 21 0x2 0x12000a0a 0x0 0x0>;
+ dma-names = "tx", "rx", "ecc";
+ status = "disabled";
+ };
};

qspi: spi@58003000 {
diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index 85628e1..a55e80c 100644
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -158,14 +158,16 @@
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>;
+ nand-controller@4,0 {
+ status = "okay";
+
+ nand@0 {
+ reg = <0>;
+ nand-on-flash-bbt;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
};
};

--
1.9.1

2020-09-04 14:28:21

by Christophe Kerello

Subject: [PATCH 1/2] ARM: multi_v7_defconfig: add FMC2 EBI controller support

This patch adds FMC2 EBI controller support used by STM32MP SOCs.

Signed-off-by: Christophe Kerello <[email protected]>
---
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 e9e76e3..4929cc8 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -1011,6 +1011,7 @@ CONFIG_EXTCON_MAX14577=m
CONFIG_EXTCON_MAX77693=m
CONFIG_EXTCON_MAX8997=m
CONFIG_TI_AEMIF=y
+CONFIG_STM32_FMC2_EBI=y
CONFIG_EXYNOS5422_DMC=m
CONFIG_IIO=y
CONFIG_IIO_SW_TRIGGER=y
--
1.9.1

2020-09-23 15:40:51

by Alexandre Torgue

Subject: Re: [PATCH 0/2] add FMC2 EBI controller support

Hi Christophe,

On 9/4/20 3:20 PM, Christophe Kerello wrote:
> This patchset enables FMC2 EBI support on STM32MP1 SOCs.
>
> Christophe Kerello (2):
> ARM: multi_v7_defconfig: add FMC2 EBI controller support
> ARM: dts: stm32: add FMC2 EBI support for stm32mp157c
>
> arch/arm/boot/dts/stm32mp151.dtsi | 43 +++++++++++++++++++++++------------
> arch/arm/boot/dts/stm32mp157c-ev1.dts | 16 +++++++------
> arch/arm/configs/multi_v7_defconfig | 1 +
> 3 files changed, 39 insertions(+), 21 deletions(-)
>

Series applied on stm32-next.

Regards
Alex