diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-02 03:36:39 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-02 03:36:39 +0300 |
| commit | 0e5d3e311189ca07aa7b5802deaff9861fc33574 (patch) | |
| tree | 13eb58a65e156180e7cb99632f35be33e10baf1c /include | |
| parent | f3b623fa52ce5c67732ea2d789d5e21667e88db3 (diff) | |
| parent | 641599a63df258c3e3cb259c75cdada0cc009d56 (diff) | |
| download | u-boot-0e5d3e311189ca07aa7b5802deaff9861fc33574.tar.xz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/uclass-id.h | 1 | ||||
| -rw-r--r-- | include/dm/uclass.h | 16 | ||||
| -rw-r--r-- | include/image.h | 1 | ||||
| -rw-r--r-- | include/linux/libfdt.h | 3 |
4 files changed, 18 insertions, 3 deletions
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 07fabc3ce6..d28fb3e23f 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -19,6 +19,7 @@ enum uclass_id { UCLASS_TEST_FDT, UCLASS_TEST_BUS, UCLASS_TEST_PROBE, + UCLASS_TEST_DUMMY, UCLASS_SPI_EMUL, /* sandbox SPI device emulator */ UCLASS_I2C_EMUL, /* sandbox I2C device emulator */ UCLASS_PCI_EMUL, /* sandbox PCI device emulator */ diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 3a01abc239..a5bf3eb831 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -211,6 +211,22 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, struct udevice **devp); /** + * uclass_get_device_by_phandle_id() - Get a uclass device by phandle id + * + * This searches the devices in the uclass for one with the given phandle id. + * + * The device is probed to activate it ready for use. + * + * @id: uclass ID to look up + * @phandle_id: the phandle id to look up + * @devp: Returns pointer to device (there is only one for each node) + * @return 0 if OK, -ENODEV if there is no device match the phandle, other + * -ve on error + */ +int uclass_get_device_by_phandle_id(enum uclass_id id, uint phandle_id, + struct udevice **devp); + +/** * uclass_get_device_by_phandle() - Get a uclass device by phandle * * This searches the devices in the uclass for one with the given phandle. diff --git a/include/image.h b/include/image.h index 621abf647f..a6f82aebfe 100644 --- a/include/image.h +++ b/include/image.h @@ -21,6 +21,7 @@ /* Define this to avoid #ifdefs later on */ struct lmb; +struct fdt_region; #ifdef USE_HOSTCC #include <sys/types.h> diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h index 9e6eeadc40..eeb2344971 100644 --- a/include/linux/libfdt.h +++ b/include/linux/libfdt.h @@ -309,7 +309,4 @@ int fdt_add_alias_regions(const void *fdt, struct fdt_region *region, int count, extern struct fdt_header *working_fdt; /* Pointer to the working fdt */ -/* adding a ramdisk needs 0x44 bytes in version 2008.10 */ -#define FDT_RAMDISK_OVERHEAD 0x80 - #endif /* _INCLUDE_LIBFDT_H_ */ |