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

Commit 21f2db5c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.17/fixes-signed' of... 

Merge tag 'omap-for-v4.17/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Pull "Two fixes for v4.17-rc cycle" from Tony Lindgren:

Fix a build regression with split object directories reported by Russell
and fix range sizes for omap4 cm2 and prm modules.

* tag 'omap-for-v4.17/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix build when using split object directories
  ARM: dts: Fix cm2 and prm sizes for omap4
parents 4b313ca7 fb289e3a

arch/arm/boot/dts/omap4.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -163,10 +163,10 @@ 


			cm2: cm2@8000 {

				compatible = "ti,omap4-cm2", "simple-bus";

				reg = <0x8000 0x3000>;

				reg = <0x8000 0x2000>;

				#address-cells = <1>;

				#size-cells = <1>;

				ranges = <0 0x8000 0x3000>;

				ranges = <0 0x8000 0x2000>;



				cm2_clocks: clocks {

					#address-cells = <1>;
@@ -250,11 +250,11 @@ 


				prm: prm@6000 {

					compatible = "ti,omap4-prm";

					reg = <0x6000 0x3000>;

					reg = <0x6000 0x2000>;

					interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

					#address-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0x6000 0x3000>;

					ranges = <0 0x6000 0x2000>;



					prm_clocks: clocks {

						#address-cells = <1>;

arch/arm/mach-omap2/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -243,8 +243,4 @@ arch/arm/mach-omap2/pm-asm-offsets.s: arch/arm/mach-omap2/pm-asm-offsets.c 
include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE

	$(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__)



# For rule to generate ti-emif-asm-offsets.h dependency

include drivers/memory/Makefile.asm-offsets



arch/arm/mach-omap2/sleep33xx.o: include/generated/ti-pm-asm-offsets.h include/generated/ti-emif-asm-offsets.h

arch/arm/mach-omap2/sleep43xx.o: include/generated/ti-pm-asm-offsets.h include/generated/ti-emif-asm-offsets.h
 
$(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h

arch/arm/mach-omap2/pm-asm-offsets.c

+3 −0
Original line number Diff line number Diff line
@@ -7,9 +7,12 @@ 


#include <linux/kbuild.h>

#include <linux/platform_data/pm33xx.h>

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



int main(void)

{

	ti_emif_asm_offsets();



	DEFINE(AMX3_PM_WFI_FLAGS_OFFSET,

	       offsetof(struct am33xx_pm_sram_data, wfi_flags));

	DEFINE(AMX3_PM_L2_AUX_CTRL_VAL_OFFSET,

arch/arm/mach-omap2/sleep33xx.S

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

 */



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

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

#include <linux/linkage.h>

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

arch/arm/mach-omap2/sleep43xx.S

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

 */



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

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

#include <linux/linkage.h>

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