From f613048460db39639f2235c4e1345b1a46c29609 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 23 Mar 2014 15:51:34 -0600 Subject: [PATCH] SAM3/4: Rename CONFIG_GPIO*_IRQ to CONFIG_SAM34_GPIO*_IRQ --- arch/arm/include/sam34/sam3u_irq.h | 6 +++--- arch/arm/include/sam34/sam3x_irq.h | 12 ++++++------ arch/arm/include/sam34/sam4e_irq.h | 10 +++++----- arch/arm/include/sam34/sam4l_irq.h | 6 +++--- arch/arm/include/sam34/sam4s_irq.h | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm/include/sam34/sam3u_irq.h b/arch/arm/include/sam34/sam3u_irq.h index 7801402460..a240eca30b 100644 --- a/arch/arm/include/sam34/sam3u_irq.h +++ b/arch/arm/include/sam34/sam3u_irq.h @@ -119,7 +119,7 @@ /* GPIO interrupts (derived from SAM_IRQ_PIOA/B/C) */ -#ifdef CONFIG_GPIOA_IRQ +#ifdef CONFIG_SAM34_GPIOA_IRQ # define SAM_IRQ_GPIOA_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT) # define SAM_IRQ_PA0 (SAM_IRQ_GPIOA_PINS+0) /* GPIOA, PIN 0 */ # define SAM_IRQ_PA1 (SAM_IRQ_GPIOA_PINS+1) /* GPIOA, PIN 1 */ @@ -158,7 +158,7 @@ # define SAM_NGPIOAIRQS 0 #endif -#ifdef CONFIG_GPIOB_IRQ +#ifdef CONFIG_SAM34_GPIOB_IRQ # define SAM_IRQ_GPIOB_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS) # define SAM_IRQ_PB0 (SAM_IRQ_GPIOB_PINS+0) /* GPIOB, PIN 0 */ # define SAM_IRQ_PB1 (SAM_IRQ_GPIOB_PINS+1) /* GPIOB, PIN 1 */ @@ -197,7 +197,7 @@ # define SAM_NGPIOBIRQS 0 #endif -#ifdef CONFIG_GPIOC_IRQ +#ifdef CONFIG_SAM34_GPIOC_IRQ # define SAM_IRQ_GPIOC_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + SAM_NGPIOBIRQS) # define SAM_IRQ_PC0 (SAM_IRQ_GPIOC_PINS+0) /* GPIOC, PIN 0 */ # define SAM_IRQ_PC1 (SAM_IRQ_GPIOC_PINS+1) /* GPIOC, PIN 1 */ diff --git a/arch/arm/include/sam34/sam3x_irq.h b/arch/arm/include/sam34/sam3x_irq.h index 38ea07cffd..06d5c22038 100644 --- a/arch/arm/include/sam34/sam3x_irq.h +++ b/arch/arm/include/sam34/sam3x_irq.h @@ -151,7 +151,7 @@ /* GPIO interrupts (derived from SAM_IRQ_PIOA/B/C/D/E/F) */ -#ifdef CONFIG_GPIOA_IRQ +#ifdef CONFIG_SAM34_GPIOA_IRQ # define SAM_IRQ_GPIOA_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT) # define SAM_IRQ_PA0 (SAM_IRQ_GPIOA_PINS+0) /* GPIOA, PIN 0 */ # define SAM_IRQ_PA1 (SAM_IRQ_GPIOA_PINS+1) /* GPIOA, PIN 1 */ @@ -190,7 +190,7 @@ # define SAM_NGPIOAIRQS 0 #endif -#ifdef CONFIG_GPIOB_IRQ +#ifdef CONFIG_SAM34_GPIOB_IRQ # define SAM_IRQ_GPIOB_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS) # define SAM_IRQ_PB0 (SAM_IRQ_GPIOB_PINS+0) /* GPIOB, PIN 0 */ # define SAM_IRQ_PB1 (SAM_IRQ_GPIOB_PINS+1) /* GPIOB, PIN 1 */ @@ -229,7 +229,7 @@ # define SAM_NGPIOBIRQS 0 #endif -#ifdef CONFIG_GPIOC_IRQ +#ifdef CONFIG_SAM34_GPIOC_IRQ # define SAM_IRQ_GPIOC_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + \ SAM_NGPIOBIRQS) # define SAM_IRQ_PC0 (SAM_IRQ_GPIOC_PINS+0) /* GPIOC, PIN 0 */ @@ -269,7 +269,7 @@ # define SAM_NGPIOCIRQS 0 #endif -#ifdef CONFIG_GPIOD_IRQ +#ifdef CONFIG_SAM34_GPIOD_IRQ # define SAM_IRQ_GPIOD_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + \ SAM_NGPIOBIRQS + SAM_NGPIOCIRQS) # define SAM_IRQ_PD0 (SAM_IRQ_GPIOD_PINS+0) /* GPIOD, PIN 0 */ @@ -309,7 +309,7 @@ # define SAM_NGPIODIRQS 0 #endif -#ifdef CONFIG_GPIOE_IRQ +#ifdef CONFIG_SAM34_GPIOE_IRQ # define SAM_IRQ_GPIOE_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + \ SAM_NGPIOBIRQS + SAM_NGPIOCIRQS + SAM_NGPIODIRQS) # define SAM_IRQ_PE0 (SAM_IRQ_GPIOE_PINS+0) /* GPIOE, PIN 0 */ @@ -349,7 +349,7 @@ # define SAM_NGPIOEIRQS 0 #endif -#ifdef CONFIG_GPIOF_IRQ +#ifdef CONFIG_SAM34_GPIOF_IRQ # define SAM_IRQ_GPIOF_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + \ SAM_NGPIOBIRQS + SAM_NGPIOCIRQS + SAM_NGPIODIRQS + \ SAM_NGPIOEIRQS) diff --git a/arch/arm/include/sam34/sam4e_irq.h b/arch/arm/include/sam34/sam4e_irq.h index c67495da03..a9bfde663d 100755 --- a/arch/arm/include/sam34/sam4e_irq.h +++ b/arch/arm/include/sam34/sam4e_irq.h @@ -146,7 +146,7 @@ /* GPIO interrupts (derived from SAM_IRQ_PIOA/B/C) */ -#ifdef CONFIG_GPIOA_IRQ +#ifdef CONFIG_SAM34_GPIOA_IRQ # define SAM_IRQ_GPIOA_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT) # define SAM_IRQ_PA0 (SAM_IRQ_GPIOA_PINS+0) /* GPIOA, PIN 0 */ # define SAM_IRQ_PA1 (SAM_IRQ_GPIOA_PINS+1) /* GPIOA, PIN 1 */ @@ -185,7 +185,7 @@ # define SAM_NGPIOAIRQS 0 #endif -#ifdef CONFIG_GPIOB_IRQ +#ifdef CONFIG_SAM34_GPIOB_IRQ # define SAM_IRQ_GPIOB_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS) # define SAM_IRQ_PB0 (SAM_IRQ_GPIOB_PINS+0) /* GPIOB, PIN 0 */ # define SAM_IRQ_PB1 (SAM_IRQ_GPIOB_PINS+1) /* GPIOB, PIN 1 */ @@ -207,7 +207,7 @@ # define SAM_NGPIOBIRQS 0 #endif -#ifdef CONFIG_GPIOC_IRQ +#ifdef CONFIG_SAM34_GPIOC_IRQ # define SAM_IRQ_GPIOC_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + SAM_NGPIOBIRQS) # define SAM_IRQ_PC0 (SAM_IRQ_GPIOC_PINS+0) /* GPIOC, PIN 0 */ # define SAM_IRQ_PC1 (SAM_IRQ_GPIOC_PINS+1) /* GPIOC, PIN 1 */ @@ -246,7 +246,7 @@ # define SAM_NGPIOCIRQS 0 #endif -#ifdef CONFIG_GPIOD_IRQ +#ifdef CONFIG_SAM34_GPIOD_IRQ # define SAM_IRQ_GPIOD_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + SAM_NGPIOBIRQS) # define SAM_IRQ_PD0 (SAM_IRQ_GPIOD_PINS+0) /* GPIOD, PIN 0 */ # define SAM_IRQ_PD1 (SAM_IRQ_GPIOD_PINS+1) /* GPIOD, PIN 1 */ @@ -285,7 +285,7 @@ # define SAM_NGPIODIRQS 0 #endif -#ifdef CONFIG_GPIOE_IRQ +#ifdef CONFIG_SAM34_GPIOE_IRQ # define SAM_IRQ_GPIOE_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + SAM_NGPIOBIRQS) # define SAM_IRQ_PE0 (SAM_IRQ_GPIOE_PINS+0) /* GPIOE, PIN 0 */ # define SAM_IRQ_PE1 (SAM_IRQ_GPIOE_PINS+1) /* GPIOE, PIN 1 */ diff --git a/arch/arm/include/sam34/sam4l_irq.h b/arch/arm/include/sam34/sam4l_irq.h index 5a384170c2..8e3450823d 100644 --- a/arch/arm/include/sam34/sam4l_irq.h +++ b/arch/arm/include/sam34/sam4l_irq.h @@ -180,7 +180,7 @@ /* GPIO interrupts (derived from SAM_IRQ_PIOA/B/C) */ -#ifdef CONFIG_GPIOA_IRQ +#ifdef CONFIG_SAM34_GPIOA_IRQ # define SAM_IRQ_GPIOA_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT) # define SAM_IRQ_PA0 (SAM_IRQ_GPIOA_PINS+0) /* GPIOA, PIN 0 */ # define SAM_IRQ_PA1 (SAM_IRQ_GPIOA_PINS+1) /* GPIOA, PIN 1 */ @@ -219,7 +219,7 @@ # define SAM_NGPIOAIRQS 0 #endif -#ifdef CONFIG_GPIOB_IRQ +#ifdef CONFIG_SAM34_GPIOB_IRQ # define SAM_IRQ_GPIOB_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS) # define SAM_IRQ_PB0 (SAM_IRQ_GPIOB_PINS+0) /* GPIOB, PIN 0 */ # define SAM_IRQ_PB1 (SAM_IRQ_GPIOB_PINS+1) /* GPIOB, PIN 1 */ @@ -258,7 +258,7 @@ # define SAM_NGPIOBIRQS 0 #endif -#ifdef CONFIG_GPIOC_IRQ +#ifdef CONFIG_SAM34_GPIOC_IRQ # define SAM_IRQ_GPIOC_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + SAM_NGPIOBIRQS) # define SAM_IRQ_PC0 (SAM_IRQ_GPIOC_PINS+0) /* GPIOC, PIN 0 */ # define SAM_IRQ_PC1 (SAM_IRQ_GPIOC_PINS+1) /* GPIOC, PIN 1 */ diff --git a/arch/arm/include/sam34/sam4s_irq.h b/arch/arm/include/sam34/sam4s_irq.h index 2d79370afb..23d82281bd 100644 --- a/arch/arm/include/sam34/sam4s_irq.h +++ b/arch/arm/include/sam34/sam4s_irq.h @@ -130,7 +130,7 @@ /* GPIO interrupts (derived from SAM_IRQ_PIOA/B/C) */ -#ifdef CONFIG_GPIOA_IRQ +#ifdef CONFIG_SAM34_GPIOA_IRQ # define SAM_IRQ_GPIOA_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT) # define SAM_IRQ_PA0 (SAM_IRQ_GPIOA_PINS+0) /* GPIOA, PIN 0 */ # define SAM_IRQ_PA1 (SAM_IRQ_GPIOA_PINS+1) /* GPIOA, PIN 1 */ @@ -169,7 +169,7 @@ # define SAM_NGPIOAIRQS 0 #endif -#ifdef CONFIG_GPIOB_IRQ +#ifdef CONFIG_SAM34_GPIOB_IRQ # define SAM_IRQ_GPIOB_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS) # define SAM_IRQ_PB0 (SAM_IRQ_GPIOB_PINS+0) /* GPIOB, PIN 0 */ # define SAM_IRQ_PB1 (SAM_IRQ_GPIOB_PINS+1) /* GPIOB, PIN 1 */ @@ -208,7 +208,7 @@ # define SAM_NGPIOBIRQS 0 #endif -#ifdef CONFIG_GPIOC_IRQ +#ifdef CONFIG_SAM34_GPIOC_IRQ # define SAM_IRQ_GPIOC_PINS (SAM_IRQ_EXTINT + SAM_IRQ_NEXTINT + SAM_NGPIOAIRQS + SAM_NGPIOBIRQS) # define SAM_IRQ_PC0 (SAM_IRQ_GPIOC_PINS+0) /* GPIOC, PIN 0 */ # define SAM_IRQ_PC1 (SAM_IRQ_GPIOC_PINS+1) /* GPIOC, PIN 1 */