| Message ID | 20190731123750.25670-8-philippe.schenker@toradex.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Common patches from downstream development | expand |
On Wed, Jul 31, 2019 at 9:38 AM Philippe Schenker <philippe.schenker@toradex.com> wrote: > > From: Stefan Agner <stefan.agner@toradex.com> > > Add pinmuxing and do not specify voltage restrictions in the > module level device tree. It would be nice to explain the reason for doing this. > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> > Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> > --- > > Changes in v2: None > > arch/arm/boot/dts/imx7-colibri.dtsi | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi > index 16d1a1ed1aff..67f5e0c87fdc 100644 > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > @@ -326,7 +326,6 @@ > &usdhc1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; > - no-1-8-v; > cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; > disable-wp; > vqmmc-supply = <®_LDO2>; > @@ -671,6 +670,28 @@ > >; > }; > > + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { > + fsl,pins = < > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a > + >; > + }; > + > + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { > + fsl,pins = < > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b > + >; > + }; You add the entries for 100MHz and 200MHz, but I don't see them being referenced anywhere.
On Wed, 2019-07-31 at 09:56 -0300, Fabio Estevam wrote: > On Wed, Jul 31, 2019 at 9:38 AM Philippe Schenker > <philippe.schenker@toradex.com> wrote: > > From: Stefan Agner <stefan.agner@toradex.com> > > > > Add pinmuxing and do not specify voltage restrictions in the > > module level device tree. > > It would be nice to explain the reason for doing this. This commit is in preparation of another patch that didn't made into this patchset (downstream stuff in there). But I will do another patch on top that will use this patch here. That should anyway be in mainline. Philippe > > > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> > > Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> > > --- > > > > Changes in v2: None > > > > arch/arm/boot/dts/imx7-colibri.dtsi | 23 ++++++++++++++++++++++- > > 1 file changed, 22 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7- > > colibri.dtsi > > index 16d1a1ed1aff..67f5e0c87fdc 100644 > > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > > @@ -326,7 +326,6 @@ > > &usdhc1 { > > pinctrl-names = "default"; > > pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; > > - no-1-8-v; > > cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; > > disable-wp; > > vqmmc-supply = <®_LDO2>; > > @@ -671,6 +670,28 @@ > > >; > > }; > > > > + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { > > + fsl,pins = < > > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a > > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a > > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a > > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a > > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a > > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a > > + >; > > + }; > > + > > + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { > > + fsl,pins = < > > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b > > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b > > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b > > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b > > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b > > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b > > + >; > > + }; > > You add the entries for 100MHz and 200MHz, but I don't see them being > referenced anywhere.
On 2019-07-31 16:52, Philippe Schenker wrote: > On Wed, 2019-07-31 at 09:56 -0300, Fabio Estevam wrote: >> On Wed, Jul 31, 2019 at 9:38 AM Philippe Schenker >> <philippe.schenker@toradex.com> wrote: >> > From: Stefan Agner <stefan.agner@toradex.com> >> > >> > Add pinmuxing and do not specify voltage restrictions in the >> > module level device tree. >> >> It would be nice to explain the reason for doing this. > > This commit is in preparation of another patch that didn't made into this > patchset (downstream stuff in there). But I will do another patch on top that > will use this patch here. That should anyway be in mainline. I guess what Fabio meant here is explain this patch. The commit message really could be improved, e.g.: Add pinmuxing and do not specify voltage restrictions for the usdhc instance available on the modules edge connector. This allows to use SD-cards with higher transfer modes if supported by the carrier board. -- Stefan > > Philippe > >> >> > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> >> > Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> >> > --- >> > >> > Changes in v2: None >> > >> > arch/arm/boot/dts/imx7-colibri.dtsi | 23 ++++++++++++++++++++++- >> > 1 file changed, 22 insertions(+), 1 deletion(-) >> > >> > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7- >> > colibri.dtsi >> > index 16d1a1ed1aff..67f5e0c87fdc 100644 >> > --- a/arch/arm/boot/dts/imx7-colibri.dtsi >> > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi >> > @@ -326,7 +326,6 @@ >> > &usdhc1 { >> > pinctrl-names = "default"; >> > pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; >> > - no-1-8-v; >> > cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; >> > disable-wp; >> > vqmmc-supply = <®_LDO2>; >> > @@ -671,6 +670,28 @@ >> > >; >> > }; >> > >> > + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { >> > + fsl,pins = < >> > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a >> > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a >> > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a >> > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a >> > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a >> > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a >> > + >; >> > + }; >> > + >> > + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { >> > + fsl,pins = < >> > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b >> > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b >> > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b >> > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b >> > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b >> > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b >> > + >; >> > + }; >> >> You add the entries for 100MHz and 200MHz, but I don't see them being >> referenced anywhere.
On Fri, 2019-08-02 at 10:51 +0200, Stefan Agner wrote: > On 2019-07-31 16:52, Philippe Schenker wrote: > > On Wed, 2019-07-31 at 09:56 -0300, Fabio Estevam wrote: > > > On Wed, Jul 31, 2019 at 9:38 AM Philippe Schenker > > > <philippe.schenker@toradex.com> wrote: > > > > From: Stefan Agner <stefan.agner@toradex.com> > > > > > > > > Add pinmuxing and do not specify voltage restrictions in the > > > > module level device tree. > > > > > > It would be nice to explain the reason for doing this. > > > > This commit is in preparation of another patch that didn't made into this > > patchset (downstream stuff in there). But I will do another patch on top > > that > > will use this patch here. That should anyway be in mainline. > > I guess what Fabio meant here is explain this patch. > > The commit message really could be improved, e.g.: > > Add pinmuxing and do not specify voltage restrictions for the usdhc > instance > available on the modules edge connector. This allows to use SD-cards > with > higher transfer modes if supported by the carrier board. > > -- > Stefan Ah, sorry Fabio. I indeed understood you wrong and thanks Stefan for clarifying. I have the new message in for v3. Philippe > > > Philippe > > > > > > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> > > > > Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> > > > > --- > > > > > > > > Changes in v2: None > > > > > > > > arch/arm/boot/dts/imx7-colibri.dtsi | 23 ++++++++++++++++++++++- > > > > 1 file changed, 22 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi > > > > b/arch/arm/boot/dts/imx7- > > > > colibri.dtsi > > > > index 16d1a1ed1aff..67f5e0c87fdc 100644 > > > > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > > > > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > > > > @@ -326,7 +326,6 @@ > > > > &usdhc1 { > > > > pinctrl-names = "default"; > > > > pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; > > > > - no-1-8-v; > > > > cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; > > > > disable-wp; > > > > vqmmc-supply = <®_LDO2>; > > > > @@ -671,6 +670,28 @@ > > > > >; > > > > }; > > > > > > > > + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { > > > > + fsl,pins = < > > > > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a > > > > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a > > > > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a > > > > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a > > > > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a > > > > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a > > > > + >; > > > > + }; > > > > + > > > > + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { > > > > + fsl,pins = < > > > > + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b > > > > + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b > > > > + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b > > > > + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b > > > > + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b > > > > + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b > > > > + >; > > > > + }; > > > > > > You add the entries for 100MHz and 200MHz, but I don't see them being > > > referenced anywhere.
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 16d1a1ed1aff..67f5e0c87fdc 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -326,7 +326,6 @@ &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; - no-1-8-v; cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; disable-wp; vqmmc-supply = <®_LDO2>; @@ -671,6 +670,28 @@ >; }; + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a + >; + }; + + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b + >; + }; + pinctrl_usdhc3: usdhc3grp { fsl,pins = < MX7D_PAD_SD3_CMD__SD3_CMD 0x59