[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-260-g592ac6c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-260-g592ac6c
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-05-22 17:29:02
|
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 592ac6cf2102eaf37fc09eb16968d4429073d8ec (commit)
via 5f58daac859f9618d323c8d7b024dc93c721654a (commit)
via efab44f78436ad4c5a87cb58581b506925cf8d08 (commit)
via 005ac68554314d4602ecf515ad807e76eb1a5b6d (commit)
from 54997a0cd2a92ac5394ed42fb0dbe2cdaa7764f0 (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 592ac6cf2102eaf37fc09eb16968d4429073d8ec
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:28:31 2013 +0200
[LINUX][3.10] Add 3.10-rc2 patches support
commit 5f58daac859f9618d323c8d7b024dc93c721654a
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:28:06 2013 +0200
[LINUX][3.10] copy patches from 3.8
commit efab44f78436ad4c5a87cb58581b506925cf8d08
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:25:24 2013 +0200
[LINUX][3.10] adapts patches 0200, 0400, 0401 and 0442 from 3.8
commit 005ac68554314d4602ecf515ad807e76eb1a5b6d
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:23:02 2013 +0200
[LINUX][3.10] apf27, apf51: Add support for 3.10-rc2
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.10-rc2.config | 1 +
...27-linux-3.8.config => apf27-linux-3.10.config} | 7 ----
...inux-3.8.config => apf51-linux-3.10-rc2.config} | 11 ------
...51-linux-3.8.config => apf51-linux-3.10.config} | 11 ------
patches/linux/3.10-rc2 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.8 => 3.10}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0025-armadeus-imx-correct_dma_shift.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
.../0029b-armadeus-add_csi_registers.patch | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
.../0030-armadeus-imx_udc-change_clk_get.patch | 0
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 0
...7-armadeus-imx_udc-add_printk_when_probed.patch | 0
...s-imx_udc-prevent_crash_after_soft_reboot.patch | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.8 => 3.10}/0073-armadeus-tsc2102.patch | 0
...02_integrate_driver_to_linux_build_system.patch | 0
...chscreen-add_driver_to_linux_build_system.patch | 0
.../0074-armadeus-tsc2102-touchscreen.patch | 0
.../0075-armadeus-spi2-reg-defines.patch | 0
...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 | 38 +++++++++-----------
.../0201-armadeus-add_apf27dev_baseboard.patch | 0
...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch | 0
...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
.../3.10/0400-Add-apf51-basic-dt-support.patch | 23 ++++++++++++
.../0401-armadeus-add_apf51dev_baseboard.patch | 32 ++++++++++++++++
.../0404-armadeus-fix_nand_ecc_oob.patch | 0
..._possibility_to_deactivate_SDIO_interrupt.patch | 0
.../0420-armadeus-Add-apf28dev-dts.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 10 +++---
36 files changed, 79 insertions(+), 55 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.8.config => apf27-linux-3.10.config} (95%)
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.8.config => apf51-linux-3.10-rc2.config} (94%)
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.8.config => apf51-linux-3.10.config} (94%)
create mode 120000 patches/linux/3.10-rc2
copy patches/linux/{3.7 => 3.10}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.8 => 3.10}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.8 => 3.10}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.8 => 3.10}/0025-armadeus-imx-correct_dma_shift.patch (100%)
copy patches/linux/{3.8 => 3.10}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.8 => 3.10}/0029b-armadeus-add_csi_registers.patch (100%)
copy patches/linux/{3.8 => 3.10}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.8 => 3.10}/0030-armadeus-imx_udc-change_clk_get.patch (100%)
copy patches/linux/{3.7 => 3.10}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.8 => 3.10}/0037-armadeus-imx_udc-add_printk_when_probed.patch (100%)
copy patches/linux/{3.8 => 3.10}/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch (100%)
copy patches/linux/{3.8 => 3.10}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.8 => 3.10}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.8 => 3.10}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.8 => 3.10}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.8 => 3.10}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.8 => 3.10}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.7 => 3.10}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.7 => 3.10}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.8 => 3.10}/0200-armadeus-add_apf27_module.patch (90%)
copy patches/linux/{3.8 => 3.10}/0201-armadeus-add_apf27dev_baseboard.patch (100%)
copy patches/linux/{3.8 => 3.10}/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch (100%)
copy patches/linux/{3.8 => 3.10}/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch (100%)
copy patches/linux/{3.8 => 3.10}/0322-armadeus-add_mach_fpga_h.patch (100%)
create mode 100644 patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch
create mode 100644 patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
copy patches/linux/{3.8 => 3.10}/0404-armadeus-fix_nand_ecc_oob.patch (100%)
copy patches/linux/{3.8 => 3.10}/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch (100%)
copy patches/linux/{3.8 => 3.10}/0420-armadeus-Add-apf28dev-dts.patch (100%)
copy patches/linux/{3.8 => 3.10}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.8 => 3.10}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (65%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config
new file mode 120000
index 0000000..de49b4f
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config
@@ -0,0 +1 @@
+apf27-linux-3.10.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
similarity index 95%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
index bc08620..266ef06 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
@@ -20,7 +20,6 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_ARCH_MXC=y
CONFIG_MXC_IRQ_PRIOR=y
CONFIG_MACH_IMX27_DT=y
-CONFIG_MACH_APF27=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -201,12 +200,6 @@ CONFIG_IMX_SDMA=y
CONFIG_IMX_DMA=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_IIO=m
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR=m
-CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON=m
-CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10-rc2.config
similarity index 94%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.10-rc2.config
index 36fd5b2..4cdf93a 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10-rc2.config
@@ -226,17 +226,6 @@ CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_WM831X=y
CONFIG_STAGING=y
CONFIG_IIO=m
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
-CONFIG_ARMADEUS_PWM_DRIVER=m
-CONFIG_MCP49x2=m
-# CONFIG_MXC_HWEVENT is not set
-# CONFIG_MXC_VPU is not set
-# CONFIG_MXC_VPU_IRAM is not set
-CONFIG_MXC_SECURITY_SCC2=m
-CONFIG_MXC_SAHARA=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.config
similarity index 94%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.config
index 36fd5b2..4cdf93a 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.config
@@ -226,17 +226,6 @@ CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_WM831X=y
CONFIG_STAGING=y
CONFIG_IIO=m
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
-CONFIG_ARMADEUS_PWM_DRIVER=m
-CONFIG_MCP49x2=m
-# CONFIG_MXC_HWEVENT is not set
-# CONFIG_MXC_VPU is not set
-# CONFIG_MXC_VPU_IRAM is not set
-CONFIG_MXC_SECURITY_SCC2=m
-CONFIG_MXC_SAHARA=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/patches/linux/3.10-rc2 b/patches/linux/3.10-rc2
new file mode 120000
index 0000000..7c7a975
--- /dev/null
+++ b/patches/linux/3.10-rc2
@@ -0,0 +1 @@
+3.10
\ No newline at end of file
diff --git a/patches/linux/3.7/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.10/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.7/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/3.10/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.8/0021-armadeus-apf9328.patch b/patches/linux/3.10/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.8/0021-armadeus-apf9328.patch
copy to patches/linux/3.10/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch
similarity index 100%
copy from patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
copy to patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch
diff --git a/patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 100%
copy from patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.8/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
similarity index 100%
copy from patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
diff --git a/patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 100%
copy from patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch b/patches/linux/3.10/0030-armadeus-imx_udc-change_clk_get.patch
similarity index 100%
copy from patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
copy to patches/linux/3.10/0030-armadeus-imx_udc-change_clk_get.patch
diff --git a/patches/linux/3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.10/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.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch b/patches/linux/3.10/0037-armadeus-imx_udc-add_printk_when_probed.patch
similarity index 100%
copy from patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
copy to patches/linux/3.10/0037-armadeus-imx_udc-add_printk_when_probed.patch
diff --git a/patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch b/patches/linux/3.10/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
similarity index 100%
copy from patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
copy to patches/linux/3.10/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
diff --git a/patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.8/0073-armadeus-tsc2102.patch b/patches/linux/3.10/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.8/0073-armadeus-tsc2102.patch
copy to patches/linux/3.10/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
similarity index 100%
copy from patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.10/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.10/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.10/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.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.8/0200-armadeus-add_apf27_module.patch b/patches/linux/3.10/0200-armadeus-add_apf27_module.patch
similarity index 90%
copy from patches/linux/3.8/0200-armadeus-add_apf27_module.patch
copy to patches/linux/3.10/0200-armadeus-add_apf27_module.patch
index a7e02ea..add80a1 100644
--- a/patches/linux/3.8/0200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.10/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.8-rc1/arch/arm/mach-imx/Kconfig
+Index: linux-3.9.1/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2013-01-02 10:07:38.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-02 10:07:44.000000000 +0100
-@@ -500,6 +500,21 @@
+--- linux-3.9.1.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.9.1/arch/arm/mach-imx/Kconfig
+@@ -492,6 +492,21 @@ config MACH_IMX27_DT
Include support for Freescale i.MX27 based platforms
using the device tree for discovery
@@ -39,11 +39,11 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
endif
if ARCH_MULTI_V6
-Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
+Index: linux-3.9.1/arch/arm/mach-imx/Makefile
===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2013-01-02 10:07:38.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-02 10:07:44.000000000 +0100
-@@ -66,6 +66,7 @@
+--- linux-3.9.1.orig/arch/arm/mach-imx/Makefile
++++ linux-3.9.1/arch/arm/mach-imx/Makefile
+@@ -70,6 +70,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
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,11 +51,11 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
# i.MX31 based machines
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.9.1/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-02 10:08:00.000000000 +0100
-@@ -0,0 +1,294 @@
+--- /dev/null
++++ linux-3.9.1/arch/arm/mach-imx/mach-apf27.c
+@@ -0,0 +1,290 @@
+ /*
+ * Support for the APF27 System On Module
+ *
@@ -335,10 +335,6 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
+ mx27_clocks_init(26000000); /* init ext ref, even if not used */
+}
+
-+static struct sys_timer apf27_timer = {
-+ .init = apf27_timer_init,
-+};
-+
+MACHINE_START(APF27, "Armadeus APF27")
+ /* Maintainer: Julien Boibessot <jul...@ar...> */
+ .atag_offset = 0x100,
@@ -346,15 +342,15 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
+ .init_early = imx27_init_early,
+ .init_irq = mx27_init_irq,
+ .handle_irq = imx27_handle_irq,
-+ .timer = &apf27_timer,
++ .init_time = apf27_timer_init,
+ .init_machine = apf27_init,
+ .restart = mxc_restart,
+MACHINE_END
-Index: linux-3.8-rc1/arch/arm/tools/mach-types
+Index: linux-3.9.1/arch/arm/tools/mach-types
===================================================================
---- linux-3.8-rc1.orig/arch/arm/tools/mach-types 2013-01-02 10:07:38.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/tools/mach-types 2013-01-02 10:07:44.000000000 +0100
-@@ -297,6 +297,7 @@
+--- linux-3.9.1.orig/arch/arm/tools/mach-types
++++ linux-3.9.1/arch/arm/tools/mach-types
+@@ -297,6 +297,7 @@ smdk2416 MACH_SMDK2416 SMDK2416 1685
wbd111 MACH_WBD111 WBD111 1690
mv2120 MACH_MV2120 MV2120 1693
mx51_3ds MACH_MX51_3DS MX51_3DS 1696
diff --git a/patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.10/0201-armadeus-add_apf27dev_baseboard.patch
similarity index 100%
copy from patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
copy to patches/linux/3.10/0201-armadeus-add_apf27dev_baseboard.patch
diff --git a/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.10/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
similarity index 100%
copy from patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
copy to patches/linux/3.10/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
diff --git a/patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.10/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
similarity index 100%
copy from patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
copy to patches/linux/3.10/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
diff --git a/patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
similarity index 100%
copy from patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch
new file mode 100644
index 0000000..b662659
--- /dev/null
+++ b/patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch
@@ -0,0 +1,23 @@
+Add apf51 basic support
+
+Signed-off-by: Laurent Cans <lau...@gm...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.9.1/arch/arm/boot/dts/imx51-apf51.dts
+===================================================================
+--- linux-3.9.1.orig/arch/arm/boot/dts/imx51-apf51.dts
++++ linux-3.9.1/arch/arm/boot/dts/imx51-apf51.dts
+@@ -36,6 +36,13 @@
+ };
+ };
+
++&nfc {
++ nand-bus-width = <8>;
++ nand-ecc-mode = "hw";
++ nand-on-flash-bbt;
++ status = "okay";
++};
++
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec_2>;
diff --git a/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
new file mode 100644
index 0000000..362f12c
--- /dev/null
+++ b/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
@@ -0,0 +1,32 @@
+The APF51Dev is a docking board for an APF51 SOM
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+Signed-off-by: Laurent Cans <lau...@gm...>
+---
+Index: linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+===================================================================
+--- linux-3.10-rc2.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+@@ -51,6 +51,14 @@
+ fsl,spi-num-chipselects = <2>;
+ cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;
+ status = "okay";
++
++ spidev: spidev@1 {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "spidev";
++ spi-max-frequency = <25000000>;
++ reg = <1>;
++ };
+ };
+
+ &esdhc1 {
+@@ -65,6 +73,7 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc2_1>;
+ bus-width = <4>;
++ fsl,no_sdio_irq;
+ non-removable;
+ status = "okay";
+ };
diff --git a/patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
similarity index 100%
copy from patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
copy to patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
diff --git a/patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch b/patches/linux/3.10/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
similarity index 100%
copy from patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
copy to patches/linux/3.10/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
diff --git a/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.10/0420-armadeus-Add-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch
copy to patches/linux/3.10/0420-armadeus-Add-apf28dev-dts.patch
diff --git a/patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
diff --git a/patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
similarity index 65%
copy from patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
copy to patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
index c5fde4e..1c4ab18 100644
--- a/patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
+++ b/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
@@ -8,15 +8,15 @@ for example:
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-3.4.37/drivers/rtc/rtc-stmp3xxx.c
+Index: linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
===================================================================
---- linux-3.4.37.orig/drivers/rtc/rtc-stmp3xxx.c 2013-04-10 11:16:54.000000000 +0200
-+++ linux-3.4.37/drivers/rtc/rtc-stmp3xxx.c 2013-04-10 12:16:21.000000000 +0200
-@@ -217,6 +217,7 @@
+--- linux-3.10-rc2.orig/drivers/rtc/rtc-stmp3xxx.c
++++ linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
+@@ -272,6 +272,7 @@ static int stmp3xxx_rtc_probe(struct pla
STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
+ device_set_wakeup_capable(&pdev->dev, 1);
- rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev,
+ rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&stmp3xxx_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc_data->rtc)) {
hooks/post-receive
--
armadeus
|
