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

Merge tag 'sunxi-drivers-for-6.4-1' of... 

Merge tag 'sunxi-drivers-for-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers

- remove MODULE_LICENSE from sram driver
- use of_property_present() in mbus driver

* tag 'sunxi-drivers-for-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  kbuild, soc: sunxi: sram: remove MODULE_LICENSE in non-modules
  soc: sunxi: Use of_property_present() for testing DT property presence

Link: https://lore.kernel.org/r/20230408125255.GA17134@jernej-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e4fa3c7f c014377b

drivers/soc/sunxi/sunxi_mbus.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int sunxi_mbus_notifier(struct notifier_block *nb, 
	 * Older DTs or SoCs who are not clearly understood need to set

	 * that DMA offset though.

	 */

	if (of_find_property(dev->of_node, "interconnects", NULL))

	if (of_property_present(dev->of_node, "interconnects"))

		return NOTIFY_DONE;



	ret = dma_direct_set_offset(dev, PHYS_OFFSET, 0, SZ_4G);

drivers/soc/sunxi/sunxi_sram.c

+0 −1
Original line number Diff line number Diff line
@@ -424,4 +424,3 @@ builtin_platform_driver_probe(sunxi_sram_driver, sunxi_sram_probe); 


MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");

MODULE_DESCRIPTION("Allwinner sunXi SRAM Controller Driver");
 
MODULE_LICENSE("GPL");