github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This fixes a small bug in the SRAM misc driver and adds

Browse Source 
a compatible for SRAMs to the SRAM bindings.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmRkf2QACgkQQRCzN7AZ
 XXP3qQ//XEqe90pCtT+89Psb2zzLcVV5Q+nrsNc00PEN4zN90+/m7PcruiP/iBbK
 C9gD9EYEybeynpcCWs8uUSS+XyyhAFtRFqJbSDqRdRh5LCkeuIavx/0vAYlmPqTu
 jW0xEynuY4cGgajG3rngqNtL24YV5/DUdt6ouMJVAqW6lF+6IBT8Foe5Um+E6y5Q
 6n18F5SVmNug6JzJ0iST7x6nf2VCgy/NfVkaWBw2X7J5OkmBZpzXE4ocbUQZkF9a
 BwquncOD7C6j64HtVfIZu3q6vPn5MKipZ0RpyIg7AD4S/SfTPIHughKCD4ZCzcF0
 LR8SuzxPrHQ0aDXN9twiNBDeFCwwc0s26irtZfK1OImfysQE+sBnPpTA3VdyEVpi
 tUb4okIwpFoqeTj8H01fHlzesk6Q00ooYonJ6/fz1Si81MqlOXTwtaK68vTvLXPK
 natkUF8APxeGEPD9mGnIKMYI5639oXBxwyX50hrBhtfRioQVGgJIDL2tjVnr6GQg
 oeOLD8qm2lK/m41JmaWfH89pa0tXHbiFSR8jUR7i6EBjt1jf9+a+U6F+gs3Gr6pS
 aKHJYFw61g7F9KYFp7d8fQjcp7R+2OXLdXBryHyz9q0geQydiD6Wr8IoP6NSjSzk
 SWhnIfuxFoJUeFqKp2WCZSRTCiE47lVbVlSXIzTH2oCXYiF5Wyw=
 =mQt9
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmRwxH0ACgkQYKtH/8kJ
 Uid5qg//VCHWOQFcD6Gk+i5k3A1wQdgxoBaTgGcj+0IylOfwKKO6XQQGKvpfNTNr
 5oExd4GvzbQO/2r0GQn+zyUxCw5so3f32t6RCaX3r+sqz4+Ku4EPD4L4cyD2yv66
 C4mRQV8pHo/JxKGBeWvEYw5huO4NZBRUgGt1J7Y48vDx4QeOAN05d1aJDpFMAJr7
 EBbYAuvaKBHLvBdL11SA+g6Yjb/fzr7miGLAhQQayWOEYDzXGAQ5waBq/1/YxUQC
 fDjVxs/OqHjVHv5ZeEm6mNxDwsGK5UO4OGxVYCq3jh0gt12DaM0nidt50f7xLym4
 d4tNRWS0AiTW4b8CdCl+enTuiENWs4bukqK1DIkLCXGWC4H6KfLvdsPzfaV/ma3d
 kx358AoaWXfxU0ttt1lhE0TBmkS9tBmpSCjYCEnGbWTj99dqzbab52v1AKukWqiC
 0IMtK74gtwuInNtqoIfqX0lNHt9LEw0S95/dQ4h0HeVCzllhLd5pMiRsORy4cNm4
 CKpS2OU8oUYBrp/JeP14DQDx5Hc4EqkpZUn3z94fpcsAfQwEAsSTXKX+HH1ztaek
 M46aSZq5+oiWeKgo59evi18sOuyaQGb/fYvUKrvWvmn/sy5qZUP56RrtKgnQ3TKc
 0EPKGZympuTFEyi5H0Z7Ah2OcIMkKM9FWCsTP66SUS8CTkyp8ig=
 =nZru
 -----END PGP SIGNATURE-----

Merge tag 'sram-for-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into soc/drivers

This fixes a small bug in the SRAM misc driver and adds
a compatible for SRAMs to the SRAM bindings.

* tag 'sram-for-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  misc: sram: Generate unique names for subpools
  dt-bindings: sram: Add compatible for ST-Ericsson U8500 eSRAM

Link: https://lore.kernel.org/r/CACRpkdbEQ7nTnJTj5WMtxvH057fDSbX5tNs5j4Y=5KSBMpa-Sw@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-05-26 16:38:52 +02:00
commit edc24de716
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/sram/sram.yaml
View File

@ -94,6 +94,7 @@ patternProperties:
- samsung,exynos4210-sysram
- samsung,exynos4210-sysram-ns
- socionext,milbeaut-smp-sram
- stericsson,u8500-esram
reg:
description:

9
drivers/misc/sram.c
View File

@ -235,10 +235,11 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
goto err_chunks;
}
if (!label)
label = child->name;
block->label = devm_kstrdup(sram->dev,
label, GFP_KERNEL);
block->label = devm_kasprintf(sram->dev, GFP_KERNEL,
"%s", dev_name(sram->dev));
else
block->label = devm_kstrdup(sram->dev,
label, GFP_KERNEL);
if (!block->label) {
ret = -ENOMEM;
goto err_chunks;