From 2881ec544d316f435ec5f064269be41446e2a522 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Wed, 9 Oct 2019 12:53:56 -0500 Subject: [PATCH] ARM: imx6q_logic: Enable Pin muxing in SPL With the 256KB of OCRAM available to SPL now, there should be enough room to enable the pinmuxing in SPL from the device tree. This patch enables SPL_PINCTRL et al and adds the serial and usdhc pin mux references to the -u-boot.dtsi file so the pins can be configured from the device tree. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam Reviewed-by: Peng Fan --- arch/arm/dts/imx6q-logicpd-u-boot.dtsi | 12 ++++++++++++ configs/imx6q_logic_defconfig | 1 + 2 files changed, 13 insertions(+) diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi index 625bed8f7d..ee44ed91fe 100644 --- a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi +++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi @@ -16,3 +16,15 @@ &usdhc2 { u-boot,dm-spl; }; + +&pinctrl_uart1 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc1 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc2 { + u-boot,dm-spl; +}; diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index a9e8cbea94..c120cb2f54 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -78,6 +78,7 @@ CONFIG_PHY_ATHEROS=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_REGULATOR=y -- 2.39.5