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

Commit e871b87a authored by Jason Cooper's avatar Jason Cooper
Browse files

ARM: kirkwood: use devicetree for rtc-mv 



Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent ea983ede

arch/arm/boot/dts/kirkwood.dtsi

+6 −0
Original line number Original line Diff line number Diff line
@@ -26,5 +26,11 @@ 
			/* set clock-frequency in board dts */

			/* set clock-frequency in board dts */

			status = "disabled";

			status = "disabled";

		};

		};



		rtc@10300 {

			compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

		};

	};

	};

};
 
};

arch/arm/mach-kirkwood/board-dt.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,6 @@ static void __init kirkwood_dt_init(void) 
#endif

#endif





	/* internal devices that every board has */

	/* internal devices that every board has */

	kirkwood_rtc_init();

	kirkwood_wdt_init();

	kirkwood_wdt_init();

	kirkwood_xor0_init();

	kirkwood_xor0_init();

	kirkwood_xor1_init();

	kirkwood_xor1_init();

arch/arm/mach-kirkwood/common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, 
/*****************************************************************************

/*****************************************************************************

 * SoC RTC

 * SoC RTC

 ****************************************************************************/

 ****************************************************************************/

void __init kirkwood_rtc_init(void)

static void __init kirkwood_rtc_init(void)

{

{

	orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC);

	orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC);

}

}

arch/arm/mach-kirkwood/common.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,6 @@ static inline void dreamplug_init(void) {}; 
/* early init functions not converted to fdt yet */

/* early init functions not converted to fdt yet */

char *kirkwood_id(void);

char *kirkwood_id(void);

void kirkwood_l2_init(void);

void kirkwood_l2_init(void);

void kirkwood_rtc_init(void);

void kirkwood_wdt_init(void);

void kirkwood_wdt_init(void);

void kirkwood_xor0_init(void);

void kirkwood_xor0_init(void);

void kirkwood_xor1_init(void);

void kirkwood_xor1_init(void);