Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab28e96f authored by Rabin Vincent's avatar Rabin Vincent Committed by Jesper Nilsson
Browse files

CRIS v32: remove old GPIO and LEDs code 



Since we now have a gpiolib driver, remove this code:

The gpio-etraxfs driver (along with things like gpio-keys-polled for
polling support) replaces the GIO driver implementations in mach-a3 and
mach-fs.  The various generic external chip drivers replace the "virtual
gpio" parts.

The generic gpio-leds driver replaces the LED handling.

Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarJesper Nilsson <jespern@axis.com>
parent 79b863c6

arch/cris/arch-v32/Kconfig

+0 −89
Original line number Diff line number Diff line
@@ -10,95 +10,6 @@ config ETRAX_DRAM_VIRTUAL_BASE 
	depends on ETRAX_ARCH_V32

	default "c0000000"



choice

	prompt "Nbr of Ethernet LED groups"

	depends on ETRAX_ARCH_V32

	default ETRAX_NBR_LED_GRP_ONE

	help

	  Select how many Ethernet LED groups that can be used. Usually one per Ethernet

	  interface is a good choice.



config	ETRAX_NBR_LED_GRP_ZERO

	bool "Use zero LED groups"

	help

	  Select this if you do not want any Ethernet LEDs.



config	ETRAX_NBR_LED_GRP_ONE

	bool "Use one LED group"

	help

	  Select this if you want one Ethernet LED group. This LED group

	  can be used for one or more Ethernet interfaces. However, it is

	  recommended that each Ethernet interface use a dedicated LED group.



config	ETRAX_NBR_LED_GRP_TWO

	bool "Use two LED groups"

	help

	  Select this if you want two Ethernet LED groups. This is the

	  best choice if you have more than one Ethernet interface and

	  would like to have separate LEDs for the interfaces.



endchoice



config ETRAX_LED_G_NET0

	string "Ethernet LED group 0 green LED bit"

	depends on ETRAX_ARCH_V32 && (ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO)

	default "PA3"

	help

	  Bit to use for the green LED in Ethernet LED group 0.



config ETRAX_LED_R_NET0

	string "Ethernet LED group 0 red LED bit"

	depends on ETRAX_ARCH_V32 && (ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO)

	default "PA4"

	help

	  Bit to use for the red LED in Ethernet LED group 0.



config ETRAX_LED_G_NET1

	string "Ethernet group 1 green LED bit"

	depends on ETRAX_ARCH_V32 && ETRAX_NBR_LED_GRP_TWO

	default ""

	help

	  Bit to use for the green LED in Ethernet LED group 1.



config ETRAX_LED_R_NET1

	string "Ethernet group 1 red LED bit"

	depends on ETRAX_ARCH_V32 && ETRAX_NBR_LED_GRP_TWO

	default ""

	help

	  Bit to use for the red LED in Ethernet LED group 1.



config ETRAX_V32_LED2G

	string "Second green LED bit"

	depends on ETRAX_ARCH_V32

	default "PA5"

	help

	  Bit to use for the first green LED (status LED).

	  Most Axis products use bit A5 here.



config ETRAX_V32_LED2R

	string "Second red LED bit"

	depends on ETRAX_ARCH_V32

	default "PA6"

	help

	  Bit to use for the first red LED (network LED).

	  Most Axis products use bit A6 here.



config ETRAX_V32_LED3G

	string "Third green LED bit"

	depends on ETRAX_ARCH_V32

	default "PA7"

	help

	  Bit to use for the first green LED (drive/power LED).

	  Most Axis products use bit A7 here.



config ETRAX_V32_LED3R

	string "Third red LED bit"

	depends on ETRAX_ARCH_V32

	default "PA7"

	help

	  Bit to use for the first red LED (drive/power LED).

	  Most Axis products use bit A7 here.



choice

	prompt "Kernel GDB port"

	depends on ETRAX_KGDB

arch/cris/arch-v32/drivers/Kconfig

+0 −149
Original line number Diff line number Diff line
@@ -149,155 +149,6 @@ config ETRAX_NANDBOOT 
	  Say Y if your boot code, kernel and root file system is in

	  NAND flash. Say N if they are in NOR flash.



