From ff6397187f7819a86db24be608bae706a7eca27a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 17:15:39 +0200 Subject: add gstreamer and plugins --- package/gst-plugins-base/Makefile | 33 +++++++++++++++++++++++++++++++++ package/gstreamer/Makefile | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 package/gst-plugins-base/Makefile create mode 100644 package/gstreamer/Makefile diff --git a/package/gst-plugins-base/Makefile b/package/gst-plugins-base/Makefile new file mode 100644 index 000000000..2759558e2 --- /dev/null +++ b/package/gst-plugins-base/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= gst-plugins-base +PKG_VERSION:= 1.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2e75fb03ed7e4d24d88601fcac4d57aa +PKG_DESCR:= gstreamer base plugins +PKG_SECTION:= libs +PKG_DEPENDS:= gstreamer +PKG_BUILDDEP:= gstreamer libvorbis libtheora alsa-lib +PKG_URL:= http://gstreamer.freedesktop.org/ +PKG_SITES:= http://gstreamer.freedesktop.org/src/gst-plugins-base/ +PKG_OPTS:= dev + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GST_PLUGINS_BASE,gst-plugins-base,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE + +gst-plugins-base-install: + $(INSTALL_DIR) $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/ + $(CP) $(WRKINST)/usr/lib/gstreamer-1.0/*.so \ + $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/ + $(CP) $(WRKINST)/usr/lib/libgst*.so* \ + $(IDIR_GST_PLUGINS_BASE)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile new file mode 100644 index 000000000..6a3012635 --- /dev/null +++ b/package/gstreamer/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= gstreamer +PKG_VERSION:= 1.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 55d50f48a496799dbb0b195c9c6c6153 +PKG_DESCR:= opensource multimedia framework +PKG_SECTION:= libs +PKG_URL:= http://gstreamer.freedesktop.org/ +PKG_SITES:= http://gstreamer.freedesktop.org/src/gstreamer/ +PKG_OPTS:= dev + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GSTREAMER,gstreamer,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +gstreamer-install: + $(INSTALL_DIR) $(IDIR_GSTREAMER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgstreamer*.so* \ + $(IDIR_GSTREAMER)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From d5aed1c97f81f422af91c1bd4d7994dc54beabe1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 17:16:52 +0200 Subject: update to latest upstream --- package/gtk+/Makefile | 4 +- package/gtk+/patches/patch-Makefile_in | 8 +-- package/gtk+/patches/patch-gtk_gtktypefuncs_c | 78 --------------------------- 3 files changed, 6 insertions(+), 84 deletions(-) delete mode 100644 package/gtk+/patches/patch-gtk_gtktypefuncs_c diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 24d7ce1d0..e048165bd 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.24.6 +PKG_VERSION:= 2.24.22 PKG_EXTRAVER:= 2.24 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4d7efde4ac24dbaa720bc0744eee8235 +PKG_MD5SUM:= 5fbbfb7637bbd571a572a2dae0e736d2 PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in index 2303be5c0..7732e28b9 100644 --- a/package/gtk+/patches/patch-Makefile_in +++ b/package/gtk+/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- gtk+-2.24.6.orig/Makefile.in 2011-08-30 22:23:21.000000000 +0200 -+++ gtk+-2.24.6/Makefile.in 2011-11-08 18:27:10.745082865 +0100 -@@ -459,7 +459,7 @@ XVFB_START = \ +--- gtk+-2.24.22.orig/Makefile.in 2013-10-11 11:58:05.000000000 +0200 ++++ gtk+-2.24.22/Makefile.in 2013-12-17 12:22:11.517248005 +0100 +@@ -552,7 +552,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY -SRC_SUBDIRS = gdk gtk modules demos tests perf -+SRC_SUBDIRS = gdk gtk modules tests perf ++SRC_SUBDIRS = gdk gtk modules perf SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build # require automake 1.4 diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c deleted file mode 100644 index 2a98f9002..000000000 --- a/package/gtk+/patches/patch-gtk_gtktypefuncs_c +++ /dev/null @@ -1,78 +0,0 @@ ---- gtk+-2.24.6.orig/gtk/gtktypefuncs.c 2011-08-30 22:24:44.000000000 +0200 -+++ gtk+-2.24.6/gtk/gtktypefuncs.c 2011-11-08 18:06:50.273051952 +0100 -@@ -54,8 +54,8 @@ - *tp++ = gdk_pixbuf_simple_anim_get_type(); - *tp++ = gdk_pixbuf_simple_anim_iter_get_type(); - *tp++ = gdk_pixmap_get_type(); --*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_prop_mode_get_type(); -+*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_rectangle_get_type(); - *tp++ = gdk_rgb_dither_get_type(); - *tp++ = gdk_screen_get_type(); -@@ -190,14 +190,14 @@ - *tp++ = gtk_icon_view_drop_position_get_type(); - *tp++ = gtk_icon_view_get_type(); - *tp++ = gtk_identifier_get_type(); --*tp++ = gtk_image_get_type(); --*tp++ = gtk_image_menu_item_get_type(); --*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_im_context_get_type(); - *tp++ = gtk_im_context_simple_get_type(); - *tp++ = gtk_im_multicontext_get_type(); - *tp++ = gtk_im_preedit_style_get_type(); - *tp++ = gtk_im_status_style_get_type(); -+*tp++ = gtk_image_get_type(); -+*tp++ = gtk_image_menu_item_get_type(); -+*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_info_bar_get_type(); - *tp++ = gtk_invisible_get_type(); - *tp++ = gtk_item_get_type(); -@@ -281,10 +281,10 @@ - *tp++ = gtk_response_type_get_type(); - *tp++ = gtk_scale_button_get_type(); - *tp++ = gtk_scale_get_type(); --*tp++ = gtk_scrollbar_get_type(); --*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_scroll_step_get_type(); - *tp++ = gtk_scroll_type_get_type(); -+*tp++ = gtk_scrollbar_get_type(); -+*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_selection_data_get_type(); - *tp++ = gtk_selection_mode_get_type(); - *tp++ = gtk_sensitivity_type_get_type(); -@@ -301,11 +301,11 @@ - *tp++ = gtk_sort_type_get_type(); - *tp++ = gtk_spin_button_get_type(); - *tp++ = gtk_spin_button_update_policy_get_type(); --*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_spin_type_get_type(); -+*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_state_type_get_type(); --*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_status_icon_get_type(); -+*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_style_get_type(); - *tp++ = gtk_submenu_direction_get_type(); - *tp++ = gtk_submenu_placement_get_type(); -@@ -329,16 +329,16 @@ - *tp++ = gtk_toggle_action_get_type(); - *tp++ = gtk_toggle_button_get_type(); - *tp++ = gtk_toggle_tool_button_get_type(); --*tp++ = gtk_toolbar_child_type_get_type(); --*tp++ = gtk_toolbar_get_type(); --*tp++ = gtk_toolbar_space_style_get_type(); --*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tool_button_get_type(); - *tp++ = gtk_tool_item_get_type(); - *tp++ = gtk_tool_item_group_get_type(); - *tp++ = gtk_tool_palette_drag_targets_get_type(); - *tp++ = gtk_tool_palette_get_type(); - *tp++ = gtk_tool_shell_get_type(); -+*tp++ = gtk_toolbar_child_type_get_type(); -+*tp++ = gtk_toolbar_get_type(); -+*tp++ = gtk_toolbar_space_style_get_type(); -+*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tooltip_get_type(); - *tp++ = gtk_tree_drag_dest_get_type(); - *tp++ = gtk_tree_drag_source_get_type(); -- cgit v1.2.3 From 1a4ca0013db4236f3e0ff8746a1787dbe560b970 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Apr 2014 21:03:19 +0200 Subject: update to latest bootloader, userland and kernel for rpi --- Config.in | 6 +- mk/kernel-ver.mk | 6 +- package/bcm2835-bootloader/Makefile | 10 +- package/bcm2835-vc/Makefile | 10 +- package/ffmpeg/Makefile | 4 +- package/omxplayer/Makefile | 10 +- .../patch-lib_xbmc-dll-symbols_DllAvFormat_c | 11 + .../cubox-i/patches/3.10.34/solidrun-cubox-i.patch | 584365 ------------------ .../cubox-i/patches/3.10.36/solidrun-cubox-i.patch | 584365 ++++++++++++++++++ .../patches/3.10.34/raspberry-pi.patch | 101472 --- .../patches/3.10.36/raspberry-pi.patch | 102048 +++ .../linux/patches/3.10.34/bsd-compatibility.patch | 2538 - target/linux/patches/3.10.34/startup.patch | 34 - .../linux/patches/3.10.36/bsd-compatibility.patch | 2538 + target/linux/patches/3.10.36/startup.patch | 34 + .../patches/3.10.34/cleankernel.patch | 11 - .../kernel-headers/patches/3.10.34/mkpiggy.patch | 28 - .../kernel-headers/patches/3.10.34/relocs.patch | 2693 - .../kernel-headers/patches/3.10.34/sgidefs.patch | 18 - .../kernel-headers/patches/3.10.34/sortext.patch | 33 - .../patches/3.10.36/headers-install.patch | 91 + .../kernel-headers/patches/3.10.36/mkpiggy.patch | 28 + .../kernel-headers/patches/3.10.36/relocs.patch | 2693 + .../kernel-headers/patches/3.10.36/sgidefs.patch | 18 + .../kernel-headers/patches/3.10.36/sortext.patch | 33 + 25 files changed, 691885 insertions(+), 691212 deletions(-) create mode 100644 package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c delete mode 100644 target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch create mode 100644 target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch delete mode 100644 target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch create mode 100644 target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch delete mode 100644 target/linux/patches/3.10.34/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.10.34/startup.patch create mode 100644 target/linux/patches/3.10.36/bsd-compatibility.patch create mode 100644 target/linux/patches/3.10.36/startup.patch delete mode 100644 toolchain/kernel-headers/patches/3.10.34/cleankernel.patch delete mode 100644 toolchain/kernel-headers/patches/3.10.34/mkpiggy.patch delete mode 100644 toolchain/kernel-headers/patches/3.10.34/relocs.patch delete mode 100644 toolchain/kernel-headers/patches/3.10.34/sgidefs.patch delete mode 100644 toolchain/kernel-headers/patches/3.10.34/sortext.patch create mode 100644 toolchain/kernel-headers/patches/3.10.36/headers-install.patch create mode 100644 toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch create mode 100644 toolchain/kernel-headers/patches/3.10.36/relocs.patch create mode 100644 toolchain/kernel-headers/patches/3.10.36/sgidefs.patch create mode 100644 toolchain/kernel-headers/patches/3.10.36/sortext.patch diff --git a/Config.in b/Config.in index 01e64ae07..09c66e435 100644 --- a/Config.in +++ b/Config.in @@ -118,8 +118,8 @@ config ADK_KERNEL_VERSION_3_11_10 prompt "3.11.10" boolean -config ADK_KERNEL_VERSION_3_10_34 - prompt "3.10.34" +config ADK_KERNEL_VERSION_3_10_36 + prompt "3.10.36" boolean config ADK_KERNEL_VERSION_3_4_84 @@ -133,7 +133,7 @@ config ADK_KERNEL_VERSION default "3.13.7" if ADK_KERNEL_VERSION_3_13_7 default "3.12.14" if ADK_KERNEL_VERSION_3_12_14 default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 - default "3.10.34" if ADK_KERNEL_VERSION_3_10_34 + default "3.10.36" if ADK_KERNEL_VERSION_3_10_36 default "3.4.84" if ADK_KERNEL_VERSION_3_4_84 help diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 7cfb5998b..452415a94 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -22,11 +22,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 endif -ifeq ($(ADK_KERNEL_VERSION_3_10_34),y) -KERNEL_VERSION:= 3.10.34 +ifeq ($(ADK_KERNEL_VERSION_3_10_36),y) +KERNEL_VERSION:= 3.10.36 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 30991b495a3d75196d5608072d2e62e6 +KERNEL_MD5SUM:= 721f76050755ec8ec88876ee350a2726 endif ifeq ($(ADK_KERNEL_VERSION_3_4_84),y) KERNEL_VERSION:= 3.4.84 diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile index b88cd7f08..a23764076 100644 --- a/package/bcm2835-bootloader/Makefile +++ b/package/bcm2835-bootloader/Makefile @@ -4,15 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bcm2835-bootloader -# actually 9953ce0847c04b587b694c79c5b5a4ac63f5c369 from 25.03.2014 -# https://github.com/raspberrypi/firmware -PKG_VERSION:= 0.7 +# actually 04ba1c03780ae708c9289bce14f56933e55e9c20 from 13.04.2014 +PKG_VERSION:= 0.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7ad7e5d3ad311d88d1e82fc729042d87 +PKG_MD5SUM:= 08beaa7d66e7dd6b0ab58483d0f4ce40 PKG_DESCR:= bootloader for raspberry pi (bcm2835) PKG_SECTION:= boot +PKG_URL:= https://github.com/raspberrypi/firmware PKG_SITES:= http://openadk.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SYSTEM_DEPENDS:= raspberry-pi include ${TOPDIR}/mk/package.mk diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index 12655228c..707d4e067 100644 --- a/package/bcm2835-vc/Makefile +++ b/package/bcm2835-vc/Makefile @@ -4,17 +4,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bcm2835-vc -# actually a8fbe2cd6a3d4455344295809f2e663373ad25cb from 25.03.2014 -# https://github.com/raspberrypi/userland -PKG_VERSION:= 0.4 +# actually a59842a068cbd19e262701f30014499e9070fbf6 from 13.04.2014 +PKG_VERSION:= 0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 091ae422e05a59ffc2b8908256047b7d +PKG_MD5SUM:= ed8c41f58e5657209cca73cb46b846d3 PKG_DESCR:= vc tools and libraries for raspberry pi PKG_SECTION:= base PKG_DEPENDS:= libpthread PKG_BUILDDEP:= cmake-host +PKG_URL:= https://github.com/raspberrypi/userland PKG_SITES:= http://openadk.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SYSTEM_DEPENDS:= raspberry-pi include ${TOPDIR}/mk/package.mk diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 6a3f60fdd..ec02cc545 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 2.2 +PKG_VERSION:= 2.2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 744febca199548c9393b1f1ed05ccdd8 +PKG_MD5SUM:= b8a1ee4964c2638f46fcc803ed453818 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index c36174f43..7e724dcd3 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= omxplayer -# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014 -PKG_VERSION:= 0.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= d4efff32305bd16315e6fa4f80ea2a98 +# actually 46616c55c2fad3dac47d17e8a6b41a16a4d6f15e from 13.04.2014 +PKG_VERSION:= 0.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1c882539dfcbc4e8efeae85ff8069cbe PKG_DESCR:= video player for raspberry pi PKG_SECTION:= multimedia PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre @@ -16,6 +16,8 @@ PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus PKG_URL:= https://github.com/popcornmix/omxplayer PKG_SITES:= http://openadk.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SYSTEM_DEPENDS:= raspberry-pi PKG_LIBC_DEPENDS:= glibc musl diff --git a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c new file mode 100644 index 000000000..1a93e1411 --- /dev/null +++ b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c @@ -0,0 +1,11 @@ +--- xbmc-12.3-Frodo.orig/lib/xbmc-dll-symbols/DllAvFormat.c 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/lib/xbmc-dll-symbols/DllAvFormat.c 2014-04-14 17:07:49.000000000 +0200 +@@ -110,7 +110,7 @@ void av_read_frame_flush(AVFormatContext + #define RELATIVE_TS_BASE (INT64_MAX - (1LL<<48)) + if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE; + else st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */ +- st->reference_dts = AV_NOPTS_VALUE; ++ //st->reference_dts = AV_NOPTS_VALUE; + + st->probe_packets = MAX_PROBE_PACKETS; + #endif diff --git a/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch b/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch deleted file mode 100644 index beaa71b4e..000000000 --- a/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch +++ /dev/null @@ -1,584365 +0,0 @@ -diff -Nur linux-3.10.30/Documentation/ABI/testing/sysfs-class-mtd linux-3.10.30-cubox-i/Documentation/ABI/testing/sysfs-class-mtd ---- linux-3.10.30/Documentation/ABI/testing/sysfs-class-mtd 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/ABI/testing/sysfs-class-mtd 2014-03-08 20:32:51.000000000 +0100 -@@ -104,7 +104,7 @@ - One of the following ASCII strings, representing the device - type: - -- absent, ram, rom, nor, nand, dataflash, ubi, unknown -+ absent, ram, rom, nor, nand, mlc-nand, dataflash, ubi, unknown - - What: /sys/class/mtd/mtdX/writesize - Date: April 2009 -@@ -128,9 +128,8 @@ - Contact: linux-mtd@lists.infradead.org - Description: - Maximum number of bit errors that the device is capable of -- correcting within each region covering an ecc step. This will -- always be a non-negative integer. Note that some devices will -- have multiple ecc steps within each writesize region. -+ correcting within each region covering an ECC step (see -+ ecc_step_size). This will always be a non-negative integer. - - In the case of devices lacking any ECC capability, it is 0. - -@@ -173,3 +172,15 @@ - This is generally applicable only to NAND flash devices with ECC - capability. It is ignored on devices lacking ECC capability; - i.e., devices for which ecc_strength is zero. -+ -+What: /sys/class/mtd/mtdX/ecc_step_size -+Date: May 2013 -+KernelVersion: 3.10 -+Contact: linux-mtd@lists.infradead.org -+Description: -+ The size of a single region covered by ECC, known as the ECC -+ step. Devices may have several equally sized ECC steps within -+ each writesize region. -+ -+ It will always be a non-negative integer. In the case of -+ devices lacking any ECC capability, it is 0. -diff -Nur linux-3.10.30/Documentation/DocBook/mtdnand.tmpl linux-3.10.30-cubox-i/Documentation/DocBook/mtdnand.tmpl ---- linux-3.10.30/Documentation/DocBook/mtdnand.tmpl 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/DocBook/mtdnand.tmpl 2014-03-08 20:32:51.000000000 +0100 -@@ -1222,10 +1222,6 @@ - #define NAND_BBT_VERSION 0x00000100 - /* Create a bbt if none axists */ - #define NAND_BBT_CREATE 0x00000200 --/* Search good / bad pattern through all pages of a block */ --#define NAND_BBT_SCANALLPAGES 0x00000400 --/* Scan block empty during good / bad block scan */ --#define NAND_BBT_SCANEMPTY 0x00000800 - /* Write bbt if neccecary */ - #define NAND_BBT_WRITE 0x00001000 - /* Read and write back block contents when writing bbt */ -diff -Nur linux-3.10.30/Documentation/arm/small_task_packing.txt linux-3.10.30-cubox-i/Documentation/arm/small_task_packing.txt ---- linux-3.10.30/Documentation/arm/small_task_packing.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/arm/small_task_packing.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,136 @@ -+Small Task Packing in the big.LITTLE MP Reference Patch Set -+ -+What is small task packing? -+---- -+Simply that the scheduler will fit as many small tasks on a single CPU -+as possible before using other CPUs. A small task is defined as one -+whose tracked load is less than 90% of a NICE_0 task. This is a change -+from the usual behavior since the scheduler will normally use an idle -+CPU for a waking task unless that task is considered cache hot. -+ -+ -+How is it implemented? -+---- -+Since all small tasks must wake up relatively frequently, the main -+requirement for packing small tasks is to select a partly-busy CPU when -+waking rather than looking for an idle CPU. We use the tracked load of -+the CPU runqueue to determine how heavily loaded each CPU is and the -+tracked load of the task to determine if it will fit on the CPU. We -+always start with the lowest-numbered CPU in a sched domain and stop -+looking when we find a CPU with enough space for the task. -+ -+Some further tweaks are necessary to suppress load balancing when the -+CPU is not fully loaded, otherwise the scheduler attempts to spread -+tasks evenly across the domain. -+ -+ -+How does it interact with the HMP patches? -+---- -+Firstly, we only enable packing on the little domain. The intent is that -+the big domain is intended to spread tasks amongst the available CPUs -+one-task-per-CPU. The little domain however is attempting to use as -+little power as possible while servicing its tasks. -+ -+Secondly, since we offload big tasks onto little CPUs in order to try -+to devote one CPU to each task, we have a threshold above which we do -+not try to pack a task and instead will select an idle CPU if possible. -+This maintains maximum forward progress for busy tasks temporarily -+demoted from big CPUs. -+ -+ -+Can the behaviour be tuned? -+---- -+Yes, the load level of a 'full' CPU can be easily modified in the source -+and is exposed through sysfs as /sys/kernel/hmp/packing_limit to be -+changed at runtime. The presence of the packing behaviour is controlled -+by CONFIG_SCHED_HMP_LITTLE_PACKING and can be disabled at run-time -+using /sys/kernel/hmp/packing_enable. -+The definition of a small task is hard coded as 90% of NICE_0_LOAD -+and cannot be modified at run time. -+ -+ -+Why do I need to tune it? -+---- -+The optimal configuration is likely to be different depending upon the -+design and manufacturing of your SoC. -+ -+In the main, there are two system effects from enabling small task -+packing. -+ -+1. CPU operating point may increase -+2. wakeup latency of tasks may be increased -+ -+There are also likely to be secondary effects from loading one CPU -+rather than spreading tasks. -+ -+Note that all of these system effects are dependent upon the workload -+under consideration. -+ -+ -+CPU Operating Point -+---- -+The primary impact of loading one CPU with a number of light tasks is to -+increase the compute requirement of that CPU since it is no longer idle -+as often. Increased compute requirement causes an increase in the -+frequency of the CPU through CPUfreq. -+ -+Consider this example: -+We have a system with 3 CPUs which can operate at any frequency between -+350MHz and 1GHz. The system has 6 tasks which would each produce 10% -+load at 1GHz. The scheduler has frequency-invariant load scaling -+enabled. Our DVFS governor aims for 80% utilization at the chosen -+frequency. -+ -+Without task packing, these tasks will be spread out amongst all CPUs -+such that each has 2. This will produce roughly 20% system load, and -+the frequency of the package will remain at 350MHz. -+ -+With task packing set to the default packing_limit, all of these tasks -+will sit on one CPU and require a package frequency of ~750MHz to reach -+80% utilization. (0.75 = 0.6 * 0.8). -+ -+When a package operates on a single frequency domain, all CPUs in that -+package share frequency and voltage. -+ -+Depending upon the SoC implementation there can be a significant amount -+of energy lost to leakage from idle CPUs. The decision about how -+loaded a CPU must be to be considered 'full' is therefore controllable -+through sysfs (sys/kernel/hmp/packing_limit) and directly in the code. -+ -+Continuing the example, lets set packing_limit to 450 which means we -+will pack tasks until the total load of all running tasks >= 450. In -+practise, this is very similar to a 55% idle 1Ghz CPU. -+ -+Now we are only able to place 4 tasks on CPU0, and two will overflow -+onto CPU1. CPU0 will have a load of 40% and CPU1 will have a load of -+20%. In order to still hit 80% utilization, CPU0 now only needs to -+operate at (0.4*0.8=0.32) 320MHz, which means that the lowest operating -+point will be selected, the same as in the non-packing case, except that -+now CPU2 is no longer needed and can be power-gated. -+ -+In order to use less energy, the saving from power-gating CPU2 must be -+more than the energy spent running CPU0 for the extra cycles. This -+depends upon the SoC implementation. -+ -+This is obviously a contrived example requiring all the tasks to -+be runnable at the same time, but it illustrates the point. -+ -+ -+Wakeup Latency -+---- -+This is an unavoidable consequence of trying to pack tasks together -+rather than giving them a CPU each. If you cannot find an acceptable -+level of wakeup latency, you should turn packing off. -+ -+Cyclictest is a good test application for determining the added latency -+when configuring packing. -+ -+ -+Why is it turned off for the VersatileExpress V2P_CA15A7 CoreTile? -+---- -+Simply, this core tile only has power gating for the whole A7 package. -+When small task packing is enabled, all our low-energy use cases -+normally fit onto one A7 CPU. We therefore end up with 2 mostly-idle -+CPUs and one mostly-busy CPU. This decreases the amount of time -+available where the whole package is idle and can be turned off. -+ -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/arm/cci.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/cci.txt ---- linux-3.10.30/Documentation/devicetree/bindings/arm/cci.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/cci.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,172 @@ -+======================================================= -+ARM CCI cache coherent interconnect binding description -+======================================================= -+ -+ARM multi-cluster systems maintain intra-cluster coherency through a -+cache coherent interconnect (CCI) that is capable of monitoring bus -+transactions and manage coherency, TLB invalidations and memory barriers. -+ -+It allows snooping and distributed virtual memory message broadcast across -+clusters, through memory mapped interface, with a global control register -+space and multiple sets of interface control registers, one per slave -+interface. -+ -+Bindings for the CCI node follow the ePAPR standard, available from: -+ -+www.power.org/documentation/epapr-version-1-1/ -+ -+with the addition of the bindings described in this document which are -+specific to ARM. -+ -+* CCI interconnect node -+ -+ Description: Describes a CCI cache coherent Interconnect component -+ -+ Node name must be "cci". -+ Node's parent must be the root node /, and the address space visible -+ through the CCI interconnect is the same as the one seen from the -+ root node (ie from CPUs perspective as per DT standard). -+ Every CCI node has to define the following properties: -+ -+ - compatible -+ Usage: required -+ Value type: -+ Definition: must be set to -+ "arm,cci-400" -+ -+ - reg -+ Usage: required -+ Value type: -+ Definition: A standard property. Specifies base physical -+ address of CCI control registers common to all -+ interfaces. -+ -+ - ranges: -+ Usage: required -+ Value type: -+ Definition: A standard property. Follow rules in the ePAPR for -+ hierarchical bus addressing. CCI interfaces -+ addresses refer to the parent node addressing -+ scheme to declare their register bases. -+ -+ CCI interconnect node can define the following child nodes: -+ -+ - CCI control interface nodes -+ -+ Node name must be "slave-if". -+ Parent node must be CCI interconnect node. -+ -+ A CCI control interface node must contain the following -+ properties: -+ -+ - compatible -+ Usage: required -+ Value type: -+ Definition: must be set to -+ "arm,cci-400-ctrl-if" -+ -+ - interface-type: -+ Usage: required -+ Value type: -+ Definition: must be set to one of {"ace", "ace-lite"} -+ depending on the interface type the node -+ represents. -+ -+ - reg: -+ Usage: required -+ Value type: -+ Definition: the base address and size of the -+ corresponding interface programming -+ registers. -+ -+* CCI interconnect bus masters -+ -+ Description: masters in the device tree connected to a CCI port -+ (inclusive of CPUs and their cpu nodes). -+ -+ A CCI interconnect bus master node must contain the following -+ properties: -+ -+ - cci-control-port: -+ Usage: required -+ Value type: -+ Definition: a phandle containing the CCI control interface node -+ the master is connected to. -+ -+Example: -+ -+ cpus { -+ #size-cells = <0>; -+ #address-cells = <1>; -+ -+ CPU0: cpu@0 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a15"; -+ cci-control-port = <&cci_control1>; -+ reg = <0x0>; -+ }; -+ -+ CPU1: cpu@1 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a15"; -+ cci-control-port = <&cci_control1>; -+ reg = <0x1>; -+ }; -+ -+ CPU2: cpu@100 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a7"; -+ cci-control-port = <&cci_control2>; -+ reg = <0x100>; -+ }; -+ -+ CPU3: cpu@101 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a7"; -+ cci-control-port = <&cci_control2>; -+ reg = <0x101>; -+ }; -+ -+ }; -+ -+ dma0: dma@3000000 { -+ compatible = "arm,pl330", "arm,primecell"; -+ cci-control-port = <&cci_control0>; -+ reg = <0x0 0x3000000 0x0 0x1000>; -+ interrupts = <10>; -+ #dma-cells = <1>; -+ #dma-channels = <8>; -+ #dma-requests = <32>; -+ }; -+ -+ cci@2c090000 { -+ compatible = "arm,cci-400"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ reg = <0x0 0x2c090000 0 0x1000>; -+ ranges = <0x0 0x0 0x2c090000 0x6000>; -+ -+ cci_control0: slave-if@1000 { -+ compatible = "arm,cci-400-ctrl-if"; -+ interface-type = "ace-lite"; -+ reg = <0x1000 0x1000>; -+ }; -+ -+ cci_control1: slave-if@4000 { -+ compatible = "arm,cci-400-ctrl-if"; -+ interface-type = "ace"; -+ reg = <0x4000 0x1000>; -+ }; -+ -+ cci_control2: slave-if@5000 { -+ compatible = "arm,cci-400-ctrl-if"; -+ interface-type = "ace"; -+ reg = <0x5000 0x1000>; -+ }; -+ }; -+ -+This CCI node corresponds to a CCI component whose control registers sits -+at address 0x000000002c090000. -+CCI slave interface @0x000000002c091000 is connected to dma controller dma0. -+CCI slave interface @0x000000002c094000 is connected to CPUs {CPU0, CPU1}; -+CCI slave interface @0x000000002c095000 is connected to CPUs {CPU2, CPU3}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt ---- linux-3.10.30/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,64 @@ -+Freescale Busfreq driver -+ -+It is a generic driver that manages the frequency of the DDR, AHB and AXI buses in the iMX6x architecture. -+It works for both SMP and UP systems and for both DDR3 and LPDDR2 memory types. -+ -+Required properties are listed below: -+- compatible: should be "fsl,imx6_busfreq" -+- clocks: Lists the various clocks used by the busfreq driver -+- interrupts - Lists the interrupts used by the busfreq driver. This is needed only for SMP architecutre. -+- fsl,max_ddr_freq - The max ddr freq for this chip -+ -+Examples: -+For SOC imx6q.dtsi: -+ busfreq { /* BUSFREQ */ -+ compatible = "fsl,imx6_busfreq"; -+ clocks = <&clks 171>, <&clks 6>, <&clks 11>, <&clks 104>, <&clks 172>, <&clks 58>, -+ <&clks 18>, <&clks 60>, <&clks 20>, <&clks 3>; -+ clock-names = "pll2_bus", "pll2_pfd2_396m", "pll2_198m", "arm", "pll3_usb_otg", "periph", -+ "periph_pre", "periph_clk2", "periph_clk2_sel", "osc"; -+ interrupts = <0 107 0x04>, <0 112 0x4>, <0 113 0x4>, <0 114 0x4>; -+ interrupt-names = "irq_busfreq_0", "irq_busfreq_1", "irq_busfreq_2", "irq_busfreq_3"; -+ fsl,max_ddr_freq = <528000000>; -+ }; -+ -+The Freescale Busfreq driver supports the following setpoints for the DDR freq: -+enum bus_freq_mode { -+ BUS_FREQ_HIGH, -> The max freq the SOC supports -+ BUS_FREQ_MED, -> Medium setpoint (ex 400MHz for DDR3 when the max is 528MHz) -+ BUS_FREQ_AUDIO, -> Audio playback freq (50MHz) -+ BUS_FREQ_LOW, -> Low power IDLE freq (24MHz) -+}; -+ -+Currently the Freescale Busfreq driver implementation requires drivers to call the following APIs: -+1. request_bus_freq(enum bus_freq_mode): -+ The driver is requesting the system and ddr freq to be set to the requested value. The driver should call this -+ API before it even enables its clocks. -+ -+2. release_bus_freq(enum bus_freq_mode): -+ The driver no longer needs the system and ddr freq at the required value. The driver should call this API after -+ its work is done and it has disabled its clocks. -+ -+Examples: -+In the IPU driver, the requesting and releasing of the required bus frequency is tied into the runtime PM implementation: -+ -+int ipu_runtime_suspend(struct device *dev) -+{ -+ release_bus_freq(BUS_FREQ_HIGH); -+ dev_dbg(dev, "ipu busfreq high release.\n"); -+ -+ return 0; -+} -+ -+int ipu_runtime_resume(struct device *dev) -+{ -+ request_bus_freq(BUS_FREQ_HIGH); -+ dev_dbg(dev, "ipu busfreq high requst.\n"); -+ -+ return 0; -+} -+ -+static const struct dev_pm_ops ipu_pm_ops = { -+ SET_RUNTIME_PM_OPS(ipu_runtime_suspend, ipu_runtime_resume, NULL) -+ SET_SYSTEM_SLEEP_PM_OPS(ipu_suspend, ipu_resume) -+}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/imx/gpc.txt ---- linux-3.10.30/Documentation/devicetree/bindings/arm/imx/gpc.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,20 @@ -+Freescale imx GPC bindings -+ -+Optional properties: -+- fsl,cpu_pupscr_sw2iso: for powering up CPU, number of 32K clock cycle PGC will wait before negating isolation signal. -+- fsl,cpu_pupscr_sw: for powering up CPU, number of 32K clock cycle PGC will wait before asserting isolation signal. -+- fsl,cpu_pdnscr_iso2sw: for powering down CPU, number of ipg clock cycle PGC will wait before negating isolation signal. -+- fsl,cpu_pdnscr_iso: for powering down CPU, number of ipg clock cycle PGC will wait before asserting isolation signal. -+ -+These properties are for adjusting the GPC PGC CPU power up/down setting, if there is no such property in dts, then default -+value in GPC PGC registers will be used. -+ -+ -+Example: -+ -+ &gpc { -+ fsl,cpu_pupscr_sw2iso = <0xf>; -+ fsl,cpu_pupscr_sw = <0xf>; -+ fsl,cpu_pdnscr_iso2sw = <0x1>; -+ fsl,cpu_pdnscr_iso = <0x1>; -+ }; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/arm/pmu.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/pmu.txt ---- linux-3.10.30/Documentation/devicetree/bindings/arm/pmu.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/pmu.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -16,6 +16,9 @@ - "arm,arm1176-pmu" - "arm,arm1136-pmu" - - interrupts : 1 combined interrupt or 1 per core. -+- cluster : a phandle to the cluster to which it belongs -+ If there are more than one cluster with same CPU type -+ then there should be separate PMU nodes per cluster. - - Example: - -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt ---- linux-3.10.30/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,19 @@ -+ARM Dual Cluster System Configuration Block -+------------------------------------------- -+ -+The Dual Cluster System Configuration Block (DCSCB) provides basic -+functionality for controlling clocks, resets and configuration pins in -+the Dual Cluster System implemented by the Real-Time System Model (RTSM). -+ -+Required properties: -+ -+- compatible : should be "arm,rtsm,dcscb" -+ -+- reg : physical base address and the size of the registers window -+ -+Example: -+ -+ dcscb@60000000 { -+ compatible = "arm,rtsm,dcscb"; -+ reg = <0x60000000 0x1000>; -+ }; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/bus/imx-weim.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/bus/imx-weim.txt ---- linux-3.10.30/Documentation/devicetree/bindings/bus/imx-weim.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/bus/imx-weim.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,49 @@ -+Device tree bindings for i.MX Wireless External Interface Module (WEIM) -+ -+The term "wireless" does not imply that the WEIM is literally an interface -+without wires. It simply means that this module was originally designed for -+wireless and mobile applications that use low-power technology. -+ -+The actual devices are instantiated from the child nodes of a WEIM node. -+ -+Required properties: -+ -+ - compatible: Should be set to "fsl,imx6q-weim" -+ - reg: A resource specifier for the register space -+ (see the example below) -+ - clocks: the clock, see the example below. -+ - #address-cells: Must be set to 2 to allow memory address translation -+ - #size-cells: Must be set to 1 to allow CS address passing -+ - ranges: Must be set up to reflect the memory layout with four -+ integer values for each chip-select line in use: -+ -+ 0 -+ -+Timing property for child nodes. It is mandatory, not optional. -+ -+ - fsl,weim-cs-timing: The timing array, contains 6 timing values for the -+ child node. We can get the CS index from the child -+ node's "reg" property. This property contains the values -+ for the registers EIM_CSnGCR1, EIM_CSnGCR2, EIM_CSnRCR1, -+ EIM_CSnRCR2, EIM_CSnWCR1, EIM_CSnWCR2 in this order. -+ -+Example for an imx6q-sabreauto board, the NOR flash connected to the WEIM: -+ -+ weim: weim@021b8000 { -+ compatible = "fsl,imx6q-weim"; -+ reg = <0x021b8000 0x4000>; -+ clocks = <&clks 196>; -+ #address-cells = <2>; -+ #size-cells = <1>; -+ ranges = <0 0 0x08000000 0x08000000>; -+ -+ nor@0,0 { -+ compatible = "cfi-flash"; -+ reg = <0 0 0x02000000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ bank-width = <2>; -+ fsl,weim-cs-timing = <0x00620081 0x00000001 0x1c022000 -+ 0x0000c000 0x1404a38e 0x00000000>; -+ }; -+ }; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/clock/imx6q-clock.txt ---- linux-3.10.30/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -89,8 +89,6 @@ - gpu3d_shader 74 - ipu1_podf 75 - ipu2_podf 76 -- ldb_di0_podf 77 -- ldb_di1_podf 78 - ipu1_di0_pre 79 - ipu1_di1_pre 80 - ipu2_di0_pre 81 -@@ -208,6 +206,29 @@ - pll4_post_div 193 - pll5_post_div 194 - pll5_video_div 195 -+ eim_slow 196 -+ spdif 197 -+ cko2_sel 198 -+ cko2_podf 199 -+ cko2 200 -+ cko 201 -+ vdoa 202 -+ gpt_3m 203 -+ video_27m 204 -+ ldb_di0_div_7 205 -+ ldb_di1_div_7 206 -+ ldb_di0_div_sel 207 -+ ldb_di1_div_sel 208 -+ pll4_audio_div 209 -+ lvds1_sel 210 -+ lvds1_in 211 -+ lvds1_out 212 -+ caam_mem 213 -+ caam_aclk 214 -+ caam_ipg 215 -+ epit1 216 -+ epit2 217 -+ tzasc2 218 - - Examples: - -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/clock/imx6sl-clock.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/clock/imx6sl-clock.txt ---- linux-3.10.30/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,10 @@ -+* Clock bindings for Freescale i.MX6 SoloLite -+ -+Required properties: -+- compatible: Should be "fsl,imx6sl-ccm" -+- reg: Address and length of the register set -+- #clock-cells: Should be <1> -+ -+The clock consumer should specify the desired clock by having the clock -+ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx6sl-clock.h -+for the full list of i.MX6 SoloLite clock IDs. -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/clock/vf610-clock.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/clock/vf610-clock.txt ---- linux-3.10.30/Documentation/devicetree/bindings/clock/vf610-clock.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/clock/vf610-clock.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,26 @@ -+* Clock bindings for Freescale Vybrid VF610 SOC -+ -+Required properties: -+- compatible: Should be "fsl,vf610-ccm" -+- reg: Address and length of the register set -+- #clock-cells: Should be <1> -+ -+The clock consumer should specify the desired clock by having the clock -+ID in its "clocks" phandle cell. See include/dt-bindings/clock/vf610-clock.h -+for the full list of VF610 clock IDs. -+ -+Examples: -+ -+clks: ccm@4006b000 { -+ compatible = "fsl,vf610-ccm"; -+ reg = <0x4006b000 0x1000>; -+ #clock-cells = <1>; -+}; -+ -+uart1: serial@40028000 { -+ compatible = "fsl,vf610-uart"; -+ reg = <0x40028000 0x1000>; -+ interrupts = <0 62 0x04>; -+ clocks = <&clks VF610_CLK_UART1>; -+ clock-names = "ipg"; -+}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt ---- linux-3.10.30/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,59 @@ -+iMX6q/iMX6dl/iMX6sl specific CPUFREQ settings -+ -+iMX6q/iMX6dl/iMX6sl has limitation that a couple of voltage rails (VDDSOC_CAP and VDDPU_CAP) -+must track VDDARM_CAP within 50mV: -+VDDARM_CAP - VDDSOC_CAP/VDDPU_CAP <= 50mV -+ -+The VDDSOC_CAP and VDDPU_CAP operating points for various VDDARM_CAP settings are listed below. -+ -+Required properties: -+- fsl,soc-operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt -+ for details. It is a voltage frequency tuple. -+ -+- For other entries in the example below please refer to Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt -+ -+Examples: -+ -+cpus { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ cpu@0 { -+ compatible = "arm,cortex-a9"; -+ reg = <0>; -+ next-level-cache = <&L2>; -+ operating-points = < -+ /* kHz uV */ -+ 1200000 1275000 -+ 996000 1250000 -+ 792000 1175000 -+ 396000 1075000 -+ >; -+ fsl,soc-operating-points = < -+ /* ARM kHz SOC-PU uV */ -+ 1200000 1275000 -+ 996000 1250000 -+ 792000 1175000 -+ 396000 1175000 -+ >; -+ clock-latency = <61036>; /* two CLK32 periods */ -+ }; -+ -+ cpu@1 { -+ compatible = "arm,cortex-a9"; -+ reg = <1>; -+ next-level-cache = <&L2>; -+ }; -+ -+ cpu@2 { -+ compatible = "arm,cortex-a9"; -+ reg = <2>; -+ next-level-cache = <&L2>; -+ }; -+ -+ cpu@3 { -+ compatible = "arm,cortex-a9"; -+ reg = <3>; -+ next-level-cache = <&L2>; -+ }; -+}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt ---- linux-3.10.30/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -4,14 +4,71 @@ - - compatible : Should be "fsl,-sdma" - - reg : Should contain SDMA registers location and length - - interrupts : Should contain SDMA interrupt -+- #dma-cells : Must be <3>. -+ The first cell specifies the DMA request/event ID. See details below -+ about the second and third cell. - - fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM - scripts firmware - -+The second cell of dma phandle specifies the peripheral type of DMA transfer. -+The full ID of peripheral types can be found below. -+ -+ ID transfer type -+ --------------------- -+ 0 MCU domain SSI -+ 1 Shared SSI -+ 2 MMC -+ 3 SDHC -+ 4 MCU domain UART -+ 5 Shared UART -+ 6 FIRI -+ 7 MCU domain CSPI -+ 8 Shared CSPI -+ 9 SIM -+ 10 ATA -+ 11 CCM -+ 12 External peripheral -+ 13 Memory Stick Host Controller -+ 14 Shared Memory Stick Host Controller -+ 15 DSP -+ 16 Memory -+ 17 FIFO type Memory -+ 18 SPDIF -+ 19 IPU Memory -+ 20 ASRC -+ 21 ESAI -+ 22 HDMI Audio -+ -+The third cell specifies the transfer priority as below. -+ -+ ID transfer priority -+ ------------------------- -+ 0 High -+ 1 Medium -+ 2 Low -+ - Examples: - - sdma@83fb0000 { - compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; - reg = <0x83fb0000 0x4000>; - interrupts = <6>; -+ #dma-cells = <3>; - fsl,sdma-ram-script-name = "sdma-imx51.bin"; - }; -+ -+DMA clients connected to the i.MX SDMA controller must use the format -+described in the dma.txt file. -+ -+Examples: -+ -+ssi2: ssi@70014000 { -+ compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; -+ reg = <0x70014000 0x4000>; -+ interrupts = <30>; -+ clocks = <&clks 49>; -+ dmas = <&sdma 24 1 0>, -+ <&sdma 25 1 0>; -+ dma-names = "rx", "tx"; -+ fsl,fifo-depth = <15>; -+}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt ---- linux-3.10.30/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,30 @@ -+* Freescale MXC Electrophoretic Display Controller (EPDC) -+ -+Required properties: -+- compatible: Should be "fsl,-epdc". Supported chips include -+ imx6dl and imx6sl -+- reg: Address and length of the register set for EPDC -+- interrupts: Should contain EPDC interrupts -+- clocks: the clocks for EPDC -+- pinctrl-names: should be "default" -+- pinctrl-0: should be pinctrl_ipu1_1 or pinctrl_ipu2_1, which depends on the -+ IPU connected. -+- V3P3_supply: power supply for EPDC_PWRCTRL0 from pmic -+- VCOM_supply: power supply for EPDC_VCOM0 from pmic -+- DISPLAY_supply: power supply enable for pmic -+ -+Examples: -+ -+imx6_epdc@0x020f8000 { -+ compatible = "fsl,imx6dl-epdc"; -+ reg = <0x020f8000 4000>; -+ interrupts = <0 97 0x04>; -+ clocks = <&clks 133>, <&clks 137>; /* ipu2, ipu2_di1 */ -+ clock-names = "epdc-axi", "epdc-pix"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_epdc_0>; -+ V3P3_supply = <&V3P3_reg>; -+ VCOM_supply = <&VCOM_reg>; -+ DISPLAY_supply = <&DISPLAY_reg>; -+ status = "disabled"; -+}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt ---- linux-3.10.30/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,146 @@ -+* FSL IPUv3 Display/FB -+ -+The FSL IPUv3 is Image Processing Unit version 3, a part of video and graphics -+subsystem in an application processor. The goal of the IPU is to provide -+comprehensive support for the flow of data from an image sensor or/and to a -+display device. -+ -+Two IPU units are on the imx6q SOC while only one IPU unit on the imx6dl SOC. -+Each IPU unit has two display interfaces. -+ -+For LDB/LVDS panel, there are two LVDS channels(LVDS0 and LVDS1) which can -+transfer video data, these two channels can be used as -+split/dual/single/separate mode. -+-split mode means display data from DI0 or DI1 will send to both channels -+ LVDS0+LVDS1. -+-dual mode means display data from DI0 or DI1 will be duplicated on LVDS0 -+ and LVDS1, it said, LVDS0 and LVDS1 has the same content. -+-single mode means only work for DI0/DI1->LVDS0 or DI0/DI1->LVDS1. -+-separate mode means you can make DI0/DI1->LVDS0 and DI0/DI1->LVDS1 work -+ at the same time. -+ "ldb=spl0/1" -- split mode on DI0/1 -+ "ldb=dul0/1" -- dual mode on DI0/1 -+ "ldb=sin0/1" -- single mode on LVDS0/1 -+ "ldb=sep0/1" -- separate mode begin from LVDS0/1 -+ -+Required properties for IPU: -+- bypass_reset :Bypass reset to avoid display channel being. -+ stopped by probe since it may start to work in bootloader: 0 or 1. -+- compatible : should be "fsl,imx6q-ipu". -+- reg : the register address range. -+- interrupts : the error and sync interrupts request. -+- clocks : the clock sources that it depends on. -+- clock-names: the related clock names. -+- resets : IPU reset specifier. See reset.txt and fsl,imx-src.txt in -+ Documentation/devicetree/bindings/reset/ for details. -+ -+Required properties for fb: -+- compatible : should be "fsl,mxc_sdc_fb". -+- disp_dev : display device: "ldb", "lcd", "hdmi", "mipi_dsi". -+- mode_str : video mode string: "LDB-XGA" or "LDB-1080P60" for ldb, -+ "CLAA-WVGA" for lcd, "TRULY-WVGA" for TRULY mipi_dsi lcd panel, -+ "1920x1080M@60" for hdmi. -+- default_bpp : default bits per pixel: 8/16/24/32 -+- int_clk : use internal clock as pixel clock: 0 or 1 -+- late_init : to avoid display channel being re-initialized -+ as we've probably setup the channel in bootloader: 0 or 1 -+- interface_pix_fmt : display interface pixel format as below: -+ RGB666 IPU_PIX_FMT_RGB666 -+ RGB565 IPU_PIX_FMT_RGB565 -+ RGB24 IPU_PIX_FMT_RGB24 -+ BGR24 IPU_PIX_FMT_BGR24 -+ GBR24 IPU_PIX_FMT_GBR24 -+ YUV444 IPU_PIX_FMT_YUV444 -+ LVDS666 IPU_PIX_FMT_LVDS666 -+ YUYV IPU_PIX_FMT_YUYV -+ UYVY IPU_PIX_FMT_UYVY -+ YVYV IPU_PIX_FMT_YVYU -+ VYUY IPU_PIX_FMT_VYUY -+ -+Required properties for display: -+- compatible : should be "fsl,lcd" for lcd panel, "fsl,imx6q-ldb" for ldb -+- reg : the register address range if necessary to have. -+- interrupts : the error and sync interrupts if necessary to have. -+- clocks : the clock sources that it depends on if necessary to have. -+- clock-names: the related clock names if necessary to have. -+- ipu_id : ipu id for the first display device: 0 or 1 -+- disp_id : display interface id for the first display interface: 0 or 1 -+- default_ifmt : save as above display interface pixel format for lcd -+- pinctrl-names : should be "default" -+- pinctrl-0 : should be pinctrl_ipu1_1 or pinctrl_ipu2_1, which depends on the -+ IPU connected. -+- sec_ipu_id : secondary ipu id for the second display device(ldb only): 0 or 1 -+- sec_disp_id : secondary display interface id for the second display -+ device(ldb only): 0 or 1 -+- ext_ref : reference resistor select for ldb only: 0 or 1 -+- mode : ldb mode as below: -+ spl0 LDB_SPL_DI0 -+ spl1 LDB_SPL_DI1 -+ dul0 LDB_DUL_DI0 -+ dul1 LDB_DUL_DI1 -+ sin0 LDB_SIN0 -+ sin1 LDB_SIN1 -+ sep0 LDB_SEP0 -+ sep1 LDB_SEP1 -+- gpr : the mux controller for the display engine's display interfaces and the display encoder -+ (only valid for mipi dsi now). -+- disp-power-on-supply : the regulator to control display panel's power. -+ (only valid for mipi dsi now). -+- resets : the gpio pin to reset the display device(only valid for mipi display panel now). -+- lcd_panel : the video mode name for the display device(only valid for mipi display panel now). -+- dev_id : the display engine's identity within the system, which intends to replace ipu_id -+ (only valid for mipi dsi now). -+ -+Example for IPU: -+ ipu1: ipu@02400000 { -+ compatible = "fsl,imx6q-ipu"; -+ reg = <0x02400000 0x400000>; -+ interrupts = <0 6 0x4 0 5 0x4>; -+ clocks = <&clks 130>, <&clks 131>, <&clks 132>, -+ <&clks 39>, <&clks 40>, -+ <&clks 135>, <&clks 136>; -+ clock-names = "bus", "di0", "di1", -+ "di0_sel", "di1_sel", -+ "ldb_di0", "ldb_di1"; -+ resets = <&src 2>; -+ bypass_reset = <0>; -+ }; -+ -+Example for fb: -+ fb0 { -+ compatible = "fsl,mxc_sdc_fb"; -+ disp_dev = "ldb"; -+ interface_pix_fmt = "RGB666"; -+ mode_str ="LDB-XGA"; -+ default_bpp = <16>; -+ int_clk = <0>; -+ late_init = <0>; -+ status = "okay"; -+ }; -+ -+Example for ldb display: -+ ldb@020e0000 { -+ ipu_id = <1>; -+ disp_id = <0>; -+ ext_ref = <1>; -+ mode = "sep0"; -+ sec_ipu_id = <1>; -+ sec_disp_id = <1>; -+ status = "okay"; -+ }; -+ -+Example for mipi dsi display: -+ mipi_dsi: mipi@021e0000 { -+ compatible = "fsl,imx6q-mipi-dsi"; -+ reg = <0x021e0000 0x4000>; -+ interrupts = <0 102 0x04>; -+ gpr = <&gpr>; -+ clocks = <&clks 138>, <&clks 204>; -+ clock-names = "mipi_pllref_clk", "mipi_cfg_clk"; -+ dev_id = <0>; -+ disp_id = <0>; -+ lcd_panel = "TRULY-WVGA"; -+ disp-power-on-supply = <®_mipi_dsi_pwr_on> -+ resets = <&mipi_dsi_reset>; -+ status = "okay"; -+ }; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/fb/mxsfb.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/fb/mxsfb.txt ---- linux-3.10.30/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -3,6 +3,9 @@ - Required properties: - - compatible: Should be "fsl,-lcdif". Supported chips include - imx23 and imx28. -+- pinctrl-names: Should be "default" -+- pinctrl-0: pinctrl setting for lcd -+- lcd-supply: lcd power supply, usually via GPIO - - reg: Address and length of the register set for lcdif - - interrupts: Should contain lcdif interrupts - - display : phandle to display node (see below for details) -@@ -22,6 +25,10 @@ - compatible = "fsl,imx28-lcdif"; - reg = <0x80030000 2000>; - interrupts = <38 86>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lcdif_24bit_pins_a -+ &lcdif_pins_evk>; -+ lcd-supply = <®_lcd_3v3>; - - display: display { - bits-per-pixel = <32>; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt ---- linux-3.10.30/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,23 @@ -+* ELAN Resistive Touch Controller -+ -+Required properties: -+- compatible: must be "elan,elan-touch" -+- reg: i2c slave address -+- interrupt-parent: the phandle for the interrupt controller -+- interrupts: touch controller interrupt -+- gpio_elan_cs: the gpio pin for chip select -+- gpio_elan_rst: the gpio pin for chip reset -+- gpio_intr: the gpio pin to be used for interrupt pin -+ -+Example: -+ -+ elan@10 { -+ compatible = "elan,elan-touch"; -+ reg = <0x10>; -+ interrupt-parent = <&gpio3>; -+ interrupts = <28 3>; -+ gpio_elan_cs = <&gpio2 18 0>; -+ gpio_elan_rst = <&gpio3 8 0>; -+ gpio_intr = <&gpio3 28 0>; -+ status = "okay"; -+ }; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/leds/leds-pwm.txt ---- linux-3.10.30/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -13,6 +13,9 @@ - For the pwms and pwm-names property please refer to: - Documentation/devicetree/bindings/pwm/pwm.txt - - max-brightness : Maximum brightness possible for the LED -+- default-brightness : (optional) Default brightness for the LED -+- active-low : (optional) For PWMs where the LED is wired to supply -+ rather than ground. - - label : (optional) - see Documentation/devicetree/bindings/leds/common.txt - - linux,default-trigger : (optional) -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/mfd/vexpress-spc.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mfd/vexpress-spc.txt ---- linux-3.10.30/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,35 @@ -+* ARM Versatile Express Serial Power Controller device tree bindings -+ -+Latest ARM development boards implement a power management interface (serial -+power controller - SPC) that is capable of managing power/voltage and -+operating point transitions, through memory mapped registers interface. -+ -+On testchips like TC2 it also provides a configuration interface that can -+be used to read/write values which cannot be read/written through simple -+memory mapped reads/writes. -+ -+- spc node -+ -+ - compatible: -+ Usage: required -+ Value type: -+ Definition: must be -+ "arm,vexpress-spc,v2p-ca15_a7","arm,vexpress-spc" -+ - reg: -+ Usage: required -+ Value type: -+ Definition: A standard property that specifies the base address -+ and the size of the SPC address space -+ - interrupts: -+ Usage: required -+ Value type: -+ Definition: SPC interrupt configuration. A standard property -+ that follows ePAPR interrupts specifications -+ -+Example: -+ -+spc: spc@7fff0000 { -+ compatible = "arm,vexpress-spc,v2p-ca15_a7","arm,vexpress-spc"; -+ reg = <0 0x7FFF0000 0 0x1000>; -+ interrupts = <0 95 4>; -+}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/mlb/mlb150.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mlb/mlb150.txt ---- linux-3.10.30/Documentation/devicetree/bindings/mlb/mlb150.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,22 @@ -+* Freescale Media Local Bus Host Controller (MLB) for i.MX6Q/DL -+ -+The Media Local Bus Host Controller on Freescale i.MX family -+provides an interface for MOST network. -+ -+Required properties: -+- compatible : Should be "fsl,-mlb150" -+- reg : Should contain mlb registers location and length -+- interrupts : Should contain mlb interrupt -+- clocks: Should contain the mlb clock sources -+- clock-names: Should be the names of mlb clock sources -+- iram : phandle pointing to the SRAM device node -+ -+Examples: -+mlb@0218c000 { -+ compatible = "fsl,imx6q-mlb150"; -+ reg = <0x0218c000 0x4000>; -+ interrupts = <0 53 0x04 0 117 0x04 0 126 0x04>; -+ clocks = <&clks 139>, <&clks 175>; -+ clock-names = "mlb", "pll8_mlb"; -+ iram = <&ocram>; -+}; -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt ---- linux-3.10.30/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -12,6 +12,11 @@ - Optional properties: - - fsl,cd-controller : Indicate to use controller internal card detection - - fsl,wp-controller : Indicate to use controller internal write protection -+- fsl,delay-line : Specify the number of delay cells for override mode. -+ This is used to set the clock delay for DLL(Delay Line) on override mode -+ to select a proper data sampling window in case the clock quality is not good -+ due to signal path is too long on the board. Please refer to eSDHC/uSDHC -+ chapter, DLL (Delay Line) section in RM for details. - - Examples: - -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/mmc/mmc.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mmc/mmc.txt ---- linux-3.10.30/Documentation/devicetree/bindings/mmc/mmc.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mmc/mmc.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -5,6 +5,8 @@ - Interpreted by the OF core: - - reg: Registers location and length. - - interrupts: Interrupts used by the MMC controller. -+- clocks: Clocks needed for the host controller, if any. -+- clock-names: Goes with clocks above. - - Card detection: - If no property below is supplied, host native card detect is used. -@@ -29,6 +31,15 @@ - - cap-power-off-card: powering off the card is safe - - cap-sdio-irq: enable SDIO IRQ signalling on this interface - -+Card power and reset control: -+The following properties can be specified for cases where the MMC -+peripheral needs additional reset, regulator and clock lines. It is for -+example common for WiFi/BT adapters to have these separate from the main -+MMC bus: -+ - card-reset-gpios: Specify GPIOs for card reset (reset active low) -+ - card-external-vcc-supply: Regulator to drive (independent) card VCC -+ - clock with name "card_ext_clock": External clock provided to the card -+ - *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line - polarity properties, we have to fix the meaning of the "normal" and "inverted" - line levels. We choose to follow the SDHCI standard, which specifies both those -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/mtd/gpmi-nand.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mtd/gpmi-nand.txt ---- linux-3.10.30/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -17,6 +17,14 @@ - Optional properties: - - nand-on-flash-bbt: boolean to enable on flash bbt option if not - present false -+ - fsl,use-minimum-ecc: Protect this NAND flash with the minimum ECC -+ strength required. The required ECC strength is -+ automatically discoverable for some flash -+ (e.g., according to the ONFI standard). -+ However, note that if this strength is not -+ discoverable or this property is not enabled, -+ the software may chooses an implementation-defined -+ ECC scheme. - - The device tree may optionally contain sub-nodes describing partitions of the - address space. See partition.txt for more detail. -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt ---- linux-3.10.30/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -15,6 +15,13 @@ - Optional properties: - - - clock-frequency : The oscillator frequency driving the flexcan device -+- gpr: phandle to general purpose register node. The remote wakeup control -+ bits is stored here. -+ -+Below are gpios for tranceiver: -+- trx_en_gpio : enable gpio -+- trx_stby_gpio : standby gpio -+- trx_nerr_gpio : NERR gpio - - Example: - -diff -Nur linux-3.10.30/Documentation/devicetree/bindings/pci/designware-pcie.txt linux-3.10.30-cubox-i/Documentation/devicetree/bindings/pci/designware-pcie.txt ---- linux-3.10.30/Documentation/devicetree/bindings/pci/designware-pcie.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.30-cubox-i/Documentation/devicetree/bindings/pci/designware-pcie.txt 2014-03-08 20:32:51.000000000 +0100 -@@ -0,0 +1,81 @@ -+* Synopsis Designware PCIe interface -+ -+Required properties: -+- compatible: should contain "snps,dw-pcie" to identify the -+ core, plus an identifier for the specific instance, such -+ as "samsung,exynos5440-pcie" or "fsl,imx6q-pcie". -+- reg: base addresses and lengths of the pcie controller, -+ the phy controller, additional register for the phy controller. -+- interru