Dove: add support for MPP configuration
v2 cover Dove: add support for MPP configuration
These patches add support for multi-purpose pins configuration on Marvell Dove and enable use of GPIOs 64-71
v2 changes:
* fix group gpio assignment
Mike Rapoport (2):
[ARM] Dove: add support for GPIOs 64-71
[ARM] Dove: add support for multi-purpose pins configuration
arch/arm/mach-dove/Makefile | 2 +- arch/arm/mach-dove/include/mach/dove.h | 9 ++- arch/arm/mach-dove/include/mach/gpio.h | 6 +- arch/arm/mach-dove/mpp.c | 215 ++++++++++++++++++++++++++++++++ arch/arm/mach-dove/mpp.h | 214 +++++++++++++++++++++++++++++++ 5 files changed, 442 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-dove/mpp.c create mode 100644 arch/arm/mach-dove/mpp.h
Signature · 1 line
1.7.3.1
PATCH v2 1/2 Dove: add support for GPIOs 64-71
Signed-off-by Mike Rapoport <[email protected]>
--- arch/arm/mach-dove/include/mach/dove.h | 1 + arch/arm/mach-dove/include/mach/gpio.h | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/mach-dove/include/mach/dove.h +1 -0
@@ -131,6 +131,7 @@#define DOVE_RESET_SAMPLE_LO (DOVE_MPP_VIRT_BASE | 0x014)#define DOVE_RESET_SAMPLE_HI (DOVE_MPP_VIRT_BASE | 0x018)#define DOVE_GPIO_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xd0400) +#define DOVE_GPIO2_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xe8400)#define DOVE_MPP_GENERAL_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xe803c)#define DOVE_AU1_SPDIFO_GPIO_EN (1 << 1)#define DOVE_NAND_GPIO_EN (1 << 0)
arch/arm/mach-dove/include/mach/gpio.h +4 -2
@@ -14,12 +14,14 @@#include <plat/gpio.h> #include <asm-generic/gpio.h> /* cansleep wrappers */ -#define GPIO_MAX 64 +#define GPIO_MAX 72#define GPIO_BASE_LO (DOVE_GPIO_VIRT_BASE + 0x00)#define GPIO_BASE_HI (DOVE_GPIO_VIRT_BASE + 0x20) -#define GPIO_BASE (pin) ((pin < 32) ? GPIO_BASE_LO : GPIO_BASE_HI) +#define GPIO_BASE (pin) ((pin < 32) ? GPIO_BASE_LO : \ + ((pin < 64) ? GPIO_BASE_HI : \ + DOVE_GPIO2_VIRT_BASE))#define GPIO_OUT (pin) (GPIO_BASE(pin) + 0x00)#define GPIO_IO_CONF (pin) (GPIO_BASE(pin) + 0x04)
Signature · 1 line
1.7.3.1
PATCH v2 2/2 Dove: add support for multi-purpose pins configuration
In reply to Mike RapoportSigned-off-by Mike Rapoport <[email protected]>
--- arch/arm/mach-dove/Makefile | 2 +- arch/arm/mach-dove/include/mach/dove.h | 8 +- arch/arm/mach-dove/mpp.c | 215 ++++++++++++++++++++++++++++++++ arch/arm/mach-dove/mpp.h | 214 +++++++++++++++++++++++++++++++ 4 files changed, 437 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-dove/mpp.c create mode 100644 arch/arm/mach-dove/mpp.h
arch/arm/mach-dove/Makefile +1 -1
@@ -1,3 +1,3 @@ -obj-y += common.o addr-map.o irq.o pcie.o +obj-y += common.o addr-map.o irq.o pcie.o mpp.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o
arch/arm/mach-dove/include/mach/dove.h +7 -1
@@ -136,10 +136,16 @@#define DOVE_AU1_SPDIFO_GPIO_EN (1 << 1)#define DOVE_NAND_GPIO_EN (1 << 0)#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_VIRT_BASE + 0x40) - +#define DOVE_SPI_GPIO_SEL (1 << 5) +#define DOVE_UART1_GPIO_SEL (1 << 4) +#define DOVE_AU1_GPIO_SEL (1 << 3) +#define DOVE_CAM_GPIO_SEL (1 << 2) +#define DOVE_SD1_GPIO_SEL (1 << 1) +#define DOVE_SD0_GPIO_SEL (1 << 0)/* Power Management */ #define DOVE_PMU_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xd0000) +#define DOVE_PMU_SIG_CTRL (DOVE_PMU_VIRT_BASE + 0x802c)/* Real Time Clock */ #define DOVE_RTC_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE | 0xd8500)
arch/arm/mach-dove/mpp.c new file +215 -0
215 lines not on this page · raw message
arch/arm/mach-dove/mpp.h new file +214 -0
214 lines not on this page · raw message
Signature · 1 line
1.7.3.1