[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-28-g995d809
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-28-g995d809
|
From: Julien B a. A. <ar...@us...> - 2016-01-11 09:19:28
|
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 995d8092d171f78b8ab364f37570bed177bcaed4 (commit)
from e71e12bd0e394f2c0758415890c1e276c1253632 (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 995d8092d171f78b8ab364f37570bed177bcaed4
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jan 5 15:56:54 2016 +0100
[LINUX] prevent some custom armadeus drivers to be selected on not supported platforms
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/as1531_platform/Kconfig | 7 ++++---
target/linux/modules/backlight/Kconfig | 11 +++++------
target/linux/modules/display/Kconfig | 13 ++++++-------
target/linux/modules/gpio/Kconfig | 5 +++--
target/linux/modules/imxlkeypad/Kconfig | 7 +++----
target/linux/modules/isp1761/Kconfig | 10 +++++-----
target/linux/modules/max1027/Kconfig | 7 +++----
target/linux/modules/max9768/max9768.c | 6 ++++++
target/linux/modules/pwm/Kconfig | 6 ++----
9 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/target/linux/modules/as1531_platform/Kconfig b/target/linux/modules/as1531_platform/Kconfig
index 179722a..b76d302 100644
--- a/target/linux/modules/as1531_platform/Kconfig
+++ b/target/linux/modules/as1531_platform/Kconfig
@@ -3,9 +3,10 @@
config ARMADEUS_AS1531_PLAT
tristate "AS1531 platform data"
- default n
depends on ARMADEUS_DRIVERS
+ depends on !SOC_IMX6Q
+ depends on !ARCH_MXS
select SENSORS_AS1531
---help---
- Specific platform data for as1531 plugged on apf27-Dev board
- on SPI3.
+ Specific platform data for as1531 connected on APF27Dev board
+ to SPI3.
diff --git a/target/linux/modules/backlight/Kconfig b/target/linux/modules/backlight/Kconfig
index 85b006a..8d05e33 100644
--- a/target/linux/modules/backlight/Kconfig
+++ b/target/linux/modules/backlight/Kconfig
@@ -2,10 +2,9 @@
#
config IMX_BACKLIGHT
- tristate "i.MX backlight driver"
- default n
- depends on ARMADEUS_DRIVERS && BACKLIGHT_LCD_SUPPORT
- ---help---
- This driver allows you to control the backlight of your graphic LCD, if it's
- connected to the i.MXL/i.MX27 "CONTRAST" pin.
+ tristate "i.MX1/2 backlight driver"
+ depends on ARMADEUS_DRIVERS && BACKLIGHT_LCD_SUPPORT && !SOC_IMX6Q && !ARCH_MXS
+ ---help---
+ This driver allows you to control the backlight of your graphic LCD, if it's
+ connected to the i.MXL/i.MX27 "CONTRAST" pin.
diff --git a/target/linux/modules/display/Kconfig b/target/linux/modules/display/Kconfig
index 54e2cfb..26c856f 100644
--- a/target/linux/modules/display/Kconfig
+++ b/target/linux/modules/display/Kconfig
@@ -2,11 +2,10 @@
#
config HX5116_DISPLAY
- tristate "HX5116 AMOLED display driver"
- default n
- depends on ARMADEUS_DRIVERS
- select DISPLAY_SUPPORT
- ---help---
- This driver allows you to control the contrast of
- HX5116 based AMOLED screen.
+ tristate "HX5116 AMOLED display driver"
+ depends on ARMADEUS_DRIVERS && !SOC_IMX6Q
+ select DISPLAY_SUPPORT
+ ---help---
+ This driver allows you to control the contrast of
+ HX5116 based AMOLED screen.
diff --git a/target/linux/modules/gpio/Kconfig b/target/linux/modules/gpio/Kconfig
index b0d51ee..b474c27 100644
--- a/target/linux/modules/gpio/Kconfig
+++ b/target/linux/modules/gpio/Kconfig
@@ -3,13 +3,14 @@
config ARMADEUS_GPIO_DRIVER
tristate "Armadeus GPIO driver"
- default n
depends on ARMADEUS_DRIVERS
+ depends on ARCH_IMX || ARCH_MX2 || ARCH_MX5
---help---
+ For old (pre 2.6.29) kernels. Please use gpiolib interface on recent
+ kernels !
config ARMADEUS_PPDEV_DRIVER
tristate "Armadeus Parallel Port emulation driver (with LCD port)"
- default n
depends on ARMADEUS_GPIO_DRIVER && MACH_APF9328
---help---
This driver allows you to emulate a parallel port interface with GPIO.
diff --git a/target/linux/modules/imxlkeypad/Kconfig b/target/linux/modules/imxlkeypad/Kconfig
index 6fc53f6..b891e3c 100644
--- a/target/linux/modules/imxlkeypad/Kconfig
+++ b/target/linux/modules/imxlkeypad/Kconfig
@@ -2,9 +2,8 @@
#
config ARMADEUS_KEYPAD_DRIVER
- tristate "Armadeus keypad driver"
- default n
- depends on ARMADEUS_DRIVERS
- ---help---
+ tristate "Armadeus i.MXL keypad driver"
+ depends on ARMADEUS_DRIVERS && !SOC_IMX6Q && !ARCH_MXS
+ ---help---
GPIO pins can be used to control a matrix keypad with this driver
diff --git a/target/linux/modules/isp1761/Kconfig b/target/linux/modules/isp1761/Kconfig
index 8712e6e..6df52f7 100644
--- a/target/linux/modules/isp1761/Kconfig
+++ b/target/linux/modules/isp1761/Kconfig
@@ -2,9 +2,9 @@
#
config ARMADEUS_ISP1761
- tristate "isp1761 USB 2.0 Host controller"
- default n
- depends on ARMADEUS_DRIVERS && USB
- ---help---
- This driver allows you to control isp1761 USB 2.0 Host controller of the DevFull board
+ tristate "isp1761 USB 2.0 Host controller"
+ depends on ARMADEUS_DRIVERS && USB && ARCH_IMX
+ ---help---
+ This driver allows you to support isp1761 USB 2.0 Host controller of
+ the APF9328DevFull board.
diff --git a/target/linux/modules/max1027/Kconfig b/target/linux/modules/max1027/Kconfig
index 63c9b88..32122c0 100644
--- a/target/linux/modules/max1027/Kconfig
+++ b/target/linux/modules/max1027/Kconfig
@@ -2,8 +2,7 @@
#
config ARMADEUS_MAX1027
- tristate "Armadeus Max1027 ADC driver (fast version)"
- default n
- depends on ARMADEUS_DRIVERS
- ---help---
+ tristate "Armadeus Max1027 ADC driver (fast version)"
+ depends on ARMADEUS_DRIVERS && !ARCH_MXS && !SOC_IMX6Q
+ ---help---
Max1027 fast driver
diff --git a/target/linux/modules/max9768/max9768.c b/target/linux/modules/max9768/max9768.c
index 7dc1ecf..7db20a7 100644
--- a/target/linux/modules/max9768/max9768.c
+++ b/target/linux/modules/max9768/max9768.c
@@ -20,12 +20,18 @@
*
*/
+#include <linux/version.h>
#include <linux/module.h>
#include <linux/param.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
#include <linux/sysfs.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
#include <mach/gpio.h>
+#else
+#include <linux/gpio.h>
+#include <linux/slab.h> /* kzalloc */
+#endif
#include <linux/err.h>
#include "max9768.h"
diff --git a/target/linux/modules/pwm/Kconfig b/target/linux/modules/pwm/Kconfig
index 2a2d47c..ace98a3 100644
--- a/target/linux/modules/pwm/Kconfig
+++ b/target/linux/modules/pwm/Kconfig
@@ -3,16 +3,14 @@
config ARMADEUS_PWM_DRIVER
tristate "Armadeus PWM driver"
- default n
- depends on ARMADEUS_DRIVERS
+ depends on ARMADEUS_DRIVERS && !ARCH_MXS && !SOC_IMX6Q
---help---
This driver allows you to control the PWM controller in the i.MXl.
PWM is useful to play sound or control motors
config ARMADEUS_MXS_PWM_DRIVER
tristate "MXS PWM driver"
- default n
- depends on ARMADEUS_DRIVERS
+ depends on ARMADEUS_DRIVERS && ARCH_MXS
---help---
This driver allows you to control the MXS PWM controller.
hooks/post-receive
--
armadeus
|