From patchwork Wed Jan 29 16:58:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 240468 List-Id: U-Boot discussion From: festevam at gmail.com (Fabio Estevam) Date: Wed, 29 Jan 2020 13:58:02 -0300 Subject: [PATCH v2 1/2] gpio: Let DM_74X164 be built without CONFIG_SPL_GPIO Message-ID: <20200129165803.16249-1-festevam@gmail.com> Since commit bcee8d6764f9 ("dm: gpio: Allow control of GPIO uclass in SPL") CONFIG_DM_74X164 is no longer built for mx7dsabresd_defconfig, as this target does not use CONFIG_SPL_GPIO. Remove such dependency and let the the 74X164 GPIO driver be built again. This restores Ethernet functionality on the imx7-sdb board as the Ethernet reset PHY comes from a GPIO driven by a 74LV595PW I/O expander. Fixes: bcee8d6764f9 ("dm: gpio: Allow control of GPIO uclass in SPL") Signed-off-by: Fabio Estevam Reviewed-by: Tom Rini Tested-by: Alifer Moraes --- Changes since v1: - Move to the 'ifndef CONFIG_SPL_BUILD' block so that it does not cause issues on SPL targets, such as mx6ul_14x14_defconfig drivers/gpio/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 449046b64c..17af123a7d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -6,13 +6,11 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_DWAPB_GPIO) += dwapb_gpio.o obj-$(CONFIG_AXP_GPIO) += axp_gpio.o +obj-$(CONFIG_DM_74X164) += 74x164_gpio.o endif obj-$(CONFIG_$(SPL_TPL_)DM_GPIO) += gpio-uclass.o obj-$(CONFIG_$(SPL_)DM_PCA953X) += pca953x_gpio.o -ifdef CONFIG_$(SPL_TPL_)GPIO -obj-$(CONFIG_DM_74X164) += 74x164_gpio.o -endif obj-$(CONFIG_AT91_GPIO) += at91_gpio.o obj-$(CONFIG_ATMEL_PIO4) += atmel_pio4.o From patchwork Wed Jan 29 16:58:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 240469 List-Id: U-Boot discussion From: festevam at gmail.com (Fabio Estevam) Date: Wed, 29 Jan 2020 13:58:03 -0300 Subject: [PATCH v2 2/2] mx6ul_14x14_evk: Move CONFIG_DM_74X164 to defconfig In-Reply-To: <20200129165803.16249-1-festevam@gmail.com> References: <20200129165803.16249-1-festevam@gmail.com> Message-ID: <20200129165803.16249-2-festevam@gmail.com> The CONFIG_DM_74X164 symbols should be moved to the defconfig file, as indicated in the comments. Signed-off-by: Fabio Estevam Reviewed-by: Tom Rini --- configs/mx6ul_14x14_evk_defconfig | 1 + include/configs/mx6ul_14x14_evk.h | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index 4fd311d2fb..029cc01285 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -44,6 +44,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_FSL_USDHC=y diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 5cc15b6d2f..f347eeb39f 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -44,11 +44,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 #endif -/* Note: This is incorrect and should move to Kconfig / defconfig */ -#ifdef CONFIG_DM_GPIO -#define CONFIG_DM_74X164 -#endif - #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_EXTRA_ENV_SETTINGS \