input: i8042: remove support for 8042-unicore32io

The unicore32 port is removed from the kernel.
There is no point to keep stale definitions to support this architecture.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/MAINTAINERS b/MAINTAINERS
index ec65e063e2585fc68a4d9b3cf80b389b44d1d24c..e5035fda296ef11a030b3ae9d9096d4dc771e2e4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13585,7 +13585,6 @@ M:      Guan Xuetao <gxt@pku.edu.cn>
 S:     Maintained
 W:     http://mprc.pku.edu.cn/~guanxuetao/linux
 T:     git git://github.com/gxt/linux.git
-F:     drivers/input/serio/i8042-unicore32io.h
 F:     drivers/rtc/rtc-puv3.c
 F:     drivers/video/fbdev/fb-puv3.c
 

diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h
deleted file mode 100644 (file)
index 50bb3ed..0000000
--- a/drivers/input/serio/i8042-unicore32io.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Code specific to PKUnity SoC and UniCore ISA
- *
- *     Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
- *     Copyright (C) 2001-2011 Guan Xuetao
- */
-#ifndef _I8042_UNICORE32_H
-#define _I8042_UNICORE32_H
-
-#include <mach/hardware.h>
-
-/*
- * Names.
- */
-#define I8042_KBD_PHYS_DESC "isa0060/serio0"
-#define I8042_AUX_PHYS_DESC "isa0060/serio1"
-#define I8042_MUX_PHYS_DESC "isa0060/serio%d"
-
-/*
- * IRQs.
- */
-#define I8042_KBD_IRQ           IRQ_PS2_KBD
-#define I8042_AUX_IRQ           IRQ_PS2_AUX
-
-/*
- * Register numbers.
- */
-#define I8042_COMMAND_REG      PS2_COMMAND
-#define I8042_STATUS_REG       PS2_STATUS
-#define I8042_DATA_REG         PS2_DATA
-
-#define I8042_REGION_START     (resource_size_t)(PS2_DATA)
-#define I8042_REGION_SIZE      (resource_size_t)(16)
-
-static inline int i8042_read_data(void)
-{
-       return readb(I8042_DATA_REG);
-}
-
-static inline int i8042_read_status(void)
-{
-       return readb(I8042_STATUS_REG);
-}
-
-static inline void i8042_write_data(int val)
-{
-       writeb(val, I8042_DATA_REG);
-}
-
-static inline void i8042_write_command(int val)
-{
-       writeb(val, I8042_COMMAND_REG);
-}
-
-static inline int i8042_platform_init(void)
-{
-       if (!request_mem_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
-               return -EBUSY;
-
-       i8042_reset = I8042_RESET_ALWAYS;
-       return 0;
-}
-
-static inline void i8042_platform_exit(void)
-{
-       release_mem_region(I8042_REGION_START, I8042_REGION_SIZE);
-}
-
-#endif /* _I8042_UNICORE32_H */

diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index eb376700dfffd9a887c9dea7e3152e5e7b4afb42..55381783dc82ddc4ada059d6ce6c7219e46c240d 100644 (file)
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -21,8 +21,6 @@
 #include "i8042-sparcio.h"
 #elif defined(CONFIG_X86) || defined(CONFIG_IA64)
 #include "i8042-x86ia64io.h"
-#elif defined(CONFIG_UNICORE32)
-#include "i8042-unicore32io.h"
 #else
 #include "i8042-io.h"
 #endif