Commit 1216037a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'memory-controller-drv-5.14' of... 

Merge tag 'memory-controller-drv-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers

Memory controller drivers for v5.14

Several small fixes and cleanups for stm32, atmel, pl353, renesas-rpc,
TI emif and fsl_ifc.

* tag 'memory-controller-drv-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: emif: remove unused frequency and voltage notifiers
  memory: fsl_ifc: fix leak of private memory on probe failure
  memory: fsl_ifc: fix leak of IO mapping on probe failure
  MAINTAINERS: memory: cover also header file
  memory: renesas-rpc-if: correct whitespace
  memory: pl353: Fix error return code in pl353_smc_probe()
  memory: atmel-ebi: add missing of_node_put for loop iteration
  memory: stm32-fmc2-ebi: add missing of_node_put for loop iteration

Link: https://lore.kernel.org/r/20210611140659.61980-1-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 97a56667 729a611e

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11796,6 +11796,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git 
F:	Documentation/devicetree/bindings/memory-controllers/

F:	drivers/memory/

F:	include/dt-bindings/memory/

F:	include/memory/









MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA









M:	Dmitry Osipenko <digetx@gmail.com>
































drivers/memory/atmel-ebi.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -600,10 +600,12 @@ static int atmel_ebi_probe(struct platform_device *pdev)







				child);



















			ret = atmel_ebi_dev_disable(ebi, child);









			if (ret)









			if (ret) {









				of_node_put(child);









				return ret;









			}









		}









	}



















	return of_platform_populate(np, NULL, NULL, dev);









}
































drivers/memory/emif.c



+0
−678




























File changed.
Preview size limit exceeded, changes collapsed.
























drivers/memory/fsl_ifc.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -97,7 +97,6 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev)







	iounmap(ctrl->gregs);



















	dev_set_drvdata(&dev->dev, NULL);









	kfree(ctrl);



















	return 0;









}








@@ -209,7 +208,8 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)

















	dev_info(&dev->dev, "Freescale Integrated Flash Controller\n");



















	fsl_ifc_ctrl_dev = kzalloc(sizeof(*fsl_ifc_ctrl_dev), GFP_KERNEL);









	fsl_ifc_ctrl_dev = devm_kzalloc(&dev->dev, sizeof(*fsl_ifc_ctrl_dev),









					GFP_KERNEL);









	if (!fsl_ifc_ctrl_dev)









		return -ENOMEM;


















@@ -219,8 +219,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)







	fsl_ifc_ctrl_dev->gregs = of_iomap(dev->dev.of_node, 0);









	if (!fsl_ifc_ctrl_dev->gregs) {









		dev_err(&dev->dev, "failed to get memory region\n");









		ret = -ENODEV;









		goto err;









		return -ENODEV;









	}



















	if (of_property_read_bool(dev->dev.of_node, "little-endian")) {








@@ -295,6 +294,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)







	free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev);









	irq_dispose_mapping(fsl_ifc_ctrl_dev->irq);









err:









	iounmap(fsl_ifc_ctrl_dev->gregs);









	return ret;









}










































drivers/memory/pl353-smc.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -407,6 +407,7 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id)







		break;









	}









	if (!match) {









		err = -ENODEV;









		dev_err(&adev->dev, "no matching children\n");









		goto out_clk_disable;









	}