mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-17 15:27:00 +00:00
Merge branch '2020-08-01-misc-cleanups'
- Further cleanup of common.h and dm.h usage in headers
This commit is contained in:
commit
d6faedca76
137 changed files with 260 additions and 143 deletions
|
@ -6,7 +6,7 @@
|
|||
#ifndef __MEDIATEK_RESET_H
|
||||
#define __MEDIATEK_RESET_H
|
||||
|
||||
#include <dm.h>
|
||||
struct udevice;
|
||||
|
||||
int mediatek_reset_bind(struct udevice *pdev, u32 regofs, u32 num_regs);
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <bootm.h>
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <log.h>
|
||||
#include <net.h>
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <image.h>
|
||||
#include <log.h>
|
||||
#include <spl.h>
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <console.h>
|
||||
#include <dm.h>
|
||||
#include <dfu.h>
|
||||
#include <malloc.h>
|
||||
#include <serial.h>
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
#ifndef _MSCC_JR2_H_
|
||||
#define _MSCC_JR2_H_
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <dm.h>
|
||||
|
||||
/*
|
||||
* Target offset base(s)
|
||||
*/
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
#ifndef _MSCC_OCELOT_H_
|
||||
#define _MSCC_OCELOT_H_
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <dm.h>
|
||||
|
||||
/*
|
||||
* Target offset base(s)
|
||||
*/
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
#ifndef _MSCC_OCELOT_H_
|
||||
#define _MSCC_OCELOT_H_
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <dm.h>
|
||||
|
||||
/*
|
||||
* Target offset base(s)
|
||||
*/
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
#ifndef _MSCC_SERVAL_H_
|
||||
#define _MSCC_SERVAL_H_
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <dm.h>
|
||||
|
||||
/*
|
||||
* Target offset base(s)
|
||||
*/
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
#ifndef _MSCC_SERVALT_H_
|
||||
#define _MSCC_SERVALT_H_
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <dm.h>
|
||||
|
||||
/*
|
||||
* Target offset base(s)
|
||||
*/
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <errno.h>
|
||||
#include <fdtdec.h>
|
||||
#include <init.h>
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <w1.h>
|
||||
#include <w1-eeprom.h>
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include <i2c.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
#include <dm.h>
|
||||
#include <dm/platform_data/serial_mxc.h>
|
||||
#include <dm/platdata.h>
|
||||
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
#include <asm/io.h>
|
||||
#include <led.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
enum {
|
||||
BOARD_TYPE_PCB116 = 0xAABBCE00,
|
||||
};
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <blk.h>
|
||||
#include <dm.h>
|
||||
#include <dfu.h>
|
||||
#include <env.h>
|
||||
#include <memalign.h>
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <dm.h>
|
||||
#include <dm-demo.h>
|
||||
#include <mapmem.h>
|
||||
#include <asm/io.h>
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <dm.h>
|
||||
#include <miiphy.h>
|
||||
#include <phy.h>
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <dm.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
typedef struct _MII_field_desc_t {
|
||||
|
|
1
cmd/w1.c
1
cmd/w1.c
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <dm.h>
|
||||
#include <w1.h>
|
||||
#include <w1-eeprom.h>
|
||||
#include <dm/device-internal.h>
|
||||
|
|
|
@ -1529,6 +1529,16 @@ config TPL_SPI_FLASH_SUPPORT
|
|||
Enable support for using SPI flash in TPL. See SPL_SPI_FLASH_SUPPORT
|
||||
for details.
|
||||
|
||||
config TPL_SPI_FLASH_TINY
|
||||
bool "Enable low footprint TPL SPI Flash support"
|
||||
depends on TPL_SPI_FLASH_SUPPORT && !SPI_FLASH_BAR
|
||||
default y if SPI_FLASH
|
||||
help
|
||||
Enable lightweight TPL SPI Flash support that supports just reading
|
||||
data/images from flash. No support to write/erase flash. Enable
|
||||
this if you have TPL size limitations and don't need full-fledged
|
||||
SPI flash support.
|
||||
|
||||
config TPL_SPI_LOAD
|
||||
bool "Support loading from SPI flash"
|
||||
depends on TPL_SPI_FLASH_SUPPORT
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <asm/io.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <linux/bitops.h>
|
||||
|
|
|
@ -26,9 +26,9 @@
|
|||
#define STM32_ADC_MAX_ADCS 3
|
||||
#define STM32_ADCX_COMN_OFFSET 0x300
|
||||
|
||||
#include <common.h>
|
||||
#include <clk.h>
|
||||
#include <dm.h>
|
||||
|
||||
struct udevice;
|
||||
|
||||
/**
|
||||
* struct stm32_adc_common - stm32 ADC driver common data (for all instances)
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <adc.h>
|
||||
#include <dm.h>
|
||||
#include <asm/io.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <linux/bitops.h>
|
||||
|
|
|
@ -25,6 +25,11 @@ static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
|
|||
return (const struct clk_ops *)dev->driver->ops;
|
||||
}
|
||||
|
||||
struct clk *dev_get_clk_ptr(struct udevice *dev)
|
||||
{
|
||||
return (struct clk *)dev_get_uclass_priv(dev);
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(OF_CONTROL)
|
||||
# if CONFIG_IS_ENABLED(OF_PLATDATA)
|
||||
int clk_get_by_driver_info(struct udevice *dev, struct phandle_1_arg *cells,
|
||||
|
|
|
@ -4,12 +4,15 @@
|
|||
*/
|
||||
|
||||
#define LOG_CATEGORY UCLASS_CLK
|
||||
#include <kendryte/bypass.h>
|
||||
|
||||
#include <common.h>
|
||||
#include <clk.h>
|
||||
#include <clk-uclass.h>
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <kendryte/bypass.h>
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/err.h>
|
||||
#include <log.h>
|
||||
|
||||
#define CLK_K210_BYPASS "k210_clk_bypass"
|
||||
|
||||
|
|
|
@ -3,18 +3,20 @@
|
|||
* Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
|
||||
*/
|
||||
#define LOG_CATEGORY UCLASS_CLK
|
||||
#include <kendryte/pll.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
/* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
|
||||
#include <div64.h>
|
||||
#include <log.h>
|
||||
#include <serial.h>
|
||||
#include <asm/io.h>
|
||||
#include <dt-bindings/clock/k210-sysctl.h>
|
||||
#include <kendryte/pll.h>
|
||||
#include <linux/bitfield.h>
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/err.h>
|
||||
#include <log.h>
|
||||
#include <serial.h>
|
||||
|
||||
#define CLK_K210_PLL "k210_clk_pll"
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include <altera.h>
|
||||
#include <asm/arch/pinmux.h>
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <dm/ofnode.h>
|
||||
#include <errno.h>
|
||||
#include <fs_loader.h>
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include <malloc.h>
|
||||
#include <mmc.h>
|
||||
#include <sdhci.h>
|
||||
#include <dm.h>
|
||||
#include <asm/cache.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/delay.h>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
// SPDX-License-Identifier: GPL-2.0+
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <malloc.h>
|
||||
#include <dm/devres.h>
|
||||
#include "brcmnand_compat.h"
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
#ifndef __BRCMNAND_COMPAT_H
|
||||
#define __BRCMNAND_COMPAT_H
|
||||
|
||||
#include <clk.h>
|
||||
#include <dm.h>
|
||||
struct clk;
|
||||
struct udevice;
|
||||
|
||||
char *devm_kasprintf(struct udevice *dev, gfp_t gfp, const char *fmt, ...);
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ spi-nor-y := sf_probe.o spi-nor-ids.o
|
|||
|
||||
ifdef CONFIG_SPL_BUILD
|
||||
obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o
|
||||
ifeq ($(CONFIG_SPL_SPI_FLASH_TINY),y)
|
||||
ifeq ($(CONFIG_$(SPL_TPL_)SPI_FLASH_TINY),y)
|
||||
spi-nor-y += spi-nor-tiny.o
|
||||
else
|
||||
spi-nor-y += spi-nor-core.o
|
||||
|
|
|
@ -119,7 +119,7 @@ static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len)
|
|||
struct erase_info instr;
|
||||
|
||||
if (offset % mtd->erasesize || len % mtd->erasesize) {
|
||||
printf("SF: Erase offset/length not multiple of erase size\n");
|
||||
debug("SF: Erase offset/length not multiple of erase size\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
@ -2470,7 +2470,7 @@ static int spi_nor_init(struct spi_nor *nor)
|
|||
* designer) that this is bad.
|
||||
*/
|
||||
if (nor->flags & SNOR_F_BROKEN_RESET)
|
||||
printf("enabling reset hack; may not recover from unexpected reboots\n");
|
||||
debug("enabling reset hack; may not recover from unexpected reboots\n");
|
||||
set_4byte(nor, nor->info, 1);
|
||||
}
|
||||
|
||||
|
|
|
@ -377,7 +377,7 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
|
|||
}
|
||||
dev_dbg(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
|
||||
id[0], id[1], id[2]);
|
||||
return ERR_PTR(-ENODEV);
|
||||
return ERR_PTR(-EMEDIUMTYPE);
|
||||
}
|
||||
|
||||
static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
|
||||
|
@ -733,7 +733,7 @@ int spi_nor_scan(struct spi_nor *nor)
|
|||
|
||||
info = spi_nor_read_id(nor);
|
||||
if (IS_ERR_OR_NULL(info))
|
||||
return -ENOENT;
|
||||
return PTR_ERR(info);
|
||||
/* Parse the Serial Flash Discoverable Parameters table. */
|
||||
ret = spi_nor_init_params(nor, info, ¶ms);
|
||||
if (ret)
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include <cpu_func.h>
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <dm.h>
|
||||
#include <malloc.h>
|
||||
#include <memalign.h>
|
||||
#include <net.h>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef _PCIE_LAYERSCAPE_H_
|
||||
#define _PCIE_LAYERSCAPE_H_
|
||||
#include <pci.h>
|
||||
#include <dm.h>
|
||||
|
||||
#include <linux/sizes.h>
|
||||
|
||||
#ifndef CONFIG_SYS_PCI_MEMORY_BUS
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <log.h>
|
||||
#include <pci.h>
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#ifndef _PCIE_LAYERSCAPE_GEN4_H_
|
||||
#define _PCIE_LAYERSCAPE_GEN4_H_
|
||||
#include <pci.h>
|
||||
#include <dm.h>
|
||||
#include <linux/bitops.h>
|
||||
|
||||
#ifndef CONFIG_SYS_PCI_MEMORY_SIZE
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <pci.h>
|
||||
#include <asm/arch/fsl_serdes.h>
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
* Przemyslaw Marczak <p.marczak@samsung.com>
|
||||
*/
|
||||
|
||||
#include "regulator_common.h"
|
||||
#include <common.h>
|
||||
#include <errno.h>
|
||||
#include <dm.h>
|
||||
|
@ -13,6 +12,8 @@
|
|||
#include <power/pmic.h>
|
||||
#include <power/regulator.h>
|
||||
|
||||
#include "regulator_common.h"
|
||||
|
||||
static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)
|
||||
{
|
||||
struct dm_regulator_uclass_platdata *uc_pdata;
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
* Keerthy <j-keerthy@ti.com>
|
||||
*/
|
||||
|
||||
#include "regulator_common.h"
|
||||
#include <common.h>
|
||||
#include <fdtdec.h>
|
||||
#include <errno.h>
|
||||
|
@ -15,6 +14,8 @@
|
|||
#include <power/pmic.h>
|
||||
#include <power/regulator.h>
|
||||
|
||||
#include "regulator_common.h"
|
||||
|
||||
#define GPIO_REGULATOR_MAX_STATES 2
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
|
|
@ -4,12 +4,14 @@
|
|||
* Sven Schwermer <sven.svenschwermer@disruptive-technologies.com>
|
||||
*/
|
||||
|
||||
#include "regulator_common.h"
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <linux/delay.h>
|
||||
#include <power/regulator.h>
|
||||
|
||||
#include "regulator_common.h"
|
||||
|
||||
int regulator_common_ofdata_to_platdata(struct udevice *dev,
|
||||
struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name)
|
||||
{
|
||||
|
|
|
@ -7,9 +7,7 @@
|
|||
#ifndef _REGULATOR_COMMON_H
|
||||
#define _REGULATOR_COMMON_H
|
||||
|
||||
#include <common.h>
|
||||
#include <asm/gpio.h>
|
||||
#include <dm.h>
|
||||
|
||||
struct regulator_common_platdata {
|
||||
struct gpio_desc gpio; /* GPIO for regulator enable control */
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include <ram.h>
|
||||
#include <asm/io.h>
|
||||
#include <power-domain.h>
|
||||
#include <dm.h>
|
||||
#include <asm/arch/sys_proto.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <power/regulator.h>
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include <log.h>
|
||||
#include <malloc.h>
|
||||
#include <spi.h>
|
||||
#include <dm.h>
|
||||
#include <asm/gpio.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/bitops.h>
|
||||
|
|
|
@ -13,9 +13,14 @@
|
|||
#include <linux/pm_runtime.h>
|
||||
#include "internals.h"
|
||||
#else
|
||||
#include <dm/device_compat.h>
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <errno.h>
|
||||
#include <malloc.h>
|
||||
#include <spi.h>
|
||||
#include <spi.h>
|
||||
#include <spi-mem.h>
|
||||
#include <dm/device_compat.h>
|
||||
#endif
|
||||
|
||||
#ifndef __UBOOT__
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
#include <dm.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <malloc.h>
|
||||
#include <spi.h>
|
||||
#include <spi-mem.h>
|
||||
#include <wait_bit.h>
|
||||
#include <asm/io.h>
|
||||
|
|
|
@ -9,8 +9,10 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <clk.h>
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <reset.h>
|
||||
#include <spi.h>
|
||||
#include <spi-mem.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <linux/bitops.h>
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <ufs.h>
|
||||
#include <asm/io.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/err.h>
|
||||
|
|
|
@ -19,9 +19,10 @@
|
|||
#include <malloc.h>
|
||||
#include <hexdump.h>
|
||||
#include <scsi.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/dma-mapping.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include "ufs.h"
|
||||
|
|
|
@ -2,11 +2,10 @@
|
|||
#ifndef __UFS_H
|
||||
#define __UFS_H
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <dm.h>
|
||||
|
||||
#include "unipro.h"
|
||||
|
||||
struct udevice;
|
||||
|
||||
#define UFS_CDB_SIZE 16
|
||||
#define UPIU_TRANSACTION_UIC_CMD 0x1F
|
||||
#define UIC_CMD_SIZE (sizeof(u32) * 4)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#include <common.h>
|
||||
#include <console.h>
|
||||
#include <dm.h>
|
||||
#include <malloc.h>
|
||||
#include <watchdog.h>
|
||||
#include <linux/delay.h>
|
||||
|
@ -452,3 +453,39 @@ struct musb *musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
|
|||
|
||||
return *musbp;
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(DM_USB)
|
||||
struct usb_device *usb_dev_get_parent(struct usb_device *udev)
|
||||
{
|
||||
struct udevice *parent = udev->dev->parent;
|
||||
|
||||
/*
|
||||
* When called from usb-uclass.c: usb_scan_device() udev->dev points
|
||||
* to the parent udevice, not the actual udevice belonging to the
|
||||
* udev as the device is not instantiated yet.
|
||||
*
|
||||
* If dev is an usb-bus, then we are called from usb_scan_device() for
|
||||
* an usb-device plugged directly into the root port, return NULL.
|
||||
*/
|
||||
if (device_get_uclass_id(udev->dev) == UCLASS_USB)
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* If these 2 are not the same we are being called from
|
||||
* usb_scan_device() and udev itself is the parent.
|
||||
*/
|
||||
if (dev_get_parent_priv(udev->dev) != udev)
|
||||
return udev;
|
||||
|
||||
/* We are being called normally, use the parent pointer */
|
||||
if (device_get_uclass_id(parent) == UCLASS_USB_HUB)
|
||||
return dev_get_parent_priv(parent);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
struct usb_device *usb_dev_get_parent(struct usb_device *udev)
|
||||
{
|
||||
return udev->parent;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <dm/device_compat.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/delay.h>
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
#ifndef __USB_COMPAT_H__
|
||||
#define __USB_COMPAT_H__
|
||||
|
||||
#include <dm.h>
|
||||
#include "usb.h"
|
||||
|
||||
struct udevice;
|
||||
|
||||
struct usb_hcd {
|
||||
void *hcd_priv;
|
||||
};
|
||||
|
@ -67,40 +68,12 @@ static inline int usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(DM_USB)
|
||||
static inline struct usb_device *usb_dev_get_parent(struct usb_device *udev)
|
||||
{
|
||||
struct udevice *parent = udev->dev->parent;
|
||||
|
||||
/*
|
||||
* When called from usb-uclass.c: usb_scan_device() udev->dev points
|
||||
* to the parent udevice, not the actual udevice belonging to the
|
||||
* udev as the device is not instantiated yet.
|
||||
*
|
||||
* If dev is an usb-bus, then we are called from usb_scan_device() for
|
||||
* an usb-device plugged directly into the root port, return NULL.
|
||||
*/
|
||||
if (device_get_uclass_id(udev->dev) == UCLASS_USB)
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* If these 2 are not the same we are being called from
|
||||
* usb_scan_device() and udev itself is the parent.
|
||||
*/
|
||||
if (dev_get_parent_priv(udev->dev) != udev)
|
||||
return udev;
|
||||
|
||||
/* We are being called normally, use the parent pointer */
|
||||
if (device_get_uclass_id(parent) == UCLASS_USB_HUB)
|
||||
return dev_get_parent_priv(parent);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
static inline struct usb_device *usb_dev_get_parent(struct usb_device *dev)
|
||||
{
|
||||
return dev->parent;
|
||||
}
|
||||
#endif
|
||||
/**
|
||||
* usb_dev_get_parent() - Get the parent of a USB device
|
||||
*
|
||||
* @udev: USB struct containing information about the device
|
||||
* @return associated device for which udev == dev_get_parent_priv(dev)
|
||||
*/
|
||||
struct usb_device *usb_dev_get_parent(struct usb_device *udev);
|
||||
|
||||
#endif /* __USB_COMPAT_H__ */
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
#ifndef __DM_DEMO_H
|
||||
#define __DM_DEMO_H
|
||||
|
||||
#include <dm.h>
|
||||
|
||||
/**
|
||||
* struct dm_demo_pdata - configuration data for demo instance
|
||||
*
|
||||
|
|
|
@ -3,6 +3,10 @@
|
|||
* Copyright (c) 2013 Google, Inc
|
||||
*/
|
||||
|
||||
#ifdef _DM_H_
|
||||
#warning "Suspect dm.h is included from a header file - please fix"
|
||||
#endif
|
||||
|
||||
#ifndef _DM_H_
|
||||
#define _DM_H_
|
||||
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
#include <linux/errno.h>
|
||||
|
||||
#include <dm/device.h>
|
||||
#include <dm/fdtaddr.h>
|
||||
#include <dm/ofnode.h>
|
||||
#include <dm/uclass.h>
|
||||
|
|
|
@ -6,9 +6,6 @@
|
|||
#ifndef __DM_TEST_H
|
||||
#define __DM_TEST_H
|
||||
|
||||
#include <dm.h>
|
||||
#include <test/test.h>
|
||||
|
||||
/**
|
||||
* struct dm_test_cdata - configuration data for test instance
|
||||
*
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
#ifndef _EFI_DRIVER_H
|
||||
#define _EFI_DRIVER_H 1
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <efi_loader.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -6,9 +6,10 @@
|
|||
#ifndef _eth_phy_h_
|
||||
#define _eth_phy_h_
|
||||
|
||||
#include <dm.h>
|
||||
#include <phy.h>
|
||||
|
||||
struct udevice;
|
||||
|
||||
int eth_phy_binds_nodes(struct udevice *eth_dev);
|
||||
int eth_phy_set_mdio_bus(struct udevice *eth_dev, struct mii_dev *mdio_bus);
|
||||
struct mii_dev *eth_phy_get_mdio_bus(struct udevice *eth_dev);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#ifndef _FS_LOADER_H_
|
||||
#define _FS_LOADER_H_
|
||||
|
||||
#include <dm.h>
|
||||
struct udevice;
|
||||
|
||||
/**
|
||||
* struct phandle_part - A place for storing phandle of node and its partition
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef K210_BYPASS_H
|
||||
#define K210_BYPASS_H
|
||||
|
||||
#include <clk.h>
|
||||
struct clk;
|
||||
|
||||
struct k210_bypass {
|
||||
struct clk clk;
|
||||
|
|
|
@ -9,12 +9,13 @@
|
|||
#ifndef __LINUX_CLK_PROVIDER_H
|
||||
#define __LINUX_CLK_PROVIDER_H
|
||||
|
||||
#include <dm.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/err.h>
|
||||
#include <clk-uclass.h>
|
||||
#include <linux/err.h>
|
||||
|
||||
struct udevice;
|
||||
|
||||
static inline void clk_dm(ulong id, struct clk *clk)
|
||||
{
|
||||
if (!IS_ERR(clk))
|
||||
|
@ -188,8 +189,5 @@ struct clk *clk_register_mux(struct device *dev, const char *name,
|
|||
const char *clk_hw_get_name(const struct clk *hw);
|
||||
ulong clk_generic_get_rate(struct clk *clk);
|
||||
|
||||
static inline struct clk *dev_get_clk_ptr(struct udevice *dev)
|
||||
{
|
||||
return (struct clk *)dev_get_uclass_priv(dev);
|
||||
}
|
||||
struct clk *dev_get_clk_ptr(struct udevice *dev);
|
||||
#endif /* __LINUX_CLK_PROVIDER_H */
|
||||
|
|
|
@ -9,14 +9,17 @@
|
|||
#ifndef _PHY_H
|
||||
#define _PHY_H
|
||||
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <phy_interface.h>
|
||||
#include <dm/ofnode.h>
|
||||
#include <dm/read.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/mii.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/mdio.h>
|
||||
#include <log.h>
|
||||
#include <phy_interface.h>
|
||||
|
||||
struct udevice;
|
||||
|
||||
#define PHY_FIXED_ID 0xa5a55a5a
|
||||
#define PHY_NCSI_ID 0xbeefcafe
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
#ifndef _PHY_INTERFACE_H
|
||||
#define _PHY_INTERFACE_H
|
||||
|
||||
#include <string.h>
|
||||
|
||||
typedef enum {
|
||||
PHY_INTERFACE_MODE_MII,
|
||||
PHY_INTERFACE_MODE_GMII,
|
||||
|
|
|
@ -11,10 +11,7 @@
|
|||
#ifndef __UBOOT_SPI_MEM_H
|
||||
#define __UBOOT_SPI_MEM_H
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <errno.h>
|
||||
#include <spi.h>
|
||||
struct udevice;
|
||||
|
||||
#define SPI_MEM_OP_CMD(__opcode, __buswidth) \
|
||||
{ \
|
||||
|
|
|
@ -146,8 +146,6 @@ struct spi_slave {
|
|||
#define SPI_XFER_BEGIN BIT(0) /* Assert CS before transfer */
|
||||
#define SPI_XFER_END BIT(1) /* Deassert CS after transfer */
|
||||
#define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END)
|
||||
#define SPI_XFER_MMAP BIT(2) /* Memory Mapped start */
|
||||
#define SPI_XFER_MMAP_END BIT(3) /* Memory Mapped End */
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -9,10 +9,11 @@
|
|||
#ifndef _SPI_FLASH_H_
|
||||
#define _SPI_FLASH_H_
|
||||
|
||||
#include <dm.h> /* Because we dereference struct udevice here */
|
||||
#include <linux/types.h>
|
||||
#include <linux/mtd/spi-nor.h>
|
||||
|
||||
struct udevice;
|
||||
|
||||
/* by default ENV use the same parameters than SF command */
|
||||
#ifndef CONFIG_ENV_SPI_BUS
|
||||
# define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include <command.h>
|
||||
#include <hexdump.h>
|
||||
#include <linux/err.h>
|
||||
#include <test/test.h>
|
||||
|
||||
struct unit_test_state;
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef _THERMAL_H_
|
||||
#define _THERMAL_H_
|
||||
|
||||
#include <dm.h>
|
||||
struct udevice;
|
||||
|
||||
int thermal_get_temp(struct udevice *dev, int *temp);
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef __W1_H
|
||||
#define __W1_H
|
||||
|
||||
#include <dm.h>
|
||||
struct udevice;
|
||||
|
||||
#define W1_FAMILY_DS24B33 0x23
|
||||
#define W1_FAMILY_DS2431 0x2d
|
||||
|
|
|
@ -6,9 +6,7 @@
|
|||
#ifndef _WDT_H_
|
||||
#define _WDT_H_
|
||||
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <dm/read.h>
|
||||
struct udevice;
|
||||
|
||||
/*
|
||||
* Implement a simple watchdog uclass. Watchdog is basically a timer that
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <blk.h>
|
||||
#include <dm.h>
|
||||
#include <efi_driver.h>
|
||||
#include <malloc.h>
|
||||
#include <dm/device-internal.h>
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
* controllers.
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <efi_driver.h>
|
||||
#include <log.h>
|
||||
#include <malloc.h>
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <common.h>
|
||||
#include <bootstage.h>
|
||||
#include <command.h>
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <log.h>
|
||||
#include <net.h>
|
||||
|
|
|
@ -2322,7 +2322,7 @@ sub get_raw_comment {
|
|||
|
||||
# Checks specific to U-Boot
|
||||
sub u_boot_line {
|
||||
my ($realfile, $line, $herecurr) = @_;
|
||||
my ($realfile, $line, $rawline, $herecurr) = @_;
|
||||
|
||||
# ask for a test if a new uclass ID is added
|
||||
if ($realfile =~ /uclass-id.h/ && $line =~ /^\+/) {
|
||||
|
@ -2353,6 +2353,12 @@ sub u_boot_line {
|
|||
ERROR("DEFINE_CONFIG_CMD",
|
||||
"All commands are managed by Kconfig\n" . $herecurr);
|
||||
}
|
||||
|
||||
# Don't put common.h and dm.h in header files
|
||||
if ($realfile =~ /\.h$/ && $rawline =~ /^\+#include\s*<(common|dm)\.h>*/) {
|
||||
ERROR("BARRED_INCLUDE_IN_HDR",
|
||||
"Avoid including common.h and dm.h in header files\n" . $herecurr);
|
||||
}
|
||||
}
|
||||
|
||||
sub process {
|
||||
|
@ -3296,7 +3302,7 @@ sub process {
|
|||
}
|
||||
|
||||
if ($u_boot) {
|
||||
u_boot_line($realfile, $line, $herecurr);
|
||||
u_boot_line($realfile, $line, $rawline, $herecurr);
|
||||
}
|
||||
|
||||
# check we are in a valid source file C or perl if not then ignore this hunk
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include <power/regulator.h>
|
||||
#include <power/sandbox_pmic.h>
|
||||
#include <sandbox-adc.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static int dm_test_adc_bind(struct unit_test_state *uts)
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <audio_codec.h>
|
||||
#include <dm.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
#include <asm/test.h>
|
||||
|
||||
|
|
|
@ -8,9 +8,10 @@
|
|||
#include <axi.h>
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/ut.h>
|
||||
#include <asm/axi.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* Test that sandbox AXI works correctly */
|
||||
static int dm_test_axi_base(struct unit_test_state *uts)
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include <usb.h>
|
||||
#include <asm/state.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include <log.h>
|
||||
#include <dm/test.h>
|
||||
#include <board.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
#include "../../drivers/board/sandbox.h"
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include <log.h>
|
||||
#include <asm/test.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static int dm_test_bootcount(struct unit_test_state *uts)
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include <dm/test.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
#include <dm/util.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include <dm/test.h>
|
||||
#include <dm/device-internal.h>
|
||||
#include <linux/err.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* Base test of the clk uclass */
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include <dm/test.h>
|
||||
#include <dm/uclass.h>
|
||||
#include <linux/err.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
#include <sandbox-clk.h>
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include <dm/util.h>
|
||||
#include <dm/test.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
#include <dm/test.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
#include <cpu.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static int dm_test_cpu(struct unit_test_state *uts)
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include <malloc.h>
|
||||
#include <dm/test.h>
|
||||
#include <dma.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static int dm_test_dma_m2m(struct unit_test_state *uts)
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
#include <asm/state.h>
|
||||
#include <asm/test.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static int dm_test_dsi_host_phy_init(void *priv_data)
|
||||
|
|
|
@ -13,10 +13,11 @@
|
|||
#include <log.h>
|
||||
#include <malloc.h>
|
||||
#include <net.h>
|
||||
#include <asm/eth.h>
|
||||
#include <dm/test.h>
|
||||
#include <dm/device-internal.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
#include <asm/eth.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
#define DM_TEST_ETH_NUM 4
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <syscon.h>
|
||||
#include <asm/test.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* Base test of firmware probe */
|
||||
|
|
|
@ -9,10 +9,11 @@
|
|||
#include <log.h>
|
||||
#include <malloc.h>
|
||||
#include <acpi/acpi_device.h>
|
||||
#include <asm/gpio.h>
|
||||
#include <dm/root.h>
|
||||
#include <dm/test.h>
|
||||
#include <dm/util.h>
|
||||
#include <asm/gpio.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* Test that sandbox GPIOs work correctly */
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include <asm/state.h>
|
||||
#include <asm/test.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* Test that hwspinlock driver functions are called */
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include <dm/uclass-internal.h>
|
||||
#include <dm/util.h>
|
||||
#include <hexdump.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static const int busnum;
|
||||
|
|
|
@ -7,9 +7,10 @@
|
|||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <i2s.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/ut.h>
|
||||
#include <asm/test.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* Basic test of the i2s codec uclass */
|
||||
static int dm_test_i2s(struct unit_test_state *uts)
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <led.h>
|
||||
#include <asm/gpio.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* Base test of the led uclass */
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <malloc.h>
|
||||
#include <dm/test.h>
|
||||
#include <asm/mbox.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static int dm_test_mailbox(struct unit_test_state *uts)
|
||||
|
|
|
@ -7,10 +7,11 @@
|
|||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <log.h>
|
||||
#include <dm/test.h>
|
||||
#include <misc.h>
|
||||
#include <test/ut.h>
|
||||
#include <miiphy.h>
|
||||
#include <misc.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* macros copied over from mdio_sandbox.c */
|
||||
#define SANDBOX_PHY_ADDR 5
|
||||
|
|
|
@ -6,10 +6,11 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <dm/test.h>
|
||||
#include <misc.h>
|
||||
#include <test/ut.h>
|
||||
#include <miiphy.h>
|
||||
#include <misc.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/* macros copied over from mdio_sandbox.c */
|
||||
#define SANDBOX_PHY_ADDR 5
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <dm.h>
|
||||
#include <dm/test.h>
|
||||
#include <misc.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
static int dm_test_misc(struct unit_test_state *uts)
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <mmc.h>
|
||||
#include <part.h>
|
||||
#include <dm/test.h>
|
||||
#include <test/test.h>
|
||||
#include <test/ut.h>
|
||||
|
||||
/*
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue