board: freescale: common: Refactor I2C mux driver
PATCH 1/1 board: freescale: common: Refactor I2C mux driver
Refactors the NXP I2C mux driver to clean up duplicate code and allow it to be disabled with a config.
New config: CONFIG_FSL_USE_PCA9547_MUX. Defaults to Y since this multiplexer was always enabled before on these targets. When enabled, adds functions for selecting the current I2C channel on the PCA9547 mux, which can be used when accessing I2C peripherals on the board.
--- board/freescale/common/Kconfig | 6 ++ board/freescale/common/Makefile | 11 ++++ board/freescale/common/i2c_common.c | 32 ++++++++++ board/freescale/common/i2c_common.h | 28 +++++++++ board/freescale/common/i2c_mux.c | 38 ++++++++++++ board/freescale/common/i2c_mux.h | 13 +++++ board/freescale/common/vid.c | 58 ++++--------------- board/freescale/ls1021aqds/dcu.c | 26 +-------- board/freescale/ls1021aqds/ls1021aqds.c | 26 +-------- board/freescale/ls1043aqds/ls1043aqds.c | 27 +-------- board/freescale/ls1046afrwy/ls1046afrwy.c | 27 +-------- board/freescale/ls1046aqds/ls1046aqds.c | 26 +-------- board/freescale/ls1088a/ls1088a.c | 32 ++-------- board/freescale/ls2080aqds/ls2080aqds.c | 25 +------- board/freescale/ls2080ardb/ls2080ardb.c | 27 +-------- board/freescale/lx2160a/lx2160a.c | 31 ++-------- board/freescale/t208xqds/t208xqds.c | 26 +-------- configs/T2080QDS_NAND_defconfig | 1 + configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/ls1021aqds_ddr4_nor_defconfig | 1 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + configs/ls1021aqds_nand_defconfig | 1 + configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 1 + configs/ls1021aqds_nor_defconfig | 1 + configs/ls1021aqds_nor_lpuart_defconfig | 1 + configs/ls1021aqds_qspi_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 1 + configs/ls1021aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_defconfig | 1 + configs/ls1043aqds_lpuart_defconfig | 1 + configs/ls1043aqds_nand_defconfig | 1 + configs/ls1043aqds_nor_ddr3_defconfig | 1 + configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043aqds_tfa_defconfig | 1 + configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046afrwy_tfa_defconfig | 1 + configs/ls1046aqds_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 1 + configs/ls1088aqds_defconfig | 1 + configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088aqds_qspi_defconfig | 1 + configs/ls1088aqds_sdcard_ifc_defconfig | 1 + configs/ls1088aqds_sdcard_qspi_defconfig | 1 + configs/ls1088aqds_tfa_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080aqds_sdcard_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/ls2081ardb_defconfig | 1 + configs/ls2088aqds_tfa_defconfig | 1 + configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_qspi_defconfig | 1 + configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_tfa_defconfig | 1 + configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + .../lx2162aqds_tfa_verified_boot_defconfig | 1 + 86 files changed, 232 insertions(+), 296 deletions(-) create mode 100644 board/freescale/common/i2c_common.c create mode 100644 board/freescale/common/i2c_common.h create mode 100644 board/freescale/common/i2c_mux.c create mode 100644 board/freescale/common/i2c_mux.h
board/freescale/common/Kconfig +6 -0
@@ -21,6 +21,12 @@ config CMD_ESBC_VALIDATE esbc_validate - validate signature using RSA verification esbc_halt - put the core in spin loop (Secure Boot Only) +config FSL_USE_PCA9547_MUX + bool "Enable PCA9547 I2C Mux on Freescale boards" + default n + help + This option enables the PCA9547 I2C mux on Freescale boards. + config VID depends on DM_I2C bool "Enable Freescale VID"
board/freescale/common/Makefile +11 -0
@@ -15,6 +15,15 @@ ifdef MINIMAL # necessary to create built-in.o obj- := __dummy__.o else +# include i2c_common.o once if either VID or FSL_USE_PCA9547_MUX +I2C_COMMON= +ifdef CONFIG_VID +I2C_COMMON=y +endif +ifdef CONFIG_FSL_USE_PCA9547_MUX +I2C_COMMON=y +endif + obj-$(CONFIG_FSL_CADMUS) += cadmus.o obj-$(CONFIG_FSL_VIA) += cds_via.o obj-$(CONFIG_FMAN_ENET) += fman.o
@@ -22,6 +31,8 @@ obj-$(CONFIG_FSL_PIXIS) += pixis.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_FSL_NGPIXIS) += ngpixis.o endif +obj-$(I2C_COMMON) += i2c_common.o +obj-$(CONFIG_FSL_USE_PCA9547_MUX) += i2c_mux.o obj-$(CONFIG_VID) += vid.o obj-$(CONFIG_FSL_QIXIS) += qixis.o obj-$(CONFIG_PQ_MDS_PIB) += pq-mds-pib.o
board/freescale/common/i2c_common.c new file +32 -0
@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2021 Microsoft Corporation +*/ + +#include <common.h> +#include <i2c.h> +#include "i2c_common.h" + +#ifdef CONFIG_DM_I2C + +/* If DM is in use, retrieve the chip for the specified bus number */ +int fsl_i2c_get_device (int address,int bus,DEVICE_HANDLE_T *dev) +{ +int ret =i2c_get_chip_for_busnum (bus, address,1 , dev); + +if (ret) +printf ("I2C: Bus %d has no device with address 0x%02X\n" , + bus, address); +return ret; +} + +#else + +/* Handle is passed directly */ +int fsl_i2c_get_device (int address,int bus,DEVICE_HANDLE_T *dev) +{ + *dev = address; +return 0 ; +} + +#endif
board/freescale/common/i2c_common.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2021 Microsoft Corporation +*/ + +#ifndef __I2C_COMMON_H__ +#define __I2C_COMMON_H__ + +/* Common functionality shared by the I2C drivers for VID and the mux. */ +#ifdef CONFIG_DM_I2C +#define DEVICE_HANDLE_T struct udevice * + +#define I2C_READ (dev, register, data, length) \ + dm_i2c_read(dev, register, data, length) +#define I2C_WRITE (dev, register, data, length) \ + dm_i2c_write(dev, register, data, length) +#else +#define DEVICE_HANDLE_T int + +#define I2C_READ (dev, register, data, length) \ + i2c_read(dev, register, 1, data, length) +#define I2C_WRITE (dev, register, data, length) \ + i2c_write(dev, register, 1, data, length) +#endif + +int fsl_i2c_get_device (int address,int bus,DEVICE_HANDLE_T *dev); + +#endif
board/freescale/common/i2c_mux.c new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2021 Microsoft Corporation +*/ + +#include <common.h> +#include <i2c.h> +#include "i2c_common.h" +#include "i2c_mux.h" + +/* +* A new Kconfig option for something that used to always be built should be +* “default y”. +*/ +#ifdef CONFIG_FSL_USE_PCA9547_MUX + +int select_i2c_ch_pca9547 (u8 ch,int bus) +{ +int ret; +DEVICE_HANDLE_T dev; + +/* Open device handle */ + ret =fsl_i2c_get_device (I2C_MUX_PCA_ADDR_PRI , bus, &dev); +if (ret) { +printf ("PCA: No PCA9547 device found\n" ); +return ret; + } + + ret =I2C_WRITE (dev,0 , &ch,sizeof (ch)); +if (ret) { +printf ("PCA: Unable to select channel %d (%d)\n" , (int )ch, ret); +return ret; + } + +return 0 ; +} + +#endif
board/freescale/common/i2c_mux.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2021 Microsoft Corporation +*/ + +#ifndef __I2C_MUX_H__ +#define __I2C_MUX_H__ + +#ifdef CONFIG_FSL_USE_PCA9547_MUX +int select_i2c_ch_pca9547 (u8 ch,int bus); +#endif + +#endif
board/freescale/common/vid.c +12 -46
120 lines not on this page · raw message
board/freescale/ls1021aqds/dcu.c +1 -25
@@ -11,37 +11,13 @@#include <common.h> #include <fsl_dcu_fb.h> #include <i2c.h> +#include "../common/i2c_mux.h" #include "div64.h" #include "../common/diu_ch7301.h" #include "ls1021aqds_qixis.h" DECLARE_GLOBAL_DATA_PTR ; -static int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -unsigned int dcu_set_pixel_clock (unsigned int pixclock) {unsigned long long div;
board/freescale/ls1021aqds/ls1021aqds.c +1 -25
@@ -25,6 +25,7 @@#include <fsl_devdis.h> #include <fsl_validate.h> #include <fsl_ddr.h> +#include "../common/i2c_mux.h" #include "../common/sleep.h" #include "../common/qixis.h" #include "ls1021aqds_qixis.h"
@@ -141,31 +142,6 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int dram_init (void ) {/*
board/freescale/ls1043aqds/ls1043aqds.c +1 -26
@@ -28,6 +28,7 @@#include <fsl_esdhc.h> #include <fsl_ifc.h> #include <spl.h> +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "ls1043aqds_qixis.h"
@@ -279,32 +280,6 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; - -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int dram_init (void ) {/*
board/freescale/ls1046afrwy/ls1046afrwy.c +1 -26
@@ -22,6 +22,7 @@#include <fsl_esdhc.h> #include <fsl_sec.h> #include <fsl_dspi.h> +#include "../common/i2c_mux.h" #define LS1046A_PORSR1_REG 0x1EE0000#define BOOT_SRC_SD 0x20000000
@@ -38,32 +39,6 @@DECLARE_GLOBAL_DATA_PTR ; -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; - -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -static inline void demux_select_usb2 (void ) {u32 val;
board/freescale/ls1046aqds/ls1046aqds.c +1 -25
@@ -29,6 +29,7 @@#include <fsl_ifc.h> #include <fsl_sec.h> #include <spl.h> +#include "../common/i2c_mux.h" #include "../common/vid.h" #include "../common/qixis.h"
@@ -276,31 +277,6 @@ u32 get_lpuart_clk(void) }#endif -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int dram_init (void ) {/*
board/freescale/ls1088a/ls1088a.c +6 -26
@@ -26,6 +26,7 @@#include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "ls1088a_qixis.h"
@@ -415,34 +416,13 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; - -#if !CONFIG_IS_ENABLED (DM_I2C ) - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#else -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -#if !defined(CONFIG_SPL_BUILD )void board_retimer_init (void ) {u8 reg;/* Retimer is connected to I2C1_CH5 */ -select_i2c_ch_pca9547 (I2C_MUX_CH5 ); +select_i2c_ch_pca9547 (I2C_MUX_CH5 ,0 );/* Access to Control/Shared register */ reg =0x0 ;
@@ -532,7 +512,7 @@ void board_retimer_init(void)#ifdef CONFIG_TARGET_LS1088AQDS /* Retimer is connected to I2C1_CH5 */ -select_i2c_ch_pca9547 (I2C_MUX_CH5 ); +select_i2c_ch_pca9547 (I2C_MUX_CH5 ,0 );/* Access to Control/Shared register */ reg =0x0 ;
@@ -620,7 +600,7 @@ void board_retimer_init(void)#endif /*return the default channel*/ -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 ); }#ifdef CONFIG_MISC_INIT_R
@@ -669,7 +649,7 @@ int misc_init_r(void)int i2c_multiplexer_select_vid_channel (u8 channel) { -return select_i2c_ch_pca9547 (channel); +return select_i2c_ch_pca9547 (channel,0 ); }#ifdef CONFIG_TARGET_LS1088AQDS
@@ -827,7 +807,7 @@ int board_init(void)u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE ;#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );board_retimer_init ();#ifdef CONFIG_ENV_IS_NOWHERE
board/freescale/ls2080aqds/ls2080aqds.c +2 -23
@@ -23,7 +23,7 @@#include <fsl_sec.h> #include <asm/arch/ppa.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> - +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "ls2080aqds_qixis.h"
@@ -161,27 +161,6 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); - -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int config_board_mux (int ctrl_type) {u8 reg5;
@@ -235,7 +214,7 @@ int board_init(void)#ifdef CONFIG_ENV_IS_NOWHERE gd->env_addr = (ulong)&default_environment[0 ];#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT #if CONFIG_IS_ENABLED (DM_I2C )
board/freescale/ls2080ardb/ls2080ardb.c +3 -24
@@ -25,6 +25,7 @@#include <asm/arch/ppa.h> #include <fsl_sec.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> +#include "../common/i2c_mux.h" #ifdef CONFIG_FSL_QIXIS #include "../common/qixis.h"
@@ -205,31 +206,9 @@ unsigned long get_board_sys_clk(void)return 100000000 ; } -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; - -#if !CONFIG_IS_ENABLED (DM_I2C ) - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#else -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); -#endif - -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int i2c_multiplexer_select_vid_channel (u8 channel) { -return select_i2c_ch_pca9547 (channel); +return select_i2c_ch_pca9547 (channel,0 ); }int config_board_mux (int ctrl_type)
@@ -267,7 +246,7 @@ int board_init(void)#ifdef CONFIG_ENV_IS_NOWHERE gd->env_addr = (ulong)&default_environment[0 ];#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#ifdef CONFIG_FSL_QIXIS QIXIS_WRITE (rst_ctl,QIXIS_RST_CTL_RESET_EN );
board/freescale/lx2160a/lx2160a.c +6 -25
@@ -29,6 +29,8 @@#include <asm/arch/config.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> +#include "../common/i2c_mux.h" +#include "../common/qixis.h" #include "../common/vid.h" #include <fsl_immap.h>
@@ -79,27 +81,6 @@ U_BOOT_DRVINFO(nxp_serial1) = { .plat = &serial1, }; -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; - -#if !CONFIG_IS_ENABLED (DM_I2C ) - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#else -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -static void uart_get_clock (void ) { serial0.clock =get_serial_clock ();
@@ -115,10 +96,10 @@ int board_early_init_f(void)uart_get_clock ();#ifdef CONFIG_EMC2305 -select_i2c_ch_pca9547 (I2C_MUX_CH_EMC2305 ); +select_i2c_ch_pca9547 (I2C_MUX_CH_EMC2305 ,0 );emc2305_init (I2C_EMC2305_ADDR );set_fan_speed (I2C_EMC2305_PWM ,I2C_EMC2305_ADDR ); -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#endif fsl_lsch3_early_init_f ();
@@ -275,7 +256,7 @@ int esdhc_status_fixup(void *blob, const char *compat)#if defined(CONFIG_VID )int i2c_multiplexer_select_vid_channel (u8 channel) { -return select_i2c_ch_pca9547 (channel); +return select_i2c_ch_pca9547 (channel,0 ); }int init_func_vid (void )
@@ -611,7 +592,7 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0 ];#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#if defined(CONFIG_FSL_MC_ENET ) && defined(CONFIG_TARGET_LX2160ARDB )/* invert AQR107 IRQ pins polarity */
board/freescale/t208xqds/t208xqds.c +1 -25
@@ -22,6 +22,7 @@#include <asm/fsl_serdes.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "../common/vsc3316_3308.h"
@@ -79,31 +80,6 @@ int checkboard(void)return 0 ; } -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; - -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int i2c_multiplexer_select_vid_channel (u8 channel) {return select_i2c_ch_pca9547 (channel,0 );
configs/T2080QDS_NAND_defconfig +1 -0
@@ -83,3 +83,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=y
configs/T2080QDS_SDCARD_defconfig +1 -0
@@ -80,3 +80,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -0
@@ -70,3 +70,4 @@ CONFIG_SYS_NUM_ADDR_MAP=64 CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
@@ -82,3 +82,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -0
@@ -60,3 +60,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=y
configs/T2080QDS_defconfig +1 -0
@@ -68,3 +68,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_ddr4_nor_defconfig +1 -0
@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_nand_defconfig +1 -0
@@ -84,3 +84,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0
@@ -68,3 +68,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_nor_defconfig +1 -0
@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_nor_lpuart_defconfig +1 -0
@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_qspi_defconfig +1 -0
@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
@@ -83,3 +83,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
@@ -81,3 +81,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_defconfig +1 -0
@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_lpuart_defconfig +1 -0
@@ -71,3 +71,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_nand_defconfig +1 -0
@@ -85,3 +85,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_nor_ddr3_defconfig +1 -0
@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_qspi_defconfig +1 -0
@@ -66,3 +66,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_sdcard_ifc_defconfig +1 -0
@@ -86,3 +86,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_sdcard_qspi_defconfig +1 -0
@@ -80,3 +80,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -72,3 +72,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1043aqds_tfa_defconfig +1 -0
@@ -79,3 +79,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +1 -0
@@ -60,3 +60,4 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_RTL8152=y CONFIG_RSA=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046afrwy_tfa_defconfig +1 -0
@@ -68,3 +68,4 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_RTL8152=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_SECURE_BOOT_defconfig +1 -0
@@ -70,3 +70,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_defconfig +1 -0
@@ -72,3 +72,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_lpuart_defconfig +1 -0
@@ -74,3 +74,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_nand_defconfig +1 -0
@@ -80,3 +80,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_qspi_defconfig +1 -0
@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_sdcard_ifc_defconfig +1 -0
@@ -90,3 +90,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_sdcard_qspi_defconfig +1 -0
@@ -85,3 +85,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -72,3 +72,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1046aqds_tfa_defconfig +1 -0
@@ -82,3 +82,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088aqds_defconfig +1 -0
@@ -74,3 +74,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +1 -0
@@ -75,3 +75,4 @@ CONFIG_USB_GADGET=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088aqds_qspi_defconfig +1 -0
@@ -76,3 +76,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088aqds_sdcard_ifc_defconfig +1 -0
@@ -82,3 +82,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088aqds_sdcard_qspi_defconfig +1 -0
@@ -85,3 +85,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088aqds_tfa_defconfig +1 -0
@@ -100,3 +100,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +1 -0
@@ -77,3 +77,4 @@ CONFIG_USB_GADGET=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088ardb_qspi_defconfig +1 -0
@@ -78,3 +78,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +1 -0
@@ -88,3 +88,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_RSA=y CONFIG_SPL_RSA=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088ardb_sdcard_qspi_defconfig +1 -0
@@ -87,3 +87,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -86,3 +86,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls1088ardb_tfa_defconfig +1 -0
@@ -92,3 +92,4 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_RTL8152=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0
@@ -68,3 +68,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080aqds_defconfig +1 -0
@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080aqds_nand_defconfig +1 -0
@@ -76,3 +76,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080aqds_qspi_defconfig +1 -0
@@ -68,3 +68,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080aqds_sdcard_defconfig +1 -0
@@ -75,3 +75,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080ardb_SECURE_BOOT_defconfig +1 -0
@@ -66,3 +66,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080ardb_defconfig +1 -0
@@ -67,3 +67,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2080ardb_nand_defconfig +1 -0
@@ -72,3 +72,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2081ardb_defconfig +1 -0
@@ -65,3 +65,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2088aqds_tfa_defconfig +1 -0
@@ -90,3 +90,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +1 -0
@@ -67,3 +67,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2088ardb_qspi_defconfig +1 -0
@@ -72,3 +72,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -83,3 +83,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/ls2088ardb_tfa_defconfig +1 -0
@@ -88,3 +88,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -86,3 +86,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2160aqds_tfa_defconfig +1 -0
@@ -92,3 +92,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -77,3 +77,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2160ardb_tfa_defconfig +1 -0
@@ -87,3 +87,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2160ardb_tfa_stmm_defconfig +1 -0
@@ -86,3 +86,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_MM_COMM_TEE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -89,3 +89,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2162aqds_tfa_defconfig +1 -0
@@ -96,3 +96,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
configs/lx2162aqds_tfa_verified_boot_defconfig +1 -0
@@ -97,3 +97,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y
Signature · 1 line
2.25.1
Quoted 12 lines
-----Original Message-----
From: Stephen Carlson <[email protected]>
Sent: Thursday, June 10, 2021 5:05 AM
To: U-Boot Mailing List <[email protected]>
Cc: Priyanka Jain <[email protected]>
Subject: [PATCH] board: freescale: common: Refactor I2C mux driverRefactors the NXP I2C mux driver to clean up duplicate code and allow it to be disabled with a config.
Quoted 8 lines
New config:
CONFIG_FSL_USE_PCA9547_MUX. Defaults to Y since this multiplexer was always enabled before on these targets. When enabled, adds functions for selecting the current I2C channel on the PCA9547 mux, which can be used when accessing I2C peripherals on the board.Signed-off-by Stephen Carlson <[email protected]>Signed-off-by Wasim Khan <[email protected]>Tested-by Zhao Zheng <[email protected]>
As this patch is touching multiple platforms.
Please share list of the platforms on which the testing has been done.
Quoted 80 lines
--- board/freescale/common/Kconfig | 6 ++ board/freescale/common/Makefile | 11 ++++ board/freescale/common/i2c_common.c | 32 ++++++++++ board/freescale/common/i2c_common.h | 28 +++++++++ board/freescale/common/i2c_mux.c | 38 ++++++++++++ board/freescale/common/i2c_mux.h | 13 +++++ board/freescale/common/vid.c | 58 ++++--------------- board/freescale/ls1021aqds/dcu.c | 26 +-------- board/freescale/ls1021aqds/ls1021aqds.c | 26 +-------- board/freescale/ls1043aqds/ls1043aqds.c | 27 +-------- board/freescale/ls1046afrwy/ls1046afrwy.c | 27 +-------- board/freescale/ls1046aqds/ls1046aqds.c | 26 +-------- board/freescale/ls1088a/ls1088a.c | 32 ++-------- board/freescale/ls2080aqds/ls2080aqds.c | 25 +------- board/freescale/ls2080ardb/ls2080ardb.c | 27 +-------- board/freescale/lx2160a/lx2160a.c | 31 ++-------- board/freescale/t208xqds/t208xqds.c | 26 +-------- configs/T2080QDS_NAND_defconfig | 1 + configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/ls1021aqds_ddr4_nor_defconfig | 1 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + configs/ls1021aqds_nand_defconfig | 1 + configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 1 + configs/ls1021aqds_nor_defconfig | 1 + configs/ls1021aqds_nor_lpuart_defconfig | 1 + configs/ls1021aqds_qspi_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 1 + configs/ls1021aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_defconfig | 1 + configs/ls1043aqds_lpuart_defconfig | 1 + configs/ls1043aqds_nand_defconfig | 1 + configs/ls1043aqds_nor_ddr3_defconfig | 1 + configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043aqds_tfa_defconfig | 1 + configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046afrwy_tfa_defconfig | 1 + configs/ls1046aqds_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 1 + configs/ls1088aqds_defconfig | 1 + configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088aqds_qspi_defconfig | 1 + configs/ls1088aqds_sdcard_ifc_defconfig | 1 + configs/ls1088aqds_sdcard_qspi_defconfig | 1 + configs/ls1088aqds_tfa_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080aqds_sdcard_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/ls2081ardb_defconfig | 1 + configs/ls2088aqds_tfa_defconfig | 1 + configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_qspi_defconfig | 1 + configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_tfa_defconfig | 1 + configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 +
Quoted 8 lines
configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + .../lx2162aqds_tfa_verified_boot_defconfig | 1 + 86 files changed, 232 insertions(+), 296 deletions(-)
Look to be a big patch. Please split this in patch series (driver changes, different platform changes should belong to different patch)
Quoted 60 lines
create mode 100644 board/freescale/common/i2c_common.c create mode 100644 board/freescale/common/i2c_common.h create mode 100644 board/freescale/common/i2c_mux.c create mode 100644 board/freescale/common/i2c_mux.hboard/freescale/common/Kconfig +6
-0@@ -21,6 +21,12 @@ config CMD_ESBC_VALIDATE esbc_validate - validate signature using RSA verification esbc_halt - put the core in spin loop (Secure Boot Only) +config FSL_USE_PCA9547_MUX + bool "Enable PCA9547 I2C Mux on Freescale boards" + default n + help + This option enables the PCA9547 I2C mux on Freescale boards. + config VID depends on DM_I2C bool "Enable Freescale VID"board/freescale/common/Makefile +11
-0@@ -15,6 +15,15 @@ ifdef MINIMAL # necessary to create built-in.o obj- := __dummy__.o else +# include i2c_common.o once if either VID or FSL_USE_PCA9547_MUX +I2C_COMMON= +ifdef CONFIG_VID +I2C_COMMON=y +endif +ifdef CONFIG_FSL_USE_PCA9547_MUX +I2C_COMMON=y +endif + obj-$(CONFIG_FSL_CADMUS) += cadmus.o obj-$(CONFIG_FSL_VIA) += cds_via.o obj-$(CONFIG_FMAN_ENET) += fman.o@@ -22,6 +31,8 @@ obj-$(CONFIG_FSL_PIXIS) += pixis.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_FSL_NGPIXIS) += ngpixis.o endif +obj-$(I2C_COMMON) += i2c_common.o +obj-$(CONFIG_FSL_USE_PCA9547_MUX) += i2c_mux.o obj-$(CONFIG_VID) += vid.o obj-$(CONFIG_FSL_QIXIS) += qixis.o obj-$(CONFIG_PQ_MDS_PIB) += pq-mds-pib.oboard/freescale/common/i2c_common.c new file +0
-0
board/freescale/common/i2c_common.c line 5
Quoted 5 lines
board/freescale/common/i2c_common.c new file +5
-0@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2021 Microsoft Corporation +*/ +
It seems The code In this file and other new files is being added after refactor from other files. Please keep original copyright as well.
Quoted 34 lines
board/freescale/common/i2c_common.c new file +27
-0+#include <common.h> +#include <i2c.h> +#include "i2c_common.h" + +#ifdef CONFIG_DM_I2C + +/* If DM is in use, retrieve the chip for the specified bus number */ +int fsl_i2c_get_device (int address,int bus,DEVICE_HANDLE_T *dev) +{ +int ret =i2c_get_chip_for_busnum (bus, address,1 , dev); + +if (ret) +printf ("I2C: Bus %d has no device with address 0x%02X\n" , + bus, address); +return ret; +} + +#else + +/* Handle is passed directly */ +int fsl_i2c_get_device (int address,int bus,DEVICE_HANDLE_T *dev) +{ + *dev = address; +return 0 ; +} + +#endif board/freescale/common/i2c_common.h new file +0
-0
board/freescale/common/i2c_common.h line 5
Quoted 5 lines
board/freescale/common/i2c_common.h new file +5
-0@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2021 Microsoft Corporation +*/ +
It seems The code In this file and other new files is being added after refactor from other files. Please keep original copyright as well.
board/freescale/common/i2c_common.h line 7
Quoted 2 lines
board/freescale/common/i2c_common.h new file +2
-0+#ifndef __I2C_COMMON_H__ +#define __I2C_COMMON_H__
If the content is something NXP board specific. If yes, rename macro to __I2C_NXP_COMMON_H__
Quoted 56 lines
board/freescale/common/i2c_common.h new file +21
-0+ +/* Common functionality shared by the I2C drivers for VID and the mux. */ +#ifdef CONFIG_DM_I2C +#define DEVICE_HANDLE_T struct udevice * + +#define I2C_READ (dev, register, data, length) \ + dm_i2c_read(dev, register, data, length) +#define I2C_WRITE (dev, register, data, length) \ + dm_i2c_write(dev, register, data, length) +#else +#define DEVICE_HANDLE_T int + +#define I2C_READ (dev, register, data, length) \ + i2c_read(dev, register, 1, data, length) +#define I2C_WRITE (dev, register, data, length) \ + i2c_write(dev, register, 1, data, length) +#endif + +int fsl_i2c_get_device (int address,int bus,DEVICE_HANDLE_T *dev); + +#endif board/freescale/common/i2c_mux.c new file +28
-0@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2021 Microsoft Corporation +*/ + +#include <common.h> +#include <i2c.h> +#include "i2c_common.h" +#include "i2c_mux.h" + +/* +* A new Kconfig option for something that used to always be built should be +* “default y”. +*/ +#ifdef CONFIG_FSL_USE_PCA9547_MUX + +int select_i2c_ch_pca9547 (u8 ch,int bus) +{ +int ret; +DEVICE_HANDLE_T dev; + +/* Open device handle */ + ret =fsl_i2c_get_device (I2C_MUX_PCA_ADDR_PRI , bus, &dev); +if (ret) { +printf ("PCA: No PCA9547 device found\n" ); +return ret; + } +
board/freescale/common/i2c_mux.c line 38
Quoted 10 lines
board/freescale/common/i2c_mux.c new file +10
-0+ ret =I2C_WRITE (dev,0 , &ch,sizeof (ch)); +if (ret) { +printf ("PCA: Unable to select channel %d (%d)\n" , (int )ch, ret); +return ret; + } + + return 0; +} + +#endif
As you are already doing refactoring, this code is not NXP(Freescale) Specific. This is i2c mux pca9547 code. I suggest to add support for pca9547 device in generic I2C driver.
Quoted 1,376 lines
board/freescale/common/i2c_mux.h new file +13
-0@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2021 Microsoft Corporation +*/ + +#ifndef __I2C_MUX_H__ +#define __I2C_MUX_H__ + +#ifdef CONFIG_FSL_USE_PCA9547_MUX +int select_i2c_ch_pca9547 (u8 ch,int bus); +#endif + +#endif board/freescale/common/vid.c +5
-38@@ -20,8 +20,13 @@#include <asm/immap_85xx.h> #endif #include <linux/delay.h> +#include "i2c_common.h" #include "vid.h" +#ifndef I2C_VOL_MONITOR_BUS +#define I2C_VOL_MONITOR_BUS 0 +#endif +/* Voltages are generally handled in mV to keep them as integers */ #define MV_PER_V 1000@@ -95,44 +100,6 @@ u16 __weak soc_get_fuse_vid(int vid_index)#define I2C_VOL_MONITOR_ADDR 0#endif -#if CONFIG_IS_ENABLED (DM_I2C ) -#define DEVICE_HANDLE_T struct udevice * - -#ifndef I2C_VOL_MONITOR_BUS -#define I2C_VOL_MONITOR_BUS 0 -#endif - -/* If DM is in use, retrieve the udevice chip for the specified bus number */ -static int vid_get_device (int address,DEVICE_HANDLE_T *dev) -{ -int ret =i2c_get_chip_for_busnum (I2C_VOL_MONITOR_BUS , address,1 , dev); - -if (ret) -printf ("VID: Bus %d has no device with address 0x%02X\n" , -I2C_VOL_MONITOR_BUS , address); -return ret; -} - -#define I2C_READ (dev, register, data, length) \ - dm_i2c_read(dev, register, data, length) -#define I2C_WRITE (dev, register, data, length) \ - dm_i2c_write(dev, register, data, length) -#else -#define DEVICE_HANDLE_T int - -/* If DM is not in use, I2C addresses are passed directly */ -static int vid_get_device (int address,DEVICE_HANDLE_T *dev) -{ - *dev = address; -return 0 ; -} - -#define I2C_READ (dev, register, data, length) \ - i2c_read(dev, register, 1, data, length) -#define I2C_WRITE (dev, register, data, length) \ - i2c_write(dev, register, 1, data, length) -#endif -#if defined(CONFIG_VOL_MONITOR_IR36021_SET ) || \ defined(CONFIG_VOL_MONITOR_IR36021_READ )/*
board/freescale/common/vid.c +1
-1@@ -158,7 +125,7 @@ static int find_ir_chip_on_i2c(void)/* Check all the address */ for (i =0 ; i < (sizeof (ir_i2c_addr)/sizeof (ir_i2c_addr[0 ])); i++) { i2caddress = ir_i2c_addr[i]; - ret =vid_get_device (i2caddress, &dev); + ret =fsl_i2c_get_device (i2caddress,I2C_VOL_MONITOR_BUS , &dev);if (!ret) { ret = I2C_READ(dev, IR36021_MFR_ID_OFFSET,board/freescale/common/vid.c +6
-7(void *)&mfrID, sizeof(mfrID));@@ -202,7 +169,7 @@ static int read_voltage_from_INA220(int i2caddress)DEVICE_HANDLE_T dev;/* Open device handle */ - ret =vid_get_device (i2caddress, &dev); + ret =fsl_i2c_get_device (i2caddress,I2C_VOL_MONITOR_BUS , &dev);if (ret)return ret;@@ -243,7 +210,7 @@ static int read_voltage_from_IR(int i2caddress)DEVICE_HANDLE_T dev;/* Open device handle */ - ret =vid_get_device (i2caddress, &dev); + ret =fsl_i2c_get_device (i2caddress,I2C_VOL_MONITOR_BUS , &dev);if (ret)return ret;@@ -344,7 +311,7 @@ static int read_voltage_from_pmbus(int i2caddress)DEVICE_HANDLE_T dev;/* Open device handle */ - ret =vid_get_device (i2caddress, &dev); + ret =fsl_i2c_get_device (i2caddress,I2C_VOL_MONITOR_BUS , &dev);if (ret)return ret;@@ -457,7 +424,7 @@ static int set_voltage_to_IR(int i2caddress, int vdd)DEVICE_HANDLE_T dev;/* Open device handle */ - ret =vid_get_device (i2caddress, &dev); + ret =fsl_i2c_get_device (i2caddress,I2C_VOL_MONITOR_BUS , &dev);if (ret)return ret;@@ -503,7 +470,7 @@ static int set_voltage_to_pmbus(int i2caddress, int vdd)DEVICE_HANDLE_T dev;/* Open device handle */ - ret =vid_get_device (i2caddress, &dev); + ret =fsl_i2c_get_device (i2caddress,I2C_VOL_MONITOR_BUS , &dev);if (ret)return ret;@@ -653,7 +620,7 @@ int adjust_vdd(ulong vdd_override)debug ("VID: IR Chip found on I2C address 0x%02x\n" , i2caddress); } - ret =vid_get_device (i2caddress, &dev); + ret =fsl_i2c_get_device (i2caddress,I2C_VOL_MONITOR_BUS , &dev);if (ret)return ret;@@ -785,7 +752,6 @@ exit:i2c_multiplexer_select_vid_channel (I2C_MUX_CH_DEFAULT );return ret <0 ?-1 :0 ; - } static int do_vdd_override(struct cmd_tbl *cmdtp,board/freescale/ls1021aqds/dcu.c +1
-25@@ -11,37 +11,13 @@#include <common.h> #include <fsl_dcu_fb.h> #include <i2c.h> +#include "../common/i2c_mux.h" #include "div64.h" #include "../common/diu_ch7301.h" #include "ls1021aqds_qixis.h" DECLARE_GLOBAL_DATA_PTR ; -static int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -unsigned int dcu_set_pixel_clock (unsigned int pixclock) {unsigned long long div;board/freescale/ls1021aqds/ls1021aqds.c +1
-25@@ -25,6 +25,7 @@#include <fsl_devdis.h> #include <fsl_validate.h> #include <fsl_ddr.h> +#include "../common/i2c_mux.h" #include "../common/sleep.h" #include "../common/qixis.h" #include "ls1021aqds_qixis.h" @@ -141,31 +142,6 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int dram_init (void ) {/* board/freescale/ls1043aqds/ls1043aqds.c +1
-26@@ -28,6 +28,7 @@#include <fsl_esdhc.h> #include <fsl_ifc.h> #include <spl.h> +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "ls1043aqds_qixis.h" @@ -279,32 +280,6 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; - -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int dram_init (void ) {/* board/freescale/ls1046afrwy/ls1046afrwy.c +1
-26@@ -22,6 +22,7 @@#include <fsl_esdhc.h> #include <fsl_sec.h> #include <fsl_dspi.h> +#include "../common/i2c_mux.h" #define LS1046A_PORSR1_REG 0x1EE0000#define BOOT_SRC_SD 0x20000000@@ -38,32 +39,6 @@DECLARE_GLOBAL_DATA_PTR ; -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; - -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -static inline void demux_select_usb2 (void ) {u32 val;board/freescale/ls1046aqds/ls1046aqds.c +1
-25@@ -29,6 +29,7 @@#include <fsl_ifc.h> #include <fsl_sec.h> #include <spl.h> +#include "../common/i2c_mux.h" #include "../common/vid.h" #include "../common/qixis.h" @@ -276,31 +277,6 @@ u32 get_lpuart_clk(void) }#endif -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI , -1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int dram_init (void ) {/* board/freescale/ls1088a/ls1088a.c +6
-26@@ -26,6 +26,7 @@#include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "ls1088a_qixis.h" @@ -415,34 +416,13 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; - -#if !CONFIG_IS_ENABLED (DM_I2C ) - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#else -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -#if !defined(CONFIG_SPL_BUILD )void board_retimer_init (void ) {u8 reg;/* Retimer is connected to I2C1_CH5 */ -select_i2c_ch_pca9547 (I2C_MUX_CH5 ); +select_i2c_ch_pca9547 (I2C_MUX_CH5 ,0 );/* Access to Control/Shared register */ reg =0x0 ;@@ -532,7 +512,7 @@ void board_retimer_init(void)#ifdef CONFIG_TARGET_LS1088AQDS /* Retimer is connected to I2C1_CH5 */ -select_i2c_ch_pca9547 (I2C_MUX_CH5 ); +select_i2c_ch_pca9547 (I2C_MUX_CH5 ,0 );/* Access to Control/Shared register */ reg =0x0 ;@@ -620,7 +600,7 @@ void board_retimer_init(void)#endif /*return the default channel*/ -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 ); }#ifdef CONFIG_MISC_INIT_R @@ -669,7 +649,7 @@ int misc_init_r(void)int i2c_multiplexer_select_vid_channel (u8 channel) { -return select_i2c_ch_pca9547 (channel); +return select_i2c_ch_pca9547 (channel,0 ); }#ifdef CONFIG_TARGET_LS1088AQDS @@ -827,7 +807,7 @@ int board_init(void)u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE ;#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );board_retimer_init ();#ifdef CONFIG_ENV_IS_NOWHERE board/freescale/ls2080aqds/ls2080aqds.c +2
-23@@ -23,7 +23,7 @@#include <fsl_sec.h> #include <asm/arch/ppa.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> - +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "ls2080aqds_qixis.h" @@ -161,27 +161,6 @@ unsigned long get_board_ddr_clk(void)return 66666666 ; } -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); - -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int config_board_mux (int ctrl_type) {u8 reg5;@@ -235,7 +214,7 @@ int board_init(void)#ifdef CONFIG_ENV_IS_NOWHERE gd->env_addr = (ulong)&default_environment[0 ];#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT #if CONFIG_IS_ENABLED (DM_I2C )board/freescale/ls2080ardb/ls2080ardb.c +3
-24@@ -25,6 +25,7 @@#include <asm/arch/ppa.h> #include <fsl_sec.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> +#include "../common/i2c_mux.h" #ifdef CONFIG_FSL_QIXIS #include "../common/qixis.h" @@ -205,31 +206,9 @@ unsigned long get_board_sys_clk(void)return 100000000 ; } -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; - -#if !CONFIG_IS_ENABLED (DM_I2C ) - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#else -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); -#endif - -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int i2c_multiplexer_select_vid_channel (u8 channel) { -return select_i2c_ch_pca9547 (channel); +return select_i2c_ch_pca9547 (channel,0 ); }int config_board_mux (int ctrl_type)@@ -267,7 +246,7 @@ int board_init(void)#ifdef CONFIG_ENV_IS_NOWHERE gd->env_addr = (ulong)&default_environment[0 ];#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#ifdef CONFIG_FSL_QIXIS QIXIS_WRITE (rst_ctl,QIXIS_RST_CTL_RESET_EN );board/freescale/lx2160a/lx2160a.c +6
-25@@ -29,6 +29,8 @@#include <asm/arch/config.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> +#include "../common/i2c_mux.h" +#include "../common/qixis.h" #include "../common/vid.h" #include <fsl_immap.h> @@ -79,27 +81,6 @@ U_BOOT_DRVINFO(nxp_serial1) = { .plat = &serial1, }; -int select_i2c_ch_pca9547 (u8 ch) -{ -int ret; - -#if !CONFIG_IS_ENABLED (DM_I2C ) - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#else -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (0 ,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (!ret) - ret =dm_i2c_write (dev,0 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -static void uart_get_clock (void ) { serial0.clock =get_serial_clock ();@@ -115,10 +96,10 @@ int board_early_init_f(void)uart_get_clock ();#ifdef CONFIG_EMC2305 -select_i2c_ch_pca9547 (I2C_MUX_CH_EMC2305 ); +select_i2c_ch_pca9547 (I2C_MUX_CH_EMC2305 ,0 );emc2305_init (I2C_EMC2305_ADDR );set_fan_speed (I2C_EMC2305_PWM ,I2C_EMC2305_ADDR ); -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#endif fsl_lsch3_early_init_f ();@@ -275,7 +256,7 @@ int esdhc_status_fixup(void *blob, const char *compat)#if defined(CONFIG_VID )int i2c_multiplexer_select_vid_channel (u8 channel) { -return select_i2c_ch_pca9547 (channel); +return select_i2c_ch_pca9547 (channel,0 ); }int init_func_vid (void )@@ -611,7 +592,7 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0 ];#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ); +select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );#if defined(CONFIG_FSL_MC_ENET ) && defined(CONFIG_TARGET_LX2160ARDB )/* invert AQR107 IRQ pins polarity */ board/freescale/t208xqds/t208xqds.c +1
-25@@ -22,6 +22,7 @@#include <asm/fsl_serdes.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> +#include "../common/i2c_mux.h" #include "../common/qixis.h" #include "../common/vsc3316_3308.h" @@ -79,31 +80,6 @@ int checkboard(void)return 0 ; } -int select_i2c_ch_pca9547 (u8 ch,int bus_num) -{ -int ret; - -#if CONFIG_IS_ENABLED (DM_I2C ) -struct udevice *dev; - - ret =i2c_get_chip_for_busnum (bus_num,I2C_MUX_PCA_ADDR_PRI ,1 , &dev); -if (ret) { -printf ("%s: Cannot find udev for a bus %d\n" , __func__, - bus_num); -return ret; - } - ret =dm_i2c_write (dev,0 , &ch,1 ); -#else - ret =i2c_write (I2C_MUX_PCA_ADDR_PRI ,0 ,1 , &ch,1 ); -#endif -if (ret) { -puts ("PCA: failed to select proper channel\n" ); -return ret; - } - -return 0 ; -} -int i2c_multiplexer_select_vid_channel (u8 channel) {board/freescale/t208xqds/t208xqds.c +0
-0return select_i2c_ch_pca9547 (channel,0 );configs/T2080QDS_NAND_defconfig +1
-0@@ -83,3 +83,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/T2080QDS_SDCARD_defconfig +1
-0@@ -80,3 +80,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/T2080QDS_SECURE_BOOT_defconfig +1
-0@@ -70,3 +70,4 @@ CONFIG_SYS_NUM_ADDR_MAP=64 CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/T2080QDS_SPIFLASH_defconfig +1
-0@@ -82,3 +82,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1
-0@@ -60,3 +60,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/T2080QDS_defconfig +1
-0@@ -68,3 +68,4 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_ddr4_nor_defconfig +1
-0@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_ddr4_nor_lpuart_defconfig +1
-0@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_nand_defconfig +1
-0@@ -84,3 +84,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_nor_SECURE_BOOT_defconfig +1
-0@@ -68,3 +68,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_nor_defconfig +1
-0@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_nor_lpuart_defconfig +1
-0@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_qspi_defconfig +1
-0@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_sdcard_ifc_defconfig +1
-0@@ -83,3 +83,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1021aqds_sdcard_qspi_defconfig +1
-0@@ -81,3 +81,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_defconfig +1
-0@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_lpuart_defconfig +1
-0@@ -71,3 +71,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_nand_defconfig +1
-0@@ -85,3 +85,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_nor_ddr3_defconfig +1
-0@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_qspi_defconfig +1
-0@@ -66,3 +66,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_sdcard_ifc_defconfig +1
-0@@ -86,3 +86,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_sdcard_qspi_defconfig +1
-0@@ -80,3 +80,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1
-0@@ -72,3 +72,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1043aqds_tfa_defconfig +1
-0@@ -79,3 +79,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +1
-0@@ -60,3 +60,4 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_RTL8152=y CONFIG_RSA=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046afrwy_tfa_defconfig +1
-0@@ -68,3 +68,4 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_RTL8152=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_SECURE_BOOT_defconfig +1
-0@@ -70,3 +70,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_defconfig +1
-0@@ -72,3 +72,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_lpuart_defconfig +1
-0@@ -74,3 +74,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_nand_defconfig +1
-0@@ -80,3 +80,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_qspi_defconfig +1
-0@@ -70,3 +70,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_sdcard_ifc_defconfig +1
-0@@ -90,3 +90,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_sdcard_qspi_defconfig +1
-0@@ -85,3 +85,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_tfa_SECURE_BOOT_defconfig +1
-0@@ -72,3 +72,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1046aqds_tfa_defconfig +1
-0@@ -82,3 +82,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088aqds_defconfig +1
-0@@ -74,3 +74,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088aqds_qspi_SECURE_BOOT_defconfig +1
-0@@ -75,3 +75,4 @@ CONFIG_USB_GADGET=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088aqds_qspi_defconfig +1
-0@@ -76,3 +76,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088aqds_sdcard_ifc_defconfig +1
-0@@ -82,3 +82,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088aqds_sdcard_qspi_defconfig +1
-0@@ -85,3 +85,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088aqds_tfa_defconfig +1
-0@@ -100,3 +100,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088ardb_qspi_SECURE_BOOT_defconfig +1
-0@@ -77,3 +77,4 @@ CONFIG_USB_GADGET=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088ardb_qspi_defconfig +1
-0@@ -78,3 +78,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +1
-0@@ -88,3 +88,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_RSA=y CONFIG_SPL_RSA=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088ardb_sdcard_qspi_defconfig +1
-0@@ -87,3 +87,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088ardb_tfa_SECURE_BOOT_defconfig +1
-0@@ -86,3 +86,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls1088ardb_tfa_defconfig +1
-0@@ -92,3 +92,4 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_RTL8152=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080aqds_SECURE_BOOT_defconfig +1
-0@@ -68,3 +68,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080aqds_defconfig +1
-0@@ -69,3 +69,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080aqds_nand_defconfig +1
-0@@ -76,3 +76,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080aqds_qspi_defconfig +1
-0@@ -68,3 +68,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080aqds_sdcard_defconfig +1
-0@@ -75,3 +75,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080ardb_SECURE_BOOT_defconfig +1
-0@@ -66,3 +66,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080ardb_defconfig +1
-0@@ -67,3 +67,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2080ardb_nand_defconfig +1
-0@@ -72,3 +72,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2081ardb_defconfig +1
-0@@ -65,3 +65,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2088aqds_tfa_defconfig +1
-0@@ -90,3 +90,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2088ardb_qspi_SECURE_BOOT_defconfig +1
-0@@ -67,3 +67,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2088ardb_qspi_defconfig +1
-0@@ -72,3 +72,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2088ardb_tfa_SECURE_BOOT_defconfig +1
-0@@ -83,3 +83,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/ls2088ardb_tfa_defconfig +1
-0@@ -88,3 +88,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1
-0@@ -86,3 +86,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2160aqds_tfa_defconfig +1
-0@@ -92,3 +92,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2160ardb_tfa_SECURE_BOOT_defconfig +1
-0@@ -77,3 +77,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2160ardb_tfa_defconfig +1
-0@@ -87,3 +87,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2160ardb_tfa_stmm_defconfig +1
-0@@ -86,3 +86,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_EFI_MM_COMM_TEE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2162aqds_tfa_SECURE_BOOT_defconfig +1
-0@@ -89,3 +89,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2162aqds_tfa_defconfig +1
-0@@ -96,3 +96,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=yconfigs/lx2162aqds_tfa_verified_boot_defconfig +1
-1@@ -97,3 +97,4 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_FSL_USE_PCA9547_MUX=y --
Quoted 1 line
2.25.1
Regards
Priyanka