Commit 7e0664b6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v6.4-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core 

Pull clocksource and clockevent updates from Daniel Lezcano:

  - Fix error returned for shared timers on Exynos MCT timers (Krzysztof Kozlowski)

  - Code reorg by splitting the CPUXGPT timer code (AngeloGioacchino Del Regno)

  - Remove the unused mxc_timer_init() function on i.MX (Fabio Estevam)

  - Replace of_get_address() and of_translate_address() calls with
    single call to of_address_to_resource() on TI timer (Rob Herring)

  - Mark driver as non-removable and remove useless remove() callback on
    SH MTU2 and STM32 LP timers. Improve the error message in the remove
    callback of the TI DM timer (Uwe Kleine-König)

  - Convert to platform remove callback returning void on Tegra186, TI
    DM timers (Uwe Kleine-König)

  - Drop pointless of_match_ptr for ID table in the STM32 LP timer
    (Krzysztof Kozlowski)

  - Fix memory leak in davinci_timer_register when init fails on DaVinci
    (Qinrun Dai)

  - Fix finding alwon timer regression on Timer TI DM (Tony Lindgren)

  - Use of_property_read_bool() for boolean properties on TI timer (Rob
    Herring)

  - Drop superfluous rk3288 compatible and add rk3588 compatible DT
    bindings (Cristian Ciocaltea)

Link: htttps://lore.kernel.org/lkml/d30fd923-e6e5-a1a6-ca76-1b39f8fad6c9@linaro.org
parents f7abf14f e2a1406c

Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ properties: 
              - rockchip,rk3188-timer

              - rockchip,rk3228-timer

              - rockchip,rk3229-timer

              - rockchip,rk3288-timer

              - rockchip,rk3368-timer

              - rockchip,rk3588-timer

              - rockchip,px30-timer

          - const: rockchip,rk3288-timer

  reg:

drivers/clocksource/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -479,6 +479,15 @@ config MTK_TIMER 
	help

	  Support for Mediatek timer driver.



config MTK_CPUX_TIMER

	bool "MediaTek CPUX timer driver" if COMPILE_TEST

	depends on HAS_IOMEM

	default ARCH_MEDIATEK

	select TIMER_OF

	select CLKSRC_MMIO

	help

	  Support for MediaTek CPUXGPT timer driver.



config SPRD_TIMER

	bool "Spreadtrum timer driver" if EXPERT

	depends on HAS_IOMEM

drivers/clocksource/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ obj-$(CONFIG_FSL_FTM_TIMER) += timer-fsl-ftm.o 
obj-$(CONFIG_VF_PIT_TIMER)	+= timer-vf-pit.o

obj-$(CONFIG_CLKSRC_QCOM)	+= timer-qcom.o

obj-$(CONFIG_MTK_TIMER)		+= timer-mediatek.o

obj-$(CONFIG_MTK_CPUX_TIMER)	+= timer-mediatek-cpux.o

obj-$(CONFIG_CLKSRC_PISTACHIO)	+= timer-pistachio.o

obj-$(CONFIG_CLKSRC_TI_32K)	+= timer-ti-32k.o

obj-$(CONFIG_OXNAS_RPS_TIMER)	+= timer-oxnas-rps.o

drivers/clocksource/exynos_mct.c

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static int __init mct_init_dt(struct device_node *np, unsigned int int_type) 
	 * processor cannot use the global comparator.

	 */

	if (frc_shared)

		return ret;

		return 0;



	return exynos4_clockevent_init();

}

drivers/clocksource/sh_mtu2.c

+1 −6
Original line number Diff line number Diff line
@@ -484,11 +484,6 @@ static int sh_mtu2_probe(struct platform_device *pdev) 
	return 0;

}



static int sh_mtu2_remove(struct platform_device *pdev)

{

	return -EBUSY; /* cannot unregister clockevent */

}



static const struct platform_device_id sh_mtu2_id_table[] = {

	{ "sh-mtu2", 0 },

	{ },
@@ -503,10 +498,10 @@ MODULE_DEVICE_TABLE(of, sh_mtu2_of_table); 


static struct platform_driver sh_mtu2_device_driver = {

	.probe		= sh_mtu2_probe,

	.remove		= sh_mtu2_remove,

	.driver		= {

		.name	= "sh_mtu2",

		.of_match_table = of_match_ptr(sh_mtu2_of_table),

		.suppress_bind_attrs = true,

	},

	.id_table	= sh_mtu2_id_table,

};