Merge git://git.denx.de/u-boot-uniphier
- add {ofnode,dev}_read_resource_byname
- provide DT probe hook to Denali NAND driver
- update clk/reset driver
- update DT
- misc cleanups
This commit is contained in:
@@ -83,7 +83,6 @@
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||
#define CONFIG_SYS_NAND_MAX_CHIPS 2
|
||||
#define CONFIG_SYS_NAND_ONFI_DETECTION
|
||||
|
||||
#define CONFIG_NAND_DENALI_ECC_SIZE 1024
|
||||
@@ -91,8 +90,6 @@
|
||||
#define CONFIG_SYS_NAND_REGS_BASE 0x68100000
|
||||
#define CONFIG_SYS_NAND_DATA_BASE 0x68000000
|
||||
|
||||
#define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_DATA_BASE + 0x10)
|
||||
|
||||
#define CONFIG_SYS_NAND_USE_FLASH_BBT
|
||||
#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
|
||||
|
||||
|
||||
@@ -625,5 +625,7 @@ int ofnode_read_simple_size_cells(ofnode node);
|
||||
bool ofnode_pre_reloc(ofnode node);
|
||||
|
||||
int ofnode_read_resource(ofnode node, uint index, struct resource *res);
|
||||
int ofnode_read_resource_byname(ofnode node, const char *name,
|
||||
struct resource *res);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -359,13 +359,24 @@ int dev_read_enabled(struct udevice *dev);
|
||||
/**
|
||||
* dev_read_resource() - obtain an indexed resource from a device.
|
||||
*
|
||||
* @dev: devuce to examine
|
||||
* @dev: device to examine
|
||||
* @index index of the resource to retrieve (0 = first)
|
||||
* @res returns the resource
|
||||
* @return 0 if ok, negative on error
|
||||
*/
|
||||
int dev_read_resource(struct udevice *dev, uint index, struct resource *res);
|
||||
|
||||
/**
|
||||
* dev_read_resource_byname() - obtain a named resource from a device.
|
||||
*
|
||||
* @dev: device to examine
|
||||
* @name: name of the resource to retrieve
|
||||
* @res: returns the resource
|
||||
* @return 0 if ok, negative on error
|
||||
*/
|
||||
int dev_read_resource_byname(struct udevice *dev, const char *name,
|
||||
struct resource *res);
|
||||
|
||||
#else /* CONFIG_DM_DEV_READ_INLINE is enabled */
|
||||
|
||||
static inline int dev_read_u32_default(struct udevice *dev,
|
||||
@@ -513,6 +524,13 @@ static inline int dev_read_resource(struct udevice *dev, uint index,
|
||||
return ofnode_read_resource(dev_ofnode(dev), index, res);
|
||||
}
|
||||
|
||||
static inline int dev_read_resource_byname(struct udevice *dev,
|
||||
const char *name,
|
||||
struct resource *res)
|
||||
{
|
||||
return ofnode_read_resource_byname(dev_ofnode(dev), name, res);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_DM_DEV_READ_INLINE */
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user