ARM: imx27: Remove iomux-v1 board code

IMX_HAVE_IOMUX_V1 was only used by i.MX27 board files. Since the
board files users are gone, it is safe to remove iomux-v1 related
code.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index c23e10fa8242582b49680dd185e2830413324bb7..138c5344f2f2f7163885457a34a7c460b8dc2a11 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -47,9 +47,6 @@ config HAVE_IMX_SRC
        def_bool y if SMP
        select ARCH_HAS_RESET_CONTROLLER
 
-config IMX_HAVE_IOMUX_V1
-       bool
-
 config ARCH_MXC_IOMUX_V3
        bool
 
@@ -99,7 +96,6 @@ config SOC_IMX25
 
 config SOC_IMX27
        bool "i.MX27 support"
-       select IMX_HAVE_IOMUX_V1
        select CPU_ARM926T
        select MXC_AVIC
        select PINCTRL_IMX27

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index ca35d3e4cab4ca31f2bd15873210f17bcd3a9b8a..7fe3060c300e54394d3e989b01642c5886c397b9 100644 (file)
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o mach-imx35.o
 imx5-pm-$(CONFIG_PM) += pm-imx5.o
 obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)
 
-obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
 obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
 
 obj-$(CONFIG_MXC_TZIC) += tzic.o

