From 5bc21d386993023690b8d65a05829fba55053f95 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Wed, 24 Aug 2022 15:59:20 +0200 Subject: [PATCH] imx: kontron-sl-mx8mm: Prepare for I2C display detection in environment script Enable the I2C bus and set a env variable for the reset GPIO of the touch controller. This allows us to probe the panel in a script. Signed-off-by: Frieder Schrempf Reviewed-by: Fabio Estevam --- arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi | 13 +++++++++++-- arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi | 8 ++++++++ arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi | 8 ++++++++ board/kontron/sl-mx8mm/sl-mx8mm.c | 5 ++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi index e7e900d..5b8b472 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi @@ -48,8 +48,17 @@ &i2c2 { status = "okay"; - u-boot,dm-spl; - u-boot,dm-pre-reloc; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; +}; + +&iomuxc { + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX8MM_IOMUXC_I2C2_SCL_I2C2_SCL 0x400001c3 + MX8MM_IOMUXC_I2C2_SDA_I2C2_SDA 0x400001c3 + >; + }; }; &pinctrl_ecspi1 { diff --git a/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi index cd990b1..fac24a2 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi @@ -4,3 +4,11 @@ */ #include "imx8mm-kontron-bl-common-u-boot.dtsi" + +&iomuxc { + pinctrl_touch: touchgrp { + fsl,pins = < + MX8MM_IOMUXC_SAI5_RXD2_GPIO3_IO23 0x19 /* Touch Reset */ + >; + }; +}; diff --git a/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi index cd990b1..e9fa8d7 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi @@ -4,3 +4,11 @@ */ #include "imx8mm-kontron-bl-common-u-boot.dtsi" + +&iomuxc { + pinctrl_touch: touchgrp { + fsl,pins = < + MX8MM_IOMUXC_SAI1_TXD3_GPIO4_IO15 0x19 /* Touch Reset */ + >; + }; +}; diff --git a/board/kontron/sl-mx8mm/sl-mx8mm.c b/board/kontron/sl-mx8mm/sl-mx8mm.c index 6411301..4ac430b 100644 --- a/board/kontron/sl-mx8mm/sl-mx8mm.c +++ b/board/kontron/sl-mx8mm/sl-mx8mm.c @@ -126,8 +126,11 @@ int board_late_init(void) if (!fdt_node_check_compatible(gd->fdt_blob, 0, "kontron,imx8mm-n802x-som") || !fdt_node_check_compatible(gd->fdt_blob, 0, "kontron,imx8mm-osm-s")) { env_set("som_type", "osm-s"); - else + env_set("touch_rst_gpio", "111"); + } else { env_set("som_type", "sl"); + env_set("touch_rst_gpio", "87"); + } return 0; } -- 2.7.4