redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: dts: add new imx6sx-sdb-lcdif1 dts file 

on SDB board, LCD1_DATA07 is shared by lcdif1 and csi1, so add -lcdif1 dts
file to resovle the conflict.

[  503.947201] imx6sx-pinctrl 20e0000.iomuxc: pin MX6SX_PAD_LCD1_DATA07 already requested by 2220000.lcdif; cannot claim for 0-003c
[  503.958957] imx6sx-pinctrl 20e0000.iomuxc: pin-59 (0-003c) status -22
[  503.965560] imx6sx-pinctrl 20e0000.iomuxc: could not request pin 59 (MX6SX_PAD_LCD1_DATA07) from group csigrp-0  on device 20e0000.iomuxc

Signed-off-by: Robby Cai <robby.cai@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Robby Cai 2019-09-29 15:40:03 +08:00 committed by Dong Aisheng
parent c4ae264ae8
commit 23abe424e7
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/Makefile
View File

@ -567,6 +567,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sdb-sai.dtb \
imx6sx-sdb.dtb \
imx6sx-sdb-emmc.dtb \
imx6sx-sdb-lcdif1.dtb \
imx6sx-sdb-m4.dtb \
imx6sx-sdb-mqs.dtb \
imx6sx-softing-vining-2000.dtb \

25
arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts 100644
View File

@ -0,0 +1,25 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2014-2015 Freescale Semiconductor, Inc.
* Copyright 2019 NXP
*/
#include "imx6sx-sdb.dts"
/ {
reg_lcd_3v3: regulator-lcd-3v3 {
status = "okay";
};
};
&csi1 {
status = "disabled";
};
&lcdif1 {
status = "okay";
};
&ov5640 {
status = "disabled";
};

3
arch/arm/boot/dts/imx6sx-sdb.dtsi
View File

@ -93,6 +93,7 @@
regulator-name = "lcd-3v3";
gpio = <&gpio3 27 0>;
enable-active-high;
status = "disabled";
};
reg_peri_3v3: regulator-peri-3v3 {
@ -393,7 +394,7 @@
pinctrl-0 = <&pinctrl_lcd>;
lcd-supply = <&reg_lcd_3v3>;
display = <&display0>;
status = "okay";
status = "disabled";
display0: display@0 {
bits-per-pixel = <16>;