* [PATCH 2/4] MIPS: Loongson2ef: Remove specific mc146818rtc.h
2020-08-25 9:09 [PATCH 1/4] MIPS: SGI-IP27: No need for kmalloc.h Thomas Bogendoerfer
@ 2020-08-25 9:09 ` Thomas Bogendoerfer
2020-08-26 1:07 ` Jiaxun Yang
2020-08-25 9:09 ` [PATCH 3/4] MIPS: Remove unused header file m48t37.h Thomas Bogendoerfer
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-25 9:09 UTC (permalink / raw)
To: Jiaxun Yang, linux-mips, linux-kernel
Loonson2ef's mc146818rtc.h is the same as the generic one -> remove it.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---
.../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 (ralf@linux-mips.org)
- *
- * 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/4] MIPS: Loongson2ef: Remove specific mc146818rtc.h
2020-08-25 9:09 ` [PATCH 2/4] MIPS: Loongson2ef: Remove specific mc146818rtc.h Thomas Bogendoerfer
@ 2020-08-26 1:07 ` Jiaxun Yang
0 siblings, 0 replies; 6+ messages in thread
From: Jiaxun Yang @ 2020-08-26 1:07 UTC (permalink / raw)
To: Thomas Bogendoerfer, linux-mips, linux-kernel
在 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 <tsbogend@alpha.franken.de>
Acked-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
> .../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 (ralf@linux-mips.org)
> - *
> - * 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 */
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/4] MIPS: Remove unused header file m48t37.h
2020-08-25 9:09 [PATCH 1/4] MIPS: SGI-IP27: No need for kmalloc.h Thomas Bogendoerfer
2020-08-25 9:09 ` [PATCH 2/4] MIPS: Loongson2ef: Remove specific mc146818rtc.h Thomas Bogendoerfer
@ 2020-08-25 9:09 ` Thomas Bogendoerfer
2020-08-25 9:09 ` [PATCH 4/4] MIPS: SGI-IP32: No need to include mc14818*.h Thomas Bogendoerfer
2020-08-26 11:12 ` [PATCH 1/4] MIPS: SGI-IP27: No need for kmalloc.h Thomas Bogendoerfer
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-25 9:09 UTC (permalink / raw)
To: linux-mips, linux-kernel
No users -> remove it.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---
arch/mips/include/asm/m48t37.h | 36 ------------------------------------
1 file changed, 36 deletions(-)
delete mode 100644 arch/mips/include/asm/m48t37.h
diff --git a/arch/mips/include/asm/m48t37.h b/arch/mips/include/asm/m48t37.h
deleted file mode 100644
index 3687a02e692b..000000000000
--- a/arch/mips/include/asm/m48t37.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Registers for the SGS-Thomson M48T37 Timekeeper RAM chip
- */
-#ifndef _ASM_M48T37_H
-#define _ASM_M48T37_H
-
-#include <linux/spinlock.h>
-
-extern spinlock_t rtc_lock;
-
-struct m48t37_rtc {
- volatile u8 pad[0x7ff0]; /* NVRAM */
- volatile u8 flags;
- volatile u8 century;
- volatile u8 alarm_sec;
- volatile u8 alarm_min;
- volatile u8 alarm_hour;
- volatile u8 alarm_data;
- volatile u8 interrupts;
- volatile u8 watchdog;
- volatile u8 control;
- volatile u8 sec;
- volatile u8 min;
- volatile u8 hour;
- volatile u8 day;
- volatile u8 date;
- volatile u8 month;
- volatile u8 year;
-};
-
-#define M48T37_RTC_SET 0x80
-#define M48T37_RTC_STOPPED 0x80
-#define M48T37_RTC_READ 0x40
-
-#endif /* _ASM_M48T37_H */
--
2.16.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] MIPS: SGI-IP32: No need to include mc14818*.h
2020-08-25 9:09 [PATCH 1/4] MIPS: SGI-IP27: No need for kmalloc.h Thomas Bogendoerfer
2020-08-25 9:09 ` [PATCH 2/4] MIPS: Loongson2ef: Remove specific mc146818rtc.h Thomas Bogendoerfer
2020-08-25 9:09 ` [PATCH 3/4] MIPS: Remove unused header file m48t37.h Thomas Bogendoerfer
@ 2020-08-25 9:09 ` Thomas Bogendoerfer
2020-08-26 11:12 ` [PATCH 1/4] MIPS: SGI-IP27: No need for kmalloc.h Thomas Bogendoerfer
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-25 9:09 UTC (permalink / raw)
To: linux-mips, linux-kernel
Nothing needs the includes in ip32-setup.c.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---
arch/mips/sgi-ip32/ip32-setup.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index 3abd1465ec02..8019dae1721a 100644
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -12,12 +12,10 @@
#include <linux/console.h>
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <linux/mc146818rtc.h>
#include <linux/param.h>
#include <linux/sched.h>
#include <asm/bootinfo.h>
-#include <asm/mc146818-time.h>
#include <asm/mipsregs.h>
#include <asm/mmu_context.h>
#include <asm/sgialib.h>
--
2.16.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] MIPS: SGI-IP27: No need for kmalloc.h
2020-08-25 9:09 [PATCH 1/4] MIPS: SGI-IP27: No need for kmalloc.h Thomas Bogendoerfer
` (2 preceding siblings ...)
2020-08-25 9:09 ` [PATCH 4/4] MIPS: SGI-IP32: No need to include mc14818*.h Thomas Bogendoerfer
@ 2020-08-26 11:12 ` Thomas Bogendoerfer
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-26 11:12 UTC (permalink / raw)
To: linux-mips, linux-kernel
On Tue, Aug 25, 2020 at 11:09:04AM +0200, Thomas Bogendoerfer wrote:
> SG -IP27 is always cache coherent so we can use generic kmalloc.h and
> remove the ip27 specific one.
>
> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> ---
> arch/mips/include/asm/mach-ip27/kmalloc.h | 8 --------
> 1 file changed, 8 deletions(-)
> delete mode 100644 arch/mips/include/asm/mach-ip27/kmalloc.h
patches 1-4 applied to mips-next.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 6+ messages in thread