board: freescale: lx2160a: Update I2C mux config
PATCH v3 7/9 board: freescale: lx2160a: Update I2C mux config
Updates the board configuration to enable use of the PCA9547 I2C mux.
Signed-off-by Stephen Carlson <[email protected]>
--- board/freescale/lx2160a/lx2160a.c | 31 ++++--------------- 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 + 9 files changed, 14 insertions(+), 25 deletions(-)
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 */
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -85,3 +85,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
@@ -91,3 +91,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
@@ -76,3 +76,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
@@ -86,3 +86,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
@@ -85,3 +85,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
@@ -88,3 +88,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
@@ -95,3 +95,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
@@ -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
Signature · 1 line
2.17.1