Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx6qdl-dhcom: Move IPU iomux node from PDK2 to SoM file

The SoM itself provides the display interface, see [1] page 20.
Those pins have to be used as the RGB/DPI interface or not used
at all. So rather than duplicate the pinmux settings in every
carrier board DT, better move them into the SoM DTSI.

[1] https://wiki.dh-electronics.com/images/2/2e/DOC_DHCOM-Standard-Specification_R01_2016-11-17.pdf

Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Christoph Niedermaier and committed by
Shawn Guo
3591be2e 7e4bf4d8

+33 -33
-33
arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi
··· 332 332 MX6QDL_PAD_GPIO_0__GPIO1_IO00 0xb1 /* Int */ 333 333 >; 334 334 }; 335 - 336 - pinctrl_ipu1_lcdif: ipu1-lcdif-grp { 337 - fsl,pins = < 338 - MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x38 339 - MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x38 340 - MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x38 341 - MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x38 342 - MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x38 343 - MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x38 344 - MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x38 345 - MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x38 346 - MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x38 347 - MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x38 348 - MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x38 349 - MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x38 350 - MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x38 351 - MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x38 352 - MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x38 353 - MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x38 354 - MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x38 355 - MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x38 356 - MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x38 357 - MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x38 358 - MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x38 359 - MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x38 360 - MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18 0x38 361 - MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19 0x38 362 - MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20 0x38 363 - MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 0x38 364 - MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 0x38 365 - MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 0x38 366 - >; 367 - }; 368 335 };
+33
arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi
··· 667 667 >; 668 668 }; 669 669 670 + pinctrl_ipu1_lcdif: ipu1-lcdif-grp { 671 + fsl,pins = < 672 + MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x38 673 + MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x38 674 + MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x38 675 + MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x38 676 + MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x38 677 + MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x38 678 + MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x38 679 + MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x38 680 + MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x38 681 + MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x38 682 + MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x38 683 + MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x38 684 + MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x38 685 + MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x38 686 + MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x38 687 + MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x38 688 + MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x38 689 + MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x38 690 + MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x38 691 + MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x38 692 + MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x38 693 + MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x38 694 + MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18 0x38 695 + MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19 0x38 696 + MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20 0x38 697 + MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 0x38 698 + MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 0x38 699 + MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 0x38 700 + >; 701 + }; 702 + 670 703 pinctrl_pcie: pcie-grp { 671 704 fsl,pins = < 672 705 MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x1b0b1 /* Wake */