diff mbox

[2/3] ARM: sa1100: populate codec platform data with irq

Message ID 1427989307-1805-2-git-send-email-dbaryshkov@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Baryshkov April 2, 2015, 3:41 p.m. UTC
For the sa11x0 boards that provide ucb1x00 codec platform data, provide
the irq data.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 arch/arm/mach-sa1100/assabet.c | 1 +
 arch/arm/mach-sa1100/collie.c  | 1 +
 arch/arm/mach-sa1100/simpad.c  | 1 +
 3 files changed, 3 insertions(+)

Comments

Russell King - ARM Linux April 2, 2015, 4 p.m. UTC | #1
On Thu, Apr 02, 2015 at 06:41:46PM +0300, Dmitry Eremin-Solenikov wrote:
> For the sa11x0 boards that provide ucb1x00 codec platform data, provide
> the irq data.

This isn't necessary.  The ucb1x00 can find its IRQ on its own.
Dmitry Baryshkov April 2, 2015, 4:01 p.m. UTC | #2
2015-04-02 19:00 GMT+03:00 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Thu, Apr 02, 2015 at 06:41:46PM +0300, Dmitry Eremin-Solenikov wrote:
>> For the sa11x0 boards that provide ucb1x00 codec platform data, provide
>> the irq data.
>
> This isn't necessary.  The ucb1x00 can find its IRQ on its own.

Yes, it can. But if it's a static configuration, why can't it be
configured statically?
Russell King - ARM Linux April 2, 2015, 4:03 p.m. UTC | #3
On Thu, Apr 02, 2015 at 07:01:52PM +0300, Dmitry Eremin-Solenikov wrote:
> 2015-04-02 19:00 GMT+03:00 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> > On Thu, Apr 02, 2015 at 06:41:46PM +0300, Dmitry Eremin-Solenikov wrote:
> >> For the sa11x0 boards that provide ucb1x00 codec platform data, provide
> >> the irq data.
> >
> > This isn't necessary.  The ucb1x00 can find its IRQ on its own.
> 
> Yes, it can. But if it's a static configuration, why can't it be
> configured statically?

Why change something that's worked for ages?
diff mbox

Patch

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index d28ecb9..28bb7ca 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -309,6 +309,7 @@  static struct ucb1x00_plat_data assabet_ucb1x00_data = {
 	.reset		= assabet_ucb1x00_reset,
 	.gpio_base	= -1,
 	.can_wakeup	= 1,
+	.irq		= IRQ_GPIO23,
 };
 
 static struct mcp_plat_data assabet_mcp_data = {
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 98710ea..cb1e7d7 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -97,6 +97,7 @@  static struct scoop_pcmcia_config collie_pcmcia_config = {
 
 static struct ucb1x00_plat_data collie_ucb1x00_data = {
 	.gpio_base	= COLLIE_TC35143_GPIO_BASE,
+	.irq		= COLLIE_IRQ_GPIO_UCB1x00_IRQ,
 };
 
 static struct mcp_plat_data collie_mcp_data = {
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 41e476e..117281c 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -184,6 +184,7 @@  static struct resource simpad_flash_resources [] = {
 
 static struct ucb1x00_plat_data simpad_ucb1x00_data = {
 	.gpio_base	= SIMPAD_UCB1X00_GPIO_BASE,
+	.irq		= IRQ_GPIO_UCB1300_IRQ,
 };
 
 static struct mcp_plat_data simpad_mcp_data = {