projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 95c4ff25092b7272860d1770c25d239ab27b50b0..6848e3400466fb8ca80258ab649ee763a8ccd535 100644
(file)
--- a/
board/nvidia/cardhu/cardhu.c
+++ b/
board/nvidia/cardhu/cardhu.c
@@
-1,19
+1,19
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2010-2013
* NVIDIA Corporation <www.nvidia.com>
/*
* (C) Copyright 2010-2013
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <dm.h>
*/
#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 <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>
#include "pinmux-config-cardhu.h"
#include <i2c.h>
-#include <netdev.h>
#define PMU_I2C_ADDRESS 0x2D
#define MAX_I2C_RETRY 3
#define PMU_I2C_ADDRESS 0x2D
#define MAX_I2C_RETRY 3
@@
-34,7
+34,7
@@
void pinmux_init(void)
pinmux_config_drvgrp_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
*
/*
* Do I2C/PMU writes to bring up SD card bus power
*
@@
-46,7
+46,7
@@
void board_sdmmc_voltage_init(void)
int ret;
int i;
int ret;
int i;
- ret = i2c_get_chip_for_busnum(0, PMU_I2C_ADDRESS, &dev);
+ ret = i2c_get_chip_for_busnum(0, PMU_I2C_ADDRESS,
1,
&dev);
if (ret) {
debug("%s: Cannot find PMIC I2C chip\n", __func__);
return;
if (ret) {
debug("%s: Cannot find PMIC I2C chip\n", __func__);
return;
@@
-57,7
+57,7
@@
void board_sdmmc_voltage_init(void)
reg = 0x32;
for (i = 0; i < MAX_I2C_RETRY; ++i) {
reg = 0x32;
for (i = 0; i < MAX_I2C_RETRY; ++i) {
- if (i2c_write(dev, reg, data_buffer, 1))
+ if (
dm_
i2c_write(dev, reg, data_buffer, 1))
udelay(100);
}
udelay(100);
}
@@
-66,7
+66,7
@@
void board_sdmmc_voltage_init(void)
reg = 0x67;
for (i = 0; i < MAX_I2C_RETRY; ++i) {
reg = 0x67;
for (i = 0; i < MAX_I2C_RETRY; ++i) {
- if (i2c_write(dev, reg, data_buffer, 1))
+ if (
dm_
i2c_write(dev, reg, data_buffer, 1))
udelay(100);
}
}
udelay(100);
}
}
@@
-94,7
+94,7
@@
int tegra_pcie_board_init(void)
u8 addr, data[1];
int err;
u8 addr, data[1];
int err;
- err = i2c_get_chip_for_busnum(0, PMU_I2C_ADDRESS, &dev);
+ err = i2c_get_chip_for_busnum(0, PMU_I2C_ADDRESS,
1,
&dev);
if (err) {
debug("failed to find PMU bus\n");
return err;
if (err) {
debug("failed to find PMU bus\n");
return err;
@@
-104,24
+104,24
@@
int tegra_pcie_board_init(void)
data[0] = 0x15;
addr = 0x30;
data[0] = 0x15;
addr = 0x30;
- err = i2c_write(dev, addr, data, 1);
+ err =
dm_
i2c_write(dev, addr, data, 1);
if (err) {
debug("failed to set VDD supply\n");
return err;
}
/* GPIO: PEX = 3.3V */
if (err) {
debug("failed to set VDD supply\n");
return err;
}
/* GPIO: PEX = 3.3V */
- err = gpio_request(
GPIO_PL7
, "PEX");
+ err = gpio_request(
TEGRA_GPIO(L, 7)
, "PEX");
if (err < 0)
return err;
if (err < 0)
return err;
- gpio_direction_output(
GPIO_PL7
, 1);
+ gpio_direction_output(
TEGRA_GPIO(L, 7)
, 1);
/* TPS659110: LDO2_REG = 1.05V, ACTIVE */
data[0] = 0x15;
addr = 0x31;
/* TPS659110: LDO2_REG = 1.05V, ACTIVE */
data[0] = 0x15;
addr = 0x31;
- err = i2c_write(dev, addr, data, 1);
+ err =
dm_
i2c_write(dev, addr, data, 1);
if (err) {
debug("failed to set AVDD supply\n");
return err;
if (err) {
debug("failed to set AVDD supply\n");
return err;
@@
-129,9
+129,4
@@
int tegra_pcie_board_init(void)
return 0;
}
return 0;
}
-
-int board_eth_init(bd_t *bis)
-{
- return pci_eth_init(bis);
-}
#endif /* PCI */
#endif /* PCI */