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

Commit d7018b15 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.3/soc-signed' of... 

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

SoC changes for omaps for v4.3 merge window:

- Clean-up omap4_local_timer_init to drop deal legacy code

- Provide proper IO map table for dra7

- Clean-up IOMMU layer init code as it now uses IOMMU framework

- A series of changes to fix up dm814x support that's been in a broken
  half-merged state for quite some time

- A series of PRCM and hwmod changes via Paul Walmsley <paul@pwsan.com>:

  - I/O wakeup support for AM43xx
  - register lock and unlock support to the hwmod code (needed for the RTC
    IP blocks on some chips)
  - several fixes for sparse warnings and an unnecessary null pointer test
  - a DRA7xx clockdomain configuration workaround, to deal with some hardware
    bugs

* tag 'omap-for-v4.3/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (21 commits)
  ARM: OMAP2: Add minimal dm814x hwmod support
  ARM: OMAP2+: Prepare dm81xx hwmod code for adding minimal dm814x support
  ARM: PRM: AM437x: Enable IO wakeup feature
  ARM: OMAP4+: PRM: Add AM437x specific data
  ARM: OMAP: PRM: Remove hardcoding of IRQENABLE_MPU_2 and IRQSTATUS_MPU_2 register offsets
  ARM: dts: AM4372: Add PRCM IRQ entry
  ARM: AM43xx: Add the PRM IRQ register offsets
  ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register
  ARM: OMAP2+: Add support for initializing dm814x clocks
  ARM: OMAP2+: Add custom prwdm_operations for 81xx to support dm814x
  ARM: OMAP2+: Add minimal clockdomains for dm814x
  ARM: OMAP2+: Fix scm compatible for dm814x
  ARM: OMAP2+: Fix dm814x DT_MACHINE_START
  ARM: OMAP2+: Remove module references from IOMMU machine layer
  ARM: DRA7: Provide proper IO map table
  ARM: OMAP2+: Clean up omap4_local_timer_init
  ARM: OMAP2: Delete an unnecessary check
  ARM: OMAP2+: sparse: add missing function declarations
  ARM: OMAP2+: sparse: add missing static declaration
  ARM: OMAP2+: hwmod: add support for lock and unlock hooks
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c3d3dbdd 24da741c

arch/arm/boot/dts/am4372.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
			prcm: prcm@1f0000 {

				compatible = "ti,am4-prcm";

				reg = <0x1f0000 0x11000>;

				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;



				prcm_clocks: clocks {

					#address-cells = <1>;

arch/arm/mach-omap2/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o 
# EMU peripherals

obj-$(CONFIG_HW_PERF_EVENTS)		+= pmu.o



iommu-$(CONFIG_OMAP_IOMMU)		:= omap-iommu.o

obj-y					+= $(iommu-m) $(iommu-y)

obj-$(CONFIG_OMAP_IOMMU)		+= omap-iommu.o



# OMAP2420 MSDI controller integration support ("MMC")

obj-$(CONFIG_SOC_OMAP2420)		+= msdi.o

arch/arm/mach-omap2/board-generic.c

+3 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static const char *const ti814x_boards_compat[] __initconst = { 
	NULL,

};



DT_MACHINE_START(TI81XX_DT, "Generic ti814x (Flattened Device Tree)")

DT_MACHINE_START(TI814X_DT, "Generic ti814x (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.map_io		= ti81xx_map_io,

	.init_early	= ti814x_init_early,
@@ -297,7 +297,7 @@ static const char *const dra74x_boards_compat[] __initconst = { 
DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.smp		= smp_ops(omap4_smp_ops),

	.map_io		= omap5_map_io,

	.map_io		= dra7xx_map_io,

	.init_early	= dra7xx_init_early,

	.init_late	= dra7xx_init_late,

	.init_irq	= omap_gic_of_init,
@@ -316,7 +316,7 @@ static const char *const dra72x_boards_compat[] __initconst = { 


DT_MACHINE_START(DRA72X_DT, "Generic DRA72X (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.map_io		= omap5_map_io,

	.map_io		= dra7xx_map_io,

	.init_early	= dra7xx_init_early,

	.init_late	= dra7xx_init_late,

	.init_irq	= omap_gic_of_init,

arch/arm/mach-omap2/clockdomain.h

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ extern void __init omap242x_clockdomains_init(void); 
extern void __init omap243x_clockdomains_init(void);

extern void __init omap3xxx_clockdomains_init(void);

extern void __init am33xx_clockdomains_init(void);

extern void __init ti81xx_clockdomains_init(void);

extern void __init ti814x_clockdomains_init(void);

extern void __init ti816x_clockdomains_init(void);

extern void __init omap44xx_clockdomains_init(void);

extern void __init omap54xx_clockdomains_init(void);

extern void __init dra7xx_clockdomains_init(void);

arch/arm/mach-omap2/clockdomains7xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static struct clockdomain l4per2_7xx_clkdm = { 
	.dep_bit	  = DRA7XX_L4PER2_STATDEP_SHIFT,

	.wkdep_srcs	  = l4per2_wkup_sleep_deps,

	.sleepdep_srcs	  = l4per2_wkup_sleep_deps,

	.flags		  = CLKDM_CAN_HWSUP_SWSUP,

	.flags		  = CLKDM_CAN_SWSUP,

};



static struct clockdomain mpu0_7xx_clkdm = {