diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-09-22 13:26:08 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-09-29 15:22:53 +0200 |
| commit | a75a5bc0bc91f29ad4df48684589d35454a5ccad (patch) | |
| tree | 80aab57be349cfa3ecf0aa72136eca23c06c8717 /arch/arm/boot/dts | |
| parent | b4413e4426977aa88e2a712cb549104e792859d8 (diff) | |
arm: dts: imx7: move standard pinctrl to module level dt
We traditionally have all standard pinctrl in the module level
device tree. Move pinctrl accordingly.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 26 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 21 |
2 files changed, 21 insertions, 26 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 75e0b5e28dae..1254aaee6a0f 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -300,31 +300,5 @@ MX7D_PAD_GPIO1_IO10__GPIO1_IO10 0x14 >; }; - - pinctrl_usbc_det: gpio_usbc_det { - fsl,pins = < - MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x74 - >; - }; - }; -}; - -&iomuxc_lpsr { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio1>; - - imx7d-eval-v3 { - pinctrl_gpio1: gpio1grp { - fsl,pins = < - MX7D_PAD_GPIO1_IO02__GPIO1_IO2 0x59 - MX7D_PAD_GPIO1_IO03__GPIO1_IO3 0x59 - >; - }; - - pinctrl_gpiokeys: gpiokeysgrp { - fsl,pins = < - MX7D_PAD_GPIO1_IO01__GPIO1_IO1 0x59 - >; - }; }; }; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 0a6be0a9f86f..7a32b89b57ff 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -600,6 +600,12 @@ >; }; + pinctrl_usbc_det: gpio_usbc_det { + fsl,pins = < + MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x74 + >; + }; + pinctrl_usdhc1: usdhc1grp { fsl,pins = < MX7D_PAD_SD1_CMD__SD1_CMD 0x59 @@ -651,7 +657,22 @@ }; &iomuxc_lpsr { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio1>; + imx7d-colibri { + pinctrl_gpio1: gpio1grp { + fsl,pins = < + MX7D_PAD_GPIO1_IO02__GPIO1_IO2 0x59 + MX7D_PAD_GPIO1_IO03__GPIO1_IO3 0x59 + >; + }; + + pinctrl_gpiokeys: gpiokeysgrp { + fsl,pins = < + MX7D_PAD_GPIO1_IO01__GPIO1_IO1 0x59 + >; + }; pinctrl_i2c1: i2c1grp { fsl,pins = < MX7D_PAD_GPIO1_IO05__I2C1_SDA 0x4000007f |