diff options
| author | Liu Ying <victor.liu@nxp.com> | 2020-05-13 17:27:46 +0800 |
|---|---|---|
| committer | Liu Ying <victor.liu@nxp.com> | 2020-05-14 09:19:03 +0800 |
| commit | 0735da29ed030b5449e3aaf22ddca7df1fabc8df (patch) | |
| tree | 23563593faccb6b798dfe27e4734b7810bfcb97a | |
| parent | 00a714982103990d8cca433878274b02f16ef2ec (diff) | |
MLK-23981 arm64: imx8x-mek.dtsi: Enable adma_pwm node in display specific DT file
The current DT file for the i.MX8x MEK platform has a pin conflict for
IMX8QXP_SPI0_CS1 bewteen the sai1 node and the adma_pwm node(as needed
by the parallel display panel backlight control). This patch enables
the adma_pwm node in display specific DT file to avoid the conflict.
Also, the lcdif_backlight is moved to display specific as it is
referencing the adma_pwm node.
Fixes: 62408b1461b6 ("LF-1189-13 arm64: dts: imx8qxp-mek: Add adma_pwm support")
Signed-off-by: Liu Ying <victor.liu@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8x-mek-dpu-lcdif.dtsi | 24 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8x-mek.dtsi | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8x-mek-dpu-lcdif.dtsi b/arch/arm64/boot/dts/freescale/imx8x-mek-dpu-lcdif.dtsi index 172c0d2734be..d4fe033cb939 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-mek-dpu-lcdif.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-mek-dpu-lcdif.dtsi @@ -48,6 +48,24 @@ }; }; }; + + lcdif_backlight: lcdif-backlight { + compatible = "pwm-backlight"; + pwms = <&adma_pwm 0 100000 0>; + + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <80>; + }; }; &dpu_disp1_lcdif { @@ -73,3 +91,9 @@ &lpuart1 { status = "disabled"; }; + +&adma_pwm { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdifpwm>; + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi index d55b57cb6d16..80ac2b39a4d7 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi @@ -17,24 +17,6 @@ pinctrl-2 = <&pinctrl_wifi>; }; - lcdif_backlight: lcdif-backlight { - compatible = "pwm-backlight"; - pwms = <&adma_pwm 0 100000 0>; - - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <80>; - }; - lvds_backlight0: lvds_backlight@0 { compatible = "pwm-backlight"; pwms = <&pwm_mipi_lvds0 0 100000 0>; @@ -733,12 +715,6 @@ status = "okay"; }; -&adma_pwm { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcdifpwm>; - status = "okay"; -}; - &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_fec1>; |