2020-08-25 09:18:46

by Thomas Bogendoerfer

Subject: [PATCH 2/4] MIPS: Loongson2ef: Remove specific mc146818rtc.h

Loonson2ef's mc146818rtc.h is the same as the generic one -> remove it.

Signed-off-by: Thomas Bogendoerfer <[email protected]>
---
.../include/asm/mach-loongson2ef/mc146818rtc.h | 36 ----------------------
1 file changed, 36 deletions(-)
delete mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h

diff --git a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h b/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h
deleted file mode 100644
index 00d602629a55..000000000000
--- a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1998, 2001, 03, 07 by Ralf Baechle ([email protected])
- *
- * RTC routines for PC style attached Dallas chip.
- */
-#ifndef __ASM_MACH_LOONGSON2EF_MC146818RTC_H
-#define __ASM_MACH_LOONGSON2EF_MC146818RTC_H
-
-#include <linux/io.h>
-
-#define RTC_PORT(x) (0x70 + (x))
-#define RTC_IRQ 8
-
-static inline unsigned char CMOS_READ(unsigned long addr)
-{
- outb_p(addr, RTC_PORT(0));
- return inb_p(RTC_PORT(1));
-}
-
-static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
-{
- outb_p(addr, RTC_PORT(0));
- outb_p(data, RTC_PORT(1));
-}
-
-#define RTC_ALWAYS_BCD 0
-
-#ifndef mc146818_decode_year
-#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970)
-#endif
-
-#endif /* __ASM_MACH_LOONGSON2EF_MC146818RTC_H */
--
2.16.4

2020-08-26 01:13:26

by Jiaxun Yang

Subject: Re: [PATCH 2/4] MIPS: Loongson2ef: Remove specific mc146818rtc.h

?? 2020/8/25 ????5:09, Thomas Bogendoerfer д??:
> Loonson2ef's mc146818rtc.h is the same as the generic one -> remove it.
>
> Signed-off-by: Thomas Bogendoerfer <[email protected]>

Acked-by: Jiaxun Yang <[email protected]>

> ---
> .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 ----------------------
> 1 file changed, 36 deletions(-)
> delete mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h
>
> diff --git a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h b/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h
> deleted file mode 100644
> index 00d602629a55..000000000000
> --- a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License. See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
> - * Copyright (C) 1998, 2001, 03, 07 by Ralf Baechle ([email protected])
> - *
> - * RTC routines for PC style attached Dallas chip.
> - */
> -#ifndef __ASM_MACH_LOONGSON2EF_MC146818RTC_H
> -#define __ASM_MACH_LOONGSON2EF_MC146818RTC_H
> -
> -#include <linux/io.h>
> -
> -#define RTC_PORT(x) (0x70 + (x))
> -#define RTC_IRQ 8
> -
> -static inline unsigned char CMOS_READ(unsigned long addr)
> -{
> - outb_p(addr, RTC_PORT(0));
> - return inb_p(RTC_PORT(1));
> -}
> -
> -static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
> -{
> - outb_p(addr, RTC_PORT(0));
> - outb_p(data, RTC_PORT(1));
> -}
> -
> -#define RTC_ALWAYS_BCD 0
> -
> -#ifndef mc146818_decode_year
> -#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970)
> -#endif
> -
> -#endif /* __ASM_MACH_LOONGSON2EF_MC146818RTC_H */