[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-96-gf91e217
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-96-gf91e217
|
From: Julien B a. A. <ar...@us...> - 2013-01-01 20:48:41
|
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 f91e217447ca4d471ec70f029291b16a81b8d7cd (commit)
from f2ef6ee142d66d14b2179624f8beb463f9dab100 (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 f91e217447ca4d471ec70f029291b16a81b8d7cd
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 1 21:48:10 2013 +0100
[LINUX] APF28 : add support for 3.8-rc1 kernel (experimental)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-3.8-rc1.config | 1 +
...f28-linux-3.7.config => apf28-linux-3.8.config} | 0
patches/linux/3.8-rc1 | 1 +
.../linux/{3.7 => 3.8}/0021-armadeus-apf9328.patch | 36 +++++-----
...s-apf9328-add_board_to_linux_build_system.patch | 20 +++---
.../0025-armadeus-imx-correct_dma_shift.patch | 8 +-
.../0029-armadeus-add_csi_and_spi_registers.patch | 6 +-
.../0029b-armadeus-add_csi_registers.patch | 6 +-
...rmadeus-devices-imx1-add_udc_registration.patch | 8 +-
.../0030-armadeus-imx_udc-change_clk_get.patch | 6 +-
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 0
...7-armadeus-imx_udc-add_printk_when_probed.patch | 6 +-
...s-imx_udc-prevent_crash_after_soft_reboot.patch | 6 +-
.../linux/{3.7 => 3.8}/0073-armadeus-tsc2102.patch | 8 +-
...02_integrate_driver_to_linux_build_system.patch | 18 +++--
...chscreen-add_driver_to_linux_build_system.patch | 16 ++--
.../0074-armadeus-tsc2102-touchscreen.patch | 6 +-
.../0075-armadeus-spi2-reg-defines.patch | 6 +-
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...madeus-clock-imx1_avoid_crash_with_module.tofix | 0
.../0200-armadeus-add_apf27_module.patch | 44 ++++-------
.../0201-armadeus-add_apf27dev_baseboard.patch | 76 ++++++++------------
...armadeus-mx27_add_clk_gate_to_enable_sspl.patch | 14 ++--
...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch | 14 ++--
...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch | 10 ++--
...-imx27-rename_spi_ipg_and_add_spi_per_clk.patch | 20 +++---
.../linux/3.8/0420-armadeus-Add-apf28dev-dts.patch | 29 ++++++++
27 files changed, 188 insertions(+), 177 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.7.config => apf28-linux-3.8.config} (100%)
create mode 120000 patches/linux/3.8-rc1
copy patches/linux/{3.7 => 3.8}/0021-armadeus-apf9328.patch (96%)
copy patches/linux/{3.7 => 3.8}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (72%)
copy patches/linux/{3.7 => 3.8}/0025-armadeus-imx-correct_dma_shift.patch (74%)
copy patches/linux/{3.7 => 3.8}/0029-armadeus-add_csi_and_spi_registers.patch (68%)
copy patches/linux/{3.7 => 3.8}/0029b-armadeus-add_csi_registers.patch (76%)
copy patches/linux/{3.7 => 3.8}/0030-armadeus-devices-imx1-add_udc_registration.patch (62%)
copy patches/linux/{3.7 => 3.8}/0030-armadeus-imx_udc-change_clk_get.patch (59%)
copy patches/linux/{3.7 => 3.8}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.7 => 3.8}/0037-armadeus-imx_udc-add_printk_when_probed.patch (60%)
copy patches/linux/{3.7 => 3.8}/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch (74%)
copy patches/linux/{3.7 => 3.8}/0073-armadeus-tsc2102.patch (99%)
copy patches/linux/{3.7 => 3.8}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (53%)
copy patches/linux/{3.7 => 3.8}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (68%)
copy patches/linux/{3.7 => 3.8}/0074-armadeus-tsc2102-touchscreen.patch (93%)
copy patches/linux/{3.7 => 3.8}/0075-armadeus-spi2-reg-defines.patch (67%)
copy patches/linux/{3.7 => 3.8}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.7 => 3.8}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.7 => 3.8}/0200-armadeus-add_apf27_module.patch (89%)
copy patches/linux/{3.7 => 3.8}/0201-armadeus-add_apf27dev_baseboard.patch (95%)
copy patches/linux/{3.7 => 3.8}/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch (82%)
copy patches/linux/{3.7 => 3.8}/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch (78%)
copy patches/linux/{3.7 => 3.8}/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch (77%)
copy patches/linux/{3.7 => 3.8}/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch (57%)
create mode 100644 patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config
new file mode 120000
index 0000000..9893aa9
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config
@@ -0,0 +1 @@
+apf28-linux-3.8.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.8.config
diff --git a/patches/linux/3.8-rc1 b/patches/linux/3.8-rc1
new file mode 120000
index 0000000..98fccd6
--- /dev/null
+++ b/patches/linux/3.8-rc1
@@ -0,0 +1 @@
+3.8
\ No newline at end of file
diff --git a/patches/linux/3.7/0021-armadeus-apf9328.patch b/patches/linux/3.8/0021-armadeus-apf9328.patch
similarity index 96%
copy from patches/linux/3.7/0021-armadeus-apf9328.patch
copy to patches/linux/3.8/0021-armadeus-apf9328.patch
index c985daa..2a223cc 100644
--- a/patches/linux/3.7/0021-armadeus-apf9328.patch
+++ b/patches/linux/3.8/0021-armadeus-apf9328.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf9328_lcd_config.h 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,350 @@
+/*
+ *
@@ -353,10 +353,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+#endif /* CONFIG_FB_IMX */
+
+#endif /* APF_LCD_CONFIG_H */
-Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/mach-apf9328.c
-+++ linux-3.7/arch/arm/mach-imx/mach-apf9328.c
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/mach-apf9328.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c 2013-01-01 21:19:56.000000000 +0100
@@ -20,7 +20,16 @@
#include <linux/dm9000.h>
#include <linux/gpio.h>
@@ -374,10 +374,10 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-@@ -30,6 +39,43 @@
- #include <mach/iomux-mx1.h>
-
+@@ -29,6 +38,43 @@
#include "devices-imx1.h"
+ #include "hardware.h"
+ #include "iomux-mx1.h"
+#include <linux/gpio.h>
+#include <linux/platform_data/serial-imx.h>
+/*#include <mach/mmc.h>
@@ -418,7 +418,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
static const int apf9328_pins[] __initconst = {
/* UART1 */
-@@ -42,10 +88,225 @@ static const int apf9328_pins[] __initco
+@@ -41,10 +87,225 @@
PB29_PF_UART2_RTS,
PB30_PF_UART2_TXD,
PB31_PF_UART2_RXD,
@@ -644,7 +644,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
/*
* The APF9328 can have up to 32MB NOR Flash
-@@ -106,11 +367,19 @@ static const struct imxuart_platform_dat
+@@ -105,11 +366,19 @@
.flags = IMXUART_HAVE_RTSCTS,
};
@@ -664,7 +664,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
&apf9328_flash_device,
&dm9000x_device,
};
-@@ -126,11 +395,31 @@ static void __init apf9328_init(void)
+@@ -125,11 +394,31 @@
imx1_add_imx_uart0(NULL);
imx1_add_imx_uart1(&uart1_pdata);
@@ -696,10 +696,10 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
}
static void __init apf9328_timer_init(void)
-Index: linux-3.7/arch/arm/mach-imx/apf9328-dev.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf9328-dev.c
===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf9328-dev.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf9328-dev.c 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,309 @@
+/*
+ * apf9328-dev.c
@@ -1010,10 +1010,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf9328-dev.c
+#endif
+}
+
-Index: linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
+Index: linux-3.8-rc1/arch/arm/plat-mxc/include/mach/board-apf9328.h
===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/plat-mxc/include/mach/board-apf9328.h 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
diff --git a/patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 72%
copy from patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
index 15f3b75..7dfaa54 100644
--- a/patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
+++ b/patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7-rc6/arch/arm/mach-imx/Kconfig
+Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7-rc6/arch/arm/mach-imx/Kconfig
-@@ -129,10 +129,43 @@ config MACH_APF9328
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-01 21:22:49.000000000 +0100
+@@ -202,10 +202,43 @@
bool "APF9328"
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART
@@ -43,14 +43,14 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/Kconfig
+
+endchoice
+
- comment "MX21 platforms:"
+ endif
- config MACH_MX21ADS
-Index: linux-3.7-rc6/arch/arm/mach-imx/Makefile
+ if ARCH_MULTI_V5
+Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7-rc6/arch/arm/mach-imx/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fi
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-01 21:22:49.000000000 +0100
+@@ -42,6 +42,7 @@
obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
diff --git a/patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
similarity index 74%
copy from patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch
copy to patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
index 1c9a4e0..687c248 100644
--- a/patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch
+++ b/patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
@@ -3,11 +3,11 @@ DMA clock is enabled by setting GCCR bit 3 instead of 4
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx1.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/clk-imx1.c
===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/clk-imx1.c
-+++ linux-3.7-rc6/arch/arm/mach-imx/clk-imx1.c
-@@ -72,7 +72,7 @@ int __init mx1_clocks_init(unsigned long
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/clk-imx1.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/clk-imx1.c 2013-01-01 21:19:56.000000000 +0100
+@@ -72,7 +72,7 @@
clk[per3] = imx_clk_divider("per3", "spll", CCM_PCDR, 16, 7);
clk[clko] = imx_clk_mux("clko", CCM_CSCR, 29, 3, clko_sel_clks,
ARRAY_SIZE(clko_sel_clks));
diff --git a/patches/linux/3.7/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 68%
copy from patches/linux/3.7/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
index 65f2398..5884050 100644
--- a/patches/linux/3.7/0029-armadeus-add_csi_and_spi_registers.patch
+++ b/patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7-rc4/drivers/spi/spi-imx.c
+Index: linux-3.8-rc1/drivers/spi/spi-imx.c
===================================================================
---- linux-3.7-rc4.orig/drivers/spi/spi-imx.c 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/drivers/spi/spi-imx.c 2012-11-06 08:50:16.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/spi/spi-imx.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/spi/spi-imx.c 2013-01-01 21:19:56.000000000 +0100
@@ -47,6 +47,9 @@
#define MXC_CSPITXDATA 0x04
#define MXC_CSPICTRL 0x08
diff --git a/patches/linux/3.7/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
similarity index 76%
copy from patches/linux/3.7/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
index 7f3b277..856b0b3 100644
--- a/patches/linux/3.7/0029b-armadeus-add_csi_registers.patch
+++ b/patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7-rc6/drivers/media/platform/soc_camera/mx1_camera.c
+Index: linux-3.8-rc1/drivers/media/platform/soc_camera/mx1_camera.c
===================================================================
---- linux-3.7-rc6.orig/drivers/media/platform/soc_camera/mx1_camera.c
-+++ linux-3.7-rc6/drivers/media/platform/soc_camera/mx1_camera.c
+--- linux-3.8-rc1.orig/drivers/media/platform/soc_camera/mx1_camera.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/media/platform/soc_camera/mx1_camera.c 2013-01-01 21:19:56.000000000 +0100
@@ -50,9 +50,13 @@
* CSI registers
*/
diff --git a/patches/linux/3.7/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 62%
copy from patches/linux/3.7/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
index 5b94c4d..6a4a7c2 100644
--- a/patches/linux/3.7/0030-armadeus-devices-imx1-add_udc_registration.patch
+++ b/patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
@@ -3,11 +3,11 @@ Add registration functions for UDC.
Signed-off-by: Gwenhael Goavec-Merou <gw...@tr...>
---
-Index: linux-3.7-rc4/arch/arm/mach-imx/devices-imx1.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h
===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/devices-imx1.h 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/devices-imx1.h 2012-11-06 08:50:16.000000000 +0100
-@@ -29,3 +29,7 @@
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/devices-imx1.h 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h 2013-01-01 21:19:56.000000000 +0100
+@@ -28,3 +28,7 @@
#define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
#define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
diff --git a/patches/linux/3.7/0030-armadeus-imx_udc-change_clk_get.patch b/patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
similarity index 59%
copy from patches/linux/3.7/0030-armadeus-imx_udc-change_clk_get.patch
copy to patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
index 527446a..553a4e8 100644
--- a/patches/linux/3.7/0030-armadeus-imx_udc-change_clk_get.patch
+++ b/patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
@@ -1,8 +1,8 @@
The usb clock is now register with device name.
-Index: linux-3.7-rc4/drivers/usb/gadget/imx_udc.c
+Index: linux-3.8-rc1/drivers/usb/gadget/imx_udc.c
===================================================================
---- linux-3.7-rc4.orig/drivers/usb/gadget/imx_udc.c 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/drivers/usb/gadget/imx_udc.c 2012-11-06 09:06:02.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/usb/gadget/imx_udc.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/gadget/imx_udc.c 2013-01-01 21:23:05.000000000 +0100
@@ -1426,7 +1426,7 @@
goto fail1;
}
diff --git a/patches/linux/3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.8/0035-armadeus-re_add_pwm_and_correct_driver.tofix
similarity index 100%
copy from patches/linux/3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix
copy to patches/linux/3.8/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.7/0037-armadeus-imx_udc-add_printk_when_probed.patch b/patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
similarity index 60%
copy from patches/linux/3.7/0037-armadeus-imx_udc-add_printk_when_probed.patch
copy to patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
index a14553f..c73e0a3 100644
--- a/patches/linux/3.7/0037-armadeus-imx_udc-add_printk_when_probed.patch
+++ b/patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
@@ -2,10 +2,10 @@ Needed by Armadeus UDC test to know if driver is up or not.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-3.7-rc4/drivers/usb/gadget/imx_udc.c
+Index: linux-3.8-rc1/drivers/usb/gadget/imx_udc.c
===================================================================
---- linux-3.7-rc4.orig/drivers/usb/gadget/imx_udc.c 2012-11-06 08:50:16.000000000 +0100
-+++ linux-3.7-rc4/drivers/usb/gadget/imx_udc.c 2012-11-06 09:05:55.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/usb/gadget/imx_udc.c 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/gadget/imx_udc.c 2013-01-01 21:23:03.000000000 +0100
@@ -1490,6 +1490,7 @@
if (ret)
goto fail4;
diff --git a/patches/linux/3.7/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch b/patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
similarity index 74%
copy from patches/linux/3.7/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
copy to patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
index e85eb46..87f2c12 100644
--- a/patches/linux/3.7/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
+++ b/patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
@@ -5,10 +5,10 @@ So this patch moves imx_usb->base definition at the right place.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-3.7-rc4/drivers/usb/gadget/imx_udc.c
+Index: linux-3.8-rc1/drivers/usb/gadget/imx_udc.c
===================================================================
---- linux-3.7-rc4.orig/drivers/usb/gadget/imx_udc.c 2012-11-06 08:50:16.000000000 +0100
-+++ linux-3.7-rc4/drivers/usb/gadget/imx_udc.c 2012-11-06 08:50:16.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/usb/gadget/imx_udc.c 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/gadget/imx_udc.c 2013-01-01 21:19:56.000000000 +0100
@@ -1455,6 +1455,7 @@
}
}
diff --git a/patches/linux/3.7/0073-armadeus-tsc2102.patch b/patches/linux/3.8/0073-armadeus-tsc2102.patch
similarity index 99%
copy from patches/linux/3.7/0073-armadeus-tsc2102.patch
copy to patches/linux/3.8/0073-armadeus-tsc2102.patch
index 99c1745..90e8154 100644
--- a/patches/linux/3.7/0073-armadeus-tsc2102.patch
+++ b/patches/linux/3.8/0073-armadeus-tsc2102.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.36/include/linux/spi/tsc2102.h
+Index: linux-3.8-rc1/include/linux/spi/tsc2102.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/include/linux/spi/tsc2102.h 2010-05-31 11:02:34.000000000 +0200
++++ linux-3.8-rc1/include/linux/spi/tsc2102.h 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,306 @@
+/*
+ * include/linux/spi/tsc2102.h
@@ -309,10 +309,10 @@ Index: linux-2.6.36/include/linux/spi/tsc2102.h
+};
+
+#endif /* __LINUX_SPI_TSC2102_H */
-Index: linux-2.6.36/drivers/spi/tsc2102.c
+Index: linux-3.8-rc1/drivers/spi/tsc2102.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/drivers/spi/tsc2102.c 2010-05-31 13:50:30.000000000 +0200
++++ linux-3.8-rc1/drivers/spi/tsc2102.c 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,1311 @@
+/*
+ * drivers/spi/tsc2102.c
diff --git a/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 53%
copy from patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
index d3cad46..3e76095 100644
--- a/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
+++ b/patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
@@ -1,6 +1,8 @@
---- a/drivers/spi/Kconfig 2010-12-07 13:15:03.000000000 +0100
-+++ b/drivers/spi/Kconfig 2010-12-07 13:14:38.000000000 +0100
-@@ -379,6 +379,14 @@
+Index: linux-3.8-rc1/drivers/spi/Kconfig
+===================================================================
+--- linux-3.8-rc1.orig/drivers/spi/Kconfig 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/spi/Kconfig 2013-01-01 21:19:56.000000000 +0100
+@@ -494,6 +494,14 @@
sysfs interface, with each line presented as a kind of GPIO
exposing both switch control and diagnostic feedback.
@@ -15,10 +17,12 @@
#
# Add new SPI protocol masters in alphabetical order above this line
#
---- a/drivers/spi/Makefile 2010-12-07 13:15:11.000000000 +0100
-+++ b/drivers/spi/Makefile 2010-12-07 13:15:27.000000000 +0100
-@@ -62,6 +62,7 @@
- obj-$(CONFIG_SPI_STMP3XXX) += spi-stmp.o
+Index: linux-3.8-rc1/drivers/spi/Makefile
+===================================================================
+--- linux-3.8-rc1.orig/drivers/spi/Makefile 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/spi/Makefile 2013-01-01 21:19:56.000000000 +0100
+@@ -64,6 +64,7 @@
+ obj-$(CONFIG_SPI_TEGRA20_SLINK) += spi-tegra20-slink.o
obj-$(CONFIG_SPI_TI_SSP) += spi-ti-ssp.o
obj-$(CONFIG_SPI_TLE62X0) += spi-tle62x0.o
+obj-$(CONFIG_SPI_TSC2102) += tsc2102.o
diff --git a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 68%
copy from patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
index 6449ec7..2640882 100644
--- a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
+++ b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.36/drivers/input/touchscreen/Kconfig
+Index: linux-3.8-rc1/drivers/input/touchscreen/Kconfig
===================================================================
---- linux-2.6.36.orig/drivers/input/touchscreen/Kconfig 2010-12-22 14:32:51.000000000 +0100
-+++ linux-2.6.36/drivers/input/touchscreen/Kconfig 2010-12-22 14:33:05.000000000 +0100
-@@ -364,6 +364,20 @@
+--- linux-3.8-rc1.orig/drivers/input/touchscreen/Kconfig 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/input/touchscreen/Kconfig 2013-01-01 21:19:56.000000000 +0100
+@@ -541,6 +541,20 @@
To compile this driver as a module, choose M here: the
module will be called atmel_tsadcc.
@@ -23,11 +23,11 @@ Index: linux-2.6.36/drivers/input/touchscreen/Kconfig
config TOUCHSCREEN_UCB1400
tristate "Philips UCB1400 touchscreen"
depends on AC97_BUS
-Index: linux-2.6.36/drivers/input/touchscreen/Makefile
+Index: linux-3.8-rc1/drivers/input/touchscreen/Makefile
===================================================================
---- linux-3.7/drivers/input/touchscreen/Makefile 2012-12-11 04:30:57.000000000 +0100
-+++ linux-3.7.new/drivers/input/touchscreen/Makefile 2012-12-23 12:23:37.000000000 +0100
-@@ -60,6 +60,7 @@
+--- linux-3.8-rc1.orig/drivers/input/touchscreen/Makefile 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/input/touchscreen/Makefile 2013-01-01 21:19:56.000000000 +0100
+@@ -59,6 +59,7 @@
obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.o
obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o
obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o
diff --git a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
similarity index 93%
copy from patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
index a396f84..24e6b91 100644
--- a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
+++ b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
@@ -1,5 +1,7 @@
---- /dev/null 2010-11-28 19:42:11.148000001 +0100
-+++ b/drivers/input/touchscreen/tsc2102_ts.c 2010-12-13 07:41:34.000000000 +0100
+Index: linux-3.8-rc1/drivers/input/touchscreen/tsc2102_ts.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/drivers/input/touchscreen/tsc2102_ts.c 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,160 @@
+/*
+ * input/touchscreen/tsc2102_ts.c
diff --git a/patches/linux/3.7/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
similarity index 67%
copy from patches/linux/3.7/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
index 32c570e..558e944 100644
--- a/patches/linux/3.7/0075-armadeus-spi2-reg-defines.patch
+++ b/patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/iomux-mx1.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/iomux-mx1.h
===================================================================
---- linux-3.7-rc4.orig/arch/arm/plat-mxc/include/mach/iomux-mx1.h 2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/plat-mxc/include/mach/iomux-mx1.h 2012-11-06 08:50:16.000000000 +0100
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/iomux-mx1.h 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/iomux-mx1.h 2013-01-01 21:19:56.000000000 +0100
@@ -119,7 +119,7 @@
#define PD6_PF_LSCLK (GPIO_PORTD | GPIO_PF | GPIO_OUT | 6)
#define PD7_PF_REV (GPIO_PORTD | GPIO_PF | 7)
diff --git a/patches/linux/3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.8/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
similarity index 100%
copy from patches/linux/3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
copy to patches/linux/3.8/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.7/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.8/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
similarity index 100%
copy from patches/linux/3.7/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.8/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch b/patches/linux/3.8/0200-armadeus-add_apf27_module.patch
similarity index 89%
copy from patches/linux/3.7/0200-armadeus-add_apf27_module.patch
copy to patches/linux/3.8/0200-armadeus-add_apf27_module.patch
index 2429f80..1fdd4e4 100644
--- a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.8/0200-armadeus-add_apf27_module.patch
@@ -13,11 +13,11 @@ Signed-off-by: Nicolas Colombain <nic...@ar...>
4 files changed, 273 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-imx/mach-apf27.c
-Index: linux-3.7/arch/arm/mach-imx/Kconfig
+Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7/arch/arm/mach-imx/Kconfig
-@@ -415,6 +415,21 @@ config MACH_IMX27_DT
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-01 21:22:46.000000000 +0100
+@@ -500,6 +500,21 @@
Include support for Freescale i.MX27 based platforms
using the device tree for discovery
@@ -38,12 +38,12 @@ Index: linux-3.7/arch/arm/mach-imx/Kconfig
+
endif
- if ARCH_IMX_V6_V7
-Index: linux-3.7/arch/arm/mach-imx/Makefile
+ if ARCH_MULTI_V6
+Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7/arch/arm/mach-imx/Makefile
-@@ -45,6 +45,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-01 21:22:46.000000000 +0100
+@@ -66,6 +66,7 @@
obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
@@ -51,10 +51,10 @@ Index: linux-3.7/arch/arm/mach-imx/Makefile
# i.MX31 based machines
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c 2013-01-01 21:22:46.000000000 +0100
@@ -0,0 +1,294 @@
+ /*
+ * Support for the APF27 System On Module
@@ -350,23 +350,11 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
+ .init_machine = apf27_init,
+ .restart = mxc_restart,
+MACHINE_END
-Index: linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-3.8-rc1/arch/arm/tools/mach-types
===================================================================
---- linux-3.7.orig/arch/arm/plat-mxc/include/mach/uncompress.h
-+++ linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
-@@ -85,6 +85,7 @@ static __inline__ void __arch_decomp_set
- case MACH_TYPE_PCA100:
- case MACH_TYPE_MXT_TD60:
- case MACH_TYPE_IMX27IPCAM:
-+ case MACH_TYPE_APF27:
- uart_base = MX2X_UART1_BASE_ADDR;
- break;
- case MACH_TYPE_MX31LITE:
-Index: linux-3.7/arch/arm/tools/mach-types
-===================================================================
---- linux-3.7.orig/arch/arm/tools/mach-types
-+++ linux-3.7/arch/arm/tools/mach-types
-@@ -297,6 +297,7 @@ smdk2416 MACH_SMDK2416 SMDK2416 1685
+--- linux-3.8-rc1.orig/arch/arm/tools/mach-types 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/tools/mach-types 2013-01-01 21:19:56.000000000 +0100
+@@ -297,6 +297,7 @@
wbd111 MACH_WBD111 WBD111 1690
mv2120 MACH_MV2120 MV2120 1693
mx51_3ds MACH_MX51_3DS MX51_3DS 1696
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
similarity index 95%
copy from patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
copy to patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
index ff9ac9d..aa6a734 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
@@ -8,11 +8,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Jeremie Scheer <jer...@ar...>
Signed-off-by: Kevin Joly <jol...@gm...>
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-dev.c
===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
-@@ -0,0 +1,1026 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf27-dev.c 2013-01-01 21:19:56.000000000 +0100
+@@ -0,0 +1,1012 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -72,7 +72,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+#ifdef CONFIG_MAX1027
+#include <linux/spi/max1027.h>
+#endif
-+#ifdef CONFIG_SPI_TSC2102
++#ifdef CONFIG_TSC2102
+#include <linux/spi/tsc2102.h>
+#endif
+#include <linux/can/platform/mcp251x.h>
@@ -141,12 +141,8 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+
+#define TSC2101_INT 17
+#define CONFIG_SPI_MXC_SELECT1
-+#define CONFIG_SPI_MXC_SELECT2
+
+#define SPI1_SS0 IMX_GPIO_NR(4, 28)
-+#define SPI2_TSC2102_CS IMX_GPIO_NR(4, 21)
-+#define SPI2_MCP251X_CS IMX_GPIO_NR(4, 20)
-+#define SPI2_SPIDEV_SS IMX_GPIO_NR(2,17)
+#define TSC2101_INT_GPIO IMX_GPIO_NR(6, TSC2101_INT)
+#define USER_LED IMX_GPIO_NR(6, 14) /* PF14 */
+#define USER_BUTTON IMX_GPIO_NR(6, 13) /* PF13 */
@@ -179,9 +175,6 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+ /* PD19_PF_CSPI2_SS2,
+ PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
+ PD21_PF_CSPI2_SS0, */
-+ SPI2_TSC2102_CS|GPIO_OUT|GPIO_GPIO,
-+ SPI2_MCP251X_CS|GPIO_OUT|GPIO_GPIO,
-+ SPI2_SPIDEV_SS|GPIO_OUT|GPIO_GPIO,
+ PD22_PF_CSPI2_SCLK,
+ PD23_PF_CSPI2_MISO,
+ PD24_PF_CSPI2_MOSI,
@@ -487,9 +480,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+
+#ifdef CONFIG_SPI_MXC_SELECT2
+static int apf27_dev_spi1_cs[] = {
-+ SPI2_TSC2102_CS, /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
-+ SPI2_MCP251X_CS, /* 1: MCP251X_CS */
-+ SPI2_SPIDEV_SS, /* 2: SPIDEV_CS (CSI_D5) */
++ (GPIO_PORTD + 21), /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
++ (GPIO_PORTD + 20), /* 1: MCP251X_CS */
++ (GPIO_PORTB + 17), /* 2: SPIDEV_CS (CSI_D5) */
+};
+
+static struct spi_imx_master apf27dev_spi1_data = {
@@ -540,7 +533,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+};
+#endif /* CONFIG_ARMADEUS_MAX1027 */
+
-+#ifdef CONFIG_SPI_TSC2102
++#ifdef CONFIG_TSC2102
+/* APF27Dev has a SPI Touchscreen controller */
+
+static struct tsc210x_config apf27_tsc2101_config = {
@@ -593,7 +586,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+ .modalias = "tsc210x",
+ .max_speed_hz = 8000000,
+ .bus_num = 1, /* SPI2 */
-+ /*.irq = (TSC2101_INT_GPIO),*/
++ .irq = IRQ_GPIOF(TSC2101_INT),
+ .chip_select = 0,
+ .mode = 0,
+ .platform_data = &apf27_tsc2101_config,
@@ -952,7 +945,6 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+void __init apf27_baseboard_init(void)
+{
+ int ret;
-+ int i;
+
+ /* SSI unit (TBDL) */
+// mxc_audmux_v1_configure_port(.....);
@@ -1000,15 +992,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+ /* TSC2101 + optionnal CAN */
+ /* Can also be used as USB2 or external SPI, with jumper J23 */
+ /* Let hardware decide the state of CS at startup */
-+ /*mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
++ mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
+ mxc_gpio_mode(GPIO_PORTD | 20 | GPIO_GPIO | GPIO_IN);
-+ mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);*/
-+ for (i=0; i< ARRAY_SIZE(apf27dev_spi_board_info);i++) {
-+ if (!strcmp(apf27dev_spi_board_info[i].modalias, "tsc210x")) {
-+ apf27dev_spi_board_info[i].irq = gpio_to_irq(TSC2101_INT_GPIO);
-+ }
-+ }
-+
++ mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);
+ imx27_add_spi_imx1(&apf27dev_spi1_data);
+#endif
+#ifdef CONFIG_SPI_MXC_SELECT3
@@ -1039,10 +1025,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+#endif
+}
+
-Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-lcd.c
===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf27-lcd.c 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,157 @@
+/*
+ * apf27-lcd.c
@@ -1201,10 +1187,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+}
+
+#endif
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2013-01-01 21:19:56.000000000 +0100
@@ -0,0 +1,175 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -1381,10 +1367,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+ printk("done\n");
+}
+
-Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/mach-apf27.c
-+++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/mach-apf27.c 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c 2013-01-01 21:19:56.000000000 +0100
@@ -43,6 +43,7 @@
#include "devices-imx27.h"
@@ -1393,7 +1379,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
static const int apf27_pins[] __initconst = {
/* UART1 */
-@@ -270,6 +271,10 @@ static void __init apf27_init(void)
+@@ -270,6 +271,10 @@
i2c_register_board_info(1, apf27_i2c_devices_bus1,
ARRAY_SIZE(apf27_i2c_devices_bus1));
imx27_add_imx_i2c(1, &apf27_i2c_1_data);
@@ -1404,11 +1390,11 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
}
static void __init apf27_timer_init(void)
-Index: linux-3.7/arch/arm/mach-imx/Kconfig
+Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7/arch/arm/mach-imx/Kconfig
-@@ -430,6 +430,103 @@ config MACH_APF27
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-01 21:19:56.000000000 +0100
+@@ -515,6 +515,103 @@
Include support for APF27 platform. This includes specific
configurations for the module and its peripherals.
@@ -1511,12 +1497,12 @@ Index: linux-3.7/arch/arm/mach-imx/Kconfig
+
endif
- if ARCH_IMX_V6_V7
-Index: linux-3.7/arch/arm/mach-imx/Makefile
+ if ARCH_MULTI_V6
+Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7/arch/arm/mach-imx/Makefile
-@@ -46,6 +46,9 @@ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-01 21:19:56.000000000 +0100
+@@ -67,6 +67,9 @@
obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
obj-$(CONFIG_MACH_APF27) += mach-apf27.o
diff --git a/patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch b/patches/linux/3.8/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
similarity index 82%
copy from patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
copy to patches/linux/3.8/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
index 987f036..b846d3c 100644
--- a/patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
+++ b/patches/linux/3.8/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
@@ -3,11 +3,11 @@ A clock gate is mandatory to activate SPLL clock needed, at least, for usb.
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c
===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/clk-imx27.c
-+++ linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
-@@ -62,7 +62,7 @@ static const char *clko_sel_clks[] = {
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/clk-imx27.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c 2013-01-01 21:22:38.000000000 +0100
+@@ -62,7 +62,7 @@
"32k", "usb_div", "dptc",
};
@@ -16,7 +16,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
enum mx27_clks {
dummy, ckih, ckil, mpll, spll, mpll_main2, ahb, ipg, nfc_div, per1_div,
-@@ -82,7 +82,7 @@ enum mx27_clks {
+@@ -82,7 +82,7 @@
csi_ahb_gate, brom_ahb_gate, ata_ahb_gate, wdog_ipg_gate, usb_ipg_gate,
uart6_ipg_gate, uart5_ipg_gate, uart4_ipg_gate, uart3_ipg_gate,
uart2_ipg_gate, uart1_ipg_gate, ckih_div1p5, fpm, mpll_osc_sel,
@@ -25,7 +25,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
};
static struct clk *clk[clk_max];
-@@ -104,6 +104,7 @@ int __init mx27_clocks_init(unsigned lon
+@@ -104,6 +104,7 @@
ARRAY_SIZE(mpll_sel_clks));
clk[mpll] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
clk[spll] = imx_clk_pllv1("spll", "ckih", CCM_SPCTL0);
@@ -33,7 +33,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
clk[mpll_main2] = imx_clk_fixed_factor("mpll_main2", "mpll", 2, 3);
if (mx27_revision() >= IMX_CHIP_REVISION_2_0) {
-@@ -121,7 +122,7 @@ int __init mx27_clocks_init(unsigned lon
+@@ -121,7 +122,7 @@
clk[per4_div] = imx_clk_divider("per4_div", "mpll_main2", CCM_PCDR1, 24, 6);
clk[vpu_sel] = imx_clk_mux("vpu_sel", CCM_CSCR, 21, 1, vpu_sel_clks, ARRAY_SIZE(vpu_sel_clks));
clk[vpu_div] = imx_clk_divider("vpu_div", "vpu_sel", CCM_PCDR0, 10, 6);
diff --git a/patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
similarity index 78%
copy from patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
copy to patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
index 4ebf63a..cba4fd7 100644
--- a/patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
+++ b/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
@@ -3,11 +3,11 @@ EHCI PER clock (aka usb_div) must be enabled to have EHCI driver working.
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.7/drivers/usb/host/ehci-mxc.c
+Index: linux-3.8-rc1/drivers/usb/host/ehci-mxc.c
===================================================================
---- linux-3.7.orig/drivers/usb/host/ehci-mxc.c
-+++ linux-3.7/drivers/usb/host/ehci-mxc.c
-@@ -32,7 +32,7 @@
+--- linux-3.8-rc1.orig/drivers/usb/host/ehci-mxc.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/host/ehci-mxc.c 2013-01-01 21:19:57.000000000 +0100
+@@ -31,7 +31,7 @@
#define ULPI_VIEWPORT_OFFSET 0x170
struct ehci_mxc_priv {
@@ -16,7 +16,7 @@ Index: linux-3.7/drivers/usb/host/ehci-mxc.c
struct usb_hcd *hcd;
};
-@@ -159,6 +159,13 @@ static int ehci_mxc_drv_probe(struct pla
+@@ -150,6 +150,13 @@
}
clk_prepare_enable(priv->ahbclk);
@@ -30,7 +30,7 @@ Index: linux-3.7/drivers/usb/host/ehci-mxc.c
/* "dr" device has its own clock on i.MX51 */
priv->phyclk = devm_clk_get(&pdev->dev, "phy");
if (IS_ERR(priv->phyclk))
-@@ -242,6 +249,8 @@ err_init:
+@@ -233,6 +240,8 @@
if (priv->phyclk)
clk_disable_unprepare(priv->phyclk);
@@ -39,7 +39,7 @@ Index: linux-3.7/drivers/usb/host/ehci-mxc.c
clk_disable_unprepare(priv->ahbclk);
err_clk_ahb:
clk_disable_unprepare(priv->usbclk);
-@@ -268,6 +277,7 @@ static int __exit ehci_mxc_drv_remove(st
+@@ -259,6 +268,7 @@
clk_disable_unprepare(priv->usbclk);
clk_disable_unprepare(priv->ahbclk);
diff --git a/patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
similarity index 77%
copy from patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
copy to patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
index 88008b9..e34aba8 100644
--- a/patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
+++ b/patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
@@ -5,11 +5,11 @@ working.
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.7/drivers/video/imxfb.c
+Index: linux-3.8-rc1/drivers/video/imxfb.c
===================================================================
---- linux-3.7.orig/drivers/video/imxfb.c
-+++ linux-3.7/drivers/video/imxfb.c
-@@ -747,6 +747,7 @@ static int __init imxfb_probe(struct pla
+--- linux-3.8-rc1.orig/drivers/video/imxfb.c 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/video/imxfb.c 2013-01-01 21:19:57.000000000 +0100
+@@ -771,6 +771,7 @@
struct imx_fb_platform_data *pdata;
struct resource *res;
int ret, i;
@@ -17,7 +17,7 @@ Index: linux-3.7/drivers/video/imxfb.c
dev_info(&pdev->dev, "i.MX Framebuffer driver\n");
-@@ -800,6 +801,13 @@ static int __init imxfb_probe(struct pla
+@@ -825,6 +826,13 @@
goto failed_getclock;
}
diff --git a/patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch b/patches/linux/3.8/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
similarity index 57%
copy from patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
copy to patches/linux/3.8/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
index 2369906..58c5698 100644
--- a/patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
+++ b/patches/linux/3.8/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
@@ -4,14 +4,14 @@ the second must be added.
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.7/arch/arm/mach-imx/clk-imx27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c
===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/clk-imx27.c
-+++ linux-3.7/arch/arm/mach-imx/clk-imx27.c
-@@ -229,9 +229,12 @@ int __init mx27_clocks_init(unsigned lon
- clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.1");
- clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.2");
- clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.2");
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/clk-imx27.c 2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c 2013-01-01 21:19:57.000000000 +0100
+@@ -229,9 +229,12 @@
+ clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.1");
+ clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.2");
+ clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.2");
- clk_register_clkdev(clk[cspi1_ipg_gate], NULL, "imx27-cspi.0");
- clk_register_clkdev(clk[cspi2_ipg_gate], NULL, "imx27-cspi.1");
- clk_register_clkdev(clk[cspi3_ipg_gate], NULL, "imx27-cspi.2");
@@ -21,6 +21,6 @@ Index: linux-3.7/arch/arm/mach-imx/clk-imx27.c
+ clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx27-cspi.1");
+ clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.2");
+ clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx27-cspi.2");
- clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0");
- clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0");
- clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0");
+ clk_register_clkdev(clk[per3_gate], "per", "imx21-fb.0");
+ clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0");
+ clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0");
diff --git a/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch
new file mode 100644
index 0000000..90ceb91
--- /dev/null
+++ b/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch
@@ -0,0 +1,29 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.8-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+===================================================================
+--- linux-3.8-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/boot/dts/imx28-apf28dev.dts 2013-01-01 21:19:57.000000000 +0100
+@@ -32,6 +32,13 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi2_pins_a>;
+ status = "okay";
++/* Uncomment to have spidev on SPI2 (ChipSelect 0):
++ device@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <3125000>;
++ };
++*/
+ };
+
+ pinctrl@80018000 {
+@@ -48,6 +55,7 @@
+ 0x1143 /* MX28_PAD_LCD_D20__GPIO_1_20 */
+ 0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */
+ 0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */
++ 0x1173 /* MX28_PAD_LCD_D23__GPIO_1_23 */
+ >;
+ fsl,drive-strength = <0>;
+ fsl,voltage = <1>;
hooks/post-receive
--
armadeus
|
