Unverified Commit edc24de7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sram-for-soc' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents db967cf8 21e5a2d1

Documentation/devicetree/bindings/sram/sram.yaml

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ patternProperties: 
            - samsung,exynos4210-sysram

            - samsung,exynos4210-sysram-ns

            - socionext,milbeaut-smp-sram

            - stericsson,u8500-esram



      reg:

        description:

drivers/misc/sram.c

+5 −4
Original line number Diff line number Diff line
@@ -235,8 +235,9 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res) 
				goto err_chunks;

			}

			if (!label)

				label = child->name;



				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) {