Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

CRISv32: Add GPIO driver to the default configs

Fix a number of small issues visible when GPIO is enabled:

- Correct missing default for !ETRAXFS in Kconfig
- Remove information on number of bits for some Kconfigs
related to the GPIO, they are different in ETRAX FS and ARTPEC-3
- Fix compile warning in ARTPEC-3 GPIO driver

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

+12 -14
+8 -8
arch/cris/arch-v32/drivers/Kconfig
··· 202 202 default "0x00" if ETRAXFS 203 203 default "0x00000000" if !ETRAXFS 204 204 help 205 - This is a bitmask (8 bits) with information of what bits in PA that a 205 + This is a bitmask with information of what bits in PA that a 206 206 user can change direction on using ioctl's. 207 207 Bit set = changeable. 208 208 You probably want 0 here, but it depends on your hardware. ··· 213 213 default "0x00" if ETRAXFS 214 214 default "0x00000000" if !ETRAXFS 215 215 help 216 - This is a bitmask (8 bits) with information of what bits in PA 216 + This is a bitmask with information of what bits in PA 217 217 that a user can change the value on using ioctl's. 218 218 Bit set = changeable. 219 219 ··· 223 223 default "0x00000" if ETRAXFS 224 224 default "0x00000000" if !ETRAXFS 225 225 help 226 - This is a bitmask (18 bits) with information of what bits in PB 226 + This is a bitmask with information of what bits in PB 227 227 that a user can change direction on using ioctl's. 228 228 Bit set = changeable. 229 229 You probably want 0 here, but it depends on your hardware. ··· 234 234 default "0x00000" if ETRAXFS 235 235 default "0x00000000" if !ETRAXFS 236 236 help 237 - This is a bitmask (18 bits) with information of what bits in PB 237 + This is a bitmask with information of what bits in PB 238 238 that a user can change the value on using ioctl's. 239 239 Bit set = changeable. 240 240 ··· 244 244 default "0x00000" if ETRAXFS 245 245 default "0x00000000" if !ETRAXFS 246 246 help 247 - This is a bitmask (18 bits) with information of what bits in PC 247 + This is a bitmask with information of what bits in PC 248 248 that a user can change direction on using ioctl's. 249 249 Bit set = changeable. 250 250 You probably want 0 here, but it depends on your hardware. ··· 253 253 hex "PC user changeable bits mask" 254 254 depends on ETRAX_GPIO 255 255 default "0x00000" if ETRAXFS 256 - default "0x00000000" if ETRAXFS 256 + default "0x00000000" if !ETRAXFS 257 257 help 258 - This is a bitmask (18 bits) with information of what bits in PC 258 + This is a bitmask with information of what bits in PC 259 259 that a user can change the value on using ioctl's. 260 260 Bit set = changeable. 261 261 ··· 264 264 depends on ETRAX_GPIO && ETRAXFS 265 265 default "0x00000" 266 266 help 267 - This is a bitmask (18 bits) with information of what bits in PD 267 + This is a bitmask with information of what bits in PD 268 268 that a user can change direction on using ioctl's. 269 269 Bit set = changeable. 270 270 You probably want 0x00000 here, but it depends on your hardware.
+2 -2
arch/cris/arch-v32/drivers/mach-a3/gpio.c
··· 957 957 958 958 static int __init gpio_init(void) 959 959 { 960 - int res; 960 + int res, res2; 961 961 962 962 printk(KERN_INFO "ETRAX FS GPIO driver v2.7, (c) 2003-2008 " 963 963 "Axis Communications AB\n"); ··· 977 977 CRIS_LED_DISK_READ(0); 978 978 CRIS_LED_DISK_WRITE(0); 979 979 980 - int res2 = request_irq(GIO_INTR_VECT, gpio_interrupt, 980 + res2 = request_irq(GIO_INTR_VECT, gpio_interrupt, 981 981 IRQF_SHARED, "gpio", &alarmlist); 982 982 if (res2) { 983 983 printk(KERN_ERR "err: irq for gpio\n");
+1 -4
arch/cris/configs/artpec_3_defconfig
··· 12 12 CONFIG_CRIS_MACH_ARTPEC3=y 13 13 CONFIG_ETRAX_DRAM_SIZE=32 14 14 CONFIG_ETRAX_FLASH1_SIZE=4 15 - CONFIG_ETRAX_DEF_GIO_PA_OE=1c 16 - CONFIG_ETRAX_DEF_GIO_PA_OUT=00 17 - CONFIG_ETRAX_DEF_GIO_PB_OE=00000 18 - CONFIG_ETRAX_DEF_GIO_PB_OUT=00000 19 15 CONFIG_NET=y 20 16 CONFIG_PACKET=y 21 17 CONFIG_UNIX=y ··· 38 42 CONFIG_CRAMFS=y 39 43 CONFIG_NFS_FS=y 40 44 CONFIG_NFS_V3=y 45 + CONFIG_ETRAX_GPIO=y
+1
arch/cris/configs/etraxfs_defconfig
··· 38 38 CONFIG_CRAMFS=y 39 39 CONFIG_NFS_FS=y 40 40 CONFIG_NFS_V3=y 41 + CONFIG_ETRAX_GPIO=y