diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2011-11-28 16:57:34 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2012-07-17 16:52:50 +0200 |
| commit | 4ccd1af9b56db0d1703276eca6e5f2ce5d300094 (patch) | |
| tree | 5b8db8316b62ee6ceb10f495816ff48904fa2d32 | |
| parent | 91e35d7d6460a238f8891a1f34f4059d8d8dfb03 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini6410-4ccd1af9b56db0d1703276eca6e5f2ce5d300094.tar.gz OSELAS.BSP-Pengutronix-Mini6410-4ccd1af9b56db0d1703276eca6e5f2ce5d300094.tar.xz | |
Kernel-3.1: fix the real 1Wire driver for the Mini6410
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/Changelog | 3 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.1/add_1wire_driver_to_mini6410.diff | 26 |
2 files changed, 20 insertions, 9 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index 6893ff5..c27a116 100644 --- a/configs/platform-friendlyarm-mini6410/Changelog +++ b/configs/platform-friendlyarm-mini6410/Changelog @@ -3,6 +3,9 @@ * Kernel 3.0: - keep in sync with stable release .11 + * Kernel 3.1: + - fix the real 1Wire driver for the Mini6410 + 2011-11-23 Juergen Beisert <jbe@pengutronix.de> * Kernel 3.0: diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/add_1wire_driver_to_mini6410.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/add_1wire_driver_to_mini6410.diff index 5eb4e7c..d7f5472 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/add_1wire_driver_to_mini6410.diff +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/add_1wire_driver_to_mini6410.diff @@ -2,20 +2,28 @@ Author: Juergen Beisert <jbe@pengutronix.de> Subject: Add the 1wire based touch and backlight control to the mini6410 This is an on demand feature. Only some display units are using it. Most display -units are using the CPU built in touch controller and an GPIO for backlight +units are using the CPU built in touch controller and a GPIO pin for backlight control. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> --- - arch/arm/mach-s3c64xx/mach-mini6410.c | 63 ++++++++++++++++++++++++++++++++-- - 1 file changed, 60 insertions(+), 3 deletions(-) + arch/arm/mach-s3c64xx/mach-mini6410.c | 64 ++++++++++++++++++++++++++++++++-- + 1 file changed, 61 insertions(+), 3 deletions(-) Index: linux-3.1/arch/arm/mach-s3c64xx/mach-mini6410.c =================================================================== --- linux-3.1.orig/arch/arm/mach-s3c64xx/mach-mini6410.c +++ linux-3.1/arch/arm/mach-s3c64xx/mach-mini6410.c -@@ -459,15 +459,59 @@ static struct platform_device *mini6410_ +@@ -29,6 +29,7 @@ + #include <linux/i2c.h> + #include <linux/leds.h> + #include <linux/pwm_backlight.h> ++#include <linux/tiny6410_1wire.h> + + #include <asm/mach-types.h> + #include <asm/mach/arch.h> +@@ -459,15 +460,59 @@ static struct platform_device *mini6410_ &s3c_device_fb, &mini6410_leds, &s3c_device_adc, @@ -36,7 +44,7 @@ Index: linux-3.1/arch/arm/mach-s3c64xx/mach-mini6410.c + &s3c_device_ts, + &s3c_device_timer[1], + &mini6410_backlight_device, -+} ++}; + +static void mini6410_1wire_pullup(int enable) +{ @@ -78,7 +86,7 @@ Index: linux-3.1/arch/arm/mach-s3c64xx/mach-mini6410.c static void __init mini6410_map_io(void) { u32 tmp; -@@ -507,10 +551,12 @@ static int __init mini6410_features_setu +@@ -507,10 +552,12 @@ static int __init mini6410_features_setu __setup("mini6410=", mini6410_features_setup); #define FEATURE_SCREEN (1 << 0) @@ -91,7 +99,7 @@ Index: linux-3.1/arch/arm/mach-s3c64xx/mach-mini6410.c }; static void mini6410_parse_features( -@@ -541,6 +587,14 @@ static void mini6410_parse_features( +@@ -541,6 +588,14 @@ static void mini6410_parse_features( } features->done |= FEATURE_SCREEN; break; @@ -106,8 +114,8 @@ Index: linux-3.1/arch/arm/mach-s3c64xx/mach-mini6410.c } } } -@@ -671,6 +725,9 @@ static void __init mini6410_machine_init - s3c_gpio_cfgpin(S3C2410_GPF(14), S3C_GPIO_SFN(2)); +@@ -671,6 +726,9 @@ static void __init mini6410_machine_init + s3c_gpio_cfgpin(S3C64XX_GPF(14), S3C_GPIO_SFN(2)); platform_add_devices(mini6410_devices, ARRAY_SIZE(mini6410_devices)); + |