config ETRAX_GPIO

	bool "GPIO support"

	depends on ETRAX_ARCH_V32

	---help---

	  Enables the ETRAX general port device (major 120, minors 0-4).

	  You can use this driver to access the general port bits. It supports

	  these ioctl's:

	  #include <linux/etraxgpio.h>

	  fd = open("/dev/gpioa", O_RDWR); // or /dev/gpiob

	  ioctl(fd, _IO(ETRAXGPIO_IOCTYPE, IO_SETBITS), bits_to_set);

	  ioctl(fd, _IO(ETRAXGPIO_IOCTYPE, IO_CLRBITS), bits_to_clear);

	  err = ioctl(fd, _IO(ETRAXGPIO_IOCTYPE, IO_READ_INBITS), &val);

	  Remember that you need to setup the port directions appropriately in

	  the General configuration.



config ETRAX_VIRTUAL_GPIO

	bool "Virtual GPIO support"

	depends on ETRAX_GPIO

	help

	  Enables the virtual Etrax general port device (major 120, minor 6).

	  It uses an I/O expander for the I2C-bus.



config ETRAX_VIRTUAL_GPIO_INTERRUPT_PA_PIN

	int "Virtual GPIO interrupt pin on PA pin"

	range 0 7

	depends on ETRAX_VIRTUAL_GPIO

	help

	  The pin to use on PA for virtual gpio interrupt.



config ETRAX_PA_CHANGEABLE_DIR

	hex "PA user changeable dir mask"

	depends on ETRAX_GPIO

	default "0x00" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask with information of what bits in PA that a

	  user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0 here, but it depends on your hardware.



config ETRAX_PA_CHANGEABLE_BITS

	hex "PA user changeable bits mask"

	depends on ETRAX_GPIO

	default "0x00" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask with information of what bits in PA

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_PB_CHANGEABLE_DIR

	hex "PB user changeable dir mask"

	depends on ETRAX_GPIO

	default "0x00000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask with information of what bits in PB

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0 here, but it depends on your hardware.



config ETRAX_PB_CHANGEABLE_BITS

	hex "PB user changeable bits mask"

	depends on ETRAX_GPIO

	default "0x00000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask with information of what bits in PB

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_PC_CHANGEABLE_DIR

	hex "PC user changeable dir mask"

	depends on ETRAX_GPIO

	default "0x00000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask with information of what bits in PC

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0 here, but it depends on your hardware.



config ETRAX_PC_CHANGEABLE_BITS

	hex "PC user changeable bits mask"

	depends on ETRAX_GPIO

	default "0x00000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask with information of what bits in PC

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_PD_CHANGEABLE_DIR

	hex "PD user changeable dir mask"

	depends on ETRAX_GPIO && ETRAXFS

	default "0x00000"

	help

	  This is a bitmask with information of what bits in PD

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0x00000 here, but it depends on your hardware.



config ETRAX_PD_CHANGEABLE_BITS

	hex "PD user changeable bits mask"

	depends on ETRAX_GPIO && ETRAXFS

	default "0x00000"

	help

	  This is a bitmask (18 bits) with information of what bits in PD

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_PE_CHANGEABLE_DIR

	hex "PE user changeable dir mask"

	depends on ETRAX_GPIO && ETRAXFS

	default "0x00000"

	help

	  This is a bitmask (18 bits) with information of what bits in PE

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0x00000 here, but it depends on your hardware.



config ETRAX_PE_CHANGEABLE_BITS

	hex "PE user changeable bits mask"

 	depends on ETRAX_GPIO && ETRAXFS

	default "0x00000"

	help

	  This is a bitmask (18 bits) with information of what bits in PE

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_PV_CHANGEABLE_DIR

	hex "PV user changeable dir mask"

	depends on ETRAX_VIRTUAL_GPIO

	default "0x0000"

	help

	  This is a bitmask (16 bits) with information of what bits in PV

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0x0000 here, but it depends on your hardware.



config ETRAX_PV_CHANGEABLE_BITS

	hex "PV user changeable bits mask"

	depends on ETRAX_VIRTUAL_GPIO

	default "0x0000"

	help

	  This is a bitmask (16 bits) with information of what bits in PV

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_CARDBUS

        bool "Cardbus support"

        depends on ETRAX_ARCH_V32

arch/cris/arch-v32/drivers/mach-a3/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,4 +3,3 @@ 
#



obj-$(CONFIG_ETRAX_NANDFLASH)   += nandflash.o
 
obj-$(CONFIG_ETRAX_GPIO)        += gpio.o

arch/cris/arch-v32/drivers/mach-a3/gpio.c

deleted100644 → 0
+0 −999

File deleted.

Preview size limit exceeded, changes collapsed.

arch/cris/arch-v32/drivers/mach-fs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,4 +3,3 @@ 
#



obj-$(CONFIG_ETRAX_NANDFLASH)   += nandflash.o
 
obj-$(CONFIG_ETRAX_GPIO)        += gpio.o