diff options
author | Jesper Nilsson <jespern@axis.com> | 2015-06-03 12:42:01 +0200 |
---|---|---|
committer | Jesper Nilsson <jespern@axis.com> | 2015-09-05 00:33:25 +0200 |
commit | 939b83fb03f275016cd72a0f81f49bf8e63c2a14 (patch) | |
tree | e235d20ea43618fee073ce85e2399fd1406aa550 /arch/cris/configs | |
parent | 94230178678cb7e0f82ff2c161ac84742f79a2e7 (diff) | |
download | op-kernel-dev-939b83fb03f275016cd72a0f81f49bf8e63c2a14.zip op-kernel-dev-939b83fb03f275016cd72a0f81f49bf8e63c2a14.tar.gz |
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>
Diffstat (limited to 'arch/cris/configs')
-rw-r--r-- | arch/cris/configs/artpec_3_defconfig | 5 | ||||
-rw-r--r-- | arch/cris/configs/etraxfs_defconfig | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/cris/configs/artpec_3_defconfig b/arch/cris/configs/artpec_3_defconfig index 71854d4..70e497e 100644 --- a/arch/cris/configs/artpec_3_defconfig +++ b/arch/cris/configs/artpec_3_defconfig @@ -12,10 +12,6 @@ CONFIG_ETRAX_FAST_TIMER=y CONFIG_CRIS_MACH_ARTPEC3=y CONFIG_ETRAX_DRAM_SIZE=32 CONFIG_ETRAX_FLASH1_SIZE=4 -CONFIG_ETRAX_DEF_GIO_PA_OE=1c -CONFIG_ETRAX_DEF_GIO_PA_OUT=00 -CONFIG_ETRAX_DEF_GIO_PB_OE=00000 -CONFIG_ETRAX_DEF_GIO_PB_OUT=00000 CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -42,3 +38,4 @@ CONFIG_JFFS2_FS=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y +CONFIG_ETRAX_GPIO=y diff --git a/arch/cris/configs/etraxfs_defconfig b/arch/cris/configs/etraxfs_defconfig index 87c7227..9123268 100644 --- a/arch/cris/configs/etraxfs_defconfig +++ b/arch/cris/configs/etraxfs_defconfig @@ -38,3 +38,4 @@ CONFIG_JFFS2_FS=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y +CONFIG_ETRAX_GPIO=y |