Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3a2902f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.4/soc-signed' of... 

Merge tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

SoC changes for omap variants for v5.4

The first change moves platform-specific asm-offsets.h to arch/arm/mach-omap2
to fix iessu with parallel build with CONFIG_IKHEADERS, and the second change
removes a useless kfree.

Note that the first change causes a trivial merge conflict with the iommu
changes for arch/arm/mach-omap2/Makefile.

* tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init()
  ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2

Link: https://lore.kernel.org/r/pull-1567016893-318461@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7bbf8693 50f57ef8

arch/arm/mach-omap2/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
pm-asm-offsets.h

arch/arm/mach-omap2/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -223,9 +223,10 @@ obj-y += omap_phy_internal.o 


obj-$(CONFIG_MACH_OMAP2_TUSB6010)	+= usb-tusb6010.o



include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE

$(obj)/pm-asm-offsets.h: $(obj)/pm-asm-offsets.s FORCE

	$(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__)



$(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h

$(obj)/sleep33xx.o $(obj)/sleep43xx.o: $(obj)/pm-asm-offsets.h



targets += pm-asm-offsets.s

clean-files += pm-asm-offsets.h

arch/arm/mach-omap2/hsmmc.c

+1 −3
Original line number Diff line number Diff line
@@ -32,10 +32,8 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, 
	char *hc_name;



	hc_name = kzalloc(HSMMC_NAME_LEN + 1, GFP_KERNEL);

	if (!hc_name) {

		kfree(hc_name);

	if (!hc_name)

		return -ENOMEM;

	}



	snprintf(hc_name, (HSMMC_NAME_LEN + 1), "mmc%islot%i", c->mmc, 1);

	mmc->name = hc_name;

arch/arm/mach-omap2/sleep33xx.S

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 *	Dave Gerlach, Vaibhav Bedia

 */



#include <generated/ti-pm-asm-offsets.h>

#include <linux/linkage.h>

#include <linux/platform_data/pm33xx.h>

#include <linux/ti-emif-sram.h>
@@ -15,6 +14,7 @@ 


#include "iomap.h"

#include "cm33xx.h"

#include "pm-asm-offsets.h"



#define AM33XX_CM_CLKCTRL_MODULESTATE_DISABLED			0x00030000

#define AM33XX_CM_CLKCTRL_MODULEMODE_DISABLE			0x0003

arch/arm/mach-omap2/sleep43xx.S

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 *	Dave Gerlach, Vaibhav Bedia

 */



#include <generated/ti-pm-asm-offsets.h>

#include <linux/linkage.h>

#include <linux/ti-emif-sram.h>

#include <linux/platform_data/pm33xx.h>
@@ -19,6 +18,7 @@ 
#include "iomap.h"

#include "omap-secure.h"

#include "omap44xx.h"

#include "pm-asm-offsets.h"

#include "prm33xx.h"

#include "prcm43xx.h"