diff options
| author | Stefan Agner <stefan@agner.ch> | 2018-06-26 16:52:42 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:41 +0100 |
| commit | b6f3f41aa997413730d4a8097ca01f3e49195ea4 (patch) | |
| tree | 4ee9c2b5d52fb1c12b1198ba004a0f5e2285c7e0 /arch/arm/boot | |
| parent | 4f0e358c63517d940efab93a75428944d09833e7 (diff) | |
ARM: dts: imx6qdl-colibri: move card detect to module device tree
Muxing the card detect only in the carrier board device tree
overwrites the USDHC muxing in the module level device tree.
Move card detect to the module level device tree since this
is also a default pinout of the Colibri standard. If a carrier
board requires a different setting it still can overwrite the
nodes in the carrier board specific device tree.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
(cherry picked from commit c768224360094b3e3b11c81a4163a9e1c7bd3336)
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 5db604019461..4143141918a3 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -216,9 +216,6 @@ /* Colibri MMC */ &usdhc1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_mmc_cd>; - cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */ status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index e4482d723ccd..ae21d5fbe8c9 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -385,7 +385,8 @@ /* Colibri MMC */ &usdhc1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1>; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>; + cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */ vqmmc-supply = <®_3p3v>; bus-width = <4>; voltage-ranges = <3300 3300>; |