Commit 1ec371ba authored by Finn Thain's avatar Finn Thain Committed by Alexandre Belloni
Browse files

m68k: mvme147, mvme16x: Adopt rtc-m48t59 platform driver 



Both mvme147 and mvme16x platforms have their own RTC driver
implementations that duplicate functionality provided by the rtc-m48t59
driver. Adopt the rtc-m48t59 driver and remove the other ones.

Tested-by: default avatarDaniel Palmer <daniel@0x0f.com>
Signed-off-by: default avatarFinn Thain <fthain@linux-m68k.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/19a16bcc94c42ea9c5397b37b1918c2937e3faab.1731450735.git.fthain@linux-m68k.org


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 5b42edef

arch/m68k/configs/multi_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ CONFIG_UHID=m 
# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_M48T59=m

CONFIG_RTC_DRV_MSM6242=m

CONFIG_RTC_DRV_RP5C01=m

CONFIG_RTC_DRV_GENERIC=m

arch/m68k/configs/mvme147_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ CONFIG_UHID=m 
# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_M48T59=y

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

arch/m68k/configs/mvme16x_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ CONFIG_UHID=m 
# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_M48T59=y

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

arch/m68k/include/asm/mvme147hw.h

+1 −18
Original line number Diff line number Diff line
@@ -4,24 +4,7 @@ 


#include <asm/irq.h>



typedef struct {

	unsigned char

		ctrl,

		bcd_sec,

		bcd_min,

		bcd_hr,

		bcd_dow,

		bcd_dom,

		bcd_mth,

		bcd_year;

} MK48T02;



#define RTC_WRITE	0x80

#define RTC_READ	0x40

#define RTC_STOP	0x20



#define m147_rtc ((MK48T02 * volatile)0xfffe07f8)



#define MVME147_RTC_BASE	0xfffe0000



struct pcc_regs {

   volatile u_long	dma_tadr;

arch/m68k/include/asm/mvme16xhw.h

+1 −17
Original line number Diff line number Diff line
@@ -24,23 +24,7 @@ typedef struct { 


#define mvmelp   ((*(volatile MVMElpPtr)(MVME_LPR_BASE)))



typedef struct {

	unsigned char

		ctrl,

		bcd_sec,

		bcd_min,

		bcd_hr,

		bcd_dow,

		bcd_dom,

		bcd_mth,

		bcd_year;

} MK48T08_t, *MK48T08ptr_t;



#define RTC_WRITE	0x80

#define RTC_READ	0x40

#define RTC_STOP	0x20



#define MVME_RTC_BASE	0xfffc1ff8

#define MVME_RTC_BASE	0xfffc0000



#define MVME_I596_BASE	0xfff46000