common: Drop linux/delay.h from common header

[oweals/u-boot.git] / board / nvidia / cardhu / cardhu.c

diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c
index 47e7abedf1145cbc694aad90e49bebeb38c0f5ad..6848e3400466fb8ca80258ab649ee763a8ccd535 100644 (file)
--- a/board/nvidia/cardhu/cardhu.c
+++ b/board/nvidia/cardhu/cardhu.c
@@ -1,13 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  (C) Copyright 2010-2013
  *  NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <dm.h>
+#include <log.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
+#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
+#include <linux/delay.h>
 #include "pinmux-config-cardhu.h"
 #include <i2c.h>
 
@@ -20,34 +24,40 @@
  */
 void pinmux_init(void)
 {
-       pinmux_config_table(tegra3_pinmux_common,
+       pinmux_config_pingrp_table(tegra3_pinmux_common,
                ARRAY_SIZE(tegra3_pinmux_common));
 
-       pinmux_config_table(unused_pins_lowpower,
+       pinmux_config_pingrp_table(unused_pins_lowpower,
                ARRAY_SIZE(unused_pins_lowpower));
 
        /* Initialize any non-default pad configs (APB_MISC_GP regs) */
-       padgrp_config_table(cardhu_padctrl, ARRAY_SIZE(cardhu_padctrl));
+       pinmux_config_drvgrp_table(cardhu_padctrl, ARRAY_SIZE(cardhu_padctrl));
 }
 
-#if defined(CONFIG_TEGRA_MMC)
+#if defined(CONFIG_MMC_SDHCI_TEGRA)
 /*
  * Do I2C/PMU writes to bring up SD card bus power
  *
  */
 void board_sdmmc_voltage_init(void)
 {
+       struct udevice *dev;
        uchar reg, data_buffer[1];
+       int ret;
        int i;
 
-       i2c_set_bus_num(0);     /* PMU is on bus 0 */
+       ret = i2c_get_chip_for_busnum(0, PMU_I2C_ADDRESS, 1, &dev);
+       if (ret) {
+               debug("%s: Cannot find PMIC I2C chip\n", __func__);
+               return;
+       }
 
        /* TPS659110: LDO5_REG = 3.3v, ACTIVE to SDMMC1 */
        data_buffer[0] = 0x65;
        reg = 0x32;
 
        for (i = 0; i < MAX_I2C_RETRY; ++i) {
-               if (i2c_write(PMU_I2C_ADDRESS, reg, 1, data_buffer, 1))
+               if (dm_i2c_write(dev, reg, data_buffer, 1))
                        udelay(100);
        }
 
@@ -56,7 +66,7 @@ void board_sdmmc_voltage_init(void)
        reg = 0x67;
 
        for (i = 0; i < MAX_I2C_RETRY; ++i) {
-               if (i2c_write(PMU_I2C_ADDRESS, reg, 1, data_buffer, 1))
+               if (dm_i2c_write(dev, reg, data_buffer, 1))
                        udelay(100);
        }
 }
@@ -76,3 +86,47 @@ void pin_mux_mmc(void)
        board_sdmmc_voltage_init();
 }
 #endif /* MMC */
+
+#ifdef CONFIG_PCI_TEGRA
+int tegra_pcie_board_init(void)
+{
+       struct udevice *dev;
+       u8 addr, data[1];
+       int err;
+
+       err = i2c_get_chip_for_busnum(0, PMU_I2C_ADDRESS, 1, &dev);
+       if (err) {
+               debug("failed to find PMU bus\n");
+               return err;
+       }
+
+       /* TPS659110: LDO1_REG = 1.05V, ACTIVE */
+       data[0] = 0x15;
+       addr = 0x30;
+
+       err = dm_i2c_write(dev, addr, data, 1);
+       if (err) {
+               debug("failed to set VDD supply\n");
+               return err;
+       }
+
+       /* GPIO: PEX = 3.3V */
+       err = gpio_request(TEGRA_GPIO(L, 7), "PEX");
+       if (err < 0)
+               return err;
+
+       gpio_direction_output(TEGRA_GPIO(L, 7), 1);
+
+       /* TPS659110: LDO2_REG = 1.05V, ACTIVE */
+       data[0] = 0x15;
+       addr = 0x31;
+
+       err = dm_i2c_write(dev, addr, data, 1);
+       if (err) {
+               debug("failed to set AVDD supply\n");
+               return err;
+       }
+
+       return 0;
+}
+#endif /* PCI */