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

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

Merge tag 'omap-for-v4.4/soc-clean-up' of... 

Merge tag 'omap-for-v4.4/soc-clean-up' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

Minimal omap SoC changes for v4.4 merge window. As we've spent quite a
bit of time sorting out regressions for v4.3 and are very late with
these, I've kept the changes down to minimum:

- A series of timer changes from Felipe Balbi to get us closer to
  moving the remaining timer code into drivers

- A series of hwmod clean-up changes queued by Paul Walmsley

- SoC detection clean-up to use soc_is instead of cpu_is as CPU is
  within the SoC and is confusing naming. The rest we can now change
  along with the other clean-up

* tag 'omap-for-v4.4/soc-clean-up' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (21 commits)
  ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs
  ARM: DRA7: hwmod data: Remove spinlock hwmod addrs
  ARM: OMAP4: hwmod data: Remove spinlock hwmod addrs
  ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data
  arm: omap2: board-generic: use omap4_local_timer_init for AM437x
  ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data
  ARM: OMAP: Remove duplicated operand in OR operation
  clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE
  ARM: OMAP: Change all cpu_is_* occurences to soc_is_* for id.c
  ARM: OMAP2+: Rename cpu_is macros to soc_is
  arm: omap2: timer: limit hwmod usage to non-DT boots
  arm: omap2+: select 32k clocksource driver
  clocksource: add TI 32.768 Hz counter driver
  arm: omap2: timer: rename omap_sync32k_timer_init()
  arm: omap2: timer: always call clocksource_of_init() when DT
  arm: omap2: timer: move realtime_counter_init() around
  arm: omap2: timer: provide generic sync32k_timer_init function
  arm: omap2: timer: remove __omap_gptimer_init()
  arm: omap2: timer: add a gptimer argument to sync32k_timer_init()
  arm: omap2: timer: get rid of obfuscating macros
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7b6e28c3 ef4da0c1

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ config ARCH_OMAP2PLUS 
	select SOC_BUS

	select TI_PRIV_EDMA

	select OMAP_IRQCHIP

	select CLKSRC_TI_32K

	help

	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5

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

+6 −6
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") 
	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_machine	= omap_generic_init,

	.init_time	= omap2_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap242x_boards_compat,

	.restart	= omap2xxx_restart,

MACHINE_END
@@ -63,7 +63,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") 
	.map_io		= omap243x_map_io,

	.init_early	= omap2430_init_early,

	.init_machine	= omap_generic_init,

	.init_time	= omap2_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap243x_boards_compat,

	.restart	= omap2xxx_restart,

MACHINE_END
@@ -82,7 +82,7 @@ DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") 
	.init_early	= omap3430_init_early,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= n900_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END
@@ -100,7 +100,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.init_early	= omap3430_init_early,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap3_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END
@@ -116,7 +116,7 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") 
	.init_early	= omap3630_init_early,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap36xx_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END
@@ -272,7 +272,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)") 
	.init_late	= am43xx_init_late,

	.init_irq	= omap_gic_of_init,

	.init_machine	= omap_generic_init,

	.init_time	= omap3_gptimer_timer_init,

	.init_time	= omap4_local_timer_init,

	.dt_compat	= am43_boards_compat,

	.restart	= omap44xx_restart,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -424,6 +424,6 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board") 
	.init_irq	= omap3_init_irq,

	.init_machine	= omap_ldp_init,

	.init_late	= omap3430_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.restart	= omap3xxx_restart,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -136,6 +136,6 @@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") 
	.init_irq	= omap3_init_irq,

	.init_machine	= rx51_init,

	.init_late	= omap3430_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.restart	= omap3xxx_restart,

MACHINE_END

arch/arm/mach-omap2/common.h

+1 −2
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ static inline int omap_mux_late_init(void) 


extern void omap2_init_common_infrastructure(void);



extern void omap2_sync32k_timer_init(void);

extern void omap3_sync32k_timer_init(void);

extern void omap_init_time(void);

extern void omap3_secure_sync32k_timer_init(void);

extern void omap3_gptimer_timer_init(void);

extern void omap4_local_timer_init(void);