Commit 6f566c4f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Move omap timer to drivers for 4.17" from Tony Lindgren:

This series from Keerthy and Ladislav Michl move omap dmtimer code
to drivers. As we don't want to export custom timer functions to
random drivers, we also need to update the related PWM driver to
pass the timer specific functions in platform data.

Note that this series is based on a merge of omap1 specific timer
fix and omap2+ platform data clean-up to keep things working and
make the move a bit simpler.

* tag 'omap-for-v4.17/timer-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  clocksource: timer-ti-dm: Check prescaler value
  clocksource: timer-ti-dm: Consolidate set source
  clocksource: timer-ti-dm: Make unexported functions static
  ARM: OMAP: pdata-quirks: Remove unused timer pdata
  pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
  clocksource: timer-ti-dm: Hook device platform data if not already assigned
  clocksource: timer-ti-dm: Populate the timer ops to the pdata
  clocksource: timer-ti-dm: Add timer ops to the platform data structure
  ARM: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource
  clocksource: timer-ti-dm: Replace architecture
  ARM: OMAP: Move dmtimer.h out of plat-omap
  ARM: OMAP: timer: Wrap the inline functions under OMAP2PLUS define
  ARM: OMAP: dmtimer: Remove all the exports
  ARM: OMAP: Fix dmtimer init for omap1
parents 7b80bd29 58a54f03

arch/arm/mach-omap1/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config ARCH_OMAP16XX 
	bool "OMAP16xx Based System"

	select ARCH_OMAP_OTG

	select CPU_ARM926T

	select OMAP_DM_TIMER



config OMAP_MUX

	bool "OMAP multiplexing support"

arch/arm/mach-omap1/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include <mach/tc.h>

#include <mach/mux.h>

#include <linux/omap-dma.h>

#include <plat/dmtimer.h>

#include <clocksource/timer-ti-dm.h>



#include <mach/irqs.h>

arch/arm/mach-omap1/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/platform_device.h>

#include <linux/platform_data/dmtimer-omap.h>



#include <plat/dmtimer.h>

#include <clocksource/timer-ti-dm.h>



#include "soc.h"

arch/arm/mach-omap2/pdata-quirks.c

+0 −32
Original line number Diff line number Diff line
@@ -24,10 +24,8 @@ 
#include <linux/platform_data/hsmmc-omap.h>

#include <linux/platform_data/iommu-omap.h>

#include <linux/platform_data/wkup_m3.h>

#include <linux/platform_data/pwm_omap_dmtimer.h>

#include <linux/platform_data/media/ir-rx51.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <plat/dmtimer.h>



#include "common.h"

#include "common-board-devices.h"
@@ -477,33 +475,6 @@ void omap_auxdata_legacy_init(struct device *dev) 
	dev->platform_data = &twl_gpio_auxdata;

}



/* Dual mode timer PWM callbacks platdata */

#if IS_ENABLED(CONFIG_OMAP_DM_TIMER)

static struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {

	.request_by_node = omap_dm_timer_request_by_node,

	.request_specific = omap_dm_timer_request_specific,

	.request = omap_dm_timer_request,

	.set_source = omap_dm_timer_set_source,

	.get_irq = omap_dm_timer_get_irq,

	.set_int_enable = omap_dm_timer_set_int_enable,

	.set_int_disable = omap_dm_timer_set_int_disable,

	.free = omap_dm_timer_free,

	.enable = omap_dm_timer_enable,

	.disable = omap_dm_timer_disable,

	.get_fclk = omap_dm_timer_get_fclk,

	.start = omap_dm_timer_start,

	.stop = omap_dm_timer_stop,

	.set_load = omap_dm_timer_set_load,

	.set_match = omap_dm_timer_set_match,

	.set_pwm = omap_dm_timer_set_pwm,

	.set_prescaler = omap_dm_timer_set_prescaler,

	.read_counter = omap_dm_timer_read_counter,

	.write_counter = omap_dm_timer_write_counter,

	.read_status = omap_dm_timer_read_status,

	.write_status = omap_dm_timer_write_status,

};

#endif



static struct ir_rx51_platform_data __maybe_unused rx51_ir_data = {

	.set_max_mpu_wakeup_lat = omap_pm_set_max_mpu_wakeup_lat,

};
@@ -572,9 +543,6 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("ti,am4372-wkup-m3", 0x44d00000, "44d00000.wkup_m3",

		       &wkup_m3_data),

#endif

#if IS_ENABLED(CONFIG_OMAP_DM_TIMER)

	OF_DEV_AUXDATA("ti,omap-dmtimer-pwm", 0, NULL, &pwm_dmtimer_pdata),

#endif

#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)

	OF_DEV_AUXDATA("ti,omap4-iommu", 0x4a066000, "4a066000.mmu",

		       &omap4_iommu_pdata),

arch/arm/mach-omap2/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include "omap_hwmod.h"

#include "omap_device.h"

#include <plat/counter-32k.h>

#include <plat/dmtimer.h>

#include <clocksource/timer-ti-dm.h>

#include "omap-pm.h"



#include "soc.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE