CRIS: Drop code related to obsolete or unused kconfigs

Drop all code related to Kconfigs that don't exist.
Fix one Kconfig where it was actually typo:ed (ETRAX_KGB_PORT2)
Drop content related to CRIS v32 SoCs from etraxgpio.h headerfile,
all use of GPIO for both ETRAX FS and ARTPEC-3 should now be through
standard gpiolib instead.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

5 files changed, 1 insertions, 34 deletions

diff --git a/arch/cris/arch-v32/kernel/debugport.c b/arch/cris/arch-v32/kernel/debugport.c
index 02e33ebe51ec..d2f3f9c37102 100644
--- a/arch/cris/arch-v32/kernel/debugport.c
+++ b/arch/cris/arch-v32/kernel/debugport.c
@@ -77,8 +77,6 @@ static struct dbg_port *port =
         &ports[2];
 #elif defined(CONFIG_ETRAX_DEBUG_PORT3)
         &ports[3];
-#elif defined(CONFIG_ETRAX_DEBUG_PORT4)
-        &ports[4];
 #else
         NULL;
 #endif
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S
index 74a66e0e3777..ea6366800df7 100644
--- a/arch/cris/arch-v32/kernel/head.S
+++ b/arch/cris/arch-v32/kernel/head.S
@@ -292,11 +292,7 @@ _no_romfs_in_flash:
         ;; For cramfs, partition starts with magic and length.
         ;; For jffs2, a jhead is prepended which contains with magic and length.
         ;; The jhead is not part of the jffs2 partition however.
-#ifndef CONFIG_ETRAXFS_SIM
         move.d  __bss_start, $r0
-#else
-        move.d  __end, $r0
-#endif
         move.d  [$r0], $r1
         cmp.d   CRAMFS_MAGIC, $r1 ; cramfs magic?
         beq     2f                ; yes, jump
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index b566a038d2a1..6de8db67cb09 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -37,7 +37,7 @@
 #define IGNOREMASK (1 << (SER0_INTR_VECT - FIRST_IRQ))
 #elif defined(CONFIG_ETRAX_KGDB_PORT1)
 #define IGNOREMASK (1 << (SER1_INTR_VECT - FIRST_IRQ))
-#elif defined(CONFIG_ETRAX_KGB_PORT2)
+#elif defined(CONFIG_ETRAX_KGDB_PORT2)
 #define IGNOREMASK (1 << (SER2_INTR_VECT - FIRST_IRQ))
 #elif defined(CONFIG_ETRAX_KGDB_PORT3)
 #define IGNOREMASK (1 << (SER3_INTR_VECT - FIRST_IRQ))
diff --git a/arch/cris/arch-v32/kernel/setup.c b/arch/cris/arch-v32/kernel/setup.c
index cd1865d68b2e..fe50287aa928 100644
--- a/arch/cris/arch-v32/kernel/setup.c
+++ b/arch/cris/arch-v32/kernel/setup.c
@@ -129,10 +129,6 @@ static struct i2c_board_info __initdata i2c_info[] = {
 #ifdef CONFIG_RTC_DRV_PCF8563
         {I2C_BOARD_INFO("pcf8563", 0x51)},
 #endif
-#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
-        {I2C_BOARD_INFO("vgpio", 0x20)},
-        {I2C_BOARD_INFO("vgpio", 0x21)},
-#endif
         {I2C_BOARD_INFO("pca9536", 0x41)},
         {I2C_BOARD_INFO("fnp300", 0x40)},
         {I2C_BOARD_INFO("fnp300", 0x42)},
@@ -146,10 +142,6 @@ static struct i2c_board_info __initdata i2c_info2[] = {
         {I2C_BOARD_INFO("tmp100", 0x4C)},
         {I2C_BOARD_INFO("tmp100", 0x4D)},
         {I2C_BOARD_INFO("tmp100", 0x4E)},
-#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
-        {I2C_BOARD_INFO("vgpio", 0x20)},
-        {I2C_BOARD_INFO("vgpio", 0x21)},
-#endif
         {I2C_BOARD_INFO("pca9536", 0x41)},
         {I2C_BOARD_INFO("fnp300", 0x40)},
         {I2C_BOARD_INFO("fnp300", 0x42)},
diff --git a/arch/cris/arch-v32/mach-fs/Kconfig b/arch/cris/arch-v32/mach-fs/Kconfig
index 774de82abef6..7d1ab972bc0f 100644
--- a/arch/cris/arch-v32/mach-fs/Kconfig
+++ b/arch/cris/arch-v32/mach-fs/Kconfig
@@ -192,25 +192,6 @@ config ETRAX_DEF_GIO_PE_OUT
           Configures the initial data for the general port E bits.  Most
           products should use 00000 here.
 
-config ETRAX_DEF_GIO_PV_OE
-        hex "GIO_PV_OE"
-        depends on ETRAX_VIRTUAL_GPIO
-        default "0000"
-        help
-          Configures the direction of virtual general port V bits. 1 is out,
-          0 is in. This is often totally different depending on the product
-          used. These bits are used for all kinds of stuff. If you don't know
-          what to use, it is always safe to put all as inputs, although
-          floating inputs isn't good.
-
-config ETRAX_DEF_GIO_PV_OUT
-        hex "GIO_PV_OUT"
-        depends on ETRAX_VIRTUAL_GPIO
-        default "0000"
-        help
-          Configures the initial data for the virtual general port V bits.
-          Most products should use 0000 here.
-
 endmenu
 
 endif