From: Jose Diaz de Grenu Date: Tue, 29 Jan 2019 14:06:19 +0100 Subject: [PATCH] ARM: dts: add support for Fusion 10" display Signed-off-by: Jose Diaz de Grenu --- arch/arm/boot/dts/imx6dl-ccimx6sbc-w.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6dl-ccimx6sbc-wb.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6dl-ccimx6sbc.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6q-ccimx6sbc-id129.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6q-ccimx6sbc-id130.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6q-ccimx6sbc-w.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6q-ccimx6sbc-wb-ldo-bypass.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6q-ccimx6sbc-wb.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6q-ccimx6sbc.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6qdl-ccimx6sbc.dtsi | 4 ++-- arch/arm/boot/dts/imx6qp-ccimx6qpsbc-id160.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6qp-ccimx6qpsbc-wb.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dts | 16 ++++++++-------- arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dtsi | 4 ++-- 14 files changed, 100 insertions(+), 100 deletions(-) diff --git a/arch/arm/boot/dts/imx6dl-ccimx6sbc-w.dts b/arch/arm/boot/dts/imx6dl-ccimx6sbc-w.dts index 5b58ce771a57..d818a72d1c5f 100644 --- a/arch/arm/boot/dts/imx6dl-ccimx6sbc-w.dts +++ b/arch/arm/boot/dts/imx6dl-ccimx6sbc-w.dts @@ -105,18 +105,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6dl-ccimx6sbc-wb.dts b/arch/arm/boot/dts/imx6dl-ccimx6sbc-wb.dts index 92bb1165b425..967fd9a5cf09 100644 --- a/arch/arm/boot/dts/imx6dl-ccimx6sbc-wb.dts +++ b/arch/arm/boot/dts/imx6dl-ccimx6sbc-wb.dts @@ -105,18 +105,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6dl-ccimx6sbc.dts b/arch/arm/boot/dts/imx6dl-ccimx6sbc.dts index 8199fc862fd4..e111ab3decc9 100644 --- a/arch/arm/boot/dts/imx6dl-ccimx6sbc.dts +++ b/arch/arm/boot/dts/imx6dl-ccimx6sbc.dts @@ -105,18 +105,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-ccimx6sbc-id129.dts b/arch/arm/boot/dts/imx6q-ccimx6sbc-id129.dts index ec6dd512942f..988b1c0147d4 100644 --- a/arch/arm/boot/dts/imx6q-ccimx6sbc-id129.dts +++ b/arch/arm/boot/dts/imx6q-ccimx6sbc-id129.dts @@ -120,18 +120,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-ccimx6sbc-id130.dts b/arch/arm/boot/dts/imx6q-ccimx6sbc-id130.dts index 38e2c3b3ac92..46abc03f927a 100644 --- a/arch/arm/boot/dts/imx6q-ccimx6sbc-id130.dts +++ b/arch/arm/boot/dts/imx6q-ccimx6sbc-id130.dts @@ -104,18 +104,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-ccimx6sbc-w.dts b/arch/arm/boot/dts/imx6q-ccimx6sbc-w.dts index 10b03e07f2ee..7b5c2354f33b 100644 --- a/arch/arm/boot/dts/imx6q-ccimx6sbc-w.dts +++ b/arch/arm/boot/dts/imx6q-ccimx6sbc-w.dts @@ -120,18 +120,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-ccimx6sbc-wb-ldo-bypass.dts b/arch/arm/boot/dts/imx6q-ccimx6sbc-wb-ldo-bypass.dts index 35696a3617e3..2c066e5d429d 100644 --- a/arch/arm/boot/dts/imx6q-ccimx6sbc-wb-ldo-bypass.dts +++ b/arch/arm/boot/dts/imx6q-ccimx6sbc-wb-ldo-bypass.dts @@ -165,18 +165,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-ccimx6sbc-wb.dts b/arch/arm/boot/dts/imx6q-ccimx6sbc-wb.dts index dc733f7e003f..0dcde496fea5 100644 --- a/arch/arm/boot/dts/imx6q-ccimx6sbc-wb.dts +++ b/arch/arm/boot/dts/imx6q-ccimx6sbc-wb.dts @@ -120,18 +120,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-ccimx6sbc.dts b/arch/arm/boot/dts/imx6q-ccimx6sbc.dts index a86663c8731f..15c2807bd10e 100644 --- a/arch/arm/boot/dts/imx6q-ccimx6sbc.dts +++ b/arch/arm/boot/dts/imx6q-ccimx6sbc.dts @@ -117,18 +117,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + edid@50 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-ccimx6sbc.dtsi b/arch/arm/boot/dts/imx6qdl-ccimx6sbc.dtsi index 2992bc8d63a1..703ee7c17c53 100644 --- a/arch/arm/boot/dts/imx6qdl-ccimx6sbc.dtsi +++ b/arch/arm/boot/dts/imx6qdl-ccimx6sbc.dtsi @@ -184,7 +184,7 @@ fsl,data-width = <18>; display-timings { - native-mode = <&g101evn010_1>; + native-mode = <&hsd101pfw2_1>; /* Fusion 10" F10A-0102 */ hsd101pfw2_1: timing@0 { @@ -222,7 +222,7 @@ fsl,data-width = <18>; display-timings { - native-mode = <&g101evn010_2>; + native-mode = <&hsd101pfw2_2>; /* Fusion 10" F10A-0102 */ hsd101pfw2_2: timing@0 { diff --git a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-id160.dts b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-id160.dts index 97a090440ba5..018f2879351d 100644 --- a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-id160.dts +++ b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-id160.dts @@ -89,18 +89,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + /* MIPI-CSI2 camera */ ov5640_mipi: ov5640_mipi@4c { status = "okay"; diff --git a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-wb.dts b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-wb.dts index 97a090440ba5..018f2879351d 100644 --- a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-wb.dts +++ b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc-wb.dts @@ -89,18 +89,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + /* MIPI-CSI2 camera */ ov5640_mipi: ov5640_mipi@4c { status = "okay"; diff --git a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dts b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dts index e811baaee4ef..0cf2f6197a5d 100644 --- a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dts +++ b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dts @@ -89,18 +89,18 @@ * to avoid this error message. */ /* Uncomment to enable the fusion touch, used with hsd101pfw2 */ - //fusion@10 { - // status = "okay"; - //}; - - //fusion@14 { - // status = "okay"; - //}; + fusion@10 { + status = "okay"; + }; - goodix_touch: gt9271@14 { + fusion@14 { status = "okay"; }; + //goodix_touch: gt9271@14 { + // status = "okay"; + //}; + /* MIPI-CSI2 camera */ ov5640_mipi: ov5640_mipi@4c { status = "okay"; diff --git a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dtsi b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dtsi index c969fb18d06d..2e7a388164b3 100644 --- a/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dtsi +++ b/arch/arm/boot/dts/imx6qp-ccimx6qpsbc.dtsi @@ -227,7 +227,7 @@ primary; display-timings { - native-mode = <&g101evn010_1>; + native-mode = <&hsd101pfw2_1>; /* Fusion 10" F10A-0102 */ hsd101pfw2_1: timing@0 { @@ -266,7 +266,7 @@ crtc = "ipu2-di1"; display-timings { - native-mode = <&g101evn010_2>; + native-mode = <&hsd101pfw2_2>; /* Fusion 10" F10A-0102 */ hsd101pfw2_2: timing@0 {