openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl1kCcERHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXPOfhAA3yv95lG1eyrhJ+E/kOWrinDARIDJvh+2
 Ha1A3HkyJ+qzNg1GdeQ5exU3/ZsJRvKdU5MSmldnrvg9jWYFcBMeF8vtR7ZMEdzJ
 GDW4o211WEmca/ni9ChNmfVWPF5WSoeMQLa3Ytg40lc1v7CuHYSrmrB2Rqjtpnon
 uokTt3hjJHCX/Q5wvf8sWdhAynPbxq7zcCMNbyGxzaoKolWas6bpLmcNwHp4zDi0
 JE+bd7sc9ZvBt8mnsJ9XUMVdQQ75jD3LeJyYzixMxNxpfUsnc3WZDZgaxFpW1hCK
 eBTRNQLiwZ9MsbgWCUdY7Brd+GIW15HPX+r5s2GhtXXqex+abfSRRqH6P7uneAmn
 9CfxzYshITfl7R7nSd1HzGKg4DjNmsktFFFyKWd/H8xvjI5lnt9M1VSyRVJiY+1z
 bw4IV+ag+n3NfOzhpi3ddB9uFhSZtpJ1SH7Ynj7NS3YSfWamJs93Z0RXVAZXYNM0
 Vwj+g/YfgtY7qnSGcbfoBPLh7gmGRpsVOxOOmuMlkwcVjN1Pvb3wqT+JGUiCxm6d
 rdcazAxjc2rvnJuJc1stzrSBMT5AZdxAw+DOTTLRfEcBnf6C5mhGFRyOCxhxL2QB
 Q2MWI1aHWqjmu1QTnBLDoUNyaKyxrZm00cq2b4U8lh7xO4v3ACks2jXuD5zQjzjo
 nTReIX6lPeQ=
 =DRR4
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-03 14:24:58 +02:00
parent 7bbf869310 50f57ef83d
commit a3a2902fb8
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap2/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
pm-asm-offsets.h

5
arch/arm/mach-omap2/Makefile
View File

@ -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

4
arch/arm/mach-omap2/hsmmc.c
View File

@ -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;

2
arch/arm/mach-omap2/sleep33xx.S
View File

@ -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

2
arch/arm/mach-omap2/sleep43xx.S
View File

@ -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"