[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-622-g6cb5ee2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-622-g6cb5ee2
|
From: Sébastien S. <ss...@us...> - 2015-02-25 13:39:16
|
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 6cb5ee231427c2136361dba9ff6974a1098beba9 (commit)
via c3a2aeb556e435a5f06bd6bdcc37b46e95f6d2a0 (commit)
from 065e5fa46fae5b23a9fcc8634a9f35eab6d2d80a (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 6cb5ee231427c2136361dba9ff6974a1098beba9
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 25 14:41:36 2015 +0100
[LINUX] apf6: add linux 4.0-rc1 support
commit c3a2aeb556e435a5f06bd6bdcc37b46e95f6d2a0
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 25 14:33:00 2015 +0100
[BUILDROOT] 2013.11/2015.02: linux: add support for 4.x versions
This patch has been sent to upstream.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-4.0-rc1.config | 1 +
...27-linux-3.18.config => apf27-linux-4.0.config} | 0
.../armadeus/apf28/apf28-linux-4.0-rc1.config | 1 +
...28-linux-3.14.config => apf28-linux-4.0.config} | 0
.../armadeus/apf51/apf51-linux-4.0-rc1.config | 1 +
...51-linux-3.17.config => apf51-linux-4.0.config} | 0
.../device/armadeus/apf6/apf6-linux-4.0-rc1.config | 1 +
...pf6-linux-3.18.config => apf6-linux-4.0.config} | 0
.../223-linux-add-support-for-4.x-versions.patch | 21 +++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
.../223-linux-add-support-for-4.x-versions.patch | 21 +++++
patches/buildroot/2015.02/cleanup_buildroot.sh | 1 +
patches/linux/4.0-rc1 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 4.0}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
...029b-armadeus-add_csi_registers.patch.dontapply | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
...-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.15 => 4.0}/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
...Add-device-tree-support-to-tsc210x-driver.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...ng-as-module-a-driver-registering-a-clock.tofix | 0
...210x-device-tree-declaration-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
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 0
...clk-imx27-fixes-vpu-spll-clock-dependency.patch | 0
.../0322-armadeus-add_mach_fpga_h.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-apf51-add_apf51_v1-and_v2_device_trees.patch | 86 +++++++++++++-------
...eus-apf51-add_mc13982_touchscreen_support.patch | 0
.../0420-armadeus-Improve-apf28dev-dts.patch | 0
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 0
...4-armadeus-usb-chipidea-add-imx27-support.patch | 0
...44-armadeus-usb-enable_usb_div_by_default.patch | 0
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 0
...46-armadeus-mxs-add-pm_power_off-function.patch | 0
...g-pwm-mxs-fixes-bug-in-period-computation.patch | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 0
...-armadeus-add-watchdog-bootstatus-logging.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
...04-armadeus-add_sx8674_touchscreen_driver.patch | 0
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
.../4.0/0506-armadeus-change_mmc_numbering.patch | 21 +++++
...ideomode-add-pos-neg-pixel-clock-polarity.patch | 53 ++++++++++++
...v3-crtc-Use-DRM-mode-flags-to-configure-p.patch | 25 +++---
...00-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch | 0
...gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch | 0
.../0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch | 0
.../0603-gpu-ipu-v3-Add-ipu_get_num.patch | 0
...u-ipu-v3-Add-IDMA-channel-linking-support.patch | 0
.../0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch | 0
...6-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch | 0
.../0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch | 0
.../0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch | 0
...pu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch | 0
...imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch | 0
.../0611-ARM-imx6q-clk-Add-video-27m-clock.patch | 0
...imx6dl-Add-iomux-field-defines-for-imx6dl.patch | 0
...-imx-Add-imx6-video-capture-platform_data.patch | 0
...mx6-Add-device-tree-binding-documentation.patch | 0
...Add-new-camera-interface-driver-for-i.MX6.patch | 84 ++++++++++----------
...ia-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch | 0
...edia-imx6-Add-support-for-Parallel-OV5642.patch | 0
...mx6-Add-support-for-ADV7180-Video-Decoder.patch | 0
...mx6-camera-Add-deinterlace-motion-control.patch | 0
...imx6-camera-Add-VDIC-deinterlacing-subdev.patch | 0
...v7_defconfig-Enable-staging-video4linux-d.patch | 0
89 files changed, 234 insertions(+), 86 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.config => apf27-linux-4.0.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.config => apf28-linux-4.0.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.17.config => apf51-linux-4.0.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf6/{apf6-linux-3.18.config => apf6-linux-4.0.config} (100%)
create mode 100644 patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch
create mode 100644 patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch
create mode 120000 patches/linux/4.0-rc1
copy patches/linux/{3.12 => 4.0}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 4.0}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.18 => 4.0}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 4.0}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.17 => 4.0}/0029b-armadeus-add_csi_registers.patch.dontapply (100%)
copy patches/linux/{3.10 => 4.0}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.18 => 4.0}/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix (100%)
copy patches/linux/{3.10 => 4.0}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.15 => 4.0}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 4.0}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 4.0}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 4.0}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 4.0}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.18 => 4.0}/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch (100%)
copy patches/linux/{3.10 => 4.0}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.18 => 4.0}/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix (100%)
copy patches/linux/{3.18 => 4.0}/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch (100%)
copy patches/linux/{3.15 => 4.0}/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch (100%)
copy patches/linux/{3.15 => 4.0}/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch (100%)
copy patches/linux/{3.13 => 4.0}/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.15 => 4.0}/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch (100%)
copy patches/linux/{3.18 => 4.0}/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch (100%)
copy patches/linux/{3.10 => 4.0}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.14 => 4.0}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.18 => 4.0}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (100%)
copy patches/linux/{3.12 => 4.0}/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch (100%)
copy patches/linux/{3.19 => 4.0}/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch (92%)
copy patches/linux/{3.16 => 4.0}/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch (100%)
copy patches/linux/{3.18 => 4.0}/0420-armadeus-Improve-apf28dev-dts.patch (100%)
copy patches/linux/{3.14 => 4.0}/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch (100%)
copy patches/linux/{3.12 => 4.0}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.10 => 4.0}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.18 => 4.0}/0444-armadeus-usb-chipidea-add-imx27-support.patch (100%)
copy patches/linux/{3.17 => 4.0}/0444-armadeus-usb-enable_usb_div_by_default.patch (100%)
copy patches/linux/{3.16 => 4.0}/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch (100%)
copy patches/linux/{3.18 => 4.0}/0446-armadeus-mxs-add-pm_power_off-function.patch (100%)
copy patches/linux/{3.18 => 4.0}/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch (100%)
copy patches/linux/{3.18 => 4.0}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (100%)
copy patches/linux/{3.16 => 4.0}/0460-armadeus-add-watchdog-bootstatus-logging.patch (100%)
copy patches/linux/{3.19 => 4.0}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
copy patches/linux/{3.13 => 4.0}/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch (100%)
copy patches/linux/{3.16 => 4.0}/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch (100%)
copy patches/linux/{3.15 => 4.0}/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch (100%)
copy patches/linux/{3.16 => 4.0}/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch (100%)
copy patches/linux/{3.13 => 4.0}/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch (100%)
copy patches/linux/{3.15 => 4.0}/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch (100%)
copy patches/linux/{3.15 => 4.0}/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch (100%)
copy patches/linux/{3.15 => 4.0}/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch (100%)
copy patches/linux/{3.15 => 4.0}/0504-armadeus-add_sx8674_touchscreen_driver.patch (100%)
copy patches/linux/{3.15 => 4.0}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
create mode 100644 patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch
create mode 100644 patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
copy patches/linux/{3.19 => 4.0}/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch (58%)
copy patches/linux/{3.19 => 4.0}/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch (100%)
copy patches/linux/{3.18 => 4.0}/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch (100%)
copy patches/linux/{3.18 => 4.0}/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch (100%)
copy patches/linux/{3.18 => 4.0}/0603-gpu-ipu-v3-Add-ipu_get_num.patch (100%)
copy patches/linux/{3.18 => 4.0}/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch (100%)
copy patches/linux/{3.18 => 4.0}/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch (100%)
copy patches/linux/{3.18 => 4.0}/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch (100%)
copy patches/linux/{3.18 => 4.0}/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch (100%)
copy patches/linux/{3.18 => 4.0}/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch (100%)
copy patches/linux/{3.18 => 4.0}/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch (100%)
copy patches/linux/{3.18 => 4.0}/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch (100%)
copy patches/linux/{3.18 => 4.0}/0611-ARM-imx6q-clk-Add-video-27m-clock.patch (100%)
copy patches/linux/{3.18 => 4.0}/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch (100%)
copy patches/linux/{3.18 => 4.0}/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch (100%)
copy patches/linux/{3.18 => 4.0}/0618-media-imx6-Add-device-tree-binding-documentation.patch (100%)
copy patches/linux/{3.19 => 4.0}/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch (97%)
copy patches/linux/{3.19 => 4.0}/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch (100%)
copy patches/linux/{3.19 => 4.0}/0621-media-imx6-Add-support-for-Parallel-OV5642.patch (100%)
copy patches/linux/{3.19 => 4.0}/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch (100%)
copy patches/linux/{3.18 => 4.0}/0623-media-imx6-camera-Add-deinterlace-motion-control.patch (100%)
copy patches/linux/{3.19 => 4.0}/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch (100%)
copy patches/linux/{3.19 => 4.0}/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index bded6b0..fc0971f 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -23,7 +23,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.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.0-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/apf27/apf27-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-4.0-rc1.config
new file mode 120000
index 0000000..c6e49c2
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf27-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config b/buildroot/target/device/armadeus/apf27/apf27-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-4.0.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config
new file mode 120000
index 0000000..390a441
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf28-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config b/buildroot/target/device/armadeus/apf28/apf28-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-4.0.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config
new file mode 120000
index 0000000..0752a6d
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf51-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-4.0.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config
new file mode 120000
index 0000000..c7dce85
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf6-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
copy to buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
diff --git a/patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch b/patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch
new file mode 100644
index 0000000..fb70de8
--- /dev/null
+++ b/patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch
@@ -0,0 +1,21 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -22,12 +22,14 @@ LINUX_SITE_METHOD = hg
+ else
+ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
+ # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
+-# to use the $(word) function. We support versions such as 3.1,
++# to use the $(word) function. We support versions such as 4.0, 3.1,
+ # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
+ ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+-else
++else ifeq ($(findstring x3.,x$(LINUX_VERSION)),x3.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
++else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
++LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x/
+ endif
+ # release candidates are in testing/ subdir
+ ifneq ($(findstring -rc,$(LINUX_VERSION)),)
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 9de2329..abaac2b 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -15,6 +15,7 @@ rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
+rm -rf buildroot/linux/linux.mk
rm -rf buildroot/package/Config.in
rm -rf buildroot/package/Config.in.host
rm -rf buildroot/package/agg/Config.in
diff --git a/patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch b/patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch
new file mode 100644
index 0000000..ff72452
--- /dev/null
+++ b/patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch
@@ -0,0 +1,21 @@
+diff --git a/linux/linux.mk b/linux/linux.mk
+index 29f59e8..0b8c912 100644
+--- a/linux/linux.mk
++++ b/linux/linux.mk
+@@ -25,12 +25,14 @@ LINUX_SITE_METHOD = hg
+ else
+ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
+ # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
+-# to use the $(word) function. We support versions such as 3.1,
++# to use the $(word) function. We support versions such as 4.0, 3.1,
+ # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
+ ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
+-else
++else ifeq ($(findstring x3.,x$(LINUX_VERSION)),x3.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
++else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
++LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
+ endif
+ # release candidates are in testing/ subdir
+ ifneq ($(findstring -rc,$(LINUX_VERSION)),)
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index cab2e20..1bf1aea 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -15,6 +15,7 @@ rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
+rm -rf buildroot/linux/linux.mk
rm -rf buildroot/package/Config.in
rm -rf buildroot/package/Config.in.host
rm -rf buildroot/package/agg/Config.in
diff --git a/patches/linux/4.0-rc1 b/patches/linux/4.0-rc1
new file mode 120000
index 0000000..389f774
--- /dev/null
+++ b/patches/linux/4.0-rc1
@@ -0,0 +1 @@
+4.0
\ No newline at end of file
diff --git a/patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/4.0/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/4.0/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/4.0/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/4.0/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/4.0/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/4.0/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/4.0/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/4.0/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply b/patches/linux/4.0/0029b-armadeus-add_csi_registers.patch.dontapply
similarity index 100%
copy from patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply
copy to patches/linux/4.0/0029b-armadeus-add_csi_registers.patch.dontapply
diff --git a/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/4.0/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/4.0/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix b/patches/linux/4.0/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
similarity index 100%
copy from patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
copy to patches/linux/4.0/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/4.0/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/4.0/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.15/0073-armadeus-tsc2102.patch b/patches/linux/4.0/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.15/0073-armadeus-tsc2102.patch
copy to patches/linux/4.0/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/4.0/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/4.0/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/4.0/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/4.0/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/4.0/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/4.0/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/4.0/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/4.0/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch b/patches/linux/4.0/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
similarity index 100%
copy from patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
copy to patches/linux/4.0/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/4.0/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/4.0/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix b/patches/linux/4.0/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
similarity index 100%
copy from patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
copy to patches/linux/4.0/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
diff --git a/patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch b/patches/linux/4.0/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
copy to patches/linux/4.0/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
diff --git a/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/4.0/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
similarity index 100%
copy from patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
copy to patches/linux/4.0/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/4.0/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
similarity index 100%
copy from patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
copy to patches/linux/4.0/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/4.0/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/4.0/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/4.0/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
similarity index 100%
copy from patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
copy to patches/linux/4.0/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
diff --git a/patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch b/patches/linux/4.0/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
copy from patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
copy to patches/linux/4.0/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/4.0/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/4.0/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/4.0/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
similarity index 100%
copy from patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
copy to patches/linux/4.0/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
diff --git a/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/4.0/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
similarity index 100%
copy from patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/4.0/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/4.0/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/4.0/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
diff --git a/patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
similarity index 92%
copy from patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
copy to patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
index 5d755d5..22df1f0 100644
--- a/patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
+++ b/patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dtsi
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -185,10 +185,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v1.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v1.dtsi
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v1.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -212,10 +212,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+ model = "Armadeus Systems APF51 V1 module";
+ compatible = "armadeus,imx51-apf51", "fsl,imx51";
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v2.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v2.dtsi
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v2.dtsi
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -286,10 +286,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev-v2.dts
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev-v2.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -310,11 +310,11 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+ model = "Armadeus Systems APF51Dev docking/development board with APF51 V2 SOM";
+ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
-@@ -0,0 +1,238 @@
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dtsi
+@@ -0,0 +1,252 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
+ *
@@ -327,6 +327,14 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ */
+
+/ {
++ backlight@bl1{
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_backlight>;
++ compatible = "gpio-backlight";
++ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
++ default-on;
++ };
++
+ display@di1 {
+ compatible = "fsl,imx-parallel-display";
+ interface-pix-fmt = "bgr666";
@@ -445,6 +453,12 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+
+&iomuxc {
+ imx51-apf51dev {
++ pinctrl_backlight: bl1grp {
++ fsl,pins = <
++ MX51_PAD_DI1_D1_CS__GPIO3_4 0x1F5
++ >;
++ };
++
+ pinctrl_bluetooth: bluetoothgrp {
+ fsl,pins = <
+ MX51_PAD_EIM_CS3__GPIO2_28 0x0c5
@@ -553,23 +567,23 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/Makefile
+Index: linux-4.0-rc1/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.18-rc5.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.18-rc5/arch/arm/boot/dts/Makefile
-@@ -184,8 +184,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx35-eukrea-mbimxsd35-baseboard.dtb \
- imx35-pdk.dtb \
- imx50-evk.dtb \
+--- linux-4.0-rc1.orig/arch/arm/boot/dts/Makefile
++++ linux-4.0-rc1/arch/arm/boot/dts/Makefile
+@@ -230,8 +230,8 @@ dtb-$(CONFIG_SOC_IMX35) += \
+ dtb-$(CONFIG_SOC_IMX50) += \
+ imx50-evk.dtb
+ dtb-$(CONFIG_SOC_IMX51) += \
- imx51-apf51.dtb \
- imx51-apf51dev.dtb \
+ imx51-apf51dev.dtb \
+ imx51-apf51dev-v2.dtb \
imx51-babbage.dtb \
imx51-digi-connectcore-jsk.dtb \
- imx51-eukrea-mbimxsd51-baseboard.dtb \
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dts
+ imx51-eukrea-mbimxsd51-baseboard.dtb
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dts
===================================================================
---- linux-3.18-rc5.orig/arch/arm/boot/dts/imx51-apf51.dts
+--- linux-4.0-rc1.orig/arch/arm/boot/dts/imx51-apf51.dts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
@@ -661,10 +675,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dts
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
-};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.18-rc5.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-4.0-rc1.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Armadeus Systems - <su...@ar...>
@@ -672,20 +686,28 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
-@@ -9,203 +9,11 @@
+@@ -9,217 +9,11 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-
+
-/* APF51Dev is a docking board for the APF51 SOM */
-#include "imx51-apf51.dts"
+/dts-v1/;
+#include "imx51-apf51-v1.dtsi"
+#include "imx51-apf51dev.dtsi"
-
+
/ {
- model = "Armadeus Systems APF51Dev docking/development board";
+ model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
- compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
+ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
+-
+- backlight@bl1{
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_backlight>;
+- compatible = "gpio-backlight";
+- gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+- default-on;
+- };
-
- display@di1 {
- compatible = "fsl,imx-parallel-display";
@@ -785,6 +807,12 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
- pinctrl-0 = <&pinctrl_hog>;
-
- imx51-apf51dev {
+- pinctrl_backlight: bl1grp {
+- fsl,pins = <
+- MX51_PAD_DI1_D1_CS__GPIO3_4 0x1F5
+- >;
+- };
+-
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
diff --git a/patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch b/patches/linux/4.0/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
similarity index 100%
copy from patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
copy to patches/linux/4.0/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
diff --git a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
copy to patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch
diff --git a/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/4.0/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
similarity index 100%
copy from patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
copy to patches/linux/4.0/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
diff --git a/patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/4.0/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/4.0/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/4.0/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/4.0/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch b/patches/linux/4.0/0444-armadeus-usb-chipidea-add-imx27-support.patch
similarity index 100%
copy from patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch
copy to patches/linux/4.0/0444-armadeus-usb-chipidea-add-imx27-support.patch
diff --git a/patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch b/patches/linux/4.0/0444-armadeus-usb-enable_usb_div_by_default.patch
similarity index 100%
copy from patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch
copy to patches/linux/4.0/0444-armadeus-usb-enable_usb_div_by_default.patch
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/4.0/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 100%
copy from patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
copy to patches/linux/4.0/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
diff --git a/patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch b/patches/linux/4.0/0446-armadeus-mxs-add-pm_power_off-function.patch
similarity index 100%
copy from patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
copy to patches/linux/4.0/0446-armadeus-mxs-add-pm_power_off-function.patch
diff --git a/patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch b/patches/linux/4.0/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
similarity index 100%
copy from patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
copy to patches/linux/4.0/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
diff --git a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 100%
copy from patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
diff --git a/patches/linux/3.16/0460-armadeus-add-watchdog-bootstatus-logging.patch b/patches/linux/4.0/0460-armadeus-add-watchdog-bootstatus-logging.patch
similarity index 100%
copy from patches/linux/3.16/0460-armadeus-add-watchdog-bootstatus-logging.patch
copy to patches/linux/4.0/0460-armadeus-add-watchdog-bootstatus-logging.patch
diff --git a/patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/4.0/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
similarity index 100%
copy from patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
copy to patches/linux/4.0/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/4.0/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/4.0/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
diff --git a/patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/4.0/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
similarity index 100%
copy from patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
copy to patches/linux/4.0/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
diff --git a/patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/4.0/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
similarity index 100%
copy from patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
copy to patches/linux/4.0/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
diff --git a/patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/4.0/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
similarity index 100%
copy from patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
copy to patches/linux/4.0/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/4.0/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/4.0/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
diff --git a/patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/4.0/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
similarity index 100%
copy from patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
copy to patches/linux/4.0/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
diff --git a/patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/4.0/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
similarity index 100%
copy from patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy to patches/linux/4.0/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
diff --git a/patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/4.0/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
similarity index 100%
copy from patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
copy to patches/linux/4.0/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch b/patches/linux/4.0/0504-armadeus-add_sx8674_touchscreen_driver.patch
similarity index 100%
copy from patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch
copy to patches/linux/4.0/0504-armadeus-add_sx8674_touchscreen_driver.patch
diff --git a/patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/4.0/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/4.0/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch b/patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch
new file mode 100644
index 0000000..9068222
--- /dev/null
+++ b/patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch
@@ -0,0 +1,21 @@
+Fix SD slot numbering.
+
+eMMC -> mmcblk2
+microSD -> mmcblk1
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+---
+Index: linux-4.0-rc1/drivers/mmc/card/block.c
+===================================================================
+--- linux-4.0-rc1.orig/drivers/mmc/card/block.c
++++ linux-4.0-rc1/drivers/mmc/card/block.c
+@@ -2161,7 +2161,7 @@ static struct mmc_blk_data *mmc_blk_allo
+ */
+
+ snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),
+- "mmcblk%u%s", md->name_idx, subname ? subname : "");
++ "mmcblk%u%s", card->host->index, subname ? subname : "");
+
+ if (mmc_card_mmc(card))
+ blk_queue_logical_block_size(md->queue.queue,
diff --git a/patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch b/patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
new file mode 100644
index 0000000..bc81f96
--- /dev/null
+++ b/patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
@@ -0,0 +1,53 @@
+From 20008681bca50b680be33e390065e44fd28a8c23 Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Tue, 1 Apr 2014 18:08:40 -0700
+Subject: [PATCH 1/2] drm_modes: videomode: add pos/neg pixel clock polarity
+ flag
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/gpu/drm/drm_modes.c | 4 ++++
+ include/uapi/drm/drm_mode.h | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+Index: linux-4.0-rc1/drivers/gpu/drm/drm_modes.c
+===================================================================
+--- linux-4.0-rc1.orig/drivers/gpu/drm/drm_modes.c
++++ linux-4.0-rc1/drivers/gpu/drm/drm_modes.c
+@@ -611,6 +611,10 @@ void drm_display_mode_from_videomode(con
+ dmode->flags |= DRM_MODE_FLAG_DBLSCAN;
+ if (vm->flags & DISPLAY_FLAGS_DOUBLECLK)
+ dmode->flags |= DRM_MODE_FLAG_DBLCLK;
++ if (vm->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE)
++ dmode->flags |= DRM_MODE_FLAG_PCLK;
++ else if (vm->flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
++ dmode->flags |= DRM_MODE_FLAG_NCLK;
+ drm_mode_set_name(dmode);
+ }
+ EXPORT_SYMBOL_GPL(drm_display_mode_from_videomode);
+@@ -652,6 +656,10 @@ void drm_display_mode_to_videomode(const
+ vm->flags |= DISPLAY_FLAGS_DOUBLESCAN;
+ if (dmode->flags & DRM_MODE_FLAG_DBLCLK)
+ vm->flags |= DISPLAY_FLAGS_DOUBLECLK;
++ if (dmode->flags & DRM_MODE_FLAG_PCLK)
++ vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
++ else if (dmode->flags & DRM_MODE_FLAG_NCLK)
++ vm->flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
+ }
+ EXPORT_SYMBOL_GPL(drm_display_mode_to_videomode);
+
+Index: linux-4.0-rc1/include/uapi/drm/drm_mode.h
+===================================================================
+--- linux-4.0-rc1.orig/include/uapi/drm/drm_mode.h
++++ linux-4.0-rc1/include/uapi/drm/drm_mode.h
+@@ -72,6 +72,10 @@
+ #define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH (6<<14)
+ #define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (7<<14)
+ #define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (8<<14)
++/* drive data on rising pixclk edge */
++#define DRM_MODE_FLAG_PCLK (1<<19)
++/* drive data on falling pixclk edge */
++#define DRM_MODE_FLAG_NCLK (1<<20)
+
+
+ /* DPMS flags */
diff --git a/patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch b/patches/linux/4.0/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
similarity index 58%
copy from patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
copy to patches/linux/4.0/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
index 1ae79d4..59f26c1 100644
--- a/patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
+++ b/patches/linux/4.0/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
@@ -14,19 +14,16 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
drivers/gpu/drm/imx/ipuv3-crtc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: linux-3.18-rc5/drivers/gpu/drm/imx/ipuv3-crtc.c
+Index: linux-4.0-rc1/drivers/gpu/drm/imx/ipuv3-crtc.c
===================================================================
---- linux-3.18-rc5.orig/drivers/gpu/drm/imx/ipuv3-crtc.c
-+++ linux-3.18-rc5/drivers/gpu/drm/imx/ipuv3-crtc.c
-@@ -159,9 +159,10 @@ static int ipu_crtc_mode_set(struct drm_
- sig_cfg.Hsync_pol = 1;
- if (mode->flags & DRM_MODE_FLAG_PVSYNC)
- sig_cfg.Vsync_pol = 1;
-+ if (mode->flags & DRM_MODE_FLAG_PCLK)
-+ sig_cfg.clk_pol = 1;
-
- sig_cfg.enable_pol = 1;
+--- linux-4.0-rc1.orig/drivers/gpu/drm/imx/ipuv3-crtc.c
++++ linux-4.0-rc1/drivers/gpu/drm/imx/ipuv3-crtc.c
+@@ -174,7 +174,7 @@ static int ipu_crtc_mode_set(struct drm_
+ out_pixel_fmt = ipu_crtc->interface_pix_fmt;
+
+ sig_cfg.enable_pol = 1;
- sig_cfg.clk_pol = 0;
- sig_cfg.width = mode->hdisplay;
- sig_cfg.height = mode->vdisplay;
- sig_cfg.pixel_fmt = out_pixel_fmt;
++ sig_cfg.clk_pol = (mode->flags & DRM_MODE_FLAG_PCLK) ? 1 : 0;
+ sig_cfg.pixel_fmt = out_pixel_fmt;
+ sig_cfg.v_to_h_sync = 0;
+ sig_cfg.hsync_pin = ipu_crtc->di_hsync_pin;
diff --git a/patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch b/patches/linux/4.0/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
similarity index 100%
copy from patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
copy to patches/linux/4.0/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
diff --git a/patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch b/patches/linux/4.0/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
similarity index 100%
copy from patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
copy to patches/linux/4.0/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
diff --git a/patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch b/patches/linux/4.0/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
similarity index 100%
copy from patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
copy to patches/linux/4.0/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
diff --git a/patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch b/patches/linux/4.0/0603-gpu-ipu-v3-Add-ipu_get_num.patch
similarity index 100%
copy from patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch
copy to patches/linux/4.0/0603-gpu-ipu-v3-Add-ipu_get_num.patch
diff --git a/patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch b/patches/linux/4.0/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
similarity index 100%
copy from patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
copy to patches/linux/4.0/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
diff --git a/patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch b/patches/linux/4.0/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
similarity index 100%
copy from patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
copy to patches/linux/4.0/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
diff --git a/patches/linux/3.18/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch b/patches/linux/4.0/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
similarity index 100%
copy from patches/linux/3.18/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
copy to patches/linux/4.0/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
diff --git a/patches/linux/3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch b/patches/linux/4.0/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
similarity index 100%
copy from patches/linux/3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
copy to patches/linux/4.0/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
diff --git a/patches/linux/3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch b/patches/linux/4.0/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
similarity index 100%
copy from patches/linux/3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
copy to patches/linux/4.0/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
diff --git a/patches/linux/3.18/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch b/patches/linux/4.0/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
similarity index 100%
copy from patches/linux/3.18/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
copy to patches/linux/4.0/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
diff --git a/patches/linux/3.18/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch b/patches/linux/4.0/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
similarity index 100%
copy from patches/linux/3.18/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
copy to patches/linux/4.0/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
diff --git a/patches/linux/3.18/0611-ARM-imx6q-clk-Add-video-27m-clock.patch b/patches/linux/4.0/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
similarity index 100%
copy from patches/linux/3.18/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
copy to patches/linux/4.0/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
diff --git a/patches/linux/3.18/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch b/patches/linux/4.0/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
similarity index 100%
copy from patches/linux/3.18/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
copy to patches/linux/4.0/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
diff --git a/patches/linux/3.18/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch b/patches/linux/4.0/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
similarity index 100%
copy from patches/linux/3.18/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
copy to patches/linux/4.0/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
diff --git a/patches/linux/3.18/0618-media-imx6-Add-device-tree-binding-documentation.patch b/patches/linux/4.0/0618-media-imx6-Add-device-tree-binding-documentation.patch
similarity index 100%
copy from patches/linux/3.18/0618-media-imx6-Add-device-tree-binding-documentation.patch
copy to patches/linux/4.0/0618-media-imx6-Add-device-tree-binding-documentation.patch
diff --git a/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch b/patches/linux/4.0/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
similarity index 97%
copy from patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
copy to patches/linux/4.0/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
index c406b97..b9e36bd 100644
--- a/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
+++ b/patches/linux/4.0/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
@@ -37,10 +37,10 @@ Signed-off-by: Vladimir Zapolskiy <vla...@me...>
create mode 100644 drivers/staging/media/imx6/capture/mx6-preview.c
create mode 100644 include/media/imx6.h
-Index: linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt
+Index: linux-4.0-rc1/Documentation/video4linux/mx6_camera.txt
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt 2014-12-30 18:59:56.228655909 +0100
+--- /dev/null
++++ linux-4.0-rc1/Documentation/video4linux/mx6_camera.txt
@@ -0,0 +1,187 @@
+ i.MX6 Video Capture Driver
+ ==========================
@@ -229,23 +229,23 @@ Index: linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt
+Vladimir Zapolskiy <vla...@me...>
+
+Copyright (C) 2012-2014 Mentor Graphics Inc.
-Index: linux-3.19-rc2/drivers/staging/media/Kconfig
+Index: linux-4.0-rc1/drivers/staging/media/Kconfig
===================================================================
---- linux-3.19-rc2.orig/drivers/staging/media/Kconfig 2014-12-30 18:59:56.232655909 +0100
-+++ linux-3.19-rc2/drivers/staging/media/Kconfig 2014-12-30 18:59:56.228655909 +0100
-@@ -27,6 +27,8 @@
+--- linux-4.0-rc1.orig/drivers/staging/media/Kconfig
++++ linux-4.0-rc1/drivers/staging/media/Kconfig
+@@ -27,6 +27,8 @@ source "drivers/staging/media/davinci_vp
source "drivers/staging/media/dt3155v4l/Kconfig"
+source "drivers/staging/media/imx6/Kconfig"
+
- source "drivers/staging/media/tlg2300/Kconfig"
-
source "drivers/staging/media/mn88472/Kconfig"
-Index: linux-3.19-rc2/drivers/staging/media/Makefile
+
+ source "drivers/staging/media/mn88473/Kconfig"
+Index: linux-4.0-rc1/drivers/staging/media/Makefile
===================================================================
---- linux-3.19-rc2.orig/drivers/staging/media/Makefile 2014-12-30 18:59:56.232655909 +0100
-+++ linux-3.19-rc2/drivers/staging/media/Makefile 2014-12-30 18:59:56.228655909 +0100
+--- linux-4.0-rc1.orig/drivers/staging/media/Makefile
++++ linux-4.0-rc1/drivers/staging/media/Makefile
@@ -1,5 +1,6 @@
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
@@ -253,10 +253,10 @@ Index: linux-3.19-rc2/drivers/staging/media/Makefile
obj-$(CONFIG_LIRC_STAGING) += lirc/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
-Index: linux-3.19-rc2/drivers/staging/media/imx6/Kconfig
+Index: linux-4.0-rc1/drivers/staging/media/imx6/Kconfig
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.19-rc2/drivers/staging/media/imx6/Kconfig 2014-12-30 18:59:56.228655909 +0100
+--- /dev/null
++++ linux-4.0-rc1/drivers/staging/media/imx6/Kconfig
@@ -0,0 +1,25 @@
+config VIDEO_IMX6
+ tristate "i.MX6 V4L2 devices"
@@ -283,16 +283,16 @@ Index: linux-3.19-rc2/drivers/staging/media/imx6/Kconfig
+if VIDEO_IMX6_CAMERA
+source "drivers/staging/media/imx6/capture/Kconfig"
+endif
-Index: linux-3.19-rc2/drivers/staging/media/imx6/Makefile
+Index: linux-4.0-rc1/drivers/staging/media/imx6/Makefile
=========================...
[truncated message content] |