From fac5bc1cc73bcfd3e9694aca2d5b8dad8102df7a Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Fri, 29 May 2020 19:54:04 +0200 Subject: ARM64: dts: apalis-imx8x: integrate reset_moci#_drv handling Integrate RESET_MOCI#_DRV handling with work-around for PCIe switch as found on the Apalis Evaluation Board similar to what we upstreamed. Related-to: ELB-1929 Signed-off-by: Philippe Schenker --- .../dts/freescale/fsl-imx8qxp-apalis-eval.dtsi | 5 ++++ .../boot/dts/freescale/fsl-imx8qxp-apalis.dtsi | 27 +++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi index 3a65565bc809..96e35e54c26f 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi @@ -402,6 +402,11 @@ }; }; +/* Apalis PCIE1 */ +&pcieb { + status = "okay"; +}; + &pixel_combiner { status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi index c9c9a490078c..750be8b8c52c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi @@ -95,7 +95,17 @@ regulator-max-microvolt = <1800000>; }; - /* TBD SPDIF, HDMI audio */ + reg_pcie_switch: regulator-pcie-switch { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio7>; + enable-active-high; + gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; + regulator-name = "pcie_switch"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + startup-delay-us = <100000>; + }; sound { compatible = "simple-audio-card"; @@ -319,9 +329,8 @@ &iomuxc { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio34>, <&pinctrl_gpio7>, <&pinctrl_usbo1oc>, - <&pinctrl_gpio8>, <&pinctrl_qspi0a_gpios>, - <&pinctrl_sata1_act>, <&pinctrl_reset_moci>, + pinctrl-0 = <&pinctrl_gpio34>, <&pinctrl_usbo1oc>, <&pinctrl_gpio8>, + <&pinctrl_qspi0a_gpios>, <&pinctrl_sata1_act>, <&pinctrl_mmc1_gpios>, <&pinctrl_dap1_gpios>, <&pinctrl_wifi_sclk>; @@ -927,13 +936,15 @@ }; /* Apalis PCIE1 */ -#if 0 /* Todo */ &pcieb { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reset_moci>; + bus-range = <0x00 0xff>; ext_osc = <0>; - hard-wired = <0>; - status = "okay"; + fsl,max-link-speed = <2>; + reset-gpio = <&gpio4 1 GPIO_ACTIVE_LOW>; + vpcie-supply = <®_pcie_switch>; }; -#endif /* Apalis console */ &pd_dma_lpuart1 { -- cgit v1.2.3