diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-12-03 13:29:27 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-12-10 17:25:06 +0100 |
| commit | 85f226ee20ede27e72bae20f1dc2ba12e016268b (patch) | |
| tree | 2be0a5a500a42ed766ad0f16c1fec6c4aa7e3090 | |
| parent | 1408747c7af9a911569a903163ac48d13632947b (diff) | |
apalis/colibri imx6 dtb: define eMMC reset pin
Set the eMMC reset pin as GPIO input with 22k pullup. Do no longer rely on
the pinmuxing from U-Boot.
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 84b446ca49be..ade6d88a86a7 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -466,7 +466,7 @@ imx6q-apalis { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_reset_moci>; + pinctrl-0 = <&pinctrl_reset_moci &pinctrl_emmc_reset_1>; pinctrl_apalis_gpio1: apalis_gpio1-1 { fsl,pins = < /* Apalis GPIO */ @@ -513,6 +513,11 @@ MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x000b0 /* SGTL5000 sys_mclk */ >; }; + pinctrl_emmc_reset_1: emmc_reset-1 { + fsl,pins = < + MX6QDL_PAD_SD3_RST__GPIO7_IO08 PAD_CTRL_PU_22k /* eMMC reset, leave it alone */ + >; + }; pinctrl_enet_ctrl_1: enet_ctrl-1 { fsl,pins = < MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 PAD_CTRL_NO /* ENET phy reset */ diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 66b2156b660f..e638266cd16d 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -393,11 +393,18 @@ }; imx6dl-colibri { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_emmc_reset_1>; pinctrl_audmux_mclk_2: audmux_mclk-2 { fsl,pins = < MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0 /* SGTL5000 sys_mclk */ >; }; + pinctrl_emmc_reset_1: emmc_reset-1 { + fsl,pins = < + MX6QDL_PAD_SD3_RST__GPIO7_IO08 PAD_CTRL_PU_22k /* eMMC reset, leave it alone */ + >; + }; pinctrl_gpio_keys: gpio_keys { fsl,pins = < MX6QDL_PAD_EIM_A16__GPIO2_IO22 PAD_CTRL_HYS_PD /* Power Button */ |