[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-22-gbbfee3d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-22-gbbfee3d
|
From: jorasse <jo...@us...> - 2012-09-16 23:02:17
|
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 bbfee3d147e08029defab26e752a2fcc1f6a04cb (commit)
from cc49ce1081ffa1f8c82b69ee52280ff628db42e1 (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 bbfee3d147e08029defab26e752a2fcc1f6a04cb
Author: Eric Jarrige <eri...@ar...>
Date: Mon Sep 17 01:05:57 2012 +0200
[LINUX] apf28: enable PWM 4 on connector J10 pin 26
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-2.6.35.config | 39 +++++++++++++++++++-
...1-armadeus-add_apf28dev_baseboard_support.patch | 35 +++++++++++++++++-
2 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 612ffa8..173a236 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.3
-# Tue Sep 11 18:40:49 2012
+# Mon Sep 17 00:59:29 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1858,6 +1858,43 @@ CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_ULPI is not set
# CONFIG_NOP_USB_XCEIV is not set
CONFIG_MXC_OTG=y
+
+#
+# Armadeus specific drivers
+#
+CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
+# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
+# CONFIG_ARMADEUS_AS1531_PLAT is not set
+# CONFIG_ARMADEUS_GPIO_DRIVER is not set
+# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
+# CONFIG_ARMADEUS_MAX1027 is not set
+# CONFIG_ARMADEUS_MAX9768 is not set
+
+#
+# FPGA related
+#
+
+#
+# FPGA Drivers
+#
+# CONFIG_ARMADEUS_FPGA_DRIVERS is not set
+
+#
+# Handheld related
+#
+# CONFIG_ARMADEUS_PWM_DRIVER is not set
+CONFIG_ARMADEUS_MXS_PWM_DRIVER=y
+# CONFIG_IMX_BACKLIGHT is not set
+# CONFIG_HX5116_DISPLAY is not set
+
+#
+# Communication bus related
+#
+# CONFIG_ARMADEUS_ISP1761 is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index c5c9cd0..4010c97 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -46,7 +46,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
===================================================================
--- /dev/null
+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
-@@ -0,0 +1,1006 @@
+@@ -0,0 +1,1037 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -99,6 +99,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+#include "mx28_pins.h"
+#include "device.h"
+#include "usb.h"
++#include "../../../drivers/armadeus/pwm/mxs-pwm.h"
+
+#define USB_POWER_ENABLE MXS_PIN_TO_GPIO(PINID_LCD_D23)
+
@@ -770,6 +771,14 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .drive = 1,
+ },
+#endif
++ {
++ .name = "PWM4",
++ .id = PINID_PWM4,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .drive = 1,
++ },
+};
+
+extern unsigned int vbus5v_gpio;
@@ -904,12 +913,34 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+};
+#endif /* CONFIG_LEDS_GPIO */
+
++#if defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER) || \
++ defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER_MODULE)
++static struct resource apf28_pwm_res = {
++ .flags = IORESOURCE_MEM,
++ .start = PWM_PHYS_ADDR,
++ .end = PWM_PHYS_ADDR + 0x2000,
++};
++
++static struct platform_device apf28dev_pwm_dev = {
++ .name = "mxs_pwm",
++ .id = 4,
++ .resource = &apf28_pwm_res,
++ .num_resources = 1,
++};
++#endif /* defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER) ||
++ defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER_MODULE) */
++
+static struct platform_device *apf28dev_platform_devices[] __initdata = {
+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+ &apf28dev_gpio_keys_device,
+#endif
+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
-+ &apf28dev_led_dev
++ &apf28dev_led_dev,
++#endif
++#if defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER) || \
++ defined(CONFIG_ARMADEUS_MXS_PWM_DRIVER_MODULE)
++ &apf28dev_pwm_dev,
++
+#endif
+};
+
hooks/post-receive
--
armadeus
|
