|
|
@@ -46,7 +46,7 @@ static const struct of_device_id denali_nand_dt_ids[] = {
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);
|
|
|
|
|
|
-static int denali_dt_probe(struct platform_device *ofdev)
|
|
|
+static int denali_dt_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct resource *denali_reg, *nand_data;
|
|
|
struct denali_dt *dt;
|
|
|
@@ -54,36 +54,38 @@ static int denali_dt_probe(struct platform_device *ofdev)
|
|
|
struct denali_nand_info *denali;
|
|
|
int ret;
|
|
|
|
|
|
- dt = devm_kzalloc(&ofdev->dev, sizeof(*dt), GFP_KERNEL);
|
|
|
+ dt = devm_kzalloc(&pdev->dev, sizeof(*dt), GFP_KERNEL);
|
|
|
if (!dt)
|
|
|
return -ENOMEM;
|
|
|
denali = &dt->denali;
|
|
|
|
|
|
- data = of_device_get_match_data(&ofdev->dev);
|
|
|
+ data = of_device_get_match_data(&pdev->dev);
|
|
|
if (data)
|
|
|
denali->caps = data->caps;
|
|
|
|
|
|
denali->platform = DT;
|
|
|
- denali->dev = &ofdev->dev;
|
|
|
- denali->irq = platform_get_irq(ofdev, 0);
|
|
|
+ denali->dev = &pdev->dev;
|
|
|
+ denali->irq = platform_get_irq(pdev, 0);
|
|
|
if (denali->irq < 0) {
|
|
|
- dev_err(&ofdev->dev, "no irq defined\n");
|
|
|
+ dev_err(&pdev->dev, "no irq defined\n");
|
|
|
return denali->irq;
|
|
|
}
|
|
|
|
|
|
- denali_reg = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "denali_reg");
|
|
|
- denali->flash_reg = devm_ioremap_resource(&ofdev->dev, denali_reg);
|
|
|
+ denali_reg = platform_get_resource_byname(pdev, IORESOURCE_MEM,
|
|
|
+ "denali_reg");
|
|
|
+ denali->flash_reg = devm_ioremap_resource(&pdev->dev, denali_reg);
|
|
|
if (IS_ERR(denali->flash_reg))
|
|
|
return PTR_ERR(denali->flash_reg);
|
|
|
|
|
|
- nand_data = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "nand_data");
|
|
|
- denali->flash_mem = devm_ioremap_resource(&ofdev->dev, nand_data);
|
|
|
+ nand_data = platform_get_resource_byname(pdev, IORESOURCE_MEM,
|
|
|
+ "nand_data");
|
|
|
+ denali->flash_mem = devm_ioremap_resource(&pdev->dev, nand_data);
|
|
|
if (IS_ERR(denali->flash_mem))
|
|
|
return PTR_ERR(denali->flash_mem);
|
|
|
|
|
|
- dt->clk = devm_clk_get(&ofdev->dev, NULL);
|
|
|
+ dt->clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
if (IS_ERR(dt->clk)) {
|
|
|
- dev_err(&ofdev->dev, "no clk available\n");
|
|
|
+ dev_err(&pdev->dev, "no clk available\n");
|
|
|
return PTR_ERR(dt->clk);
|
|
|
}
|
|
|
clk_prepare_enable(dt->clk);
|
|
|
@@ -92,7 +94,7 @@ static int denali_dt_probe(struct platform_device *ofdev)
|
|
|
if (ret)
|
|
|
goto out_disable_clk;
|
|
|
|
|
|
- platform_set_drvdata(ofdev, dt);
|
|
|
+ platform_set_drvdata(pdev, dt);
|
|
|
return 0;
|
|
|
|
|
|
out_disable_clk:
|
|
|
@@ -101,9 +103,9 @@ out_disable_clk:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int denali_dt_remove(struct platform_device *ofdev)
|
|
|
+static int denali_dt_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
- struct denali_dt *dt = platform_get_drvdata(ofdev);
|
|
|
+ struct denali_dt *dt = platform_get_drvdata(pdev);
|
|
|
|
|
|
denali_remove(&dt->denali);
|
|
|
clk_disable_unprepare(dt->clk);
|