diff --git a/arch/arm/mach-imx/iomux-v1.c b/arch/arm/mach-imx/iomux-v1.c
deleted file mode 100644 (file)
index a4bec3b..0000000
--- a/arch/arm/mach-imx/iomux-v1.c
+++ /dev/null
@@ -1,174 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * arch/arm/plat-mxc/iomux-v1.c
- *
- * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
- * Copyright (C) 2009 Uwe Kleine-Koenig, Pengutronix
- *
- * Common code for i.MX1, i.MX21 and i.MX27
- */
-
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/gpio.h>
-
-#include <asm/mach/map.h>
-
-#include "hardware.h"
-#include "iomux-v1.h"
-
-static void __iomem *imx_iomuxv1_baseaddr;
-static unsigned imx_iomuxv1_numports;
-
-static inline unsigned long imx_iomuxv1_readl(unsigned offset)
-{
-       return imx_readl(imx_iomuxv1_baseaddr + offset);
-}
-
-static inline void imx_iomuxv1_writel(unsigned long val, unsigned offset)
-{
-       imx_writel(val, imx_iomuxv1_baseaddr + offset);
-}
-
-static inline void imx_iomuxv1_rmwl(unsigned offset,
-               unsigned long mask, unsigned long value)
-{
-       unsigned long reg = imx_iomuxv1_readl(offset);
-
-       reg &= ~mask;
-       reg |= value;
-
-       imx_iomuxv1_writel(reg, offset);
-}
-
-static inline void imx_iomuxv1_set_puen(
-               unsigned int port, unsigned int pin, int on)
-{
-       unsigned long mask = 1 << pin;
-
-       imx_iomuxv1_rmwl(MXC_PUEN(port), mask, on ? mask : 0);
-}
-
-static inline void imx_iomuxv1_set_ddir(
-               unsigned int port, unsigned int pin, int out)
-{
-       unsigned long mask = 1 << pin;
-
-       imx_iomuxv1_rmwl(MXC_DDIR(port), mask, out ? mask : 0);
-}
-
-static inline void imx_iomuxv1_set_gpr(
-               unsigned int port, unsigned int pin, int af)
-{
-       unsigned long mask = 1 << pin;
-
-       imx_iomuxv1_rmwl(MXC_GPR(port), mask, af ? mask : 0);
-}
-
-static inline void imx_iomuxv1_set_gius(
-               unsigned int port, unsigned int pin, int inuse)
-{
-       unsigned long mask = 1 << pin;
-
-       imx_iomuxv1_rmwl(MXC_GIUS(port), mask, inuse ? mask : 0);
-}
-
-static inline void imx_iomuxv1_set_ocr(
-               unsigned int port, unsigned int pin, unsigned int ocr)
-{
-       unsigned long shift = (pin & 0xf) << 1;
-       unsigned long mask = 3 << shift;
-       unsigned long value = ocr << shift;
-       unsigned long offset = pin < 16 ? MXC_OCR1(port) : MXC_OCR2(port);
-
-       imx_iomuxv1_rmwl(offset, mask, value);
-}
-
-static inline void imx_iomuxv1_set_iconfa(
-               unsigned int port, unsigned int pin, unsigned int aout)
-{
-       unsigned long shift = (pin & 0xf) << 1;
-       unsigned long mask = 3 << shift;
-       unsigned long value = aout << shift;
-       unsigned long offset = pin < 16 ? MXC_ICONFA1(port) : MXC_ICONFA2(port);
-
-       imx_iomuxv1_rmwl(offset, mask, value);
-}
-
-static inline void imx_iomuxv1_set_iconfb(
-               unsigned int port, unsigned int pin, unsigned int bout)
-{
-       unsigned long shift = (pin & 0xf) << 1;
-       unsigned long mask = 3 << shift;
-       unsigned long value = bout << shift;
-       unsigned long offset = pin < 16 ? MXC_ICONFB1(port) : MXC_ICONFB2(port);
-
-       imx_iomuxv1_rmwl(offset, mask, value);
-}
-
-int mxc_gpio_mode(int gpio_mode)
-{
-       unsigned int pin = gpio_mode & GPIO_PIN_MASK;
-       unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
-       unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> GPIO_OCR_SHIFT;
-       unsigned int aout = (gpio_mode >> GPIO_AOUT_SHIFT) & 3;
-       unsigned int bout = (gpio_mode >> GPIO_BOUT_SHIFT) & 3;
-
-       if (port >= imx_iomuxv1_numports)
-               return -EINVAL;
-
-       /* Pullup enable */
-       imx_iomuxv1_set_puen(port, pin, gpio_mode & GPIO_PUEN);
-
-       /* Data direction */
-       imx_iomuxv1_set_ddir(port, pin, gpio_mode & GPIO_OUT);
-
-       /* Primary / alternate function */
-       imx_iomuxv1_set_gpr(port, pin, gpio_mode & GPIO_AF);
-
-       /* use as gpio? */
-       imx_iomuxv1_set_gius(port, pin, !(gpio_mode & (GPIO_PF | GPIO_AF)));
-
-       imx_iomuxv1_set_ocr(port, pin, ocr);
-
-       imx_iomuxv1_set_iconfa(port, pin, aout);
-
-       imx_iomuxv1_set_iconfb(port, pin, bout);
-
-       return 0;
-}
-
-static int imx_iomuxv1_setup_multiple(const int *list, unsigned count)
-{
-       size_t i;
-       int ret = 0;
-
-       for (i = 0; i < count; ++i) {
-               ret = mxc_gpio_mode(list[i]);
-
-               if (ret)
-                       return ret;
-       }
-
-       return ret;
-}
-
-int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
-               const char *label)
-{
-       int ret;
-
-       ret = imx_iomuxv1_setup_multiple(pin_list, count);
-       return ret;
-}
-
-int __init imx_iomuxv1_init(void __iomem *base, int numports)
-{
-       imx_iomuxv1_baseaddr = base;
-       imx_iomuxv1_numports = numports;
-
-       return 0;
-}

diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c
index caf1da1754f6da208f9afa6bc714750a3a6243a7..17345066b04372d7d991bf401b56517b95b92315 100644 (file)
--- a/arch/arm/mach-imx/mm-imx27.c
+++ b/arch/arm/mach-imx/mm-imx27.c
@@ -7,13 +7,11 @@
 
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/pinctrl/machine.h>
 #include <asm/mach/map.h>
 
 #include "common.h"
 #include "devices/devices-common.h"
 #include "hardware.h"
-#include "iomux-v1.h"
 
 /* MX27 memory map definition */
 static struct map_desc imx27_io_desc[] __initdata = {
@@ -52,8 +50,6 @@ void __init mx27_map_io(void)
 void __init imx27_init_early(void)
 {
        mxc_set_cpu_type(MXC_CPU_MX27);
-       imx_iomuxv1_init(MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR),
-                       MX27_NUM_GPIO_PORT);
 }
 
 void __init mx27_init_irq(void)