Layerscape: Enable Job ring driver model.

[platform/kernel/u-boot.git] / board / freescale / ls1088a / ls1088a.c

diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index f5dc449..5bf13dc 100644 (file)
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright 2017-2018 NXP
+ * Copyright 2017-2022 NXP
  */
 #include <common.h>
+#include <clock_legacy.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
@@ -12,7 +13,6 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
-#include <fsl_sec.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
@@ -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"
@@ -373,6 +374,7 @@ bool if_board_diff_clk(void)
 #endif
 }
 
+#ifdef CONFIG_DYNAMIC_SYS_CLK_FREQ
 unsigned long get_board_sys_clk(void)
 {
        u8 sysclk_conf = QIXIS_READ(brdcfg[1]);
@@ -396,7 +398,9 @@ unsigned long get_board_sys_clk(void)
 
        return 66666666;
 }
+#endif
 
+#ifdef CONFIG_DYNAMIC_DDR_CLK_FREQ
 unsigned long get_board_ddr_clk(void)
 {
        u8 ddrclk_conf = QIXIS_READ(brdcfg[1]);
@@ -414,27 +418,7 @@ 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)
@@ -442,7 +426,7 @@ 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 +516,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 +604,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 +653,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,21 +811,14 @@ 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
-       gd->env_addr = (ulong)&default_environment[0];
-#endif
-
 #if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET)
        /* invert AQR105 IRQ pins polarity */
        out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK);
 #endif
 
-#ifdef CONFIG_FSL_CAAM
-       sec_init();
-#endif
 #ifdef CONFIG_FSL_LS_PPA
        ppa_init();
 #endif
@@ -923,10 +900,10 @@ void fsl_fdt_fixup_flash(void *fdt)
        }
 
        if (disable_ifc) {
-               offset = fdt_path_offset(fdt, "/soc/ifc/nor");
+               offset = fdt_path_offset(fdt, "/soc/memory-controller/nor");
 
                if (offset < 0)
-                       offset = fdt_path_offset(fdt, "/ifc/nor");
+                       offset = fdt_path_offset(fdt, "/memory-controller/nor");
        } else {
                offset = fdt_path_offset(fdt, "/soc/quadspi");
 
@@ -936,10 +913,10 @@ void fsl_fdt_fixup_flash(void *fdt)
 
 #else
 #ifdef CONFIG_FSL_QSPI
-       offset = fdt_path_offset(fdt, "/soc/ifc/nor");
+       offset = fdt_path_offset(fdt, "/soc/memory-controller/nor");
 
        if (offset < 0)
-               offset = fdt_path_offset(fdt, "/ifc/nor");
+               offset = fdt_path_offset(fdt, "/memory-controller/nor");
 #else
        offset = fdt_path_offset(fdt, "/soc/quadspi");