random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

mtd: nand: sunxi: Convert from fdtdec to ofnode

Browse Source 
As a first step toward converting this driver to the driver model, use
the ofnode abstraction to replace direct references to the FDT blob.

Using ofnode_read_u32_index removes an extra pair of loops and makes the
allwinner,rb property optional, matching the devicetree binding.

Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2022-05-15 21:54:25 -05:00
parent 6002fc4afb
commit 4b61133e79
3 changed files with 26 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/mtd/nand/raw/sunxi_nand.c
View File

@ -25,11 +25,10 @@
*/ */
#include <common.h> #include <common.h>
#include <fdtdec.h> #include <dm.h>
#include <malloc.h> #include <malloc.h>
#include <memalign.h> #include <memalign.h>
#include <nand.h> #include <nand.h>
#include <asm/global_data.h>
#include <dm/device_compat.h> #include <dm/device_compat.h>
#include <dm/devres.h> #include <dm/devres.h>
#include <linux/bitops.h> #include <linux/bitops.h>
@ -45,8 +44,6 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
DECLARE_GLOBAL_DATA_PTR;
#define NFC_REG_CTL 0x0000 #define NFC_REG_CTL 0x0000
#define NFC_REG_ST 0x0004 #define NFC_REG_ST 0x0004
#define NFC_REG_INT 0x0008 #define NFC_REG_INT 0x0008
@ -1605,19 +1602,18 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc)
return 0; return 0;
} }
static int sunxi_nand_chip_init(int node, struct sunxi_nfc *nfc, int devnum) static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
{ {
const struct nand_sdr_timings *timings; const struct nand_sdr_timings *timings;
const void *blob = gd->fdt_blob;
struct sunxi_nand_chip *chip; struct sunxi_nand_chip *chip;
struct mtd_info *mtd; struct mtd_info *mtd;
struct nand_chip *nand; struct nand_chip *nand;
int nsels; int nsels;
int ret; int ret;
int i; int i;
u32 cs[8], rb[8]; u32 tmp;
if (!fdt_getprop(blob, node, "reg", &nsels)) if (!ofnode_get_property(np, "reg", &nsels))
return -EINVAL; return -EINVAL;
nsels /= sizeof(u32); nsels /= sizeof(u32);
@ -1638,26 +1634,13 @@ static int sunxi_nand_chip_init(int node, struct sunxi_nfc *nfc, int devnum)
chip->selected = -1; chip->selected = -1;
for (i = 0; i < nsels; i++) { for (i = 0; i < nsels; i++) {
cs[i] = -1; ret = ofnode_read_u32_index(np, "reg", i, &tmp);
rb[i] = -1;
}
ret = fdtdec_get_int_array(gd->fdt_blob, node, "reg", cs, nsels);
if (ret) { if (ret) {
dev_err(nfc->dev, "could not retrieve reg property: %d\n", ret); dev_err(nfc->dev, "could not retrieve reg property: %d\n",
ret);
return ret; return ret;
} }
ret = fdtdec_get_int_array(gd->fdt_blob, node, "allwinner,rb", rb,
nsels);
if (ret) {
dev_err(nfc->dev, "could not retrieve reg property: %d\n", ret);
return ret;
}
for (i = 0; i < nsels; i++) {
int tmp = cs[i];
if (tmp > NFC_MAX_CS) { if (tmp > NFC_MAX_CS) {
dev_err(nfc->dev, dev_err(nfc->dev,
"invalid reg value: %u (max CS = 7)\n", tmp); "invalid reg value: %u (max CS = 7)\n", tmp);
@ -1671,13 +1654,12 @@ static int sunxi_nand_chip_init(int node, struct sunxi_nfc *nfc, int devnum)
chip->sels[i].cs = tmp; chip->sels[i].cs = tmp;
tmp = rb[i]; if (!ofnode_read_u32_index(np, "allwinner,rb", i, &tmp) &&
if (tmp >= 0 && tmp < 2) { tmp < 2) {
chip->sels[i].rb.type = RB_NATIVE; chip->sels[i].rb.type = RB_NATIVE;
chip->sels[i].rb.info.nativeid = tmp; chip->sels[i].rb.info.nativeid = tmp;
} else { } else {
ret = gpio_request_by_name_nodev(offset_to_ofnode(node), ret = gpio_request_by_name_nodev(np, "rb-gpios", i,
"rb-gpios", i,
&chip->sels[i].rb.info.gpio, &chip->sels[i].rb.info.gpio,
GPIOD_IS_IN); GPIOD_IS_IN);
if (ret) if (ret)
@ -1711,7 +1693,7 @@ static int sunxi_nand_chip_init(int node, struct sunxi_nfc *nfc, int devnum)
* in the DT. * in the DT.
*/ */
nand->ecc.mode = NAND_ECC_HW; nand->ecc.mode = NAND_ECC_HW;
nand->flash_node = offset_to_ofnode(node); nand->flash_node = np;
nand->select_chip = sunxi_nfc_select_chip; nand->select_chip = sunxi_nfc_select_chip;
nand->cmd_ctrl = sunxi_nfc_cmd_ctrl; nand->cmd_ctrl = sunxi_nfc_cmd_ctrl;
nand->read_buf = sunxi_nfc_read_buf; nand->read_buf = sunxi_nfc_read_buf;
@ -1760,15 +1742,13 @@ static int sunxi_nand_chip_init(int node, struct sunxi_nfc *nfc, int devnum)
return 0; return 0;
} }
static int sunxi_nand_chips_init(int node, struct sunxi_nfc *nfc) static int sunxi_nand_chips_init(ofnode node, struct sunxi_nfc *nfc)
{ {
const void *blob = gd->fdt_blob; ofnode nand_np;
int nand_node;
int ret, i = 0; int ret, i = 0;
for (nand_node = fdt_first_subnode(blob, node); nand_node >= 0; ofnode_for_each_subnode(nand_np, node) {
nand_node = fdt_next_subnode(blob, nand_node)) { ret = sunxi_nand_chip_init(nand_np, nfc, i++);
ret = sunxi_nand_chip_init(nand_node, nfc, i++);
if (ret) if (ret)
return ret; return ret;
} }
@ -1794,10 +1774,9 @@ static void sunxi_nand_chips_cleanup(struct sunxi_nfc *nfc)
void sunxi_nand_init(void) void sunxi_nand_init(void)
{ {
const void *blob = gd->fdt_blob;
struct sunxi_nfc *nfc; struct sunxi_nfc *nfc;
fdt_addr_t regs; phys_addr_t regs;
int node; ofnode node;
int ret; int ret;
nfc = kzalloc(sizeof(*nfc), GFP_KERNEL); nfc = kzalloc(sizeof(*nfc), GFP_KERNEL);
@ -1808,18 +1787,18 @@ void sunxi_nand_init(void)
init_waitqueue_head(&nfc->controller.wq); init_waitqueue_head(&nfc->controller.wq);
INIT_LIST_HEAD(&nfc->chips); INIT_LIST_HEAD(&nfc->chips);
node = fdtdec_next_compatible(blob, 0, COMPAT_SUNXI_NAND); node = ofnode_by_compatible(ofnode_null(), "allwinner,sun4i-a10-nand");
if (node < 0) { if (!ofnode_valid(node)) {
pr_err("unable to find nfc node in device tree\n"); pr_err("unable to find nfc node in device tree\n");
goto err; goto err;
} }
if (!fdtdec_get_is_enabled(blob, node)) { if (!ofnode_is_enabled(node)) {
pr_err("nfc disabled in device tree\n"); pr_err("nfc disabled in device tree\n");
goto err; goto err;
} }
regs = fdtdec_get_addr(blob, node, "reg"); regs = ofnode_get_addr(node);
if (regs == FDT_ADDR_T_NONE) { if (regs == FDT_ADDR_T_NONE) {
pr_err("unable to find nfc address in device tree\n"); pr_err("unable to find nfc address in device tree\n");
goto err; goto err;

1
include/fdtdec.h
View File

@ -187,7 +187,6 @@ enum fdt_compat_id {
COMPAT_INTEL_BAYTRAIL_FSP, /* Intel Bay Trail FSP */ COMPAT_INTEL_BAYTRAIL_FSP, /* Intel Bay Trail FSP */
COMPAT_INTEL_BAYTRAIL_FSP_MDP, /* Intel FSP memory-down params */ COMPAT_INTEL_BAYTRAIL_FSP_MDP, /* Intel FSP memory-down params */
COMPAT_INTEL_IVYBRIDGE_FSP, /* Intel Ivy Bridge FSP */ COMPAT_INTEL_IVYBRIDGE_FSP, /* Intel Ivy Bridge FSP */
COMPAT_SUNXI_NAND, /* SUNXI NAND controller */
COMPAT_ALTERA_SOCFPGA_CLK, /* SoCFPGA Clock initialization */ COMPAT_ALTERA_SOCFPGA_CLK, /* SoCFPGA Clock initialization */
COMPAT_ALTERA_SOCFPGA_PINCTRL_SINGLE, /* SoCFPGA pinctrl-single */ COMPAT_ALTERA_SOCFPGA_PINCTRL_SINGLE, /* SoCFPGA pinctrl-single */
COMPAT_ALTERA_SOCFPGA_H2F_BRG, /* SoCFPGA hps2fpga bridge */ COMPAT_ALTERA_SOCFPGA_H2F_BRG, /* SoCFPGA hps2fpga bridge */

1
lib/fdtdec.c
View File

@ -64,7 +64,6 @@ static const char * const compat_names[COMPAT_COUNT] = {
COMPAT(INTEL_BAYTRAIL_FSP, "intel,baytrail-fsp"), COMPAT(INTEL_BAYTRAIL_FSP, "intel,baytrail-fsp"),
COMPAT(INTEL_BAYTRAIL_FSP_MDP, "intel,baytrail-fsp-mdp"), COMPAT(INTEL_BAYTRAIL_FSP_MDP, "intel,baytrail-fsp-mdp"),
COMPAT(INTEL_IVYBRIDGE_FSP, "intel,ivybridge-fsp"), COMPAT(INTEL_IVYBRIDGE_FSP, "intel,ivybridge-fsp"),
COMPAT(COMPAT_SUNXI_NAND, "allwinner,sun4i-a10-nand"),
COMPAT(ALTERA_SOCFPGA_CLK, "altr,clk-mgr"), COMPAT(ALTERA_SOCFPGA_CLK, "altr,clk-mgr"),
COMPAT(ALTERA_SOCFPGA_PINCTRL_SINGLE, "pinctrl-single"), COMPAT(ALTERA_SOCFPGA_PINCTRL_SINGLE, "pinctrl-single"),
COMPAT(ALTERA_SOCFPGA_H2F_BRG, "altr,socfpga-hps2fpga-bridge"), COMPAT(ALTERA_SOCFPGA_H2F_BRG, "altr,socfpga-hps2fpga-bridge"),