diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-10-28 19:15:06 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-10-30 13:15:22 +0100 |
| commit | f79675e581a4abda12db31cde3ee71d44016b981 (patch) | |
| tree | 74ebf761b016288e696bbfe00a6d3ebf3429fab5 /arch/arm/boot/dts/imx6q.dtsi | |
| parent | e4d6ca5866fb71e43081e10fdd9f830bf589a01a (diff) | |
dtb: move trdx pinmux definitions into trdx filesColibri_iMX6_LinuxImageV2.3Beta4_20141113Apalis_iMX6_LinuxImageV2.3Beta3_20141031
The Freescale provided files imx6qdl.dtsi, imx6q.dtsi provide among
other things pinmux definitions.
We added missing definitions to these files, however that could
become a merging nightmare in the future.
Move our additions into apalis/colibri files and use names which
likely do not collide with future upstream additions.
Diffstat (limited to 'arch/arm/boot/dts/imx6q.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index af7e6cdf60bb..580631278e79 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -240,29 +240,5 @@ MX6QDL_PAD_DISP0_DAT23__IPU2_DISP0_DATA23 0x10 >; }; - pinctrl_ipu2_2: ipu2grp-2 { - fsl,pins = < - MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0xD1 - MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15 0xD1 - MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02 0xD1 - MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03 0xD1 - MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0xF9 - MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0xF9 - MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0xF9 - MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0xF9 - MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0xF9 - MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0xF9 - MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0xF9 - MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0xF9 - MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0xF9 - MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0xF9 - MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0xF9 - MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0xF9 - MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0xF9 - MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0xF9 - MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0xF9 - MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0xF9 - >; - }; }; }; |