* [PATCH 0/6] Add mmc support for STM32F7 boards
@ 2018-03-01 9:43 patrice.chotard
2018-03-01 9:43 ` [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 patrice.chotard
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: patrice.chotard @ 2018-03-01 9:43 UTC (permalink / raw)
To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel,
devicetree, alexandre.torgue, lee.jones
Cc: Patrice Chotard, mcoquelin.stm32
From: Patrice Chotard <patrice.chotard@st.com>
This series adds :
_ SDIO pins definition for STM32F7 SoCs family
_ add sdio1 DT entry for STM32F746 Discovery board
_ add sdio1 DT entry for STM32F746 Evaluation board
_ add sdio1 DT entry for STM32F769 Discovery board
_ add SDMMC2 entry in stm32f7-rcc.h
_ replace sdio2 hard coded value in stm32f746.dtsi
Patrice Chotard (6):
ARM: dts: stm32: Add sdio pins definition for stm32f7
ARM: dts: stm32: Enable sdio1 for stm32f746-disco
ARM: dts: stm32: Enable sdio1 for stm32f746-eval
ARM: dts: stm32: Enable sdio1 for stm32f769-disco
dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry
ARM: dts: stm32: Fix sdio2 rcc hard coded value
arch/arm/boot/dts/stm32746g-eval.dts | 17 ++++++++++
arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 62 ++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/stm32f746-disco.dts | 19 +++++++++++
arch/arm/boot/dts/stm32f746.dtsi | 2 +-
arch/arm/boot/dts/stm32f769-disco.dts | 19 +++++++++++
include/dt-bindings/mfd/stm32f7-rcc.h | 1 +
6 files changed, 119 insertions(+), 1 deletion(-)
--
1.9.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 2018-03-01 9:43 [PATCH 0/6] Add mmc support for STM32F7 boards patrice.chotard @ 2018-03-01 9:43 ` patrice.chotard 2018-03-01 9:51 ` Alexandre Torgue 2018-03-01 9:43 ` [PATCH 2/6] ARM: dts: stm32: Enable sdio1 for stm32f746-disco patrice.chotard ` (4 subsequent siblings) 5 siblings, 1 reply; 9+ messages in thread From: patrice.chotard @ 2018-03-01 9:43 UTC (permalink / raw) To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel, devicetree, alexandre.torgue, lee.jones Cc: Patrice Chotard, mcoquelin.stm32 From: Patrice Chotard <patrice.chotard@st.com> Add sdio pins definition for the 2 sdio instances embeds in stm32f746. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi index f518de184e52..fb40f0835dd4 100644 --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi @@ -222,6 +222,68 @@ slew-rate = <2>; }; }; + + sdio_pins: sdio_pins@0 { + pins { + pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */ + <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */ + <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */ + <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */ + <STM32_PINMUX('C', 12, AF12)>, /* SDMMC1 CLK */ + <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 CMD */ + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdio_pins_od: sdio_pins_od@0 { + pins1 { + pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */ + <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */ + <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */ + <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */ + <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1 CLK */ + drive-push-pull; + slew-rate = <2>; + }; + + pins2 { + pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 CMD */ + drive-open-drain; + slew-rate = <2>; + }; + }; + + sdio_pins_b: sdio_pins_b@0 { + pins { + pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */ + <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */ + <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */ + <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */ + <STM32_PINMUX('D', 6, AF11)>, /* SDMMC2 CLK */ + <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 CMD */ + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdio_pins_od_b: sdio_pins_od_b@0 { + pins1 { + pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */ + <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */ + <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */ + <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */ + <STM32_PINMUX('D', 6, AF11)>; /* SDMMC2 CLK */ + drive-push-pull; + slew-rate = <2>; + }; + + pins2 { + pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 CMD */ + drive-open-drain; + slew-rate = <2>; + }; + }; }; }; }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 2018-03-01 9:43 ` [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 patrice.chotard @ 2018-03-01 9:51 ` Alexandre Torgue 2018-03-01 10:17 ` Patrice CHOTARD 0 siblings, 1 reply; 9+ messages in thread From: Alexandre Torgue @ 2018-03-01 9:51 UTC (permalink / raw) To: patrice.chotard, robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel, devicetree, lee.jones Cc: mcoquelin.stm32 Hi Patrice On 03/01/2018 10:43 AM, patrice.chotard@st.com wrote: > From: Patrice Chotard <patrice.chotard@st.com> > > Add sdio pins definition for the 2 sdio instances embeds in stm32f746. > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> > --- > arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 62 ++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > > diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi > index f518de184e52..fb40f0835dd4 100644 > --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi > @@ -222,6 +222,68 @@ > slew-rate = <2>; > }; > }; > + > + sdio_pins: sdio_pins@0 { > + pins { > + pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */ > + <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */ > + <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */ > + <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */ > + <STM32_PINMUX('C', 12, AF12)>, /* SDMMC1 CLK */ > + <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 CMD */ > + drive-push-pull; > + slew-rate = <2>; > + }; > + }; if you have 2 pins groups, please use '_a' for the first one. You could have something like: sdio_pins_a sdio_od_pins_a and sdio_pins_b sdio_od_pins_b > + sdio_pins_od: sdio_pins_od@0 { > + pins1 { > + pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */ > + <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */ > + <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */ > + <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */ > + <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1 CLK */ > + drive-push-pull; > + slew-rate = <2>; > + }; > + > + pins2 { > + pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 CMD */ > + drive-open-drain; > + slew-rate = <2>; > + }; > + }; > + > + sdio_pins_b: sdio_pins_b@0 { > + pins { > + pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */ > + <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */ > + <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */ > + <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */ > + <STM32_PINMUX('D', 6, AF11)>, /* SDMMC2 CLK */ > + <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 CMD */ > + drive-push-pull; > + slew-rate = <2>; > + }; > + }; > + > + sdio_pins_od_b: sdio_pins_od_b@0 { > + pins1 { > + pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */ > + <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */ > + <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */ > + <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */ > + <STM32_PINMUX('D', 6, AF11)>; /* SDMMC2 CLK */ > + drive-push-pull; > + slew-rate = <2>; > + }; > + > + pins2 { > + pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 CMD */ > + drive-open-drain; > + slew-rate = <2>; > + }; > + }; > }; > }; > }; > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 2018-03-01 9:51 ` Alexandre Torgue @ 2018-03-01 10:17 ` Patrice CHOTARD 0 siblings, 0 replies; 9+ messages in thread From: Patrice CHOTARD @ 2018-03-01 10:17 UTC (permalink / raw) To: Alexandre TORGUE, robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, lee.jones@linaro.org Cc: mcoquelin.stm32@gmail.com Hi Alex On 03/01/2018 10:51 AM, Alexandre Torgue wrote: > Hi Patrice > > On 03/01/2018 10:43 AM, patrice.chotard@st.com wrote: >> From: Patrice Chotard <patrice.chotard@st.com> >> >> Add sdio pins definition for the 2 sdio instances embeds in stm32f746. >> >> Signed-off-by: Patrice Chotard <patrice.chotard@st.com> >> --- >> arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 62 >> ++++++++++++++++++++++++++++++++++ >> 1 file changed, 62 insertions(+) >> >> diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi >> b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi >> index f518de184e52..fb40f0835dd4 100644 >> --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi >> +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi >> @@ -222,6 +222,68 @@ >> slew-rate = <2>; >> }; >> }; >> + >> + sdio_pins: sdio_pins@0 { >> + pins { >> + pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 >> D0 */ >> + <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */ >> + <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */ >> + <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */ >> + <STM32_PINMUX('C', 12, AF12)>, /* SDMMC1 CLK */ >> + <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 CMD */ >> + drive-push-pull; >> + slew-rate = <2>; >> + }; >> + }; > > if you have 2 pins groups, please use '_a' for the first one. You could > have something like: > > sdio_pins_a > sdio_od_pins_a > > and > > sdio_pins_b > sdio_od_pins_b Ok, i prepare a v2 Thanks Patrice > >> + sdio_pins_od: sdio_pins_od@0 { >> + pins1 { >> + pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 >> D0 */ >> + <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */ >> + <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */ >> + <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */ >> + <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1 CLK */ >> + drive-push-pull; >> + slew-rate = <2>; >> + }; >> + >> + pins2 { >> + pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 >> CMD */ >> + drive-open-drain; >> + slew-rate = <2>; >> + }; >> + }; >> + >> + sdio_pins_b: sdio_pins_b@0 { >> + pins { >> + pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 >> D0 */ >> + <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */ >> + <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */ >> + <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */ >> + <STM32_PINMUX('D', 6, AF11)>, /* SDMMC2 CLK */ >> + <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 CMD */ >> + drive-push-pull; >> + slew-rate = <2>; >> + }; >> + }; >> + >> + sdio_pins_od_b: sdio_pins_od_b@0 { >> + pins1 { >> + pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 >> D0 */ >> + <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */ >> + <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */ >> + <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */ >> + <STM32_PINMUX('D', 6, AF11)>; /* SDMMC2 CLK */ >> + drive-push-pull; >> + slew-rate = <2>; >> + }; >> + >> + pins2 { >> + pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 >> CMD */ >> + drive-open-drain; >> + slew-rate = <2>; >> + }; >> + }; >> }; >> }; >> }; >> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/6] ARM: dts: stm32: Enable sdio1 for stm32f746-disco 2018-03-01 9:43 [PATCH 0/6] Add mmc support for STM32F7 boards patrice.chotard 2018-03-01 9:43 ` [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 patrice.chotard @ 2018-03-01 9:43 ` patrice.chotard 2018-03-01 9:43 ` [PATCH 3/6] ARM: dts: stm32: Enable sdio1 for stm32f746-eval patrice.chotard ` (3 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: patrice.chotard @ 2018-03-01 9:43 UTC (permalink / raw) To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel, devicetree, alexandre.torgue, lee.jones Cc: mcoquelin.stm32, Patrice Chotard From: Patrice Chotard <patrice.chotard@st.com> Adds SDIO related DT nodes for stm32f746-disco board. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32f746-disco.dts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/stm32f746-disco.dts b/arch/arm/boot/dts/stm32f746-disco.dts index 623b6f2bc361..ab65f812e8ae 100644 --- a/arch/arm/boot/dts/stm32f746-disco.dts +++ b/arch/arm/boot/dts/stm32f746-disco.dts @@ -44,6 +44,7 @@ #include "stm32f746.dtsi" #include "stm32f746-pinctrl.dtsi" #include <dt-bindings/input/input.h> +#include <dt-bindings/gpio/gpio.h> / { model = "STMicroelectronics STM32F746-DISCO board"; @@ -76,12 +77,30 @@ regulator-name = "vcc5_host1"; regulator-always-on; }; + + mmc_vcard: mmc_vcard { + compatible = "regulator-fixed"; + regulator-name = "mmc_vcard"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; }; &clk_hse { clock-frequency = <25000000>; }; +&sdio1 { + status = "okay"; + vmmc-supply = <&mmc_vcard>; + cd-gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>; + cd-inverted; + pinctrl-names = "default", "opendrain"; + pinctrl-0 = <&sdio_pins>; + pinctrl-1 = <&sdio_pins_od>; + bus-width = <4>; +}; + &usart1 { pinctrl-0 = <&usart1_pins_b>; pinctrl-names = "default"; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/6] ARM: dts: stm32: Enable sdio1 for stm32f746-eval 2018-03-01 9:43 [PATCH 0/6] Add mmc support for STM32F7 boards patrice.chotard 2018-03-01 9:43 ` [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 patrice.chotard 2018-03-01 9:43 ` [PATCH 2/6] ARM: dts: stm32: Enable sdio1 for stm32f746-disco patrice.chotard @ 2018-03-01 9:43 ` patrice.chotard 2018-03-01 9:43 ` [PATCH 4/6] ARM: dts: stm32: Enable sdio1 for stm32f769-disco patrice.chotard ` (2 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: patrice.chotard @ 2018-03-01 9:43 UTC (permalink / raw) To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel, devicetree, alexandre.torgue, lee.jones Cc: Patrice Chotard, mcoquelin.stm32 From: Patrice Chotard <patrice.chotard@st.com> Adds SDIO related DT nodes for stm32f746-eval board. broken-cd property is needed as card detect signal is connected to a GPIO expander which is not yet supported in kernel linux. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32746g-eval.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts index b2d4b8c46677..63160199e39a 100644 --- a/arch/arm/boot/dts/stm32746g-eval.dts +++ b/arch/arm/boot/dts/stm32746g-eval.dts @@ -91,6 +91,13 @@ clocks = <&rcc 0 STM32F7_AHB1_CLOCK(OTGHSULPI)>; clock-names = "main_clk"; }; + + mmc_vcard: mmc_vcard { + compatible = "regulator-fixed"; + regulator-name = "mmc_vcard"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; }; &clk_hse { @@ -113,6 +120,16 @@ status = "okay"; }; +&sdio1 { + status = "okay"; + vmmc-supply = <&mmc_vcard>; + broken-cd; + pinctrl-names = "default", "opendrain"; + pinctrl-0 = <&sdio_pins>; + pinctrl-1 = <&sdio_pins_od>; + bus-width = <4>; +}; + &usart1 { pinctrl-0 = <&usart1_pins_a>; pinctrl-names = "default"; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/6] ARM: dts: stm32: Enable sdio1 for stm32f769-disco 2018-03-01 9:43 [PATCH 0/6] Add mmc support for STM32F7 boards patrice.chotard ` (2 preceding siblings ...) 2018-03-01 9:43 ` [PATCH 3/6] ARM: dts: stm32: Enable sdio1 for stm32f746-eval patrice.chotard @ 2018-03-01 9:43 ` patrice.chotard 2018-03-01 9:43 ` [PATCH 5/6] dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry patrice.chotard 2018-03-01 9:43 ` [PATCH 6/6] ARM: dts: stm32: Fix sdio2 rcc hard coded value patrice.chotard 5 siblings, 0 replies; 9+ messages in thread From: patrice.chotard @ 2018-03-01 9:43 UTC (permalink / raw) To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel, devicetree, alexandre.torgue, lee.jones Cc: mcoquelin.stm32, Patrice Chotard From: Patrice Chotard <patrice.chotard@st.com> Adds SDIO related DT nodes for stm32f769-disco board. broken-cd property is needed as it misses a pullup on board (resistor R76 is missing). Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32f769-disco.dts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts index 9dba286c6d2f..2d922b5d4766 100644 --- a/arch/arm/boot/dts/stm32f769-disco.dts +++ b/arch/arm/boot/dts/stm32f769-disco.dts @@ -44,6 +44,7 @@ #include "stm32f746.dtsi" #include "stm32f769-pinctrl.dtsi" #include <dt-bindings/input/input.h> +#include <dt-bindings/gpio/gpio.h> / { model = "STMicroelectronics STM32F769-DISCO board"; @@ -62,6 +63,12 @@ serial0 = &usart1; }; + mmc_vcard: mmc_vcard { + compatible = "regulator-fixed"; + regulator-name = "mmc_vcard"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; }; &cec { @@ -74,6 +81,18 @@ clock-frequency = <25000000>; }; +&sdio2 { + status = "okay"; + vmmc-supply = <&mmc_vcard>; + cd-gpios = <&gpioi 15 GPIO_ACTIVE_HIGH>; + cd-inverted; + broken-cd; + pinctrl-names = "default", "opendrain"; + pinctrl-0 = <&sdio_pins_b>; + pinctrl-1 = <&sdio_pins_od_b>; + bus-width = <4>; +}; + &usart1 { pinctrl-0 = <&usart1_pins_a>; pinctrl-names = "default"; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/6] dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry 2018-03-01 9:43 [PATCH 0/6] Add mmc support for STM32F7 boards patrice.chotard ` (3 preceding siblings ...) 2018-03-01 9:43 ` [PATCH 4/6] ARM: dts: stm32: Enable sdio1 for stm32f769-disco patrice.chotard @ 2018-03-01 9:43 ` patrice.chotard 2018-03-01 9:43 ` [PATCH 6/6] ARM: dts: stm32: Fix sdio2 rcc hard coded value patrice.chotard 5 siblings, 0 replies; 9+ messages in thread From: patrice.chotard @ 2018-03-01 9:43 UTC (permalink / raw) To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel, devicetree, alexandre.torgue, lee.jones Cc: mcoquelin.stm32, Patrice Chotard From: Patrice Chotard <patrice.chotard@st.com> STM32F769 SoC provides 2 SDMMC instances, add missing RCC SDMMC2 entry for it. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- include/dt-bindings/mfd/stm32f7-rcc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/mfd/stm32f7-rcc.h b/include/dt-bindings/mfd/stm32f7-rcc.h index 8b7b7197ffd7..a90f3613c584 100644 --- a/include/dt-bindings/mfd/stm32f7-rcc.h +++ b/include/dt-bindings/mfd/stm32f7-rcc.h @@ -91,6 +91,7 @@ #define STM32F7_RCC_APB2_TIM8 1 #define STM32F7_RCC_APB2_USART1 4 #define STM32F7_RCC_APB2_USART6 5 +#define STM32F7_RCC_APB2_SDMMC2 7 #define STM32F7_RCC_APB2_ADC1 8 #define STM32F7_RCC_APB2_ADC2 9 #define STM32F7_RCC_APB2_ADC3 10 -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/6] ARM: dts: stm32: Fix sdio2 rcc hard coded value 2018-03-01 9:43 [PATCH 0/6] Add mmc support for STM32F7 boards patrice.chotard ` (4 preceding siblings ...) 2018-03-01 9:43 ` [PATCH 5/6] dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry patrice.chotard @ 2018-03-01 9:43 ` patrice.chotard 5 siblings, 0 replies; 9+ messages in thread From: patrice.chotard @ 2018-03-01 9:43 UTC (permalink / raw) To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel, devicetree, alexandre.torgue, lee.jones Cc: mcoquelin.stm32, Patrice Chotard From: Patrice Chotard <patrice.chotard@st.com> Replace sdio2 rcc hard coded clock value by its macro. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32f746.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi index 07c29658696c..2c5704f96801 100644 --- a/arch/arm/boot/dts/stm32f746.dtsi +++ b/arch/arm/boot/dts/stm32f746.dtsi @@ -432,7 +432,7 @@ compatible = "arm,pl180", "arm,primecell"; arm,primecell-periphid = <0x00880180>; reg = <0x40011c00 0x400>; - clocks = <&rcc 0 167>; + clocks = <&rcc 0 STM32F7_APB2_CLOCK(SDMMC2)>; clock-names = "apb_pclk"; interrupts = <103>; max-frequency = <48000000>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-03-01 10:17 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-03-01 9:43 [PATCH 0/6] Add mmc support for STM32F7 boards patrice.chotard 2018-03-01 9:43 ` [PATCH 1/6] ARM: dts: stm32: Add sdio pins definition for stm32f7 patrice.chotard 2018-03-01 9:51 ` Alexandre Torgue 2018-03-01 10:17 ` Patrice CHOTARD 2018-03-01 9:43 ` [PATCH 2/6] ARM: dts: stm32: Enable sdio1 for stm32f746-disco patrice.chotard 2018-03-01 9:43 ` [PATCH 3/6] ARM: dts: stm32: Enable sdio1 for stm32f746-eval patrice.chotard 2018-03-01 9:43 ` [PATCH 4/6] ARM: dts: stm32: Enable sdio1 for stm32f769-disco patrice.chotard 2018-03-01 9:43 ` [PATCH 5/6] dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry patrice.chotard 2018-03-01 9:43 ` [PATCH 6/6] ARM: dts: stm32: Fix sdio2 rcc hard coded value patrice.chotard
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).