diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2018-06-26 15:24:04 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:33 +0100 |
commit | 6dab5c483c9338648b40cbf330dd3db307ef09dd (patch) | |
tree | f892709a59e52a32121665a6fd6c89151ce8f9d9 | |
parent | 3a8e71d0b90bf58a780edf04c4ed9b53f75502b8 (diff) |
ARM: dts: imx6: mux SD/MMC CD and SPI CS explicitly
Use a pinmux configuration for SD/MMC card detect and SPI chip
select instead of relying on reset/boot settings. There have
been no adverse effects observed, but it seems sensible to mux
the pads explicitly.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index abc72e9600bb..b0ca2d06cad8 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -570,7 +570,7 @@ #endif pinctrl_spi_cs1: spi_cs1 { fsl,pins = < - MX6QDL_PAD_EIM_A25__GPIO5_IO02 PAD_CTRL_NO /* SPI cs */ + MX6QDL_PAD_EIM_A25__GPIO5_IO02 PAD_CTRL_HYS_PU /* SPI cs */ >; }; pinctrl_touch_int_1: touch_int-1 { @@ -775,7 +775,7 @@ usdhc { pinctrl_mmc_cd: gpio_mmc_cd { fsl,pins = < - MX6QDL_PAD_NANDF_D5__GPIO2_IO05 PAD_CTRL_NO /* MMC1 CD */ + MX6QDL_PAD_NANDF_D5__GPIO2_IO05 PAD_CTRL_HYS_PU /* MMC1 CD */ >; }; pinctrl_usdhc1: usdhc1grp { |