Commit 7d8d2019 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-core-2023-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull more timer updates from Thomas Gleixner:
 "Timekeeping and clocksource/event driver updates the second batch:

   - A trivial documentation fix in the timekeeping core

   - A really boring set of small fixes, enhancements and cleanups in
     the drivers code. No new clocksource/clockevent drivers for a
     change"

* tag 'timers-core-2023-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Fix references to nonexistent ktime_get_fast_ns()
  dt-bindings: timer: rockchip: Add rk3588 compatible
  dt-bindings: timer: rockchip: Drop superfluous rk3288 compatible
  clocksource/drivers/ti: Use of_property_read_bool() for boolean properties
  clocksource/drivers/timer-ti-dm: Fix finding alwon timer
  clocksource/drivers/davinci: Fix memory leak in davinci_timer_register when init fails
  clocksource/drivers/stm32-lp: Drop of_match_ptr for ID table
  clocksource/drivers/timer-ti-dm: Convert to platform remove callback returning void
  clocksource/drivers/timer-tegra186: Convert to platform remove callback returning void
  clocksource/drivers/timer-ti-dm: Improve error message in .remove
  clocksource/drivers/timer-stm32-lp: Mark driver as non-removable
  clocksource/drivers/sh_mtu2: Mark driver as non-removable
  clocksource/drivers/timer-ti-dm: Use of_address_to_resource()
  clocksource/drivers/timer-imx-gpt: Remove non-DT function
  clocksource/drivers/timer-mediatek: Split out CPUXGPT timers
  clocksource/drivers/exynos_mct: Explicitly return 0 for shared timer
parents 8c1318e4 158009f1

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,

};