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

Unverified Commit fbc23c71 authored by Paul Cercueil's avatar Paul Cercueil Committed by James Hogan
Browse files

MIPS: JZ4740: dts: Add bindings for the jz4740-wdt driver 



Also remove the watchdog platform_device from platform.c, since it
wasn't used anywhere anyway.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Malaterre <malat@debian.org>
Cc: linux-mips@linux-mips.org
Cc: linux-watchdog@vger.kernel.org
Cc: devicetree@vger.kernel.org
[jhogan@kernel.org: Drop jz4740_wdt_device declaration from header]
Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
parent b6559c8c

arch/mips/boot/dts/ingenic/jz4740.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -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";

	};



	rtc_dev: rtc@10003000 {

		compatible = "ingenic,jz4740-rtc";

		reg = <0x10003000 0x40>;

arch/mips/include/asm/mach-jz4740/platform.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ extern struct platform_device jz4740_i2s_device; 
extern struct platform_device jz4740_pcm_device;

extern struct platform_device jz4740_codec_device;

extern struct platform_device jz4740_adc_device;

extern struct platform_device jz4740_wdt_device;

extern struct platform_device jz4740_pwm_device;

extern struct platform_device jz4740_dma_device;

arch/mips/jz4740/platform.c

+0 −16
Original line number Diff line number Diff line
@@ -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",