mirror of
https://github.com/torvalds/linux.git
synced 2026-05-29 17:43:52 +02:00
Memory controller drivers for v5.18, part two
1. TI: Two fixes for TI EMIF driver for quite old error path issues (so
for unlikely scenarios).
2. Renesas: Document RZ/V2L SoC in bindings.
-----BEGIN PGP SIGNATURE-----
iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmIlwKkQHGtyemtAa2Vy
bmVsLm9yZwAKCRDBN2bmhouD1xakD/sEI2EmFjcWr3eJmfud3+ZmJdyIV1aiQUN/
3ClkRg/M5205zMxUj7mBoeG9nyuVWp5FuUgkY28ThvgsSbSgBwvDYZJMe//YLnNW
ObDgStiu157KgfRpkZNMd5DqI0KHD++b0lrdjc3H1KWNm0bouDwKScBwEYgllLu+
gj9g5galOMhLszR2PI4FV6r/AQ4E0YIMnGSiZ87MctzNQlQVDgXrPn0G/+wqZCk4
kobFjjm9mwnqTG3LoBvUF+cjpxqWUoBLJ3+/R91iSA7OtvLsxYWoOznWXr26jNRW
L3cbvAHWNriaxRP9z+nDhRsg7YFQXf69q1NFhUkicFEmN+TXf35toMkDa6eF30YT
8HCSKAqY4nb8CCTYmdgecxmXG5PTyp+B1dL0UDTHU2EcnNcKysmCiEMYUQW4LK46
YBxg5vM6XWKbqau1jszFp4ODOj+OSSBqPIvKKPrvsYBhqnSNddiyuBC32DGV6J1o
ZUHZ85hgVfceAwtJtSqYYvO+wEgyWAZlLGr31xj8W4TUkfewIBthWfRX+OS9Q+yq
qSNO1hXTwlbQ7+Bphoq/VrNhBDLW7AMyy7RWYhPR5p7lmUj/OQcoGWPeWDLAn2r5
F6kzsXxkr3dASTx4D2Pe6kXIDyuhAWv+Mr7heg0bl2XtvegjROTu9D/0rYufOp81
aavcdNwfPA==
=f06i
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmInezoACgkQmmx57+YA
GNltdRAAsGOjZI9OIL5U9+qd1kbMOyG1IRqrwPW8B+rNJW35O5Z/yswo3B5w4AIx
Km4VrVNrGmNOCCrSB9kxyKjYcIMQZQWhhR8TjULU+lSCJEOke9XJXjzGJB0Jmbba
vf2OILxnfMA8GFPQqnXaXe7H4o5/Km++jxn7qHUj9i71sCQRhSWHuAnTluOVgdBA
/oYRg4UNfvJv2jconZ7bDwI6digxediMjT74xI3kkYyCBEbNP16hTCZYJmO1iMQp
d/vsiQG6FkfdZBqTgYFsLojPiwal68z709FqaqZPGOMuP4SoykgmQB9tU/elQqMd
ZAgGKosLylBRbzKYGay1SD9SPS1VjgncHavqhH7ofNwwJ4vikITCDvL1C4TehCjA
rQpm1kWONLo+NaKOHrtvdjHQvpXRMC+qG6U4XXKrMn/vi924kZrz30EKDH+5HHN5
iBgELvokfnrdwGLkVG1TB+qgFwFtKGUBJ0sqXxVP2byQYqNELzHfG8Q45vOCWWvW
82vUj7wpwSTKWlHBDsy0GQXRRuYuOtwXS5WEW/8doAwLI9hp1CrU/V8I2oLf0xGm
/sgvp+rw57TgtOrcXJS2Sjf7bbbIv5WF8L7Xuq9qJYk6Uyh/ZuF/NHpd0KRoeykP
9w25UgrxiSFyZNhhDz+c4UWir3xlaPDBLtSzlZ3itAaQ8IfX1xs=
=Fe+j
-----END PGP SIGNATURE-----
Merge tag 'memory-controller-drv-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.18, part two
1. TI: Two fixes for TI EMIF driver for quite old error path issues (so
for unlikely scenarios).
2. Renesas: Document RZ/V2L SoC in bindings.
* tag 'memory-controller-drv-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
dt-bindings: memory: renesas,rpc-if: Document RZ/V2L SoC
memory: emif: check the pointer temp in get_device_details()
memory: emif: Add check for setup_interrupts
Link: https://lore.kernel.org/r/20220307082552.55719-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
608f7cf3f5
|
|
@ -40,7 +40,8 @@ properties:
|
|||
- items:
|
||||
- enum:
|
||||
- renesas,r9a07g044-rpc-if # RZ/G2{L,LC}
|
||||
- const: renesas,rzg2l-rpc-if # RZ/G2L family
|
||||
- renesas,r9a07g054-rpc-if # RZ/V2L
|
||||
- const: renesas,rzg2l-rpc-if
|
||||
|
||||
reg:
|
||||
items:
|
||||
|
|
|
|||
|
|
@ -1025,7 +1025,7 @@ static struct emif_data *__init_or_module get_device_details(
|
|||
temp = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);
|
||||
dev_info = devm_kzalloc(dev, sizeof(*dev_info), GFP_KERNEL);
|
||||
|
||||
if (!emif || !pd || !dev_info) {
|
||||
if (!emif || !temp || !dev_info) {
|
||||
dev_err(dev, "%s:%d: allocation error\n", __func__, __LINE__);
|
||||
goto error;
|
||||
}
|
||||
|
|
@ -1117,7 +1117,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev)
|
|||
{
|
||||
struct emif_data *emif;
|
||||
struct resource *res;
|
||||
int irq;
|
||||
int irq, ret;
|
||||
|
||||
if (pdev->dev.of_node)
|
||||
emif = of_get_memory_device_details(pdev->dev.of_node, &pdev->dev);
|
||||
|
|
@ -1147,7 +1147,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev)
|
|||
emif_onetime_settings(emif);
|
||||
emif_debugfs_init(emif);
|
||||
disable_and_clear_all_interrupts(emif);
|
||||
setup_interrupts(emif, irq);
|
||||
ret = setup_interrupts(emif, irq);
|
||||
if (ret)
|
||||
goto error;
|
||||
|
||||
/* One-time actions taken on probing the first device */
|
||||
if (!emif1) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user