[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-453-g9cb4659
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-453-g9cb4659
|
From: Fabien M <fa...@us...> - 2012-07-20 13:00:29
|
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 9cb4659fed106a037ceac6731736460bcc1300f6 (commit)
from 1538836b51b9f30f833e5f120bc292f6ae93ee1e (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 9cb4659fed106a037ceac6731736460bcc1300f6
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jul 20 14:55:18 2012 +0200
[kernel][platform][apf51] use spidev_platform_data for spidev
-----------------------------------------------------------------------
Summary of changes:
.../408-armadeus-add_apf51-dev_baseboard.patch | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index 50ac23d..2d974ab 100644
--- a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2012-03-19 18:51:31.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2012-03-19 19:01:08.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2012-07-20 10:19:29.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2012-07-20 14:54:06.000000000 +0200
@@ -175,4 +175,27 @@
Include support for Armadeus systems APF51 System On Module. This
includes specific configurations for the board and its peripherals.
@@ -36,8 +36,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2012-03-19 18:51:31.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2012-03-19 19:01:08.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2012-07-20 10:19:29.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2012-07-20 14:54:06.000000000 +0200
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -49,8 +49,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c 2012-03-19 19:01:24.000000000 +0100
-@@ -0,0 +1,547 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c 2012-07-20 13:55:30.000000000 +0200
+@@ -0,0 +1,553 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -75,6 +75,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+#include <linux/input.h>
+#include <linux/leds.h>
+#include <linux/spi/spi.h>
++#include <linux/spi/spidev.h>
+#include <linux/fb.h>
+#include <linux/mfd/imx-ipu-v3.h>
+#include <sound/wm8960.h>
@@ -317,6 +318,10 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+#define APF51DEV_ECSPI2_SS1 IMX_GPIO_NR(3, 28)
+#define APF51DEV_ECSPI2_SS2 IMX_GPIO_NR(3, 27)
+
++static struct spidev_platform_data spidev_platdata = {
++ .init = NULL,
++};
++
+static struct spi_board_info apf51dev_spi2_board_info[] = {
+ {
+ .modalias = "mcp2515",
@@ -333,7 +338,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .bus_num = 1,
+ .chip_select = 1,
+ .mode = SPI_MODE_0,
-+ .platform_data = &mcp4912_dat,
++ .platform_data = &spidev_platdata,
+ },
+};
+
@@ -560,6 +565,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+ spi_register_board_info(apf51dev_spi1_board_info,
+ ARRAY_SIZE(apf51dev_spi1_board_info));
+ imx51_add_ecspi(0, &apf51dev_spi1_pdata);
++
+ spi_register_board_info(apf51dev_spi2_board_info,
+ ARRAY_SIZE(apf51dev_spi2_board_info));
+ imx51_add_ecspi(1, &apf51dev_spi2_pdata);
hooks/post-receive
--
armadeus
|
