Hi Paul,
On 30 December 2017 at 19:21, Paul Cercueil <paul@xxxxxxxxxxxxxxx> wrote:
> Also remove the watchdog platform_device from platform.c, since it
> wasn't used anywhere anyway.
>
> Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
> ---
> arch/mips/boot/dts/ingenic/jz4740.dtsi | 8 ++++++++
> arch/mips/jz4740/platform.c | 16 ----------------
> 2 files changed, 8 insertions(+), 16 deletions(-)
>
> v2: No change
>
> diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
> index cd5185bb90ae..26c6b561d6f7 100644
> --- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
> +++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
> @@ -45,6 +45,14 @@
> #clock-cells = <1>;
> };
>
> + watchdog: watchdog@10002000 {
> + compatible = "ingenic,jz4740-watchdog";
> + reg = <0x10002000 0x10>;
> +
> + clocks = <&cgu JZ4740_CLK_RTC>;
> + clock-names = "rtc";
> + };
> +
The watchdog driver calls jz4740_timer_enable_watchdog and
jz4740_timer_disable_watchdog which defined in
arch/mips/jz4740/timer.c. It accesses registers iomapped by timer
code. Declaring register size as 0x10 does not show the real picture.
Better use register size as 0x100 and let timer, wdt, pwm drivers to
share them.
Code from one of your branches
(https://github.com/OpenDingux/linux/blob/for-upstream-clocksource/arch/mips/boot/dts/ingenic/jz4740.dtsi)
does it. Can you prepare a patch series and send it?
I have a patch set that moves timer code out of arch/mips/jz4740/ and
does a similar thing for watchdog and pwm. As your new timer driver is
better than the existing one I have not sent my patches yet. I would
like to see it getting mainlined as it paves way for removing most of
code in arch/mips/jz4740.
> rtc_dev: rtc@10003000 {
> compatible = "ingenic,jz4740-rtc";
> reg = <0x10003000 0x40>;
> diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
> index 5b7cdd67a9d9..cbc5f8e87230 100644
> --- a/arch/mips/jz4740/platform.c
> +++ b/arch/mips/jz4740/platform.c
> @@ -233,22 +233,6 @@ struct platform_device jz4740_adc_device = {
> .resource = jz4740_adc_resources,
> };
>
> -/* Watchdog */
> -static struct resource jz4740_wdt_resources[] = {
> - {
> - .start = JZ4740_WDT_BASE_ADDR,
> - .end = JZ4740_WDT_BASE_ADDR + 0x10 - 1,
> - .flags = IORESOURCE_MEM,
> - },
> -};
> -
> -struct platform_device jz4740_wdt_device = {
> - .name = "jz4740-wdt",
> - .id = -1,
> - .num_resources = ARRAY_SIZE(jz4740_wdt_resources),
> - .resource = jz4740_wdt_resources,
> -};
> -
> /* PWM */
> struct platform_device jz4740_pwm_device = {
> .name = "jz4740-pwm",
> --
> 2.11.0
>
>
Regards,
PrasannaKumar
