[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-309-gbc18b31

[Julien B a. A. <ar...@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  bc18b318299dbbd41f9f6da2baafffe1a0894716 (commit)
      from  f5e94c225bc48fbe5d049d91264c41e80b5d1991 (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 bc18b318299dbbd41f9f6da2baafffe1a0894716
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jul 8 14:30:56 2011 +0200

    [LINUX] APF51: makes pwm driver support both PWMs and condition PWM sound feature to i.MX1/2 only

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

Summary of changes:
 target/linux/modules/pwm/pwm.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/target/linux/modules/pwm/pwm.c b/target/linux/modules/pwm/pwm.c
index f2d1868..3f7870d 100644
--- a/target/linux/modules/pwm/pwm.c
+++ b/target/linux/modules/pwm/pwm.c
@@ -76,7 +76,11 @@
 #define PWM_PERIOD(x)		((x) & 0xFFFF)
 #define PWM_SAMPLE(x)		((x) & 0xFFFF)
 #define PWM_INT		MXC_INT_PWM
-#define PWM_MAX_DEV	1
+#if defined(CONFIG_ARCH_MX2)
+# define PWM_MAX_DEV	1
+#else
+# define PWM_MAX_DEV	2
+#endif
 
 #define PWM_MIN_FREQUENCY 1		/* Hz */
 #define PWM_MAX_FREQUENCY 1000000	/* Hz */
@@ -914,6 +918,7 @@ static int imx_pwm_drv_probe(struct platform_device *pdev)
                 goto error_memreg;
         }
 
+#ifndef CONFIG_ARCH_MX5
 	/* Register our char device */
 	err = register_chrdev(gMajor, DRIVER_NAME, &pwm_fops);
 	if (err < 0) {
@@ -925,7 +930,7 @@ static int imx_pwm_drv_probe(struct platform_device *pdev)
 		gMajor = err;
 		dev_dbg(&pdev->dev, "major = %d\n", gMajor);
 	}
-
+#endif
 	err = request_irq(pwm->irq, pwm_interrupt, IRQF_DISABLED, DRIVER_NAME, pwm);
 	if (err) {
 		dev_err(&pdev->dev, "can't reserve irq=%d\n", pwm->irq);
@@ -1033,7 +1038,9 @@ static int imx_pwm_drv_remove(struct platform_device *pdev)
 	unregister_sys_file(pwm);
 	device_destroy(pwm_class, MKDEV(gMajor, pdev->id));
 	free_irq(pwm->irq, pwm);
+#ifndef CONFIG_ARCH_MX5
 	unregister_chrdev(gMajor, DRIVER_NAME);
+#endif
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	release_mem_region(res->start, res->end - res->start + 1);
 	kfree(pwm);


hooks/post-receive
-- 
armadeus