[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-335-g6f69738
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-335-g6f69738
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-05-25 18:42:21
|
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 6f6973828179e8f77384eb3b8c8c4cbb70d4ce67 (commit)
from fec65f233446f1d0b2176dab6fa1229a3bd7fc55 (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 6f6973828179e8f77384eb3b8c8c4cbb70d4ce67
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri May 25 20:41:15 2012 +0200
[LINUX] 2.6.35: apf28: add support for spidev on apf28dev
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-add_apf28dev_baseboard_support.patch | 68 ++++++++++++--------
1 files changed, 41 insertions(+), 27 deletions(-)
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 e17e557..f37e549 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
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.35.3/arch/arm/mach-mx28/Kconfig
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/Kconfig 2012-02-15 14:42:20.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/Kconfig 2012-02-15 14:43:35.000000000 +0100
-@@ -16,6 +16,22 @@
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/Kconfig
++++ linux-2.6.35.3/arch/arm/mach-mx28/Kconfig
+@@ -16,6 +16,22 @@ config MACH_APF28
endchoice
@@ -31,9 +31,9 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/Kconfig
default 0
Index: linux-2.6.35.3/arch/arm/mach-mx28/Makefile
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/Makefile 2012-02-15 14:42:20.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/Makefile 2012-02-15 14:43:35.000000000 +0100
-@@ -6,6 +6,7 @@
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/Makefile
++++ linux-2.6.35.3/arch/arm/mach-mx28/Makefile
+@@ -6,6 +6,7 @@ obj-y += pinctrl.o clock.o device.o seri
# Board select
obj-$(CONFIG_MACH_MX28EVK) += mx28evk.o mx28evk_pins.o
obj-$(CONFIG_MACH_APF28) += mach-apf28.o
@@ -43,9 +43,9 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/Makefile
Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c 2012-02-15 15:51:09.000000000 +0100
-@@ -0,0 +1,742 @@
+--- /dev/null
++++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+@@ -0,0 +1,756 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -773,6 +773,16 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+}
+#endif /* defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE) */
+
++#if defined(CONFIG_SPI_MXS) || defined(CONFIG_SPI_MXS_MODULE)
++static struct spi_board_info spi_board_info[] __initdata = {
++ {
++ .modalias = "spidev",
++ .max_speed_hz = 120000,
++ .bus_num = 1, /* SSPI2 */
++ .chip_select = 0,
++ },
++};
++#endif /* defined(CONFIG_SPI_MXS) || defined(CONFIG_SPI_MXS_MODULE) */
+
+void __init apf28_baseboard_pins_init(void)
+{
@@ -785,14 +795,18 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+{
+ /* Add apf28dev special code */
+ platform_add_devices(apf28dev_platform_devices, ARRAY_SIZE(apf28dev_platform_devices));
++
++#if defined(CONFIG_SPI_MXS) || defined(CONFIG_SPI_MXS_MODULE)
++ spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
++#endif /* defined(CONFIG_SPI_MXS) || defined(CONFIG_SPI_MXS_MODULE) */
+}
+
+
Index: linux-2.6.35.3/drivers/video/mxs/Kconfig
===================================================================
---- linux-2.6.35.3.orig/drivers/video/mxs/Kconfig 2012-02-15 14:42:20.000000000 +0100
-+++ linux-2.6.35.3/drivers/video/mxs/Kconfig 2012-02-15 14:43:35.000000000 +0100
-@@ -21,6 +21,20 @@
+--- linux-2.6.35.3.orig/drivers/video/mxs/Kconfig
++++ linux-2.6.35.3/drivers/video/mxs/Kconfig
+@@ -21,6 +21,20 @@ config FB_MXS_LCD_LMS430
---help---
Use LMS430 dotclock LCD panel for MXS
@@ -815,9 +829,9 @@ Index: linux-2.6.35.3/drivers/video/mxs/Kconfig
bool "TVENC"
Index: linux-2.6.35.3/drivers/video/mxs/Makefile
===================================================================
---- linux-2.6.35.3.orig/drivers/video/mxs/Makefile 2012-02-15 14:42:20.000000000 +0100
-+++ linux-2.6.35.3/drivers/video/mxs/Makefile 2012-02-15 14:43:35.000000000 +0100
-@@ -2,5 +2,7 @@
+--- linux-2.6.35.3.orig/drivers/video/mxs/Makefile
++++ linux-2.6.35.3/drivers/video/mxs/Makefile
+@@ -2,5 +2,7 @@ obj-$(CONFIG_ARCH_MXS) += lcdif.o
obj-$(CONFIG_FB_MXS) += mxsfb.o
obj-$(CONFIG_FB_MXS_LCD_43WVF1G) += lcd_43wvf1g.o
obj-$(CONFIG_FB_MXS_LCD_LMS430) += lcd_lms430.o
@@ -827,8 +841,8 @@ Index: linux-2.6.35.3/drivers/video/mxs/Makefile
obj-$(CONFIG_FB_MXS_TVENC) += tvenc.o
Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c 2012-02-15 14:43:35.000000000 +0100
+--- /dev/null
++++ linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
@@ -0,0 +1,305 @@
+/*
+ * Tianma TM035 LCD panel initialization for Armadeus APF28Dev
@@ -1137,8 +1151,8 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
+subsys_initcall(register_devices);
Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c 2012-02-15 14:43:35.000000000 +0100
+--- /dev/null
++++ linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
@@ -0,0 +1,297 @@
+/*
+ * Freescale MX28 Densitron LW700 LCD panel driver
@@ -1439,9 +1453,9 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
+subsys_initcall(register_devices);
Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/device.c 2012-02-15 14:43:59.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/device.c 2012-02-15 14:52:10.000000000 +0100
-@@ -426,7 +426,6 @@
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/device.c
++++ linux-2.6.35.3/arch/arm/mach-mx28/device.c
+@@ -426,7 +426,6 @@ static void mx28_init_gpmi_nfc(void)
#define MMC1_POWER MXS_PIN_TO_GPIO(PINID_PWM4)
#define MMC0_WP MXS_PIN_TO_GPIO(PINID_SSP1_SCK)
#define MMC1_WP MXS_PIN_TO_GPIO(PINID_GPMI_RESETN)
@@ -1449,7 +1463,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
static int mxs_mmc_get_wp_ssp0(void)
{
-@@ -467,6 +466,7 @@
+@@ -467,6 +466,7 @@ static void mxs_mmc_hw_release_ssp0(void
gpio_free(MMC0_WP);
}
@@ -1457,7 +1471,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
static void mxs_mmc_cmd_pullup_ssp0(int enable)
{
-@@ -490,6 +490,7 @@
+@@ -490,6 +490,7 @@ static unsigned long mxs_mmc_setclock_ss
return hz;
}
@@ -1465,7 +1479,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
static int mxs_mmc_get_wp_ssp1(void)
{
return gpio_get_value(MMC1_WP);
-@@ -528,6 +529,7 @@
+@@ -528,6 +529,7 @@ static void mxs_mmc_hw_release_ssp1(void
gpio_free(MMC1_POWER);
gpio_free(MMC1_WP);
}
@@ -1473,7 +1487,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
static void mxs_mmc_cmd_pullup_ssp1(int enable)
{
-@@ -552,9 +554,11 @@
+@@ -552,9 +554,11 @@ static unsigned long mxs_mmc_setclock_ss
}
static struct mxs_mmc_platform_data mmc0_data = {
@@ -1485,7 +1499,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
.cmd_pullup = mxs_mmc_cmd_pullup_ssp0,
.setclock = mxs_mmc_setclock_ssp0,
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
-@@ -591,9 +595,11 @@
+@@ -591,9 +595,11 @@ static struct resource mmc0_resource[] =
};
static struct mxs_mmc_platform_data mmc1_data = {
hooks/post-receive
--
armadeus
|
