[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-93-g60d9d65
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-93-g60d9d65
|
From: Sébastien S. <ss...@us...> - 2014-02-03 12:54:13
|
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 60d9d6586bf51c049ebc983432b116c649d71cc5 (commit)
from d08f8d7ada96a645819cedab20bdce965dea67b8 (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 60d9d6586bf51c049ebc983432b116c649d71cc5
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 3 13:54:35 2014 +0100
[LINUX]: apf6q: move to 3.14-rc1
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 2 +-
.../armadeus/apf6q/apf6q-linux-3.14-rc1.config | 1 +
...q-linux-3.13.config => apf6q-linux-3.14.config} | 1 -
patches/linux/3.14-rc1 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 3.14}/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
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.10 => 3.14}/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
.../0076-Add-tsc210x-device-tree-support.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...madeus-clock-imx1_avoid_crash_with_module.tofix | 0
.../0206-c-imx-dts-pin_functions.patch | 0
.../0206-d-linaro-dts-imx27-pinctrl.patch | 0
.../0206-e-linaro-imx27-enable_pinctrl.patch | 0
.../0207-armadeus-apf27dev-add_hog_pinctrl.patch | 0
...madeus-imx27_dtsi-add_framebuffer_pinctrl.patch | 0
...armadeus-imx27-apf27dev-add_imxfb_support.patch | 0
...re_to_setup_PWM_Contrast_Control_Register.patch | 0
.../0213-armadeus-add_cspi_pinctrl.patch | 0
.../0214-armadeus-add_cspi_and_sdhc_pinctrl.patch | 0
...-imx27-apf27dev-add_pinctrl_for_cspi_node.patch | 0
...-armadeus-imx27-apf27dev-add_sdhc_support.patch | 0
...us-apf27-apf27dev-dts-peripherals_pinctrl.patch | 0
...deus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch | 0
...-tsc210x-device-tree-support-for-apf27dev.patch | 0
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 0
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 0
...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 0
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 0
.../0400-Add-apf51-basic-dt-support.patch | 0
.../0401-armadeus-add_apf51dev_baseboard.patch | 0
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 0
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 0
...adeus-chipidea-add_node_to_select_clk_phy.patch | 0
...us-imx51-dts-add-pin-definition-for-uart1.patch | 0
...imx-drm-fix_clk_polarity_for_apf51_screen.patch | 0
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 0
.../0420-armadeus-Add-apf28dev-dts.patch | 0
..._otg_phy_clock_directly_to_osc_ref.patch.tofix} | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 0
...0443-armadeus-apf28-fix_mac_address_issue.patch | 0
.../0444-armadeus-imx27-add-usb.patch.tofix} | 0
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 32 ++-----
...around-fec-tx-queue-timeouts-when-SATA-SD.patch | 0
...inux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch | 0
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 0
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 0
...-remove-pwr_in_suspend-from-platform-data.patch | 0
...-instead-of-enumerations-for-pdata-clocks.patch | 0
...al-device-tree-support-to-the-sdio-module.patch | 0
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 0
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 0
...heck-if-we-got-correct-clock-data-from-DT.patch | 0
...cumentation-dt-bindings-TI-WiLink-modules.patch | 0
.../3.14/0497-fix-compilation-of-imx-hdmi.patch | 90 ++++++++++++++++++++
69 files changed, 101 insertions(+), 26 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
copy buildroot/target/device/armadeus/apf6q/{apf6q-linux-3.13.config => apf6q-linux-3.14.config} (99%)
create mode 120000 patches/linux/3.14-rc1
copy patches/linux/{3.12 => 3.14}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 3.14}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.10 => 3.14}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14}/0025-armadeus-imx-correct_dma_shift.patch (100%)
copy patches/linux/{3.10 => 3.14}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.10 => 3.14}/0029b-armadeus-add_csi_registers.patch (100%)
copy patches/linux/{3.10 => 3.14}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.10 => 3.14}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.10 => 3.14}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.10 => 3.14}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 3.14}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 3.14}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.12 => 3.14}/0076-Add-tsc210x-device-tree-support.patch (100%)
copy patches/linux/{3.10 => 3.14}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.10 => 3.14}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.12 => 3.14}/0206-c-imx-dts-pin_functions.patch (100%)
copy patches/linux/{3.12 => 3.14}/0206-d-linaro-dts-imx27-pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0206-e-linaro-imx27-enable_pinctrl.patch (100%)
copy patches/linux/{3.11 => 3.14}/0207-armadeus-apf27dev-add_hog_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch (100%)
copy patches/linux/{3.13 => 3.14}/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch (100%)
copy patches/linux/{3.11 => 3.14}/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch (100%)
copy patches/linux/{3.12 => 3.14}/0213-armadeus-add_cspi_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch (100%)
copy patches/linux/{3.12 => 3.14}/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch (100%)
copy patches/linux/{3.12 => 3.14}/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch (100%)
copy patches/linux/{3.13 => 3.14}/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch (100%)
copy patches/linux/{3.13 => 3.14}/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch (100%)
copy patches/linux/{3.13 => 3.14}/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.13 => 3.14}/0230-armadeus-fixes-vpu-spll-clock-dependency.patch (100%)
copy patches/linux/{3.10 => 3.14}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.10 => 3.14}/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch (100%)
copy patches/linux/{3.13 => 3.14}/0400-Add-apf51-basic-dt-support.patch (100%)
copy patches/linux/{3.13 => 3.14}/0401-armadeus-add_apf51dev_baseboard.patch (100%)
copy patches/linux/{3.11 => 3.14}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.12 => 3.14}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (100%)
copy patches/linux/{3.12 => 3.14}/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch (100%)
copy patches/linux/{3.12 => 3.14}/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch (100%)
copy patches/linux/{3.13 => 3.14}/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch (100%)
copy patches/linux/{3.13 => 3.14}/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.13 => 3.14}/0420-armadeus-Add-apf28dev-dts.patch (100%)
copy patches/linux/{3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch => 3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix} (100%)
copy patches/linux/{3.12 => 3.14}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.10 => 3.14}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.12 => 3.14}/0443-armadeus-apf28-fix_mac_address_issue.patch (100%)
copy patches/linux/{3.13/0444-armadeus-imx27-add-usb.patch => 3.14/0444-armadeus-imx27-add-usb.patch.tofix} (100%)
copy patches/linux/{3.13 => 3.14}/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch (100%)
copy patches/linux/{3.13 => 3.14}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (87%)
copy patches/linux/{3.12 => 3.14}/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch (100%)
copy patches/linux/{3.12 => 3.14}/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch (100%)
copy patches/linux/{3.12 => 3.14}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
copy patches/linux/{3.13 => 3.14}/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch (100%)
copy patches/linux/{3.13 => 3.14}/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch (100%)
copy patches/linux/{3.13 => 3.14}/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch (100%)
copy patches/linux/{3.13 => 3.14}/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch (100%)
copy patches/linux/{3.13 => 3.14}/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch (100%)
copy patches/linux/{3.13 => 3.14}/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch (100%)
copy patches/linux/{3.13 => 3.14}/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch (100%)
copy patches/linux/{3.13 => 3.14}/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch (100%)
create mode 100644 patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index 1556959..badc0a1 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14-rc1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
new file mode 120000
index 0000000..991c9a7
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
@@ -0,0 +1 @@
+apf6q-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config
similarity index 99%
copy from buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
copy to buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config
index 5fbf6b1..eea7d0a 100644
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config
@@ -247,7 +247,6 @@ CONFIG_DRM_IMX_LDB=y
CONFIG_DRM_IMX_IPUV3_CORE=y
CONFIG_DRM_IMX_IPUV3=y
CONFIG_DRM_IMX_HDMI=y
-CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
CONFIG_PWM_IMX=y
diff --git a/patches/linux/3.14-rc1 b/patches/linux/3.14-rc1
new file mode 120000
index 0000000..3767b4b
--- /dev/null
+++ b/patches/linux/3.14-rc1
@@ -0,0 +1 @@
+3.14
\ No newline at end of file
diff --git a/patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.14/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/3.14/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/3.14/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/3.14/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.14/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.14/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.14/0025-armadeus-imx-correct_dma_shift.patch
similarity index 100%
copy from patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch
copy to patches/linux/3.14/0025-armadeus-imx-correct_dma_shift.patch
diff --git a/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.14/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 100%
copy from patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/3.14/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.10/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.14/0029b-armadeus-add_csi_registers.patch
similarity index 100%
copy from patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.14/0029b-armadeus-add_csi_registers.patch
diff --git a/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.14/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 100%
copy from patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/3.14/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.14/0035-armadeus-re_add_pwm_and_correct_driver.tofix
similarity index 100%
copy from patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix
copy to patches/linux/3.14/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.14/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/3.14/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102.patch b/patches/linux/3.14/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102.patch
copy to patches/linux/3.14/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.14/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.14/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.14/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.14/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.14/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.14/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.14/0075-armadeus-spi2-reg-defines.patch
similarity index 100%
copy from patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.14/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.14/0076-Add-tsc210x-device-tree-support.patch
similarity index 100%
copy from patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch
copy to patches/linux/3.14/0076-Add-tsc210x-device-tree-support.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.14/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
similarity index 100%
copy from patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
copy to patches/linux/3.14/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.14/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
similarity index 100%
copy from patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.14/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.12/0206-c-imx-dts-pin_functions.patch b/patches/linux/3.14/0206-c-imx-dts-pin_functions.patch
similarity index 100%
copy from patches/linux/3.12/0206-c-imx-dts-pin_functions.patch
copy to patches/linux/3.14/0206-c-imx-dts-pin_functions.patch
diff --git a/patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch b/patches/linux/3.14/0206-d-linaro-dts-imx27-pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch
copy to patches/linux/3.14/0206-d-linaro-dts-imx27-pinctrl.patch
diff --git a/patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch b/patches/linux/3.14/0206-e-linaro-imx27-enable_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch
copy to patches/linux/3.14/0206-e-linaro-imx27-enable_pinctrl.patch
diff --git a/patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch b/patches/linux/3.14/0207-armadeus-apf27dev-add_hog_pinctrl.patch
similarity index 100%
copy from patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch
copy to patches/linux/3.14/0207-armadeus-apf27dev-add_hog_pinctrl.patch
diff --git a/patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch b/patches/linux/3.14/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
copy to patches/linux/3.14/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
diff --git a/patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.14/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
similarity index 100%
copy from patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
copy to patches/linux/3.14/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
diff --git a/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.14/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
similarity index 100%
copy from patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
copy to patches/linux/3.14/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
diff --git a/patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch b/patches/linux/3.14/0213-armadeus-add_cspi_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch
copy to patches/linux/3.14/0213-armadeus-add_cspi_pinctrl.patch
diff --git a/patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch b/patches/linux/3.14/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
copy to patches/linux/3.14/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
diff --git a/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch b/patches/linux/3.14/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
similarity index 100%
copy from patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
copy to patches/linux/3.14/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
diff --git a/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch b/patches/linux/3.14/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
similarity index 100%
copy from patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
copy to patches/linux/3.14/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
diff --git a/patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch b/patches/linux/3.14/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
copy to patches/linux/3.14/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
diff --git a/patches/linux/3.12/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch b/patches/linux/3.14/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
copy to patches/linux/3.14/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
diff --git a/patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.14/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
copy to patches/linux/3.14/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
diff --git a/patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.14/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
similarity index 100%
copy from patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
copy to patches/linux/3.14/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.14/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
similarity index 100%
copy from patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
copy to patches/linux/3.14/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
diff --git a/patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.14/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
similarity index 100%
copy from patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
copy to patches/linux/3.14/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.14/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
copy from patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
copy to patches/linux/3.14/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
similarity index 100%
copy from patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
similarity index 100%
copy from patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
copy to patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
diff --git a/patches/linux/3.13/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.14/0400-Add-apf51-basic-dt-support.patch
similarity index 100%
copy from patches/linux/3.13/0400-Add-apf51-basic-dt-support.patch
copy to patches/linux/3.14/0400-Add-apf51-basic-dt-support.patch
diff --git a/patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch
similarity index 100%
copy from patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch
copy to patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch
diff --git a/patches/linux/3.11/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
similarity index 100%
copy from patches/linux/3.11/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
copy to patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
diff --git a/patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.14/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
similarity index 100%
copy from patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/3.14/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
diff --git a/patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch b/patches/linux/3.14/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
similarity index 100%
copy from patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
copy to patches/linux/3.14/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
diff --git a/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.14/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
similarity index 100%
copy from patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
copy to patches/linux/3.14/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
diff --git a/patches/linux/3.13/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch b/patches/linux/3.14/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
similarity index 100%
copy from patches/linux/3.13/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
copy to patches/linux/3.14/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
diff --git a/patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.14/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
similarity index 100%
copy from patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
copy to patches/linux/3.14/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.14/0420-armadeus-Add-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
copy to patches/linux/3.14/0420-armadeus-Add-apf28dev-dts.patch
diff --git a/patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
similarity index 100%
copy from patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
copy to patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
diff --git a/patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.14/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.14/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
diff --git a/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.14/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
similarity index 100%
copy from patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
copy to patches/linux/3.14/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/patches/linux/3.12/0443-armadeus-apf28-fix_mac_address_issue.patch b/patches/linux/3.14/0443-armadeus-apf28-fix_mac_address_issue.patch
similarity index 100%
copy from patches/linux/3.12/0443-armadeus-apf28-fix_mac_address_issue.patch
copy to patches/linux/3.14/0443-armadeus-apf28-fix_mac_address_issue.patch
diff --git a/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.14/0444-armadeus-imx27-add-usb.patch.tofix
similarity index 100%
copy from patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
copy to patches/linux/3.14/0444-armadeus-imx27-add-usb.patch.tofix
diff --git a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 100%
copy from patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
copy to patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 87%
copy from patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 97b773f..0568d50 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,23 +1,7 @@
-Index: linux-3.13/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-3.13.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13/arch/arm/boot/dts/Makefile
-@@ -136,9 +136,11 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx53-mba53.dtb \
- imx53-qsb.dtb \
- imx53-smd.dtb \
-+ imx6dl-apf6dev.dtb \
- imx6dl-sabreauto.dtb \
- imx6dl-sabresd.dtb \
- imx6dl-wandboard.dtb \
-+ imx6q-apf6dev.dtb \
- imx6q-arm2.dtb \
- imx6q-phytec-pbab01.dtb \
- imx6q-sabreauto.dtb \
-Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -47,10 +31,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -128,10 +112,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -295,10 +279,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
diff --git a/patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch b/patches/linux/3.14/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
similarity index 100%
copy from patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
copy to patches/linux/3.14/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
diff --git a/patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch b/patches/linux/3.14/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
similarity index 100%
copy from patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
copy to patches/linux/3.14/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.14/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
similarity index 100%
copy from patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
copy to patches/linux/3.14/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
diff --git a/patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch b/patches/linux/3.14/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
similarity index 100%
copy from patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
copy to patches/linux/3.14/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
diff --git a/patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/3.14/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
similarity index 100%
copy from patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
copy to patches/linux/3.14/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
diff --git a/patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/3.14/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
similarity index 100%
copy from patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
copy to patches/linux/3.14/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
diff --git a/patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/3.14/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
similarity index 100%
copy from patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
copy to patches/linux/3.14/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
diff --git a/patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch b/patches/linux/3.14/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
similarity index 100%
copy from patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
copy to patches/linux/3.14/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
diff --git a/patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/3.14/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
similarity index 100%
copy from patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
copy to patches/linux/3.14/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
diff --git a/patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/3.14/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
similarity index 100%
copy from patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy to patches/linux/3.14/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
diff --git a/patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/3.14/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
similarity index 100%
copy from patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
copy to patches/linux/3.14/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch b/patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch
new file mode 100644
index 0000000..fc379a9
--- /dev/null
+++ b/patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch
@@ -0,0 +1,90 @@
+From patchwork Thu Jan 30 16:13:47 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: fix compilation of imx-hdmi
+From: Russell King - ARM Linux <li...@ar...>
+X-Patchwork-Id: 3558181
+Message-Id: <201...@n2...>
+To: Fabio Estevam <fab...@fr...>, sha...@li...
+Cc: David Airlie <ai...@li...>, Daniel Vetter <dan...@ff...>,
+ lin...@li..., dri...@li...
+Date: Thu, 30 Jan 2014 16:13:47 +0000
+
+imx-hdmi creates a hdmi_colorimetry enum. This is also defined by
+include/linux/hdmi.h, which gets included now via DRM headers since
+985e5dc207e133 (drm/edid: Populate picture aspect ratio for CEA modes).
+This leads to the compiler complaining:
+
+drivers/staging/imx-drm/imx-hdmi.c:58:6: error: nested redefinition of 'enum hdmi_colorimetry'
+drivers/staging/imx-drm/imx-hdmi.c:58:6: error: redeclaration of 'enum hdmi_colorimetry'
+include/linux/hdmi.h:48:6: note: originally defined here
+
+Fix it by using the one in linux/hdmi.h
+
+Signed-off-by: Russell King <rmk...@ar...>
+
+---
+drivers/staging/imx-drm/imx-hdmi.c | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
+index d358d89e11c4..74d635fcb3d5 100644
+--- a/drivers/staging/imx-drm/imx-hdmi.c
++++ b/drivers/staging/imx-drm/imx-hdmi.c
+@@ -55,11 +55,6 @@ enum hdmi_datamap {
+ YCbCr422_12B = 0x12,
+ };
+
+-enum hdmi_colorimetry {
+- ITU601,
+- ITU709,
+-};
+-
+ enum imx_hdmi_devtype {
+ IMX6Q_HDMI,
+ IMX6DL_HDMI,
+@@ -475,12 +470,12 @@ static void imx_hdmi_update_csc_coeffs(struct imx_hdmi *hdmi)
+
+ if (is_color_space_conversion(hdmi)) {
+ if (hdmi->hdmi_data.enc_out_format == RGB) {
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ csc_coeff = &csc_coeff_rgb_out_eitu601;
+ else
+ csc_coeff = &csc_coeff_rgb_out_eitu709;
+ } else if (hdmi->hdmi_data.enc_in_format == RGB) {
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ csc_coeff = &csc_coeff_rgb_in_eitu601;
+ else
+ csc_coeff = &csc_coeff_rgb_in_eitu709;
+@@ -1009,14 +1004,14 @@ static void hdmi_config_AVI(struct imx_hdmi *hdmi)
+ /* Set up colorimetry */
+ if (hdmi->hdmi_data.enc_out_format == XVYCC444) {
+ colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_EXTENDED_INFO;
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ ext_colorimetry =
+ HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC601;
+ else /* hdmi->hdmi_data.colorimetry == ITU709 */
+ ext_colorimetry =
+ HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC709;
+ } else if (hdmi->hdmi_data.enc_out_format != RGB) {
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_SMPTE;
+ else /* hdmi->hdmi_data.colorimetry == ITU709 */
+ colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_ITUR;
+@@ -1247,9 +1242,9 @@ static int imx_hdmi_setup(struct imx_hdmi *hdmi, struct drm_display_mode *mode)
+ (hdmi->vic == 21) || (hdmi->vic == 22) ||
+ (hdmi->vic == 2) || (hdmi->vic == 3) ||
+ (hdmi->vic == 17) || (hdmi->vic == 18))
+- hdmi->hdmi_data.colorimetry = ITU601;
++ hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601;
+ else
+- hdmi->hdmi_data.colorimetry = ITU709;
++ hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709;
+
+ if ((hdmi->vic == 10) || (hdmi->vic == 11) ||
+ (hdmi->vic == 12) || (hdmi->vic == 13) ||
hooks/post-receive
--
armadeus
|
