mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-11 19:48:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq807x: uboot: usb init: code clean up"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-21 07:28:12 -08:00 • committed by Gerrit - the friendly Code Review server
commit 8663573287
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
board/qca/arm/ipq807x/ipq807x.c
View file

@ -459,15 +459,19 @@ int board_mmc_init(bd_t *bis)
void board_nand_init(void)
{
#ifdef CONFIG_QCA_SPI
int gpio_node;
#endif
qpic_nand_init();
#ifdef CONFIG_QCA_SPI
gpio_node = fdt_path_offset(gd->fdt_blob, "/spi/spi_gpio");
if (gpio_node >= 0) {
qca_gpio_init(gpio_node);
ipq_spi_init(CONFIG_IPQ_SPI_NOR_INFO_IDX);
}
#endif
}
static void pcie_clock_init(int id)
@ -526,6 +530,7 @@ static void pcie_clock_deinit(int id)
}
}
#ifdef CONFIG_PCI_IPQ
void board_pci_init(int id)
{
int node, gpio_node;
@ -576,7 +581,9 @@ void board_pci_deinit()
return ;
}
#endif
#ifdef CONFIG_USB_XHCI_IPQ
void board_usb_deinit(int id)
{
void __iomem *boot_clk_ctl, *usb_bcr, *qusb2_phy_bcr;
@ -868,6 +875,7 @@ int ipq_board_usb_init(void)
}
return 0;
}
#endif
void ipq_fdt_fixup_socinfo(void *blob)
{

2
board/qca/arm/ipq807x/ipq807x.h
View file

@ -236,7 +236,9 @@ extern const char *del_node[];
extern const add_node_t add_node[];
void reset_crashdump(void);
#ifdef CONFIG_PCI_IPQ
void board_pci_init(int id);
#endif
void ipq_fdt_fixup_socinfo(void *blob);
int ipq_board_usb_init(void);

4
configs/ipq807x_defconfig
View file

@ -71,7 +71,6 @@ CONFIG_CMD_FLASH=y
# CONFIG_CMD_I2C is not set
# CONFIG_CMD_USB is not set
CONFIG_CMD_FPGA=y
CONFIG_CMD_MMC=y
#
# Shell scripting commands
@ -194,9 +193,6 @@ CONFIG_SIMPLE_BUS=y
# MMC Host controller Support
#
# CONFIG_DM_MMC is not set
CONFIG_GENERIC_MMC=y
CONFIG_SDHCI=y
CONFIG_SDHCI_QCA=y
#
# NAND Device Support

4
include/configs/ipq807x.h
View file

@ -160,6 +160,10 @@ extern loff_t board_env_size;
#ifdef CONFIG_QCA_MMC
#define CONFIG_MMC
#define CONFIG_CMD_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SDHCI
#define CONFIG_SDHCI_QCA
#define CONFIG_EFI_PARTITION
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0