Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-30 00:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

mtd: nand: sunxi: Pass the device to the init function

Browse source 
This more closely matches the U-Boot driver to the Linux version.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Michael Trimarchi <micahel@amarulasolutions.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Samuel Holland 2023-01-22 16:06:36 -06:00 committed by Andre Przywara
parent 21b790fd49
commit 2a6805b5fa
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/mtd/nand/raw/sunxi_nand.c
View file

@ -1604,7 +1604,8 @@ 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(ofnode np, struct sunxi_nfc *nfc, int devnum) static int sunxi_nand_chip_init(struct udevice *dev, struct sunxi_nfc *nfc,
ofnode np, int devnum)
{ {
const struct nand_sdr_timings *timings; const struct nand_sdr_timings *timings;
struct sunxi_nand_chip *chip; struct sunxi_nand_chip *chip;
@ -1620,7 +1621,7 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
nsels /= sizeof(u32); nsels /= sizeof(u32);
if (!nsels || nsels > 8) { if (!nsels || nsels > 8) {
dev_err(nfc->dev, "invalid reg property size\n"); dev_err(dev, "invalid reg property size\n");
return -EINVAL; return -EINVAL;
} }
@ -1628,7 +1629,7 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
(nsels * sizeof(struct sunxi_nand_chip_sel)), (nsels * sizeof(struct sunxi_nand_chip_sel)),
GFP_KERNEL); GFP_KERNEL);
if (!chip) { if (!chip) {
dev_err(nfc->dev, "could not allocate chip\n"); dev_err(dev, "could not allocate chip\n");
return -ENOMEM; return -ENOMEM;
} }
@ -1638,19 +1639,19 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
for (i = 0; i < nsels; i++) { for (i = 0; i < nsels; i++) {
ret = ofnode_read_u32_index(np, "reg", i, &tmp); ret = ofnode_read_u32_index(np, "reg", i, &tmp);
if (ret) { if (ret) {
dev_err(nfc->dev, "could not retrieve reg property: %d\n", dev_err(dev, "could not retrieve reg property: %d\n",
ret); ret);
return ret; return ret;
} }
if (tmp > NFC_MAX_CS) { if (tmp > NFC_MAX_CS) {
dev_err(nfc->dev, dev_err(dev,
"invalid reg value: %u (max CS = 7)\n", tmp); "invalid reg value: %u (max CS = 7)\n", tmp);
return -EINVAL; return -EINVAL;
} }
if (test_and_set_bit(tmp, &nfc->assigned_cs)) { if (test_and_set_bit(tmp, &nfc->assigned_cs)) {
dev_err(nfc->dev, "CS %d already assigned\n", tmp); dev_err(dev, "CS %d already assigned\n", tmp);
return -EINVAL; return -EINVAL;
} }
@ -1661,9 +1662,9 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
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(np, "rb-gpios", i, ret = gpio_request_by_name(dev, "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)
chip->sels[i].rb.type = RB_GPIO; chip->sels[i].rb.type = RB_GPIO;
else else
@ -1674,7 +1675,7 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
timings = onfi_async_timing_mode_to_sdr_timings(0); timings = onfi_async_timing_mode_to_sdr_timings(0);
if (IS_ERR(timings)) { if (IS_ERR(timings)) {
ret = PTR_ERR(timings); ret = PTR_ERR(timings);
dev_err(nfc->dev, dev_err(dev,
"could not retrieve timings for ONFI mode 0: %d\n", "could not retrieve timings for ONFI mode 0: %d\n",
ret); ret);
return ret; return ret;
@ -1682,7 +1683,7 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
ret = sunxi_nand_chip_set_timings(nfc, chip, timings); ret = sunxi_nand_chip_set_timings(nfc, chip, timings);
if (ret) { if (ret) {
dev_err(nfc->dev, "could not configure chip timings: %d\n", ret); dev_err(dev, "could not configure chip timings: %d\n", ret);
return ret; return ret;
} }
@ -1717,25 +1718,25 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
ret = sunxi_nand_chip_init_timings(nfc, chip); ret = sunxi_nand_chip_init_timings(nfc, chip);
if (ret) { if (ret) {
dev_err(nfc->dev, "could not configure chip timings: %d\n", ret); dev_err(dev, "could not configure chip timings: %d\n", ret);
return ret; return ret;
} }
ret = sunxi_nand_ecc_init(mtd, &nand->ecc); ret = sunxi_nand_ecc_init(mtd, &nand->ecc);
if (ret) { if (ret) {
dev_err(nfc->dev, "ECC init failed: %d\n", ret); dev_err(dev, "ECC init failed: %d\n", ret);
return ret; return ret;
} }
ret = nand_scan_tail(mtd); ret = nand_scan_tail(mtd);
if (ret) { if (ret) {
dev_err(nfc->dev, "nand_scan_tail failed: %d\n", ret); dev_err(dev, "nand_scan_tail failed: %d\n", ret);
return ret; return ret;
} }
ret = nand_register(devnum, mtd); ret = nand_register(devnum, mtd);
if (ret) { if (ret) {
dev_err(nfc->dev, "failed to register mtd device: %d\n", ret); dev_err(dev, "failed to register mtd device: %d\n", ret);
return ret; return ret;
} }
@ -1744,13 +1745,13 @@ static int sunxi_nand_chip_init(ofnode np, struct sunxi_nfc *nfc, int devnum)
return 0; return 0;
} }
static int sunxi_nand_chips_init(ofnode node, struct sunxi_nfc *nfc) static int sunxi_nand_chips_init(struct udevice *dev, struct sunxi_nfc *nfc)
{ {
ofnode nand_np; ofnode nand_np;
int ret, i = 0; int ret, i = 0;
ofnode_for_each_subnode(nand_np, node) { dev_for_each_subnode(nand_np, dev) {
ret = sunxi_nand_chip_init(nand_np, nfc, i++); ret = sunxi_nand_chip_init(dev, nfc, nand_np, i++);
if (ret) if (ret)
return ret; return ret;
} }
@ -1802,7 +1803,7 @@ static int sunxi_nand_probe(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
ret = sunxi_nand_chips_init(dev_ofnode(dev), nfc); ret = sunxi_nand_chips_init(dev, nfc);
if (ret) { if (ret) {
dev_err(dev, "failed to init nand chips\n"); dev_err(dev, "failed to init nand chips\n");
return ret; return ret;