[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-16-gc5c5552

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  c5c5552e2dd26324a89310f3641115814e04b57e (commit)
       via  c15c2304fed4597ba747e0a36be6ab79bd590c1e (commit)
      from  f5a2faada616650b930bdb8501a7f5fe79708034 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c5c5552e2dd26324a89310f3641115814e04b57e
Merge: c15c230 f5a2faa
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Oct 24 08:45:32 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit c15c2304fed4597ba747e0a36be6ab79bd590c1e
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Oct 23 19:08:26 2012 +0200

    [kernel][fpga][pod_gpio] adding irq number information when probed

-----------------------------------------------------------------------

Summary of changes:
 .../fpga/virtual_components/pod_gpio/pod_gpio.c    |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
index 7c68911..e501128 100644
--- a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
+++ b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
@@ -78,6 +78,7 @@ static void pod_gpio_mask_irq(struct irq_data *data)
 	u16 enable_interrupt_config;
 	enable_interrupt_config = cg_read_reg(cg_chip, GPIO_ENABLE_INTERRUPT);
 
+
 	cg_write_reg(cg_chip , GPIO_ENABLE_INTERRUPT, enable_interrupt_config &
 					~(1 << (data->irq - IRQ_GPIO_POD(0))));
 }
@@ -89,6 +90,8 @@ static void pod_gpio_unmask_irq(struct irq_data *data)
 		container_of(chip, struct pod_gpio_chip, interrupt_chip);
 
 	u16 enable_interrupt_config;
+
+
 	enable_interrupt_config = cg_read_reg(cg_chip, GPIO_ENABLE_INTERRUPT);
 
 	cg_write_reg(cg_chip, GPIO_ENABLE_INTERRUPT, enable_interrupt_config |
@@ -103,6 +106,7 @@ static int pod_gpio_irq_type(unsigned int _irq, unsigned int type)
 							interrupt_chip);
 	u16 edge_config;
 
+
 	edge_config = cg_read_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE);
 
 	/* Only falling and rising edge are supporter by pod_gpio */
@@ -206,7 +210,6 @@ static int pod_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 	struct pod_gpio_chip *cg_chip =
 			container_of(chip, struct pod_gpio_chip, chip);
 
-
 	return cg_chip->irq_base + offset;
 }
 
@@ -316,8 +319,8 @@ static int pod_gpio_probe(struct platform_device *pdev)
 		goto exit_iounmap;
 	}
 
-	dev_info(&pdev->dev, "pod_gpio probed. GPIO used: %d..%d\n",
-	cg_chip->chip.base, cg_chip->chip.base + cg_chip->chip.ngpio-1);
+	dev_info(&pdev->dev, "pod_gpio probed. GPIO used: %d..%d, IRQ used: %d..%d\n",
+	cg_chip->chip.base, cg_chip->chip.base + cg_chip->chip.ngpio-1, IRQ_GPIO_POD(0), IRQ_GPIO_POD(16));
 
 	return 0;
 


hooks/post-receive
-- 
armadeus