[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-241-gd5b49e9

[jorasse <jo...@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  d5b49e9545d887a3a8521e6f538a58c47f7c16e5 (commit)
      from  3f83827667c952b7677241ec1ff88178cfbef96a (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 d5b49e9545d887a3a8521e6f538a58c47f7c16e5
Author: Janos Angeli <an...@an...>
Date:   Thu May 9 23:52:12 2013 +0200

    [LINUX] 2.6.35: Add OneWire GPIO Bus Master Device to APF28DEV
    
    This is the fixed version, now it works as static and as compiled module too.
    
    Signed-off-by: Janos Angeli <an...@an...>

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

Summary of changes:
 ...463-armadeus-add_apf28dev_onewire_support.patch |   56 ++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/2.6.35/463-armadeus-add_apf28dev_onewire_support.patch

diff --git a/patches/linux/2.6.35/463-armadeus-add_apf28dev_onewire_support.patch b/patches/linux/2.6.35/463-armadeus-add_apf28dev_onewire_support.patch
new file mode 100644
index 0000000..52d262c
--- /dev/null
+++ b/patches/linux/2.6.35/463-armadeus-add_apf28dev_onewire_support.patch
@@ -0,0 +1,56 @@
+Add OneWire GPIO Bus Master Device to APF28_DEV Board.
+(Fixed version, works with driver compiled as module)
+OneWire data pin is PINID_LCD_D18 (GPIO 1_18)
+
+Signed-off-by: Janos Angeli <an...@an...>
+---
+Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+===================================================================
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/apf28dev.c
++++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+@@ -33,6 +33,7 @@
+ #include <linux/mmc/host.h>
+ #include <linux/platform_device.h>
+ #include <linux/i2c.h>
++#include <linux/w1-gpio.h>
+ 
+ #include <asm/setup.h>
+ #include <asm/mach-types.h>
+@@ -924,6 +925,21 @@ static struct platform_device apf28dev_l
+ #endif /* defined(CONFIG_ARMADEUS_SENSOR_MXS_LRADC) ||
+ 	defined(CONFIG_ARMADEUS_SENSOR_MXS_LRADC_MODULE) */
+ 
++#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
++static struct w1_gpio_platform_data apf28dev_w1_gpio_data = {
++	.pin		= MXS_PIN_TO_GPIO(PINID_LCD_D18),
++	.is_open_drain	= 0,
++};
++
++static struct platform_device apf28dev_w1_gpio_dev = {
++	.name		= "w1-gpio",
++	.id		= -1,
++	.dev		= {
++		.platform_data	= &apf28dev_w1_gpio_data,
++	},
++};
++#endif /* defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE) */
++
+ static struct platform_device *apf28dev_platform_devices[] __initdata = {
+ #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+ 	&apf28dev_gpio_keys_device,
+@@ -934,12 +950,13 @@ static struct platform_device *apf28dev_
+ #if defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER) || \
+ 	defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER_MODULE)
+ 	&apf28dev_pwm_dev,
+-
+ #endif
+ #if defined(CONFIG_ARMADEUS_SENSOR_MXS_LRADC) || \
+ 	defined(CONFIG_ARMADEUS_SENSOR_MXS_LRADC_MODULE)
+ 	&apf28dev_lradc_dev,
+-
++#endif
++#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
++	&apf28dev_w1_gpio_dev,
+ #endif
+ };
+ 


hooks/post-receive
-- 
armadeus