common: Drop linux/delay.h from common header

[oweals/u-boot.git] / board / freescale / t4qds / t4240qds.c

diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c
index 4f2cccd709d6554dbda9fd30e432265fb9b3e0b2..8d1a66f223a2dc48d6b3df747b0b140c521155ea 100644 (file)
--- a/board/freescale/t4qds/t4240qds.c
+++ b/board/freescale/t4qds/t4240qds.c
@@ -1,12 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2009-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright 2020 NXP
  */
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
+#include <fdt_support.h>
 #include <i2c.h>
+#include <image.h>
+#include <init.h>
+#include <irq_func.h>
+#include <log.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
@@ -15,9 +21,9 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
-#include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
+#include <linux/delay.h>
 
 #include "../common/qixis.h"
 #include "../common/vsc3316_3308.h"
@@ -89,11 +95,25 @@ int checkboard(void)
        return 0;
 }
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
        int ret;
 
+#ifdef CONFIG_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;
@@ -113,10 +133,28 @@ static inline int read_voltage(void)
 {
        int i, ret, voltage_read = 0;
        u16 vol_mon;
+#ifdef CONFIG_DM_I2C
+       struct udevice *dev;
+       int bus_num = 0;
+#endif
 
        for (i = 0; i < NUM_READINGS; i++) {
+#ifdef CONFIG_DM_I2C
+               ret = i2c_get_chip_for_busnum(bus_num, I2C_VOL_MONITOR_ADDR,
+                                             1, &dev);
+               if (ret) {
+                       printf("%s: Cannot find udev for a bus %d\n", __func__,
+                              bus_num);
+                       return ret;
+               }
+
+               ret = dm_i2c_read(dev,
+                                 I2C_VOL_MONITOR_BUS_V_OFFSET,
+                                 (void *)&vol_mon, 2);
+#else
                ret = i2c_read(I2C_VOL_MONITOR_ADDR,
                        I2C_VOL_MONITOR_BUS_V_OFFSET, 1, (void *)&vol_mon, 2);
+#endif
                if (ret) {
                        printf("VID: failed to read core voltage\n");
                        return ret;
@@ -248,7 +286,7 @@ static int adjust_vdd(ulong vdd_override)
                unsigned voltage;
        };
 
-       ret = select_i2c_ch_pca9547(I2C_MUX_CH_VOL_MONITOR);
+       ret = select_i2c_ch_pca9547(I2C_MUX_CH_VOL_MONITOR, 0);
        if (ret) {
                debug("VID: I2c failed to switch channel\n");
                ret = -1;
@@ -266,7 +304,7 @@ static int adjust_vdd(ulong vdd_override)
        vdd_target = vdd[vid];
 
        /* check override variable for overriding VDD */
-       vdd_string = getenv("t4240qds_vdd_mv");
+       vdd_string = env_get("t4240qds_vdd_mv");
        if (vdd_override == 0 && vdd_string &&
            !strict_strtoul(vdd_string, 10, &vdd_string_override))
                vdd_override = vdd_string_override;
@@ -346,7 +384,7 @@ int config_frontside_crossbar_vsc3316(void)
        u32 srds_prtcl_s1, srds_prtcl_s2;
        int ret;
 
-       ret = select_i2c_ch_pca9547(I2C_MUX_CH_VSC3316_FS);
+       ret = select_i2c_ch_pca9547(I2C_MUX_CH_VSC3316_FS, 0);
        if (ret)
                return ret;
 
@@ -552,11 +590,6 @@ int board_early_init_r(void)
                MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                0, flash_esel, BOOKE_PAGESZ_256M, 1);
 
-       set_liodns();
-#ifdef CONFIG_SYS_DPAA_QBMAN
-       setup_portals();
-#endif
-
        /* Disable remote I2C connection to qixis fpga */
        QIXIS_WRITE(brdcfg[5], QIXIS_READ(brdcfg[5]) & ~BRDCFG5_IRE);
 
@@ -570,7 +603,7 @@ int board_early_init_r(void)
        /* Configure board SERDES ports crossbar */
        config_frontside_crossbar_vsc3316();
        config_backside_crossbar_mux();
-       select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+       select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 
        return 0;
 }
@@ -690,8 +723,8 @@ int ft_board_setup(void *blob, bd_t *bd)
 
        ft_cpu_setup(blob, bd);
 
-       base = getenv_bootm_low();
-       size = getenv_bootm_size();
+       base = env_get_bootm_low();
+       size = env_get_bootm_size();
 
        fdt_fixup_memory(blob, (u64)base, (u64)size);
 
@@ -700,7 +733,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 #endif
 
        fdt_fixup_liodn(blob);
-       fdt_fixup_dr_usb(blob, bd);
+       fsl_fdt_fixup_dr_usb(blob, bd);
 
 #ifdef CONFIG_SYS_DPAA_FMAN
        fdt_fixup_fman_ethernet(blob);
@@ -735,11 +768,11 @@ void board_detail(void)
        }
 
        /* Voltage secion */
-       if (!select_i2c_ch_pca9547(I2C_MUX_CH_VOL_MONITOR)) {
+       if (!select_i2c_ch_pca9547(I2C_MUX_CH_VOL_MONITOR, 0)) {
                vdd = read_voltage();
                if (vdd > 0)
                        printf("Core voltage= %d mV\n", vdd);
-               select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+               select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
        }
 
        printf("XVDD        = 1.%d V\n", ((brdcfg[8] & 0xf) - 4) * 5 + 25);
@@ -871,9 +904,9 @@ void qixis_dump_switch(void)
        }
 }
 
-static int do_vdd_adjust(cmd_tbl_t *cmdtp,
+static int do_vdd_adjust(struct cmd_tbl *cmdtp,
                         int flag, int argc,
-                        char * const argv[])
+                        char *const argv[])
 {
        ulong override;