eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-nand-20221009' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash

Browse Source 
- mtd: Update the function name to 'rfree'
- Support NAND ONFI EDO mode for imx8mn architecture
- dm: clk: add missing stub when CONFIG_CLK is deactivated
This commit is contained in:
Tom Rini
2022-10-10 08:17:08 -04:00
parent 11ef7f07ce 7676811867
commit 73e741b8ee
10 changed files with 343 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/clk.h
View File

@@ -88,8 +88,9 @@ struct clk_bulk {
unsigned int count;
};
#if CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(CLK)
struct phandle_1_arg;
#if CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(CLK)
/**
* clk_get_by_phandle() - Get a clock by its phandle information (of-platadata)
* @dev: Device containing the phandle
@@ -258,12 +259,26 @@ int clk_release_all(struct clk *clk, int count);
void devm_clk_put(struct udevice *dev, struct clk *clk);
#else
static inline int clk_get_by_phandle(struct udevice *dev, const
struct phandle_1_arg *cells,
struct clk *clk)
{
return -ENOSYS;
}
static inline int clk_get_by_index(struct udevice *dev, int index,
struct clk *clk)
{
return -ENOSYS;
}
static inline int clk_get_by_index_nodev(ofnode node, int index,
struct clk *clk)
{
return -ENOSYS;
}
static inline int clk_get_bulk(struct udevice *dev, struct clk_bulk *bulk)
{
return -ENOSYS;
@@ -275,6 +290,17 @@ static inline int clk_get_by_name(struct udevice *dev, const char *name,
return -ENOSYS;
}
static inline struct clk *devm_clk_get(struct udevice *dev, const char *id)
{
return ERR_PTR(-ENOSYS);
}
static inline struct clk *devm_clk_get_optional(struct udevice *dev,
const char *id)
{
return ERR_PTR(-ENOSYS);
}
static inline int
clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk)
{
@@ -285,6 +311,10 @@ static inline int clk_release_all(struct clk *clk, int count)
{
return -ENOSYS;
}
static inline void devm_clk_put(struct udevice *dev, struct clk *clk)
{
}
#endif
/**

2
include/linux/mtd/mtd.h
View File

@@ -122,7 +122,7 @@ struct mtd_oob_region {
* @ecc: function returning an ECC region in the OOB area.
* Should return -ERANGE if %section exceeds the total number of
* ECC sections.
* @free: function returning a free region in the OOB area.
* @rfree: function returning a free region in the OOB area.
* Should return -ERANGE if %section exceeds the total number of
* free sections.
*/

3
include/mxs_nand.h
View File

@@ -12,6 +12,7 @@
#include <asm/cache.h>
#include <nand.h>
#include <asm/mach-imx/dma.h>
#include <clk.h>
/**
* @gf_len: The length of Galois Field. (e.g., 13 or 14)
@@ -43,6 +44,7 @@ struct mxs_nand_info {
struct nand_chip chip;
struct udevice *dev;
unsigned int max_ecc_strength_supported;
int max_chain_delay;
bool use_minimum_ecc;
int cur_chip;
@@ -59,6 +61,7 @@ struct mxs_nand_info {
struct mxs_gpmi_regs *gpmi_regs;
struct mxs_bch_regs *bch_regs;
struct clk *gpmi_clk;
/* Functions with altered behaviour */
int (*hooked_read_oob)(struct mtd_info *mtd,