[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-42-gc370a7a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-42-gc370a7a
|
From: jscheer <js...@us...> - 2011-04-08 15:32:12
|
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 c370a7ae9bf6763560df39995b445b0bf2777176 (commit)
via 5ebd91d8660e05626c47e4f25ef57d208199af07 (commit)
via dc92496fdb458b28a76bae47b5fe6ce59cf4e3ef (commit)
via 86290b7a6caaa0634fcaf7b628fb6a6e4a5687e0 (commit)
via 33021bb72ba04429b05816c96b1ce7347a03bd42 (commit)
via 8b975748b66cdecbcfeaf9485c59f0559a9274ba (commit)
via 5e751660805224eaf043fd0344b1fbd5b64a88d3 (commit)
from 4e73a16427dc35f5c3fa0dee2b4f89d565252f54 (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 c370a7ae9bf6763560df39995b445b0bf2777176
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:30:10 2011 +0200
[LINUX] [2.6.38.1] Convert Armadeus driver PWM from Linux 2.6.38.1 (pwm.c).
commit 5ebd91d8660e05626c47e4f25ef57d208199af07
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:29:23 2011 +0200
[LINUX] [2.6.38.1] Convert Armadeus driver IMX Backlight from Linux 2.6.29.6 (imx_bl_2.6.23.c)
commit dc92496fdb458b28a76bae47b5fe6ce59cf4e3ef
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:27:45 2011 +0200
[LINUX] [2.6.38.1] Convert driver ad9889 from Linux 2.6.29.6 in patch 314.
commit 86290b7a6caaa0634fcaf7b628fb6a6e4a5687e0
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:26:17 2011 +0200
[LINUX] [2.6.38.1] Convert preprocessor variables in patch 291 (board-apf27.h) from Linux 2.6.29.6.
commit 33021bb72ba04429b05816c96b1ce7347a03bd42
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:24:57 2011 +0200
[LINUX] [2.6.38.1] Fix PWM's GPIO variable name in patch 426.
commit 8b975748b66cdecbcfeaf9485c59f0559a9274ba
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:21:13 2011 +0200
[LINUX] [2.6.38.1] Add an option to mach-imx's Kconfig to support PWM in patch 282.
commit 5e751660805224eaf043fd0344b1fbd5b64a88d3
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Apr 8 17:18:31 2011 +0200
[LINUX] [2.6.38.1] Make PWM device be registered in apf27.c' (patch 281).
[LINUX] [2.6.38.1] Convert the apf27 platform file in patch 281 from Linux 2.6.29.6.
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/281-apf27-armadeus-add_apf27.c.patch | 76 ++++++++-----------
...-apf27-armadeus-add_apf27_to_build_system.patch | 11 ++--
...291-apf27-armadeus-add_mach_board-apf27_h.patch | 7 +-
.../2.6.38/314-armadeus-ad9889-add_driver.patch | 37 +++++-----
...rmadeus-mx2-iomux-correct_gpio_port_names.patch | 17 +++++
target/linux/modules/backlight/imx_bl_2.6.23.c | 40 +++++++++-
target/linux/modules/pwm/pwm.c | 48 ++++++++++++-
7 files changed, 161 insertions(+), 75 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index f493ce8..c1d5a5a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -6,12 +6,13 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Jeremie Scheer <jer...@ar...>
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c 2011-03-21 11:56:54.000000000 +0100
-@@ -0,0 +1,745 @@
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27.c 2011-04-08 14:10:00.000000000 +0200
+@@ -0,0 +1,728 @@
+ /*
+ * apf27.c
+ *
@@ -96,7 +97,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
+#define CONFIG_PWM
+#endif
++#ifdef CONFIG_ARMADEUS_PWM_DRIVER
++#define CONFIG_PWM
++#endif
+
++extern const struct imx_mxc_pwm_data imx27_mxc_pwm_data __initconst;
+
+static int apf27_pins[] = {
+ /* CONSOLE */
@@ -146,6 +151,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ /* I2C2 */
+ PC5_PF_I2C2_SDA,
+ PC6_PF_I2C2_SCL,
++ /* PWM */
++ PE5_PF_PWM0,
+};
+
+int lan8700_wakeup(struct phy_device *phydev)
@@ -160,29 +167,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ return 0;
+}
+
-+#ifdef CONFIG_PWM
-+static int mxc_pwm0_pins[] = {
-+ PE5_PF_PWM0
-+};
-+
-+static int apf27_pwm_0_init(void)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_pwm0_pins, ARRAY_SIZE(mxc_pwm0_pins), "PWM0");
-+}
-+
-+static int apf27_pwm_0_exit(void)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_pwm0_pins, ARRAY_SIZE(mxc_pwm0_pins));
-+ return 0;
-+}
-+
-+static struct imx_pwm_platform_data apf27_pwm_0_data = {
-+ .init = apf27_pwm_0_init,
-+ .exit = apf27_pwm_0_exit,
-+};
-+#endif
-+
-+
+/* APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width */
+static struct mxc_nand_platform_data apf27_nand_board_info __initconst = {
+ .width = 2,
@@ -700,7 +684,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ imx27_add_mxc_nand(&apf27_nand_board_info);
+
+#ifdef CONFIG_PWM
-+ mxc_register_device(&mxc_pwm_device0, &apf27_pwm_0_data);
++ imx_add_mxc_pwm(&imx27_mxc_pwm_data);
+#endif
+
+ imx27_add_imx2_wdt(NULL);
@@ -757,11 +741,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ .init_machine = apf27_init,
+ .timer = &apf27_timer,
+MACHINE_END
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-03-21 14:14:34.000000000 +0100
-@@ -0,0 +1,934 @@
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c 2011-04-08 13:48:21.000000000 +0200
+@@ -0,0 +1,938 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -827,7 +811,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#include <linux/can/platform/mcp251x.h>
+#if 0
+#include "../../../drivers/armadeus/pwm/pwm.h"
-+#include <media/ad9889.h>
+#include <mach/imx_dam.h>
+#include <mach/imx_sound.h>
+#include <mach/imx-alsa.h>
@@ -835,6 +818,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#endif
+#include <mach/ssi.h>
+
++#include <media/ad9889.h>
++
+#include <media/soc_camera.h>
+#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
+#include "cpufreq_imx.h"
@@ -848,6 +833,9 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#include "devices-imx27.h"
+//#include "crm_regs.h"
+
++#include <mach/mx27.h>
++#define VA_GPIO_BASE MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR)
++
+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+extern void apf27_lcd_init(void);
+#endif
@@ -1032,8 +1020,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+};
+
+static struct ad9889_fb_data apf27_ad9889_fb_data;
-+extern void acquire_console_sem(void);
-+extern void release_console_sem(void);
++extern void console_lock(void);
++extern void console_unlock(void);
+
+static void ad9889_display_connected(void)
+{
@@ -1069,13 +1057,13 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+ temp_var.vmode = FB_VMODE_NONINTERLACED,
+ temp_var.nonstd = 0;
+
-+ acquire_console_sem();
++ console_lock();
+ /* tel the FB client that params have been changed */
+ info->flags |= FBINFO_MISC_USEREVENT;
+ /* set new params */
+ fb_set_var(info, &temp_var);
+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ release_console_sem();
++ console_unlock();
+}
+
+static void ad9889_display_disconnected(void)
@@ -1086,13 +1074,13 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+ if (apf27_ad9889_fb_data.PA31_GIUS_old_state)
+ mxc_gpio_mode(GPIO_PORTA | 31 | GPIO_OUT| GPIO_GPIO);
+
-+ acquire_console_sem();
++ console_lock();
+ /* inform the console that the FB params have been changed */
+ info->flags |= FBINFO_MISC_USEREVENT;
+ /* restore old FB params */
+ fb_set_var(info, &apf27_ad9889_fb_data.var);
+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ release_console_sem();
++ console_unlock();
+}
+
+static struct ad9889_config apf27_ad9889_config = {
@@ -1696,10 +1684,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+#endif
+}
+
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-03-21 11:56:54.000000000 +0100
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c 2011-04-08 13:48:21.000000000 +0200
@@ -0,0 +1,168 @@
+/*
+ * apf27-lcd.c
@@ -1869,10 +1857,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
+ return;
+}
+
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
+Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-03-21 11:56:54.000000000 +0100
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-04-08 13:48:21.000000000 +0200
@@ -0,0 +1,175 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2049,10 +2037,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
+ printk("done\n");
+}
+
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-21 14:25:38.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-04-08 14:09:01.000000000 +0200
@@ -83,6 +83,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch
index 0d1c4bb..c0d8790 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/282-apf27-armadeus-add_apf27_to_build_system.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Kconfig 2011-02-09 14:47:30.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig 2011-02-14 16:09:34.000000000 +0100
-@@ -350,4 +350,121 @@
+--- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Kconfig 2011-04-04 14:51:50.000000000 +0200
++++ linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig 2011-04-04 14:54:28.000000000 +0200
+@@ -350,4 +350,122 @@
Include support for i-MXT (aka td60) platform. This
includes specific configurations for the module and its peripherals.
@@ -16,6 +16,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
+ select IMX_HAVE_PLATFORM_MXC_EHCI
+ select IMX_HAVE_PLATFORM_MXC_NAND
+ select IMX_HAVE_PLATFORM_SPI_IMX
++ select IMX_HAVE_PLATFORM_MXC_PWM
+ select MXC_ULPI if USB_ULPI
+ select SERIAL_IMX_UART1
+ help
@@ -126,8 +127,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/Kconfig
endif
Index: linux-2.6.38-rc3/arch/arm/mach-imx/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Makefile 2011-02-09 14:47:30.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/Makefile 2011-02-09 14:47:31.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/mach-imx/Makefile 2011-04-04 14:51:50.000000000 +0200
++++ linux-2.6.38-rc3/arch/arm/mach-imx/Makefile 2011-04-04 14:53:56.000000000 +0200
@@ -38,3 +38,7 @@
obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch
index afea8ad..98ed759 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/291-apf27-armadeus-add_mach_board-apf27_h.patch
@@ -1,9 +1,10 @@
Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Jeremie Scheer <jer...@ar...>
-Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf27.h
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf27.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf27.h 2010-12-22 14:34:38.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf27.h 2011-03-28 18:07:48.000000000 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008-2010 Armadeus Systems
@@ -38,7 +39,7 @@ Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf27.h
+
+/* FPGA addresses */
+#define APF27_FPGA_VIRT (CS5_BASE_ADDR_VIRT)
-+#define APF27_FPGA_PHYS (CS5_BASE_ADDR)
++#define APF27_FPGA_PHYS (MX27_CS5_BASE_ADDR)
+#define ARMADEUS_FPGA_BASE_ADDR_VIRT (APF27_FPGA_VIRT)
+#define ARMADEUS_FPGA_BASE_ADDR_PHYS (APF27_FPGA_PHYS)
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch
index 5bbb959..734cca3 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/314-armadeus-ad9889-add_driver.patch
@@ -1,12 +1,13 @@
Adds a driver for Analog Devices AD9889 digital video encoder.
Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Jeremie Scheer <jer...@ar...>
-Index: linux-2.6.36/drivers/media/video/Makefile
+Index: linux-2.6.38-rc3/drivers/media/video/Makefile
===================================================================
---- linux-2.6.36.orig/drivers/media/video/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/media/video/Makefile 2010-11-25 11:05:40.000000000 +0100
-@@ -44,6 +44,7 @@
+--- linux-2.6.38-rc3.orig/drivers/media/video/Makefile 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/drivers/media/video/Makefile 2011-03-29 10:14:12.000000000 +0200
+@@ -37,6 +37,7 @@
obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
@@ -14,11 +15,11 @@ Index: linux-2.6.36/drivers/media/video/Makefile
obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
-Index: linux-2.6.36/drivers/media/video/Kconfig
+Index: linux-2.6.38-rc3/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.36.orig/drivers/media/video/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/media/video/Kconfig 2010-11-25 11:05:40.000000000 +0100
-@@ -448,6 +448,16 @@
+--- linux-2.6.38-rc3.orig/drivers/media/video/Kconfig 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/drivers/media/video/Kconfig 2011-03-29 10:14:12.000000000 +0200
+@@ -434,6 +434,16 @@
To compile this driver as a module, choose M here: the
module will be called saa7185.
@@ -35,11 +36,11 @@ Index: linux-2.6.36/drivers/media/video/Kconfig
config VIDEO_ADV7170
tristate "Analog Devices ADV7170 video encoder"
depends on VIDEO_V4L2 && I2C
-Index: linux-2.6.36/drivers/media/video/ad9889.c
+Index: linux-2.6.38-rc3/drivers/media/video/ad9889.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/drivers/media/video/ad9889.c 2010-11-25 11:05:40.000000000 +0100
-@@ -0,0 +1,513 @@
++++ linux-2.6.38-rc3/drivers/media/video/ad9889.c 2011-03-29 10:13:25.000000000 +0200
+@@ -0,0 +1,515 @@
+/*
+ * ad9889 - Analog Devices AD9889 video encoder driver
+ *
@@ -69,7 +70,7 @@ Index: linux-2.6.36/drivers/media/video/ad9889.c
+#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
-+#include <media/v4l2-i2c-drv.h>
++#include <media/v4l2-ctrls.h>
+#include <media/ad9889.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
@@ -546,17 +547,19 @@ Index: linux-2.6.36/drivers/media/video/ad9889.c
+};
+MODULE_DEVICE_TABLE(i2c, ad9889_id);
+
-+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-+ .name = "ad9889",
-+ /*.command = ad9889_command,*/
++static struct i2c_driver ad9889_driver = {
++ .driver = {
++ .owner = THIS_MODULE,
++ .name = "ad9889",
++ },
+ .probe = ad9889_probe,
+ .remove = ad9889_remove,
+ .id_table = ad9889_id,
+};
-Index: linux-2.6.36/include/media/ad9889.h
+Index: linux-2.6.38-rc3/include/media/ad9889.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/include/media/ad9889.h 2010-11-25 11:05:40.000000000 +0100
++++ linux-2.6.38-rc3/include/media/ad9889.h 2011-03-28 18:12:54.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * AD9889 driver
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
new file mode 100644
index 0000000..6704474
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
@@ -0,0 +1,17 @@
+Fix GPIO port names.
+
+Signed-off-by: Jeremie Scheer <jer...@ar...>
+
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
+===================================================================
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-01 17:11:02.000000000 +0200
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2011-04-01 17:11:49.000000000 +0200
+@@ -105,7 +105,7 @@
+ #define PD31_PF_CSPI1_MOSI (GPIO_PORTD | GPIO_PF | GPIO_OUT | 31)
+ #define PE3_PF_UART2_CTS (GPIO_PORTE | GPIO_PF | GPIO_OUT | 3)
+ #define PE4_PF_UART2_RTS (GPIO_PORTE | GPIO_PF | GPIO_IN | 4)
+-#define PE5_PF_PWMO (GPIO_PORTE | GPIO_PF | 5)
++#define PE5_PF_PWM0 (GPIO_PORTE | GPIO_PF | 5)
+ #define PE6_PF_UART2_TXD (GPIO_PORTE | GPIO_PF | GPIO_OUT | 6)
+ #define PE7_PF_UART2_RXD (GPIO_PORTE | GPIO_PF | GPIO_IN | 7)
+ #define PE8_PF_UART3_TXD (GPIO_PORTE | GPIO_PF | GPIO_OUT | 8)
diff --git a/target/linux/modules/backlight/imx_bl_2.6.23.c b/target/linux/modules/backlight/imx_bl_2.6.23.c
index c261352..2487438 100644
--- a/target/linux/modules/backlight/imx_bl_2.6.23.c
+++ b/target/linux/modules/backlight/imx_bl_2.6.23.c
@@ -26,9 +26,23 @@
#include <mach/imxfb.h> /* Backlight machinfo struct is defined here */
#include <mach/hardware.h>
#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
#ifdef CONFIG_ARCH_IMX
-#define LCDC_BASE_ADDR IMX_LCDC_BASE
-#endif
+#define LCDC_BASE_ADDR IMX_LCDC_BASE
+#define MXC_IO_ADDRESS IO_ADDRESS
+#endif /* CONFIG_ARCH_IMX */
+#else
+#ifdef CONFIG_ARCH_MX1
+#include <mach/mx1.h>
+#define LCDC_BASE_ADDR MX1_LCDC_BASE_ADDR
+#define MXC_IO_ADDRESS MX1_IO_ADDRESS
+#else
+# include <mach/mx2x.h>
+#define LCDC_BASE_ADDR MX27_LCDC_BASE_ADDR
+#define MXC_IO_ADDRESS MX27_IO_ADDRESS
+#endif /* CONFIG_ARCH_MX1 */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) */
#define DRIVER_NAME "imx-bl"
#define DRIVER_VERSION "0.2"
@@ -61,10 +75,10 @@ static int imxbl_send_intensity(struct backlight_device *bd)
if( bl_machinfo->set_bl_intensity ) {
bl_machinfo->set_bl_intensity(intensity);
} else { /* Otherwise use this default one: */
- shadow = readl(IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c); /* PWMR / LPCCR */
+ shadow = readl(MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c); /* PWMR / LPCCR */
shadow &= ~PWMR_PW(0xff);
shadow |= PWMR_PW(intensity);
- writel(shadow, IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c);
+ writel(shadow, MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c);
pr_debug("Setting backlight intensity to %d\n", intensity);
}
@@ -130,8 +144,23 @@ static int imxbl_probe(struct platform_device *pdev)
if (!machinfo->limit_mask)
machinfo->limit_mask = -1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ struct backlight_properties props;
+
+ memset(&props, 0, sizeof(struct backlight_properties));
+ props.max_brightness = machinfo->max_intensity;
+ props.power = FB_BLANK_UNBLANK;
+ props.brightness = machinfo->default_intensity;
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
imx_backlight_device = backlight_device_register(DRIVER_NAME,
&pdev->dev, NULL, &imxbl_ops);
+#else
+ imx_backlight_device = backlight_device_register(DRIVER_NAME,
+ &pdev->dev, NULL, &imxbl_ops, &props);
+#endif
+
if (IS_ERR (imx_backlight_device)) {
printk("can't register backlight device\n");
return PTR_ERR (imx_backlight_device);
@@ -139,9 +168,12 @@ static int imxbl_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, imx_backlight_device);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
imx_backlight_device->props.max_brightness = machinfo->max_intensity;
imx_backlight_device->props.power = FB_BLANK_UNBLANK;
imx_backlight_device->props.brightness = machinfo->default_intensity;
+#endif
+
backlight_update_status(imx_backlight_device);
printk("i.MX Backlight driver v" DRIVER_VERSION " initialized.\n");
diff --git a/target/linux/modules/pwm/pwm.c b/target/linux/modules/pwm/pwm.c
index 82c686e..933f529 100644
--- a/target/linux/modules/pwm/pwm.c
+++ b/target/linux/modules/pwm/pwm.c
@@ -43,6 +43,10 @@
#include <linux/circ_buf.h>
#include <linux/platform_device.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+#include <linux/slab.h>
+#endif
+
#include "pwm.h"
#ifdef CONFIG_ARCH_MX2
@@ -109,7 +113,12 @@
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
#define DRIVER_NAME "imx-pwm"
+#else
+#define DRIVER_NAME "mxc_pwm"
+#endif
+
#define DRIVER_VERSION "0.8"
@@ -418,12 +427,19 @@ static int pwm_fasync(int fd, struct file *filp, int mode)
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
int pwm_ioctl(struct inode * inode, struct file *filp, unsigned int cmd, unsigned long arg)
+#else
+int pwm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+#endif
{
char *str=NULL;
int ret = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = dev_table[iminor(inode)];
-
+#else
+ struct pwm_device *pwm = dev_table[iminor(filp->f_dentry->d_inode)];
+#endif
switch (cmd) {
/* Set PWM Mode (Tone or Playback) */
case PWM_IOC_SMODE:
@@ -631,7 +647,11 @@ struct file_operations pwm_fops = {
release: pwm_release,
read: pwm_read,
write: pwm_write,
- ioctl: pwm_ioctl,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ ioctl: pwm_ioctl,
+#else
+ unlocked_ioctl: pwm_ioctl,
+#endif
fasync: pwm_fasync
};
@@ -850,10 +870,12 @@ static int imx_pwm_drv_probe(struct platform_device *pdev)
return -ENODEV;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (!pdata) {
dev_err(&pdev->dev, "platform data not supplied\n");
return -ENOENT;
}
+#endif
pwm = kmalloc(sizeof(struct pwm_device), GFP_KERNEL);
if (!pwm) {
@@ -912,9 +934,11 @@ static int imx_pwm_drv_probe(struct platform_device *pdev)
init_waitqueue_head(&pwm->write_wait);
init_waitqueue_head(&pwm->exit_wait);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
/* init gpio */
if (pdata->init)
pdata->init();
+#endif
/* Create /dev */
pwm->dev = device_create(pwm_class, NULL, MKDEV(gMajor, pdev->id), NULL, "pwm%i", pdev->id);
@@ -955,8 +979,10 @@ error_file:
error_dev_create:
device_destroy(pwm_class, MKDEV(gMajor, pdev->id));
error_platform_init:
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->exit)
pdata->exit();
+#endif
free_irq(pwm->irq, pwm);
error_chrdev:
unregister_chrdev(gMajor, DRIVER_NAME);
@@ -982,7 +1008,11 @@ static inline void unregister_sys_file(struct pwm_device *pwm)
static int imx_pwm_drv_remove(struct platform_device *pdev)
{
struct resource *res;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = (struct pwm_device*)pdev->dev.driver_data;
+#else
+ struct pwm_device *pwm = (struct pwm_device*)(dev_get_drvdata(&pdev->dev));
+#endif
struct imx_pwm_platform_data *pdata = pdev->dev.platform_data;
unregister_sys_file(pwm);
@@ -993,8 +1023,10 @@ static int imx_pwm_drv_remove(struct platform_device *pdev)
release_mem_region(res->start, res->end - res->start + 1);
kfree(pwm);
dev_table[pdev->id] = NULL;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->exit())
pdata->exit();
+#endif
return 0;
}
@@ -1002,26 +1034,38 @@ static int imx_pwm_drv_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
static int imx_pwm_drv_suspend(struct platform_device *pdev, pm_message_t state)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = (struct pwm_device*)pdev->dev.driver_data;
+#else
+ struct pwm_device *pwm = (struct pwm_device*)(dev_get_drvdata(&pdev->dev));
+#endif
struct imx_pwm_platform_data *pdata = pdev->dev.platform_data;
clk_disable(pwm->clk);
dev_dbg(&pdev->dev, "suspended\n");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->exit())
pdata->exit();
+#endif
return 0;
}
static int imx_pwm_drv_resume(struct platform_device *pdev)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
struct pwm_device *pwm = (struct pwm_device*)pdev->dev.driver_data;
+#else
+ struct pwm_device *pwm = (struct pwm_device*)(dev_get_drvdata(&pdev->dev));
+#endif
struct imx_pwm_platform_data *pdata = pdev->dev.platform_data;
clk_enable(pwm->clk);
dev_dbg(&pdev->dev, "resumed\n");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
if (pdata->init())
pdata->init();
+#endif
return 0;
}
hooks/post-receive
--
armadeus
|
