mirror of
				https://source.denx.de/u-boot/u-boot.git
				synced 2025-10-31 08:21:36 +01:00 
			
		
		
		
	Use the _ptr suffixed variant instead of casting. Also, convert it to
dev_read_addr_ptr(), which is safe to CONFIG_OF_LIVE.
One curious part is an error check like follows in
drivers/watchdog/omap_wdt.c:
    priv->regs = (struct wd_timer *)devfdt_get_addr(dev);
    if (!priv->regs)
            return -EINVAL;
devfdt_get_addr() returns FDT_ADDR_T_NONE (i.e. -1) on error.
So, this code does not catch any error in DT parsing.
dev_read_addr_ptr() returns NULL on error, so this error check
will work.
I generated this commit by the following command:
 $ find . -name .git -prune -o -name '*.[ch]' -type f -print | \
   xargs sed -i -e 's/([^*)]*\*)devfdt_get_addr(/dev_read_addr_ptr(/'
I manually fixed drivers/usb/host/ehci-mx6.c
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
		
	
			
		
			
				
	
	
		
			130 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			130 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0+
 | |
| /*
 | |
|  * Copyright (C) 2015 Atmel Corporation
 | |
|  *		      Wenyou.Yang <wenyou.yang@atmel.com>
 | |
|  */
 | |
| 
 | |
| #include <common.h>
 | |
| #include <clk.h>
 | |
| #include <dm.h>
 | |
| #include <malloc.h>
 | |
| #include <sdhci.h>
 | |
| #include <asm/arch/clk.h>
 | |
| 
 | |
| #define ATMEL_SDHC_MIN_FREQ	400000
 | |
| #define ATMEL_SDHC_GCK_RATE	240000000
 | |
| 
 | |
| #ifndef CONFIG_DM_MMC
 | |
| int atmel_sdhci_init(void *regbase, u32 id)
 | |
| {
 | |
| 	struct sdhci_host *host;
 | |
| 	u32 max_clk, min_clk = ATMEL_SDHC_MIN_FREQ;
 | |
| 
 | |
| 	host = (struct sdhci_host *)calloc(1, sizeof(struct sdhci_host));
 | |
| 	if (!host) {
 | |
| 		printf("%s: sdhci_host calloc failed\n", __func__);
 | |
| 		return -ENOMEM;
 | |
| 	}
 | |
| 
 | |
| 	host->name = "atmel_sdhci";
 | |
| 	host->ioaddr = regbase;
 | |
| 	host->quirks = SDHCI_QUIRK_WAIT_SEND_CMD;
 | |
| 	max_clk = at91_get_periph_generated_clk(id);
 | |
| 	if (!max_clk) {
 | |
| 		printf("%s: Failed to get the proper clock\n", __func__);
 | |
| 		free(host);
 | |
| 		return -ENODEV;
 | |
| 	}
 | |
| 	host->max_clk = max_clk;
 | |
| 
 | |
| 	add_sdhci(host, 0, min_clk);
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| #else
 | |
| 
 | |
| DECLARE_GLOBAL_DATA_PTR;
 | |
| 
 | |
| struct atmel_sdhci_plat {
 | |
| 	struct mmc_config cfg;
 | |
| 	struct mmc mmc;
 | |
| };
 | |
| 
 | |
| static int atmel_sdhci_probe(struct udevice *dev)
 | |
| {
 | |
| 	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
 | |
| 	struct atmel_sdhci_plat *plat = dev_get_platdata(dev);
 | |
| 	struct sdhci_host *host = dev_get_priv(dev);
 | |
| 	u32 max_clk;
 | |
| 	struct clk clk;
 | |
| 	int ret;
 | |
| 
 | |
| 	ret = clk_get_by_index(dev, 0, &clk);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	ret = clk_enable(&clk);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	host->name = dev->name;
 | |
| 	host->ioaddr = dev_read_addr_ptr(dev);
 | |
| 
 | |
| 	host->quirks = SDHCI_QUIRK_WAIT_SEND_CMD;
 | |
| 	host->bus_width	= fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
 | |
| 					 "bus-width", 4);
 | |
| 
 | |
| 	ret = clk_get_by_index(dev, 1, &clk);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	ret = clk_set_rate(&clk, ATMEL_SDHC_GCK_RATE);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	max_clk = clk_get_rate(&clk);
 | |
| 	if (!max_clk)
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	host->max_clk = max_clk;
 | |
| 	host->mmc = &plat->mmc;
 | |
| 	host->mmc->dev = dev;
 | |
| 
 | |
| 	ret = sdhci_setup_cfg(&plat->cfg, host, 0, ATMEL_SDHC_MIN_FREQ);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	host->mmc->priv = host;
 | |
| 	upriv->mmc = host->mmc;
 | |
| 
 | |
| 	clk_free(&clk);
 | |
| 
 | |
| 	return sdhci_probe(dev);
 | |
| }
 | |
| 
 | |
| static int atmel_sdhci_bind(struct udevice *dev)
 | |
| {
 | |
| 	struct atmel_sdhci_plat *plat = dev_get_platdata(dev);
 | |
| 
 | |
| 	return sdhci_bind(dev, &plat->mmc, &plat->cfg);
 | |
| }
 | |
| 
 | |
| static const struct udevice_id atmel_sdhci_ids[] = {
 | |
| 	{ .compatible = "atmel,sama5d2-sdhci" },
 | |
| 	{ .compatible = "microchip,sam9x60-sdhci" },
 | |
| 	{ }
 | |
| };
 | |
| 
 | |
| U_BOOT_DRIVER(atmel_sdhci_drv) = {
 | |
| 	.name		= "atmel_sdhci",
 | |
| 	.id		= UCLASS_MMC,
 | |
| 	.of_match	= atmel_sdhci_ids,
 | |
| 	.ops		= &sdhci_ops,
 | |
| 	.bind		= atmel_sdhci_bind,
 | |
| 	.probe		= atmel_sdhci_probe,
 | |
| 	.priv_auto_alloc_size = sizeof(struct sdhci_host),
 | |
| 	.platdata_auto_alloc_size = sizeof(struct atmel_sdhci_plat),
 | |
| };
 | |
| #endif
 |