diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-09-19 23:21:26 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-10-06 17:31:01 +0200 |
| commit | 0a46ffa3604ec64b6a6784f134267c49ec224b75 (patch) | |
| tree | 039639f1960e9c57dd23ef6a0c532748bfa7f3a3 | |
| parent | MIPS: Malta: Remove custom DT match table (diff) | |
| download | linux-0a46ffa3604ec64b6a6784f134267c49ec224b75.tar.xz linux-0a46ffa3604ec64b6a6784f134267c49ec224b75.zip | |
MIPS: Malta: Probe RTC via DT
Add the DT node required to probe the RTC, and remove the platform code
that was previously doing it.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14277/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/boot/dts/mti/malta.dts | 15 | ||||
| -rw-r--r-- | arch/mips/mti-malta/malta-platform.c | 21 |
2 files changed, 15 insertions, 21 deletions
diff --git a/arch/mips/boot/dts/mti/malta.dts b/arch/mips/boot/dts/mti/malta.dts index af765afce825..fecbca8ca691 100644 --- a/arch/mips/boot/dts/mti/malta.dts +++ b/arch/mips/boot/dts/mti/malta.dts @@ -49,4 +49,19 @@ interrupt-parent = <&gic>; interrupts = <GIC_SHARED 3 IRQ_TYPE_LEVEL_HIGH>; }; + + isa { + compatible = "isa"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <1 0 0 0x1000>; + + rtc@70 { + compatible = "motorola,mc146818"; + reg = <1 0x70 0x8>; + + interrupt-parent = <&i8259>; + interrupts = <8>; + }; + }; }; diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c index 20a53e73b28e..4e003b900fa2 100644 --- a/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c @@ -23,7 +23,6 @@ */ #include <linux/init.h> #include <linux/serial_8250.h> -#include <linux/mc146818rtc.h> #include <linux/module.h> #include <linux/irq.h> #include <linux/mtd/partitions.h> @@ -68,25 +67,6 @@ static struct platform_device malta_uart8250_device = { }, }; -struct resource malta_rtc_resources[] = { - { - .start = RTC_PORT(0), - .end = RTC_PORT(7), - .flags = IORESOURCE_IO, - }, { - .start = RTC_IRQ, - .end = RTC_IRQ, - .flags = IORESOURCE_IRQ, - } -}; - -static struct platform_device malta_rtc_device = { - .name = "rtc_cmos", - .id = -1, - .resource = malta_rtc_resources, - .num_resources = ARRAY_SIZE(malta_rtc_resources), -}; - static struct mtd_partition malta_mtd_partitions[] = { { .name = "YAMON", @@ -129,7 +109,6 @@ static struct platform_device malta_flash_device = { static struct platform_device *malta_devices[] __initdata = { &malta_uart8250_device, - &malta_rtc_device, &malta_flash_device, }; |