diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-03-09 15:07:09 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-03-09 16:26:42 +0100 |
| commit | 2fb42416d67952647374e53563e2bbae2bded1f0 (patch) | |
| tree | 09d8e51770c2e78d3138bf9a69780204c0c33d66 | |
| parent | be6f54035a07983113b68ae20a51975b10ea9518 (diff) | |
colibri imx6: devicetree: make pinmuxing more granular
Pull out pins used as GPIOs which can also be used for flexcan to ease using
them for can.
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 21 |
2 files changed, 17 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 2a418b1b0c20..ad284b74c07b 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -155,9 +155,10 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_weim_gpio_1 &pinctrl_weim_gpio_2 &pinctrl_weim_gpio_3 &pinctrl_weim_gpio_4 - &pinctrl_weim_gpio_5 + &pinctrl_weim_gpio_5 &pinctrl_weim_gpio_6 &pinctrl_csi_gpio_1 &pinctrl_gpio_1 + &pinctrl_gpio_2 &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1 &pinctrl_usbc_det_1>; }; diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 05f0a8caeec3..09f18cf54613 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -376,8 +376,6 @@ gpio { pinctrl_gpio_1: gpio-1 { fsl,pins = < - MX6QDL_PAD_GPIO_7__GPIO1_IO07 PAD_CTRL_HYS_PU - MX6QDL_PAD_GPIO_8__GPIO1_IO08 PAD_CTRL_HYS_PU MX6QDL_PAD_EIM_D26__GPIO3_IO26 PAD_CTRL_HYS_PU MX6QDL_PAD_EIM_D27__GPIO3_IO27 PAD_CTRL_HYS_PU MX6QDL_PAD_NANDF_D6__GPIO2_IO06 PAD_CTRL_HYS_PU @@ -389,6 +387,12 @@ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 PAD_CTRL_HYS_PU >; }; + pinctrl_gpio_2: gpio-2 { + fsl,pins = < + MX6QDL_PAD_GPIO_7__GPIO1_IO07 PAD_CTRL_HYS_PU + MX6QDL_PAD_GPIO_8__GPIO1_IO08 PAD_CTRL_HYS_PU + >; + }; }; imx6dl-colibri { @@ -622,10 +626,9 @@ >; }; - /* ADDRESS[16:18] [25] used as GPIO */ + /* ADDRESS[17:18] [25] used as GPIO */ pinctrl_weim_gpio_1: weim_gpio-1 { fsl,pins = < - MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 PAD_CTRL_HYS_PU MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 PAD_CTRL_HYS_PU MX6QDL_PAD_KEY_COL2__GPIO4_IO10 PAD_CTRL_HYS_PU MX6QDL_PAD_NANDF_D1__GPIO2_IO01 PAD_CTRL_HYS_PU @@ -642,7 +645,7 @@ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 PAD_CTRL_HYS_PU >; }; - /* DATA[16:31] used as GPIO */ + /* DATA[16:29] [31] used as GPIO */ pinctrl_weim_gpio_3: weim_gpio-3 { fsl,pins = < MX6QDL_PAD_EIM_LBA__GPIO2_IO27 PAD_CTRL_HYS_PU @@ -659,7 +662,6 @@ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 PAD_CTRL_HYS_PU MX6QDL_PAD_GPIO_4__GPIO1_IO04 PAD_CTRL_HYS_PU MX6QDL_PAD_GPIO_5__GPIO1_IO05 PAD_CTRL_HYS_PU - MX6QDL_PAD_KEY_COL4__GPIO4_IO14 PAD_CTRL_HYS_PU MX6QDL_PAD_GPIO_2__GPIO1_IO02 PAD_CTRL_HYS_PU >; }; @@ -678,6 +680,13 @@ MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 PAD_CTRL_HYS_PU >; }; + /* ADDRESS[16] DATA[30] used as GPIO */ + pinctrl_weim_gpio_6: weim_gpio-6 { + fsl,pins = < + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 PAD_CTRL_HYS_PU + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 PAD_CTRL_HYS_PU + >; + }; }; }; |