summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-24 11:59:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-24 11:59:43 +0200
commit6fafa7633cccc5f777faed9a82ebd94dc16f49eb (patch)
tree2b8c8912615a1430ff049a31c30102cd95ba0834 /target
parent87fb18dba507125f9a17cbc4585229d8b125e11b (diff)
add network support to cubox, working for 3.14.1
Diffstat (limited to 'target')
-rw-r--r--target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch35547
-rw-r--r--target/arm/kernel/cubox-i2ultra7
-rw-r--r--target/arm/kernel/cubox-i4pro7
-rw-r--r--target/config/Config.in2
-rw-r--r--target/linux/config/Config.in.graphics24
-rw-r--r--target/linux/config/Config.in.regulator5
6 files changed, 7002 insertions, 28590 deletions
diff --git a/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch b/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch
index eff9be5d8..87c955bdf 100644
--- a/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch
+++ b/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.10.36/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/clcd-panels.dtsi linux-solidrun/arch/arm/boot/dts/clcd-panels.dtsi
--- linux-3.10.36/arch/arm/boot/dts/clcd-panels.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi 2014-04-21 13:50:39.050713614 +0200
++++ linux-solidrun/arch/arm/boot/dts/clcd-panels.dtsi 2014-04-24 07:58:12.840168701 +0200
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -54,9 +54,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-m
+ };
+ };
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/exynos5440.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/exynos5440.dtsi linux-solidrun/arch/arm/boot/dts/exynos5440.dtsi
--- linux-3.10.36/arch/arm/boot/dts/exynos5440.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440.dtsi 2014-04-21 13:50:39.054713631 +0200
++++ linux-solidrun/arch/arm/boot/dts/exynos5440.dtsi 2014-04-24 07:58:12.848168731 +0200
@@ -113,7 +113,7 @@
clock-names = "spi", "spi_busclk0";
};
@@ -111,9 +111,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/exynos5440.dtsi linux-linaro-stable-mx
+ num-lanes = <4>;
+ };
};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/exynos5440-ssdk5440.dts linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440-ssdk5440.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/exynos5440-ssdk5440.dts linux-solidrun/arch/arm/boot/dts/exynos5440-ssdk5440.dts
--- linux-3.10.36/arch/arm/boot/dts/exynos5440-ssdk5440.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440-ssdk5440.dts 2014-04-21 13:50:39.054713631 +0200
++++ linux-solidrun/arch/arm/boot/dts/exynos5440-ssdk5440.dts 2014-04-24 07:58:12.848168731 +0200
@@ -30,4 +30,12 @@
clock-frequency = <50000000>;
};
@@ -127,18059 +127,66 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/exynos5440-ssdk5440.dts linux-linaro-s
+ reset-gpio = <&pin_ctrl 22 0>;
+ };
};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx23.dtsi linux-solidrun/arch/arm/boot/dts/imx23.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx23.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi 2014-04-21 13:50:39.054713631 +0200
-@@ -9,7 +9,8 @@
- * http://www.gnu.org/copyleft/gpl.html
- */
-
--/include/ "skeleton.dtsi"
-+#include "skeleton.dtsi"
-+#include "imx23-pinfunc.h"
-
- / {
- interrupt-parent = <&icoll>;
-@@ -20,6 +21,9 @@
++++ linux-solidrun/arch/arm/boot/dts/imx23.dtsi 2014-04-24 07:58:12.848168731 +0200
+@@ -20,6 +20,7 @@
gpio2 = &gpio2;
serial0 = &auart0;
serial1 = &auart1;
-+ spi0 = &ssp0;
-+ spi1 = &ssp1;
+ usbphy0 = &usbphy0;
};
cpus {
-@@ -76,23 +80,21 @@
- #size-cells = <1>;
- reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
- reg-names = "gpmi-nand", "bch";
-- interrupts = <13>, <56>;
-- interrupt-names = "gpmi-dma", "bch";
-+ interrupts = <56>;
-+ interrupt-names = "bch";
- clocks = <&clks 34>;
- clock-names = "gpmi_io";
- dmas = <&dma_apbh 4>;
- dma-names = "rx-tx";
-- fsl,gpmi-dma-channel = <4>;
- status = "disabled";
- };
-
- ssp0: ssp@80010000 {
- reg = <0x80010000 0x2000>;
-- interrupts = <15 14>;
-+ interrupts = <15>;
- clocks = <&clks 33>;
- dmas = <&dma_apbh 1>;
- dma-names = "rx-tx";
-- fsl,ssp-dma-channel = <1>;
- status = "disabled";
- };
-
-@@ -137,174 +139,174 @@
- duart_pins_a: duart@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x11a2 /* MX23_PAD_PWM0__DUART_RX */
-- 0x11b2 /* MX23_PAD_PWM1__DUART_TX */
-+ MX23_PAD_PWM0__DUART_RX
-+ MX23_PAD_PWM1__DUART_TX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart0_pins_a: auart0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x01c0 /* MX23_PAD_AUART1_RX__AUART1_RX */
-- 0x01d0 /* MX23_PAD_AUART1_TX__AUART1_TX */
-- 0x01a0 /* MX23_PAD_AUART1_CTS__AUART1_CTS */
-- 0x01b0 /* MX23_PAD_AUART1_RTS__AUART1_RTS */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX23_PAD_AUART1_RX__AUART1_RX
-+ MX23_PAD_AUART1_TX__AUART1_TX
-+ MX23_PAD_AUART1_CTS__AUART1_CTS
-+ MX23_PAD_AUART1_RTS__AUART1_RTS
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart0_2pins_a: auart0-2pins@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x01e2 /* MX23_PAD_I2C_SCL__AUART1_TX */
-- 0x01f2 /* MX23_PAD_I2C_SDA__AUART1_RX */
-+ MX23_PAD_I2C_SCL__AUART1_TX
-+ MX23_PAD_I2C_SDA__AUART1_RX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- gpmi_pins_a: gpmi-nand@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0000 /* MX23_PAD_GPMI_D00__GPMI_D00 */
-- 0x0010 /* MX23_PAD_GPMI_D01__GPMI_D01 */
-- 0x0020 /* MX23_PAD_GPMI_D02__GPMI_D02 */
-- 0x0030 /* MX23_PAD_GPMI_D03__GPMI_D03 */
-- 0x0040 /* MX23_PAD_GPMI_D04__GPMI_D04 */
-- 0x0050 /* MX23_PAD_GPMI_D05__GPMI_D05 */
-- 0x0060 /* MX23_PAD_GPMI_D06__GPMI_D06 */
-- 0x0070 /* MX23_PAD_GPMI_D07__GPMI_D07 */
-- 0x0100 /* MX23_PAD_GPMI_CLE__GPMI_CLE */
-- 0x0110 /* MX23_PAD_GPMI_ALE__GPMI_ALE */
-- 0x0130 /* MX23_PAD_GPMI_RDY0__GPMI_RDY0 */
-- 0x0140 /* MX23_PAD_GPMI_RDY1__GPMI_RDY1 */
-- 0x0170 /* MX23_PAD_GPMI_WPN__GPMI_WPN */
-- 0x0180 /* MX23_PAD_GPMI_WRN__GPMI_WRN */
-- 0x0190 /* MX23_PAD_GPMI_RDN__GPMI_RDN */
-- 0x21b0 /* MX23_PAD_GPMI_CE1N__GPMI_CE1N */
-- 0x21c0 /* MX23_PAD_GPMI_CE0N__GPMI_CE0N */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX23_PAD_GPMI_D00__GPMI_D00
-+ MX23_PAD_GPMI_D01__GPMI_D01
-+ MX23_PAD_GPMI_D02__GPMI_D02
-+ MX23_PAD_GPMI_D03__GPMI_D03
-+ MX23_PAD_GPMI_D04__GPMI_D04
-+ MX23_PAD_GPMI_D05__GPMI_D05
-+ MX23_PAD_GPMI_D06__GPMI_D06
-+ MX23_PAD_GPMI_D07__GPMI_D07
-+ MX23_PAD_GPMI_CLE__GPMI_CLE
-+ MX23_PAD_GPMI_ALE__GPMI_ALE
-+ MX23_PAD_GPMI_RDY0__GPMI_RDY0
-+ MX23_PAD_GPMI_RDY1__GPMI_RDY1
-+ MX23_PAD_GPMI_WPN__GPMI_WPN
-+ MX23_PAD_GPMI_WRN__GPMI_WRN
-+ MX23_PAD_GPMI_RDN__GPMI_RDN
-+ MX23_PAD_GPMI_CE1N__GPMI_CE1N
-+ MX23_PAD_GPMI_CE0N__GPMI_CE0N
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- gpmi_pins_fixup: gpmi-pins-fixup {
- fsl,pinmux-ids = <
-- 0x0170 /* MX23_PAD_GPMI_WPN__GPMI_WPN */
-- 0x0180 /* MX23_PAD_GPMI_WRN__GPMI_WRN */
-- 0x0190 /* MX23_PAD_GPMI_RDN__GPMI_RDN */
-+ MX23_PAD_GPMI_WPN__GPMI_WPN
-+ MX23_PAD_GPMI_WRN__GPMI_WRN
-+ MX23_PAD_GPMI_RDN__GPMI_RDN
- >;
-- fsl,drive-strength = <2>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
- };
-
- mmc0_4bit_pins_a: mmc0-4bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2020 /* MX23_PAD_SSP1_DATA0__SSP1_DATA0 */
-- 0x2030 /* MX23_PAD_SSP1_DATA1__SSP1_DATA1 */
-- 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */
-- 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */
-- 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */
-- 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX23_PAD_SSP1_DATA0__SSP1_DATA0
-+ MX23_PAD_SSP1_DATA1__SSP1_DATA1
-+ MX23_PAD_SSP1_DATA2__SSP1_DATA2
-+ MX23_PAD_SSP1_DATA3__SSP1_DATA3
-+ MX23_PAD_SSP1_CMD__SSP1_CMD
-+ MX23_PAD_SSP1_SCK__SSP1_SCK
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- mmc0_8bit_pins_a: mmc0-8bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2020 /* MX23_PAD_SSP1_DATA0__SSP1_DATA0 */
-- 0x2030 /* MX23_PAD_SSP1_DATA1__SSP1_DATA1 */
-- 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */
-- 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */
-- 0x0082 /* MX23_PAD_GPMI_D08__SSP1_DATA4 */
-- 0x0092 /* MX23_PAD_GPMI_D09__SSP1_DATA5 */
-- 0x00a2 /* MX23_PAD_GPMI_D10__SSP1_DATA6 */
-- 0x00b2 /* MX23_PAD_GPMI_D11__SSP1_DATA7 */
-- 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */
-- 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */
-- 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX23_PAD_SSP1_DATA0__SSP1_DATA0
-+ MX23_PAD_SSP1_DATA1__SSP1_DATA1
-+ MX23_PAD_SSP1_DATA2__SSP1_DATA2
-+ MX23_PAD_SSP1_DATA3__SSP1_DATA3
-+ MX23_PAD_GPMI_D08__SSP1_DATA4
-+ MX23_PAD_GPMI_D09__SSP1_DATA5
-+ MX23_PAD_GPMI_D10__SSP1_DATA6
-+ MX23_PAD_GPMI_D11__SSP1_DATA7
-+ MX23_PAD_SSP1_CMD__SSP1_CMD
-+ MX23_PAD_SSP1_DETECT__SSP1_DETECT
-+ MX23_PAD_SSP1_SCK__SSP1_SCK
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- mmc0_pins_fixup: mmc0-pins-fixup {
- fsl,pinmux-ids = <
-- 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */
-- 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */
-+ MX23_PAD_SSP1_DETECT__SSP1_DETECT
-+ MX23_PAD_SSP1_SCK__SSP1_SCK
- >;
-- fsl,pull-up = <0>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- pwm2_pins_a: pwm2@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x11c0 /* MX23_PAD_PWM2__PWM2 */
-+ MX23_PAD_PWM2__PWM2
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_24bit_pins_a: lcdif-24bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1000 /* MX23_PAD_LCD_D00__LCD_D0 */
-- 0x1010 /* MX23_PAD_LCD_D01__LCD_D1 */
-- 0x1020 /* MX23_PAD_LCD_D02__LCD_D2 */
-- 0x1030 /* MX23_PAD_LCD_D03__LCD_D3 */
-- 0x1040 /* MX23_PAD_LCD_D04__LCD_D4 */
-- 0x1050 /* MX23_PAD_LCD_D05__LCD_D5 */
-- 0x1060 /* MX23_PAD_LCD_D06__LCD_D6 */
-- 0x1070 /* MX23_PAD_LCD_D07__LCD_D7 */
-- 0x1080 /* MX23_PAD_LCD_D08__LCD_D8 */
-- 0x1090 /* MX23_PAD_LCD_D09__LCD_D9 */
-- 0x10a0 /* MX23_PAD_LCD_D10__LCD_D10 */
-- 0x10b0 /* MX23_PAD_LCD_D11__LCD_D11 */
-- 0x10c0 /* MX23_PAD_LCD_D12__LCD_D12 */
-- 0x10d0 /* MX23_PAD_LCD_D13__LCD_D13 */
-- 0x10e0 /* MX23_PAD_LCD_D14__LCD_D14 */
-- 0x10f0 /* MX23_PAD_LCD_D15__LCD_D15 */
-- 0x1100 /* MX23_PAD_LCD_D16__LCD_D16 */
-- 0x1110 /* MX23_PAD_LCD_D17__LCD_D17 */
-- 0x0081 /* MX23_PAD_GPMI_D08__LCD_D18 */
-- 0x0091 /* MX23_PAD_GPMI_D09__LCD_D19 */
-- 0x00a1 /* MX23_PAD_GPMI_D10__LCD_D20 */
-- 0x00b1 /* MX23_PAD_GPMI_D11__LCD_D21 */
-- 0x00c1 /* MX23_PAD_GPMI_D12__LCD_D22 */
-- 0x00d1 /* MX23_PAD_GPMI_D13__LCD_D23 */
-- 0x1160 /* MX23_PAD_LCD_DOTCK__LCD_DOTCK */
-- 0x1170 /* MX23_PAD_LCD_ENABLE__LCD_ENABLE */
-- 0x1180 /* MX23_PAD_LCD_HSYNC__LCD_HSYNC */
-- 0x1190 /* MX23_PAD_LCD_VSYNC__LCD_VSYNC */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX23_PAD_LCD_D00__LCD_D00
-+ MX23_PAD_LCD_D01__LCD_D01
-+ MX23_PAD_LCD_D02__LCD_D02
-+ MX23_PAD_LCD_D03__LCD_D03
-+ MX23_PAD_LCD_D04__LCD_D04
-+ MX23_PAD_LCD_D05__LCD_D05
-+ MX23_PAD_LCD_D06__LCD_D06
-+ MX23_PAD_LCD_D07__LCD_D07
-+ MX23_PAD_LCD_D08__LCD_D08
-+ MX23_PAD_LCD_D09__LCD_D09
-+ MX23_PAD_LCD_D10__LCD_D10
-+ MX23_PAD_LCD_D11__LCD_D11
-+ MX23_PAD_LCD_D12__LCD_D12
-+ MX23_PAD_LCD_D13__LCD_D13
-+ MX23_PAD_LCD_D14__LCD_D14
-+ MX23_PAD_LCD_D15__LCD_D15
-+ MX23_PAD_LCD_D16__LCD_D16
-+ MX23_PAD_LCD_D17__LCD_D17
-+ MX23_PAD_GPMI_D08__LCD_D18
-+ MX23_PAD_GPMI_D09__LCD_D19
-+ MX23_PAD_GPMI_D10__LCD_D20
-+ MX23_PAD_GPMI_D11__LCD_D21
-+ MX23_PAD_GPMI_D12__LCD_D22
-+ MX23_PAD_GPMI_D13__LCD_D23
-+ MX23_PAD_LCD_DOTCK__LCD_DOTCK
-+ MX23_PAD_LCD_ENABLE__LCD_ENABLE
-+ MX23_PAD_LCD_HSYNC__LCD_HSYNC
-+ MX23_PAD_LCD_VSYNC__LCD_VSYNC
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- spi2_pins_a: spi2@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0182 /* MX23_PAD_GPMI_WRN__SSP2_SCK */
-- 0x0142 /* MX23_PAD_GPMI_RDY1__SSP2_CMD */
-- 0x0002 /* MX23_PAD_GPMI_D00__SSP2_DATA0 */
-- 0x0032 /* MX23_PAD_GPMI_D03__SSP2_DATA3 */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX23_PAD_GPMI_WRN__SSP2_SCK
-+ MX23_PAD_GPMI_RDY1__SSP2_CMD
-+ MX23_PAD_GPMI_D00__SSP2_DATA0
-+ MX23_PAD_GPMI_D03__SSP2_DATA3
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
- };
-
-@@ -336,8 +338,10 @@
- };
-
- dcp@80028000 {
-+ compatible = "fsl,imx23-dcp";
- reg = <0x80028000 0x2000>;
-- status = "disabled";
-+ interrupts = <53 54>;
-+ status = "okay";
- };
-
- pxp@8002a000 {
-@@ -366,11 +370,10 @@
-
- ssp1: ssp@80034000 {
- reg = <0x80034000 0x2000>;
-- interrupts = <2 20>;
-+ interrupts = <2>;
- clocks = <&clks 33>;
- dmas = <&dma_apbh 2>;
- dma-names = "rx-tx";
-- fsl,ssp-dma-channel = <2>;
- status = "disabled";
- };
-
-@@ -426,11 +429,12 @@
- status = "disabled";
- };
-
-- lradc@80050000 {
-+ lradc: lradc@80050000 {
- compatible = "fsl,imx23-lradc";
- reg = <0x80050000 0x2000>;
- interrupts = <36 37 38 39 40 41 42 43 44>;
- status = "disabled";
-+ clocks = <&clks 26>;
- };
-
- spdif@80054000 {
-@@ -472,7 +476,7 @@
- auart0: serial@8006c000 {
- compatible = "fsl,imx23-auart";
- reg = <0x8006c000 0x2000>;
-- interrupts = <24 25 23>;
-+ interrupts = <24>;
- clocks = <&clks 32>;
- dmas = <&dma_apbx 6>, <&dma_apbx 7>;
- dma-names = "rx", "tx";
-@@ -482,7 +486,7 @@
- auart1: serial@8006e000 {
- compatible = "fsl,imx23-auart";
- reg = <0x8006e000 0x2000>;
-- interrupts = <59 60 58>;
-+ interrupts = <59>;
- clocks = <&clks 32>;
- dmas = <&dma_apbx 8>, <&dma_apbx 9>;
- dma-names = "rx", "tx";
-@@ -523,4 +527,9 @@
- status = "disabled";
- };
- };
-+
-+ iio_hwmon {
-+ compatible = "iio-hwmon";
-+ io-channels = <&lradc 8>;
-+ };
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx23-evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-evk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx23-evk.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-evk.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -10,7 +10,7 @@
- */
-
- /dts-v1/;
--/include/ "imx23.dtsi"
-+#include "imx23.dtsi"
-
- / {
- model = "Freescale i.MX23 Evaluation Kit";
-@@ -45,14 +45,14 @@
- hog_pins_a: hog@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1123 /* MX23_PAD_LCD_RESET__GPIO_1_18 */
-- 0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */
-- 0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */
-- 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */
-+ MX23_PAD_LCD_RESET__GPIO_1_18
-+ MX23_PAD_PWM3__GPIO_1_29
-+ MX23_PAD_PWM4__GPIO_1_30
-+ MX23_PAD_SSP1_DETECT__SSP1_DETECT
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
-
-@@ -90,6 +90,11 @@
- };
-
- apbx@80040000 {
-+ lradc@80050000 {
-+ status = "okay";
-+ fsl,lradc-touchscreen-wires = <4>;
-+ };
-+
- pwm: pwm@80064000 {
- pinctrl-names = "default";
- pinctrl-0 = <&pwm2_pins_a>;
-@@ -107,22 +112,36 @@
- pinctrl-0 = <&duart_pins_a>;
- status = "okay";
- };
-+
-+ usbphy0: usbphy@8007c000 {
-+ status = "okay";
-+ };
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ usb0: usb@80080000 {
-+ status = "okay";
- };
- };
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_vddio_sd0: vddio-sd0 {
-+ reg_vddio_sd0: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "vddio-sd0";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio1 29 0>;
- };
-
-- reg_lcd_3v3: lcd-3v3 {
-+ reg_lcd_3v3: regulator@1 {
- compatible = "regulator-fixed";
-+ reg = <1>;
- regulator-name = "lcd-3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx23-olinuxino.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-olinuxino.dts
---- linux-3.10.36/arch/arm/boot/dts/imx23-olinuxino.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-olinuxino.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -12,7 +12,7 @@
- */
-
- /dts-v1/;
--/include/ "imx23.dtsi"
-+#include "imx23.dtsi"
-
- / {
- model = "i.MX23 Olinuxino Low Cost Board";
-@@ -40,21 +40,21 @@
- hog_pins_a: hog@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */
-+ MX23_PAD_GPMI_ALE__GPIO_0_17
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- led_pin_gpio2_1: led_gpio2_1@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
-+ MX23_PAD_SSP1_DETECT__GPIO_2_1
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
-
-@@ -69,6 +69,10 @@
- };
-
- apbx@80040000 {
-+ lradc@80050000 {
-+ status = "okay";
-+ };
-+
- duart: serial@80070000 {
- pinctrl-names = "default";
- pinctrl-0 = <&duart_pins_a>;
-@@ -96,9 +100,12 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_usb0_vbus: usb0_vbus {
-+ reg_usb0_vbus: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "usb0_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx23-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-pinfunc.h
---- linux-3.10.36/arch/arm/boot/dts/imx23-pinfunc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-pinfunc.h 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,333 @@
-+/*
-+ * Header providing constants for i.MX23 pinctrl bindings.
-+ *
-+ * Copyright (C) 2013 Lothar Waßmann <LW@KARO-electronics.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#ifndef __DT_BINDINGS_MX23_PINCTRL_H__
-+#define __DT_BINDINGS_MX23_PINCTRL_H__
-+
-+#include "mxs-pinfunc.h"
-+
-+#define MX23_PAD_GPMI_D00__GPMI_D00 0x0000
-+#define MX23_PAD_GPMI_D01__GPMI_D01 0x0010
-+#define MX23_PAD_GPMI_D02__GPMI_D02 0x0020
-+#define MX23_PAD_GPMI_D03__GPMI_D03 0x0030
-+#define MX23_PAD_GPMI_D04__GPMI_D04 0x0040
-+#define MX23_PAD_GPMI_D05__GPMI_D05 0x0050
-+#define MX23_PAD_GPMI_D06__GPMI_D06 0x0060
-+#define MX23_PAD_GPMI_D07__GPMI_D07 0x0070
-+#define MX23_PAD_GPMI_D08__GPMI_D08 0x0080
-+#define MX23_PAD_GPMI_D09__GPMI_D09 0x0090
-+#define MX23_PAD_GPMI_D10__GPMI_D10 0x00a0
-+#define MX23_PAD_GPMI_D11__GPMI_D11 0x00b0
-+#define MX23_PAD_GPMI_D12__GPMI_D12 0x00c0
-+#define MX23_PAD_GPMI_D13__GPMI_D13 0x00d0
-+#define MX23_PAD_GPMI_D14__GPMI_D14 0x00e0
-+#define MX23_PAD_GPMI_D15__GPMI_D15 0x00f0
-+#define MX23_PAD_GPMI_CLE__GPMI_CLE 0x0100
-+#define MX23_PAD_GPMI_ALE__GPMI_ALE 0x0110
-+#define MX23_PAD_GPMI_CE2N__GPMI_CE2N 0x0120
-+#define MX23_PAD_GPMI_RDY0__GPMI_RDY0 0x0130
-+#define MX23_PAD_GPMI_RDY1__GPMI_RDY1 0x0140
-+#define MX23_PAD_GPMI_RDY2__GPMI_RDY2 0x0150
-+#define MX23_PAD_GPMI_RDY3__GPMI_RDY3 0x0160
-+#define MX23_PAD_GPMI_WPN__GPMI_WPN 0x0170
-+#define MX23_PAD_GPMI_WRN__GPMI_WRN 0x0180
-+#define MX23_PAD_GPMI_RDN__GPMI_RDN 0x0190
-+#define MX23_PAD_AUART1_CTS__AUART1_CTS 0x01a0
-+#define MX23_PAD_AUART1_RTS__AUART1_RTS 0x01b0
-+#define MX23_PAD_AUART1_RX__AUART1_RX 0x01c0
-+#define MX23_PAD_AUART1_TX__AUART1_TX 0x01d0
-+#define MX23_PAD_I2C_SCL__I2C_SCL 0x01e0
-+#define MX23_PAD_I2C_SDA__I2C_SDA 0x01f0
-+#define MX23_PAD_LCD_D00__LCD_D00 0x1000
-+#define MX23_PAD_LCD_D01__LCD_D01 0x1010
-+#define MX23_PAD_LCD_D02__LCD_D02 0x1020
-+#define MX23_PAD_LCD_D03__LCD_D03 0x1030
-+#define MX23_PAD_LCD_D04__LCD_D04 0x1040
-+#define MX23_PAD_LCD_D05__LCD_D05 0x1050
-+#define MX23_PAD_LCD_D06__LCD_D06 0x1060
-+#define MX23_PAD_LCD_D07__LCD_D07 0x1070
-+#define MX23_PAD_LCD_D08__LCD_D08 0x1080
-+#define MX23_PAD_LCD_D09__LCD_D09 0x1090
-+#define MX23_PAD_LCD_D10__LCD_D10 0x10a0
-+#define MX23_PAD_LCD_D11__LCD_D11 0x10b0
-+#define MX23_PAD_LCD_D12__LCD_D12 0x10c0
-+#define MX23_PAD_LCD_D13__LCD_D13 0x10d0
-+#define MX23_PAD_LCD_D14__LCD_D14 0x10e0
-+#define MX23_PAD_LCD_D15__LCD_D15 0x10f0
-+#define MX23_PAD_LCD_D16__LCD_D16 0x1100
-+#define MX23_PAD_LCD_D17__LCD_D17 0x1110
-+#define MX23_PAD_LCD_RESET__LCD_RESET 0x1120
-+#define MX23_PAD_LCD_RS__LCD_RS 0x1130
-+#define MX23_PAD_LCD_WR__LCD_WR 0x1140
-+#define MX23_PAD_LCD_CS__LCD_CS 0x1150
-+#define MX23_PAD_LCD_DOTCK__LCD_DOTCK 0x1160
-+#define MX23_PAD_LCD_ENABLE__LCD_ENABLE 0x1170
-+#define MX23_PAD_LCD_HSYNC__LCD_HSYNC 0x1180
-+#define MX23_PAD_LCD_VSYNC__LCD_VSYNC 0x1190
-+#define MX23_PAD_PWM0__PWM0 0x11a0
-+#define MX23_PAD_PWM1__PWM1 0x11b0
-+#define MX23_PAD_PWM2__PWM2 0x11c0
-+#define MX23_PAD_PWM3__PWM3 0x11d0
-+#define MX23_PAD_PWM4__PWM4 0x11e0
-+#define MX23_PAD_SSP1_CMD__SSP1_CMD 0x2000
-+#define MX23_PAD_SSP1_DETECT__SSP1_DETECT 0x2010
-+#define MX23_PAD_SSP1_DATA0__SSP1_DATA0 0x2020
-+#define MX23_PAD_SSP1_DATA1__SSP1_DATA1 0x2030
-+#define MX23_PAD_SSP1_DATA2__SSP1_DATA2 0x2040
-+#define MX23_PAD_SSP1_DATA3__SSP1_DATA3 0x2050
-+#define MX23_PAD_SSP1_SCK__SSP1_SCK 0x2060
-+#define MX23_PAD_ROTARYA__ROTARYA 0x2070
-+#define MX23_PAD_ROTARYB__ROTARYB 0x2080
-+#define MX23_PAD_EMI_A00__EMI_A00 0x2090
-+#define MX23_PAD_EMI_A01__EMI_A01 0x20a0
-+#define MX23_PAD_EMI_A02__EMI_A02 0x20b0
-+#define MX23_PAD_EMI_A03__EMI_A03 0x20c0
-+#define MX23_PAD_EMI_A04__EMI_A04 0x20d0
-+#define MX23_PAD_EMI_A05__EMI_A05 0x20e0
-+#define MX23_PAD_EMI_A06__EMI_A06 0x20f0
-+#define MX23_PAD_EMI_A07__EMI_A07 0x2100
-+#define MX23_PAD_EMI_A08__EMI_A08 0x2110
-+#define MX23_PAD_EMI_A09__EMI_A09 0x2120
-+#define MX23_PAD_EMI_A10__EMI_A10 0x2130
-+#define MX23_PAD_EMI_A11__EMI_A11 0x2140
-+#define MX23_PAD_EMI_A12__EMI_A12 0x2150
-+#define MX23_PAD_EMI_BA0__EMI_BA0 0x2160
-+#define MX23_PAD_EMI_BA1__EMI_BA1 0x2170
-+#define MX23_PAD_EMI_CASN__EMI_CASN 0x2180
-+#define MX23_PAD_EMI_CE0N__EMI_CE0N 0x2190
-+#define MX23_PAD_EMI_CE1N__EMI_CE1N 0x21a0
-+#define MX23_PAD_GPMI_CE1N__GPMI_CE1N 0x21b0
-+#define MX23_PAD_GPMI_CE0N__GPMI_CE0N 0x21c0
-+#define MX23_PAD_EMI_CKE__EMI_CKE 0x21d0
-+#define MX23_PAD_EMI_RASN__EMI_RASN 0x21e0
-+#define MX23_PAD_EMI_WEN__EMI_WEN 0x21f0
-+#define MX23_PAD_EMI_D00__EMI_D00 0x3000
-+#define MX23_PAD_EMI_D01__EMI_D01 0x3010
-+#define MX23_PAD_EMI_D02__EMI_D02 0x3020
-+#define MX23_PAD_EMI_D03__EMI_D03 0x3030
-+#define MX23_PAD_EMI_D04__EMI_D04 0x3040
-+#define MX23_PAD_EMI_D05__EMI_D05 0x3050
-+#define MX23_PAD_EMI_D06__EMI_D06 0x3060
-+#define MX23_PAD_EMI_D07__EMI_D07 0x3070
-+#define MX23_PAD_EMI_D08__EMI_D08 0x3080
-+#define MX23_PAD_EMI_D09__EMI_D09 0x3090
-+#define MX23_PAD_EMI_D10__EMI_D10 0x30a0
-+#define MX23_PAD_EMI_D11__EMI_D11 0x30b0
-+#define MX23_PAD_EMI_D12__EMI_D12 0x30c0
-+#define MX23_PAD_EMI_D13__EMI_D13 0x30d0
-+#define MX23_PAD_EMI_D14__EMI_D14 0x30e0
-+#define MX23_PAD_EMI_D15__EMI_D15 0x30f0
-+#define MX23_PAD_EMI_DQM0__EMI_DQM0 0x3100
-+#define MX23_PAD_EMI_DQM1__EMI_DQM1 0x3110
-+#define MX23_PAD_EMI_DQS0__EMI_DQS0 0x3120
-+#define MX23_PAD_EMI_DQS1__EMI_DQS1 0x3130
-+#define MX23_PAD_EMI_CLK__EMI_CLK 0x3140
-+#define MX23_PAD_EMI_CLKN__EMI_CLKN 0x3150
-+#define MX23_PAD_GPMI_D00__LCD_D8 0x0001
-+#define MX23_PAD_GPMI_D01__LCD_D9 0x0011
-+#define MX23_PAD_GPMI_D02__LCD_D10 0x0021
-+#define MX23_PAD_GPMI_D03__LCD_D11 0x0031
-+#define MX23_PAD_GPMI_D04__LCD_D12 0x0041
-+#define MX23_PAD_GPMI_D05__LCD_D13 0x0051
-+#define MX23_PAD_GPMI_D06__LCD_D14 0x0061
-+#define MX23_PAD_GPMI_D07__LCD_D15 0x0071
-+#define MX23_PAD_GPMI_D08__LCD_D18 0x0081
-+#define MX23_PAD_GPMI_D09__LCD_D19 0x0091
-+#define MX23_PAD_GPMI_D10__LCD_D20 0x00a1
-+#define MX23_PAD_GPMI_D11__LCD_D21 0x00b1
-+#define MX23_PAD_GPMI_D12__LCD_D22 0x00c1
-+#define MX23_PAD_GPMI_D13__LCD_D23 0x00d1
-+#define MX23_PAD_GPMI_D14__AUART2_RX 0x00e1
-+#define MX23_PAD_GPMI_D15__AUART2_TX 0x00f1
-+#define MX23_PAD_GPMI_CLE__LCD_D16 0x0101
-+#define MX23_PAD_GPMI_ALE__LCD_D17 0x0111
-+#define MX23_PAD_GPMI_CE2N__ATA_A2 0x0121
-+#define MX23_PAD_AUART1_RTS__IR_CLK 0x01b1
-+#define MX23_PAD_AUART1_RX__IR_RX 0x01c1
-+#define MX23_PAD_AUART1_TX__IR_TX 0x01d1
-+#define MX23_PAD_I2C_SCL__GPMI_RDY2 0x01e1
-+#define MX23_PAD_I2C_SDA__GPMI_CE2N 0x01f1
-+#define MX23_PAD_LCD_D00__ETM_DA8 0x1001
-+#define MX23_PAD_LCD_D01__ETM_DA9 0x1011
-+#define MX23_PAD_LCD_D02__ETM_DA10 0x1021
-+#define MX23_PAD_LCD_D03__ETM_DA11 0x1031
-+#define MX23_PAD_LCD_D04__ETM_DA12 0x1041
-+#define MX23_PAD_LCD_D05__ETM_DA13 0x1051
-+#define MX23_PAD_LCD_D06__ETM_DA14 0x1061
-+#define MX23_PAD_LCD_D07__ETM_DA15 0x1071
-+#define MX23_PAD_LCD_D08__ETM_DA0 0x1081
-+#define MX23_PAD_LCD_D09__ETM_DA1 0x1091
-+#define MX23_PAD_LCD_D10__ETM_DA2 0x10a1
-+#define MX23_PAD_LCD_D11__ETM_DA3 0x10b1
-+#define MX23_PAD_LCD_D12__ETM_DA4 0x10c1
-+#define MX23_PAD_LCD_D13__ETM_DA5 0x10d1
-+#define MX23_PAD_LCD_D14__ETM_DA6 0x10e1
-+#define MX23_PAD_LCD_D15__ETM_DA7 0x10f1
-+#define MX23_PAD_LCD_RESET__ETM_TCTL 0x1121
-+#define MX23_PAD_LCD_RS__ETM_TCLK 0x1131
-+#define MX23_PAD_LCD_DOTCK__GPMI_RDY3 0x1161
-+#define MX23_PAD_LCD_ENABLE__I2C_SCL 0x1171
-+#define MX23_PAD_LCD_HSYNC__I2C_SDA 0x1181
-+#define MX23_PAD_LCD_VSYNC__LCD_BUSY 0x1191
-+#define MX23_PAD_PWM0__ROTARYA 0x11a1
-+#define MX23_PAD_PWM1__ROTARYB 0x11b1
-+#define MX23_PAD_PWM2__GPMI_RDY3 0x11c1
-+#define MX23_PAD_PWM3__ETM_TCTL 0x11d1
-+#define MX23_PAD_PWM4__ETM_TCLK 0x11e1
-+#define MX23_PAD_SSP1_DETECT__GPMI_CE3N 0x2011
-+#define MX23_PAD_SSP1_DATA1__I2C_SCL 0x2031
-+#define MX23_PAD_SSP1_DATA2__I2C_SDA 0x2041
-+#define MX23_PAD_ROTARYA__AUART2_RTS 0x2071
-+#define MX23_PAD_ROTARYB__AUART2_CTS 0x2081
-+#define MX23_PAD_GPMI_D00__SSP2_DATA0 0x0002
-+#define MX23_PAD_GPMI_D01__SSP2_DATA1 0x0012
-+#define MX23_PAD_GPMI_D02__SSP2_DATA2 0x0022
-+#define MX23_PAD_GPMI_D03__SSP2_DATA3 0x0032
-+#define MX23_PAD_GPMI_D04__SSP2_DATA4 0x0042
-+#define MX23_PAD_GPMI_D05__SSP2_DATA5 0x0052
-+#define MX23_PAD_GPMI_D06__SSP2_DATA6 0x0062
-+#define MX23_PAD_GPMI_D07__SSP2_DATA7 0x0072
-+#define MX23_PAD_GPMI_D08__SSP1_DATA4 0x0082
-+#define MX23_PAD_GPMI_D09__SSP1_DATA5 0x0092
-+#define MX23_PAD_GPMI_D10__SSP1_DATA6 0x00a2
-+#define MX23_PAD_GPMI_D11__SSP1_DATA7 0x00b2
-+#define MX23_PAD_GPMI_D15__GPMI_CE3N 0x00f2
-+#define MX23_PAD_GPMI_RDY0__SSP2_DETECT 0x0132
-+#define MX23_PAD_GPMI_RDY1__SSP2_CMD 0x0142
-+#define MX23_PAD_GPMI_WRN__SSP2_SCK 0x0182
-+#define MX23_PAD_AUART1_CTS__SSP1_DATA4 0x01a2
-+#define MX23_PAD_AUART1_RTS__SSP1_DATA5 0x01b2
-+#define MX23_PAD_AUART1_RX__SSP1_DATA6 0x01c2
-+#define MX23_PAD_AUART1_TX__SSP1_DATA7 0x01d2
-+#define MX23_PAD_I2C_SCL__AUART1_TX 0x01e2
-+#define MX23_PAD_I2C_SDA__AUART1_RX 0x01f2
-+#define MX23_PAD_LCD_D08__SAIF2_SDATA0 0x1082
-+#define MX23_PAD_LCD_D09__SAIF1_SDATA0 0x1092
-+#define MX23_PAD_LCD_D10__SAIF_MCLK_BITCLK 0x10a2
-+#define MX23_PAD_LCD_D11__SAIF_LRCLK 0x10b2
-+#define MX23_PAD_LCD_D12__SAIF2_SDATA1 0x10c2
-+#define MX23_PAD_LCD_D13__SAIF2_SDATA2 0x10d2
-+#define MX23_PAD_LCD_D14__SAIF1_SDATA2 0x10e2
-+#define MX23_PAD_LCD_D15__SAIF1_SDATA1 0x10f2
-+#define MX23_PAD_LCD_D16__SAIF_ALT_BITCLK 0x1102
-+#define MX23_PAD_LCD_RESET__GPMI_CE3N 0x1122
-+#define MX23_PAD_PWM0__DUART_RX 0x11a2
-+#define MX23_PAD_PWM1__DUART_TX 0x11b2
-+#define MX23_PAD_PWM3__AUART1_CTS 0x11d2
-+#define MX23_PAD_PWM4__AUART1_RTS 0x11e2
-+#define MX23_PAD_SSP1_CMD__JTAG_TDO 0x2002
-+#define MX23_PAD_SSP1_DETECT__USB_OTG_ID 0x2012
-+#define MX23_PAD_SSP1_DATA0__JTAG_TDI 0x2022
-+#define MX23_PAD_SSP1_DATA1__JTAG_TCLK 0x2032
-+#define MX23_PAD_SSP1_DATA2__JTAG_RTCK 0x2042
-+#define MX23_PAD_SSP1_DATA3__JTAG_TMS 0x2052
-+#define MX23_PAD_SSP1_SCK__JTAG_TRST 0x2062
-+#define MX23_PAD_ROTARYA__SPDIF 0x2072
-+#define MX23_PAD_ROTARYB__GPMI_CE3N 0x2082
-+#define MX23_PAD_GPMI_D00__GPIO_0_0 0x0003
-+#define MX23_PAD_GPMI_D01__GPIO_0_1 0x0013
-+#define MX23_PAD_GPMI_D02__GPIO_0_2 0x0023
-+#define MX23_PAD_GPMI_D03__GPIO_0_3 0x0033
-+#define MX23_PAD_GPMI_D04__GPIO_0_4 0x0043
-+#define MX23_PAD_GPMI_D05__GPIO_0_5 0x0053
-+#define MX23_PAD_GPMI_D06__GPIO_0_6 0x0063
-+#define MX23_PAD_GPMI_D07__GPIO_0_7 0x0073
-+#define MX23_PAD_GPMI_D08__GPIO_0_8 0x0083
-+#define MX23_PAD_GPMI_D09__GPIO_0_9 0x0093
-+#define MX23_PAD_GPMI_D10__GPIO_0_10 0x00a3
-+#define MX23_PAD_GPMI_D11__GPIO_0_11 0x00b3
-+#define MX23_PAD_GPMI_D12__GPIO_0_12 0x00c3
-+#define MX23_PAD_GPMI_D13__GPIO_0_13 0x00d3
-+#define MX23_PAD_GPMI_D14__GPIO_0_14 0x00e3
-+#define MX23_PAD_GPMI_D15__GPIO_0_15 0x00f3
-+#define MX23_PAD_GPMI_CLE__GPIO_0_16 0x0103
-+#define MX23_PAD_GPMI_ALE__GPIO_0_17 0x0113
-+#define MX23_PAD_GPMI_CE2N__GPIO_0_18 0x0123
-+#define MX23_PAD_GPMI_RDY0__GPIO_0_19 0x0133
-+#define MX23_PAD_GPMI_RDY1__GPIO_0_20 0x0143
-+#define MX23_PAD_GPMI_RDY2__GPIO_0_21 0x0153
-+#define MX23_PAD_GPMI_RDY3__GPIO_0_22 0x0163
-+#define MX23_PAD_GPMI_WPN__GPIO_0_23 0x0173
-+#define MX23_PAD_GPMI_WRN__GPIO_0_24 0x0183
-+#define MX23_PAD_GPMI_RDN__GPIO_0_25 0x0193
-+#define MX23_PAD_AUART1_CTS__GPIO_0_26 0x01a3
-+#define MX23_PAD_AUART1_RTS__GPIO_0_27 0x01b3
-+#define MX23_PAD_AUART1_RX__GPIO_0_28 0x01c3
-+#define MX23_PAD_AUART1_TX__GPIO_0_29 0x01d3
-+#define MX23_PAD_I2C_SCL__GPIO_0_30 0x01e3
-+#define MX23_PAD_I2C_SDA__GPIO_0_31 0x01f3
-+#define MX23_PAD_LCD_D00__GPIO_1_0 0x1003
-+#define MX23_PAD_LCD_D01__GPIO_1_1 0x1013
-+#define MX23_PAD_LCD_D02__GPIO_1_2 0x1023
-+#define MX23_PAD_LCD_D03__GPIO_1_3 0x1033
-+#define MX23_PAD_LCD_D04__GPIO_1_4 0x1043
-+#define MX23_PAD_LCD_D05__GPIO_1_5 0x1053
-+#define MX23_PAD_LCD_D06__GPIO_1_6 0x1063
-+#define MX23_PAD_LCD_D07__GPIO_1_7 0x1073
-+#define MX23_PAD_LCD_D08__GPIO_1_8 0x1083
-+#define MX23_PAD_LCD_D09__GPIO_1_9 0x1093
-+#define MX23_PAD_LCD_D10__GPIO_1_10 0x10a3
-+#define MX23_PAD_LCD_D11__GPIO_1_11 0x10b3
-+#define MX23_PAD_LCD_D12__GPIO_1_12 0x10c3
-+#define MX23_PAD_LCD_D13__GPIO_1_13 0x10d3
-+#define MX23_PAD_LCD_D14__GPIO_1_14 0x10e3
-+#define MX23_PAD_LCD_D15__GPIO_1_15 0x10f3
-+#define MX23_PAD_LCD_D16__GPIO_1_16 0x1103
-+#define MX23_PAD_LCD_D17__GPIO_1_17 0x1113
-+#define MX23_PAD_LCD_RESET__GPIO_1_18 0x1123
-+#define MX23_PAD_LCD_RS__GPIO_1_19 0x1133
-+#define MX23_PAD_LCD_WR__GPIO_1_20 0x1143
-+#define MX23_PAD_LCD_CS__GPIO_1_21 0x1153
-+#define MX23_PAD_LCD_DOTCK__GPIO_1_22 0x1163
-+#define MX23_PAD_LCD_ENABLE__GPIO_1_23 0x1173
-+#define MX23_PAD_LCD_HSYNC__GPIO_1_24 0x1183
-+#define MX23_PAD_LCD_VSYNC__GPIO_1_25 0x1193
-+#define MX23_PAD_PWM0__GPIO_1_26 0x11a3
-+#define MX23_PAD_PWM1__GPIO_1_27 0x11b3
-+#define MX23_PAD_PWM2__GPIO_1_28 0x11c3
-+#define MX23_PAD_PWM3__GPIO_1_29 0x11d3
-+#define MX23_PAD_PWM4__GPIO_1_30 0x11e3
-+#define MX23_PAD_SSP1_CMD__GPIO_2_0 0x2003
-+#define MX23_PAD_SSP1_DETECT__GPIO_2_1 0x2013
-+#define MX23_PAD_SSP1_DATA0__GPIO_2_2 0x2023
-+#define MX23_PAD_SSP1_DATA1__GPIO_2_3 0x2033
-+#define MX23_PAD_SSP1_DATA2__GPIO_2_4 0x2043
-+#define MX23_PAD_SSP1_DATA3__GPIO_2_5 0x2053
-+#define MX23_PAD_SSP1_SCK__GPIO_2_6 0x2063
-+#define MX23_PAD_ROTARYA__GPIO_2_7 0x2073
-+#define MX23_PAD_ROTARYB__GPIO_2_8 0x2083
-+#define MX23_PAD_EMI_A00__GPIO_2_9 0x2093
-+#define MX23_PAD_EMI_A01__GPIO_2_10 0x20a3
-+#define MX23_PAD_EMI_A02__GPIO_2_11 0x20b3
-+#define MX23_PAD_EMI_A03__GPIO_2_12 0x20c3
-+#define MX23_PAD_EMI_A04__GPIO_2_13 0x20d3
-+#define MX23_PAD_EMI_A05__GPIO_2_14 0x20e3
-+#define MX23_PAD_EMI_A06__GPIO_2_15 0x20f3
-+#define MX23_PAD_EMI_A07__GPIO_2_16 0x2103
-+#define MX23_PAD_EMI_A08__GPIO_2_17 0x2113
-+#define MX23_PAD_EMI_A09__GPIO_2_18 0x2123
-+#define MX23_PAD_EMI_A10__GPIO_2_19 0x2133
-+#define MX23_PAD_EMI_A11__GPIO_2_20 0x2143
-+#define MX23_PAD_EMI_A12__GPIO_2_21 0x2153
-+#define MX23_PAD_EMI_BA0__GPIO_2_22 0x2163
-+#define MX23_PAD_EMI_BA1__GPIO_2_23 0x2173
-+#define MX23_PAD_EMI_CASN__GPIO_2_24 0x2183
-+#define MX23_PAD_EMI_CE0N__GPIO_2_25 0x2193
-+#define MX23_PAD_EMI_CE1N__GPIO_2_26 0x21a3
-+#define MX23_PAD_GPMI_CE1N__GPIO_2_27 0x21b3
-+#define MX23_PAD_GPMI_CE0N__GPIO_2_28 0x21c3
-+#define MX23_PAD_EMI_CKE__GPIO_2_29 0x21d3
-+#define MX23_PAD_EMI_RASN__GPIO_2_30 0x21e3
-+#define MX23_PAD_EMI_WEN__GPIO_2_31 0x21f3
-+
-+#endif /* __DT_BINDINGS_MX23_PINCTRL_H__ */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx23-stmp378x_devb.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-stmp378x_devb.dts
---- linux-3.10.36/arch/arm/boot/dts/imx23-stmp378x_devb.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23-stmp378x_devb.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -10,7 +10,7 @@
- */
-
- /dts-v1/;
--/include/ "imx23.dtsi"
-+#include "imx23.dtsi"
-
- / {
- model = "Freescale STMP378x Development Board";
-@@ -39,12 +39,12 @@
- hog_pins_a: hog@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */
-- 0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */
-+ MX23_PAD_PWM3__GPIO_1_29
-+ MX23_PAD_PWM4__GPIO_1_30
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
- };
-@@ -66,9 +66,12 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_vddio_sd0: vddio-sd0 {
-+ reg_vddio_sd0: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "vddio-sd0";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx25.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx25.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi 2014-04-21 13:50:39.054713631 +0200
-@@ -10,22 +10,40 @@
- */
-
- #include "skeleton.dtsi"
-+#include "imx25-pinfunc.h"
-
- / {
- aliases {
-+ ethernet0 = &fec;
-+ gpio0 = &gpio1;
-+ gpio1 = &gpio2;
-+ gpio2 = &gpio3;
-+ gpio3 = &gpio4;
-+ i2c0 = &i2c1;
-+ i2c1 = &i2c2;
-+ i2c2 = &i2c3;
- serial0 = &uart1;
- serial1 = &uart2;
- serial2 = &uart3;
- serial3 = &uart4;
- serial4 = &uart5;
-- gpio0 = &gpio1;
-- gpio1 = &gpio2;
-- gpio2 = &gpio3;
-- gpio3 = &gpio4;
-+ spi0 = &spi1;
-+ spi1 = &spi2;
-+ spi2 = &spi3;
- usb0 = &usbotg;
- usb1 = &usbhost1;
- };
-
-+ cpus {
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+
-+ cpu {
-+ compatible = "arm,arm926ej-s";
-+ device_type = "cpu";
-+ };
-+ };
-+
- asic: asic-interrupt-controller@68000000 {
- compatible = "fsl,imx25-asic", "fsl,avic";
- interrupt-controller;
-@@ -147,9 +165,10 @@
- status = "disabled";
- };
-
-- kpp@43fa8000 {
-+ kpp: kpp@43fa8000 {
- #address-cells = <1>;
- #size-cells = <0>;
-+ compatible = "fsl,imx25-kpp", "fsl,imx21-kpp";
- reg = <0x43fa8000 0x4000>;
- clocks = <&clks 102>;
- clock-names = "";
-@@ -157,12 +176,12 @@
- status = "disabled";
- };
-
-- iomuxc@43fac000{
-+ iomuxc: iomuxc@43fac000 {
- compatible = "fsl,imx25-iomuxc";
- reg = <0x43fac000 0x4000>;
- };
-
-- audmux@43fb0000 {
-+ audmux: audmux@43fb0000 {
- compatible = "fsl,imx25-audmux", "fsl,imx31-audmux";
- reg = <0x43fb0000 0x4000>;
- status = "disabled";
-@@ -220,6 +239,11 @@
- compatible = "fsl,imx25-ssi", "fsl,imx21-ssi";
- reg = <0x50014000 0x4000>;
- interrupts = <11>;
-+ clocks = <&clks 118>;
-+ clock-names = "ipg";
-+ dmas = <&sdma 24 1 0>,
-+ <&sdma 25 1 0>;
-+ dma-names = "rx", "tx";
- status = "disabled";
- };
-
-@@ -250,6 +274,11 @@
- compatible = "fsl,imx25-ssi", "fsl,imx21-ssi";
- reg = <0x50034000 0x4000>;
- interrupts = <12>;
-+ clocks = <&clks 117>;
-+ clock-names = "ipg";
-+ dmas = <&sdma 28 1 0>,
-+ <&sdma 29 1 0>;
-+ dma-names = "rx", "tx";
- status = "disabled";
- };
-
-@@ -377,7 +406,8 @@
- status = "disabled";
- };
-
-- lcdc@53fbc000 {
-+ lcdc: lcdc@53fbc000 {
-+ compatible = "fsl,imx25-fb", "fsl,imx21-fb";
- reg = <0x53fbc000 0x4000>;
- interrupts = <39>;
- clocks = <&clks 103>, <&clks 66>, <&clks 49>;
-@@ -419,12 +449,14 @@
- #interrupt-cells = <2>;
- };
-
-- sdma@53fd4000 {
-+ sdma: sdma@53fd4000 {
- compatible = "fsl,imx25-sdma", "fsl,imx35-sdma";
- reg = <0x53fd4000 0x4000>;
- clocks = <&clks 112>, <&clks 68>;
- clock-names = "ipg", "ahb";
-+ #dma-cells = <3>;
- interrupts = <34>;
-+ fsl,sdma-ram-script-name = "imx/sdma/sdma-imx25.bin";
- };
-
- wdog@53fdc000 {
-@@ -444,23 +476,20 @@
- interrupts = <26>;
- };
-
-- usbphy1: usbphy@1 {
-- compatible = "nop-usbphy";
-- status = "disabled";
-- };
--
-- usbphy2: usbphy@2 {
-- compatible = "nop-usbphy";
-- status = "disabled";
-+ iim: iim@53ff0000 {
-+ compatible = "fsl,imx25-iim", "fsl,imx27-iim";
-+ reg = <0x53ff0000 0x4000>;
-+ interrupts = <19>;
-+ clocks = <&clks 99>;
- };
-
- usbotg: usb@53ff4000 {
- compatible = "fsl,imx25-usb", "fsl,imx27-usb";
- reg = <0x53ff4000 0x0200>;
- interrupts = <37>;
-- clocks = <&clks 9>, <&clks 70>, <&clks 8>;
-- clock-names = "ipg", "ahb", "per";
-+ clocks = <&clks 70>;
- fsl,usbmisc = <&usbmisc 0>;
-+ fsl,usbphy = <&usbphy0>;
- status = "disabled";
- };
-
-@@ -468,9 +497,9 @@
- compatible = "fsl,imx25-usb", "fsl,imx27-usb";
- reg = <0x53ff4400 0x0200>;
- interrupts = <35>;
-- clocks = <&clks 9>, <&clks 70>, <&clks 8>;
-- clock-names = "ipg", "ahb", "per";
-+ clocks = <&clks 70>;
- fsl,usbmisc = <&usbmisc 1>;
-+ fsl,usbphy = <&usbphy1>;
+@@ -360,7 +361,8 @@
+ compatible = "fsl,imx23-lcdif";
+ reg = <0x80030000 2000>;
+ interrupts = <46 45>;
+- clocks = <&clks 38>;
++ clocks = <&clks 38>, <&clks 38>;
++ clock-names = "pix", "axi";
status = "disabled";
};
-@@ -480,7 +509,6 @@
- clocks = <&clks 9>, <&clks 70>, <&clks 8>;
- clock-names = "ipg", "ahb", "per";
- reg = <0x53ff4600 0x00f>;
-- status = "disabled";
- };
-
- dryice@53ffc000 {
-@@ -512,4 +540,20 @@
- };
- };
- };
-+
-+ usbphy {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ usbphy0: usb-phy@0 {
-+ reg = <0>;
-+ compatible = "usb-nop-xceiv";
-+ };
-+
-+ usbphy1: usb-phy@1 {
-+ reg = <1>;
-+ compatible = "usb-nop-xceiv";
-+ };
-+ };
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include "imx25.dtsi"
-+
-+/ {
-+ model = "Eukrea CPUIMX25";
-+ compatible = "eukrea,cpuimx25", "fsl,imx25";
-+
-+ memory {
-+ reg = <0x80000000 0x4000000>; /* 64M */
-+ };
-+};
-+
-+&fec {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ pcf8563@51 {
-+ compatible = "nxp,pcf8563";
-+ reg = <0x51>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx25-eukrea-cpuimx25 {
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX25_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX25_PAD_FEC_MDIO__FEC_MDIO 0x400001e0
-+ MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x80000000
-+ MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x80000000
-+ MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x80000000
-+ MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x80000000
-+ MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000
-+ MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x1c0
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX25_PAD_I2C1_CLK__I2C1_CLK 0x80000000
-+ MX25_PAD_I2C1_DAT__I2C1_DAT 0x80000000
-+ >;
-+ };
-+ };
-+};
-+
-+&nfc {
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
---- linux-3.10.36/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,187 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+/dts-v1/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+#include "imx25-eukrea-cpuimx25.dtsi"
-+
-+/ {
-+ model = "Eukrea MBIMXSD25";
-+ compatible = "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25";
-+
-+ gpio_keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpiokeys>;
-+
-+ bp1 {
-+ label = "BP1";
-+ gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
-+ linux,code = <BTN_MISC>;
-+ gpio-key,wakeup;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpioled>;
-+
-+ led1 {
-+ label = "led1";
-+ gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ sound {
-+ compatible = "eukrea,asoc-tlv320";
-+ eukrea,model = "imx25-eukrea-tlv320aic23";
-+ ssi-controller = <&ssi1>;
-+ fsl,mux-int-port = <1>;
-+ fsl,mux-ext-port = <5>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&esdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ cd-gpios = <&gpio1 20>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ tlv320aic23: codec@1a {
-+ compatible = "ti,tlv320aic23";
-+ reg = <0x1a>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx25-eukrea-mbimxsd25-baseboard {
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX25_PAD_KPP_COL3__AUD5_TXFS 0xe0
-+ MX25_PAD_KPP_COL2__AUD5_TXC 0xe0
-+ MX25_PAD_KPP_COL1__AUD5_RXD 0xe0
-+ MX25_PAD_KPP_COL0__AUD5_TXD 0xe0
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX25_PAD_SD1_CMD__SD1_CMD 0x400000c0
-+ MX25_PAD_SD1_CLK__SD1_CLK 0x400000c0
-+ MX25_PAD_SD1_DATA0__SD1_DATA0 0x400000c0
-+ MX25_PAD_SD1_DATA1__SD1_DATA1 0x400000c0
-+ MX25_PAD_SD1_DATA2__SD1_DATA2 0x400000c0
-+ MX25_PAD_SD1_DATA3__SD1_DATA3 0x400000c0
-+ >;
-+ };
-+
-+ pinctrl_gpiokeys: gpiokeysgrp {
-+ fsl,pins = <MX25_PAD_VSTBY_ACK__GPIO_3_18 0x80000000>;
-+ };
-+
-+ pinctrl_gpioled: gpioledgrp {
-+ fsl,pins = <MX25_PAD_POWER_FAIL__GPIO_3_19 0x80000000>;
-+ };
-+
-+ pinctrl_lcdc: lcdcgrp {
-+ fsl,pins = <
-+ MX25_PAD_LD0__LD0 0x1
-+ MX25_PAD_LD1__LD1 0x1
-+ MX25_PAD_LD2__LD2 0x1
-+ MX25_PAD_LD3__LD3 0x1
-+ MX25_PAD_LD4__LD4 0x1
-+ MX25_PAD_LD5__LD5 0x1
-+ MX25_PAD_LD6__LD6 0x1
-+ MX25_PAD_LD7__LD7 0x1
-+ MX25_PAD_LD8__LD8 0x1
-+ MX25_PAD_LD9__LD9 0x1
-+ MX25_PAD_LD10__LD10 0x1
-+ MX25_PAD_LD11__LD11 0x1
-+ MX25_PAD_LD12__LD12 0x1
-+ MX25_PAD_LD13__LD13 0x1
-+ MX25_PAD_LD14__LD14 0x1
-+ MX25_PAD_LD15__LD15 0x1
-+ MX25_PAD_GPIO_E__LD16 0x1
-+ MX25_PAD_GPIO_F__LD17 0x1
-+ MX25_PAD_HSYNC__HSYNC 0x80000000
-+ MX25_PAD_VSYNC__VSYNC 0x80000000
-+ MX25_PAD_LSCLK__LSCLK 0x80000000
-+ MX25_PAD_OE_ACD__OE_ACD 0x80000000
-+ MX25_PAD_CONTRAST__CONTRAST 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX25_PAD_UART1_RTS__UART1_RTS 0xe0
-+ MX25_PAD_UART1_CTS__UART1_CTS 0xe0
-+ MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
-+ MX25_PAD_UART1_RXD__UART1_RXD 0xc0
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX25_PAD_UART2_RXD__UART2_RXD 0x80000000
-+ MX25_PAD_UART2_TXD__UART2_TXD 0x80000000
-+ MX25_PAD_UART2_RTS__UART2_RTS 0x80000000
-+ MX25_PAD_UART2_CTS__UART2_CTS 0x80000000
-+ >;
-+ };
-+ };
-+};
-+
-+&ssi1 {
-+ codec-handle = <&tlv320aic23>;
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&usbhost1 {
-+ phy_type = "serial";
-+ dr_mode = "host";
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ phy_type = "utmi";
-+ dr_mode = "otg";
-+ external-vbus-divider;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx25-pdk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-pdk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx25-pdk.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-pdk.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -10,6 +10,7 @@
- */
-
- /dts-v1/;
-+#include <dt-bindings/input/input.h>
- #include "imx25.dtsi"
-
- / {
-@@ -19,18 +20,232 @@
- memory {
- reg = <0x80000000 0x4000000>;
- };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_fec_3v3: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "fec-3v3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio2 3 0>;
-+ enable-active-high;
-+ };
-+
-+ reg_2p5v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ };
-+
-+ reg_3p3v: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ reg_can_3v3: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "can-3v3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio4 6 0>;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx25-pdk-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx25-pdk-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <4>;
-+ };
- };
-
--&uart1 {
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_can1>;
-+ xceiver-supply = <&reg_can_3v3>;
-+ status = "okay";
-+};
-+
-+&esdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ cd-gpios = <&gpio2 1 0>;
-+ wp-gpios = <&gpio2 0 0>;
- status = "okay";
- };
-
- &fec {
- phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ phy-supply = <&reg_fec_3v3>;
-+ phy-reset-gpios = <&gpio4 8 0>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
- status = "okay";
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 129>;
-+ VDDA-supply = <&reg_2p5v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx25-pdk {
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX25_PAD_RW__AUD4_TXFS 0xe0
-+ MX25_PAD_OE__AUD4_TXC 0xe0
-+ MX25_PAD_EB0__AUD4_TXD 0xe0
-+ MX25_PAD_EB1__AUD4_RXD 0xe0
-+ >;
-+ };
-+
-+ pinctrl_can1: can1grp {
-+ fsl,pins = <
-+ MX25_PAD_GPIO_A__CAN1_TX 0x0
-+ MX25_PAD_GPIO_B__CAN1_RX 0x0
-+ MX25_PAD_D14__GPIO_4_6 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX25_PAD_SD1_CMD__SD1_CMD 0x80000000
-+ MX25_PAD_SD1_CLK__SD1_CLK 0x80000000
-+ MX25_PAD_SD1_DATA0__SD1_DATA0 0x80000000
-+ MX25_PAD_SD1_DATA1__SD1_DATA1 0x80000000
-+ MX25_PAD_SD1_DATA2__SD1_DATA2 0x80000000
-+ MX25_PAD_SD1_DATA3__SD1_DATA3 0x80000000
-+ MX25_PAD_A14__GPIO_2_0 0x80000000
-+ MX25_PAD_A15__GPIO_2_1 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX25_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX25_PAD_FEC_MDIO__FEC_MDIO 0x400001e0
-+ MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x80000000
-+ MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x80000000
-+ MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x80000000
-+ MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x80000000
-+ MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000
-+ MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x1c0
-+ MX25_PAD_A17__GPIO_2_3 0x80000000
-+ MX25_PAD_D12__GPIO_4_8 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX25_PAD_I2C1_CLK__I2C1_CLK 0x80000000
-+ MX25_PAD_I2C1_DAT__I2C1_DAT 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_kpp: kppgrp {
-+ fsl,pins = <
-+ MX25_PAD_KPP_ROW0__KPP_ROW0 0x80000000
-+ MX25_PAD_KPP_ROW1__KPP_ROW1 0x80000000
-+ MX25_PAD_KPP_ROW2__KPP_ROW2 0x80000000
-+ MX25_PAD_KPP_ROW3__KPP_ROW3 0x80000000
-+ MX25_PAD_KPP_COL0__KPP_COL0 0x80000000
-+ MX25_PAD_KPP_COL1__KPP_COL1 0x80000000
-+ MX25_PAD_KPP_COL2__KPP_COL2 0x80000000
-+ MX25_PAD_KPP_COL3__KPP_COL3 0x80000000
-+ >;
-+ };
-+
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX25_PAD_UART1_RTS__UART1_RTS 0xe0
-+ MX25_PAD_UART1_CTS__UART1_CTS 0xe0
-+ MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
-+ MX25_PAD_UART1_RXD__UART1_RXD 0xc0
-+ >;
-+ };
-+ };
- };
-
- &nfc {
- nand-on-flash-bbt;
- status = "okay";
- };
-+
-+&kpp {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_kpp>;
-+ linux,keymap = <
-+ MATRIX_KEY(0x0, 0x0, KEY_UP)
-+ MATRIX_KEY(0x0, 0x1, KEY_DOWN)
-+ MATRIX_KEY(0x0, 0x2, KEY_VOLUMEDOWN)
-+ MATRIX_KEY(0x0, 0x3, KEY_HOME)
-+ MATRIX_KEY(0x1, 0x0, KEY_RIGHT)
-+ MATRIX_KEY(0x1, 0x1, KEY_LEFT)
-+ MATRIX_KEY(0x1, 0x2, KEY_ENTER)
-+ MATRIX_KEY(0x1, 0x3, KEY_VOLUMEUP)
-+ MATRIX_KEY(0x2, 0x0, KEY_F6)
-+ MATRIX_KEY(0x2, 0x1, KEY_F8)
-+ MATRIX_KEY(0x2, 0x2, KEY_F9)
-+ MATRIX_KEY(0x2, 0x3, KEY_F10)
-+ MATRIX_KEY(0x3, 0x0, KEY_F1)
-+ MATRIX_KEY(0x3, 0x1, KEY_F2)
-+ MATRIX_KEY(0x3, 0x2, KEY_F3)
-+ MATRIX_KEY(0x3, 0x2, KEY_POWER)
-+ >;
-+ status = "okay";
-+};
-+
-+&ssi1 {
-+ codec-handle = <&codec>;
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&usbhost1 {
-+ phy_type = "serial";
-+ dr_mode = "host";
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx25-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-pinfunc.h
---- linux-3.10.36/arch/arm/boot/dts/imx25-pinfunc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-pinfunc.h 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,494 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ * Based on imx35-pinfunc.h in the same directory Which is:
-+ * Copyright 2013 Freescale Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __DTS_IMX25_PINFUNC_H
-+#define __DTS_IMX25_PINFUNC_H
-+
-+/*
-+ * The pin function ID is a tuple of
-+ * <mux_reg conf_reg input_reg mux_mode input_val>
-+ */
-+
-+#define MX25_PAD_A10__A10 0x008 0x000 0x000 0x00 0x000
-+#define MX25_PAD_A10__GPIO_4_0 0x008 0x000 0x000 0x05 0x000
-+
-+#define MX25_PAD_A13__A13 0x00c 0x22C 0x000 0x00 0x000
-+#define MX25_PAD_A13__GPIO_4_1 0x00c 0x22C 0x000 0x05 0x000
-+
-+#define MX25_PAD_A14__A14 0x010 0x230 0x000 0x10 0x000
-+#define MX25_PAD_A14__GPIO_2_0 0x010 0x230 0x000 0x15 0x000
-+
-+#define MX25_PAD_A15__A15 0x014 0x234 0x000 0x10 0x000
-+#define MX25_PAD_A15__GPIO_2_1 0x014 0x234 0x000 0x15 0x000
-+
-+#define MX25_PAD_A16__A16 0x018 0x000 0x000 0x10 0x000
-+#define MX25_PAD_A16__GPIO_2_2 0x018 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_A17__A17 0x01c 0x238 0x000 0x10 0x000
-+#define MX25_PAD_A17__GPIO_2_3 0x01c 0x238 0x000 0x15 0x000
-+
-+#define MX25_PAD_A18__A18 0x020 0x23c 0x000 0x10 0x000
-+#define MX25_PAD_A18__GPIO_2_4 0x020 0x23c 0x000 0x15 0x000
-+#define MX25_PAD_A18__FEC_COL 0x020 0x23c 0x504 0x17 0x000
-+
-+#define MX25_PAD_A19__A19 0x024 0x240 0x000 0x10 0x000
-+#define MX25_PAD_A19__FEC_RX_ER 0x024 0x240 0x518 0x17 0x000
-+#define MX25_PAD_A19__GPIO_2_5 0x024 0x240 0x000 0x15 0x000
-+
-+#define MX25_PAD_A20__A20 0x028 0x244 0x000 0x10 0x000
-+#define MX25_PAD_A20__GPIO_2_6 0x028 0x244 0x000 0x15 0x000
-+#define MX25_PAD_A20__FEC_RDATA2 0x028 0x244 0x50c 0x17 0x000
-+
-+#define MX25_PAD_A21__A21 0x02c 0x248 0x000 0x10 0x000
-+#define MX25_PAD_A21__GPIO_2_7 0x02c 0x248 0x000 0x15 0x000
-+#define MX25_PAD_A21__FEC_RDATA3 0x02c 0x248 0x510 0x17 0x000
-+
-+#define MX25_PAD_A22__A22 0x030 0x000 0x000 0x10 0x000
-+#define MX25_PAD_A22__GPIO_2_8 0x030 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_A23__A23 0x034 0x24c 0x000 0x10 0x000
-+#define MX25_PAD_A23__GPIO_2_9 0x034 0x24c 0x000 0x15 0x000
-+
-+#define MX25_PAD_A24__A24 0x038 0x250 0x000 0x10 0x000
-+#define MX25_PAD_A24__GPIO_2_10 0x038 0x250 0x000 0x15 0x000
-+#define MX25_PAD_A24__FEC_RX_CLK 0x038 0x250 0x514 0x17 0x000
-+
-+#define MX25_PAD_A25__A25 0x03c 0x254 0x000 0x10 0x000
-+#define MX25_PAD_A25__GPIO_2_11 0x03c 0x254 0x000 0x15 0x000
-+#define MX25_PAD_A25__FEC_CRS 0x03c 0x254 0x508 0x17 0x000
-+
-+#define MX25_PAD_EB0__EB0 0x040 0x258 0x000 0x10 0x000
-+#define MX25_PAD_EB0__AUD4_TXD 0x040 0x258 0x464 0x14 0x000
-+#define MX25_PAD_EB0__GPIO_2_12 0x040 0x258 0x000 0x15 0x000
-+
-+#define MX25_PAD_EB1__EB1 0x044 0x25c 0x000 0x10 0x000
-+#define MX25_PAD_EB1__AUD4_RXD 0x044 0x25c 0x460 0x14 0x000
-+#define MX25_PAD_EB1__GPIO_2_13 0x044 0x25c 0x000 0x15 0x000
-+
-+#define MX25_PAD_OE__OE 0x048 0x260 0x000 0x10 0x000
-+#define MX25_PAD_OE__AUD4_TXC 0x048 0x260 0x000 0x14 0x000
-+#define MX25_PAD_OE__GPIO_2_14 0x048 0x260 0x000 0x15 0x000
-+
-+#define MX25_PAD_CS0__CS0 0x04c 0x000 0x000 0x00 0x000
-+#define MX25_PAD_CS0__GPIO_4_2 0x04c 0x000 0x000 0x05 0x000
-+
-+#define MX25_PAD_CS1__CS1 0x050 0x000 0x000 0x00 0x000
-+#define MX25_PAD_CS1__NF_CE3 0x050 0x000 0x000 0x01 0x000
-+#define MX25_PAD_CS1__GPIO_4_3 0x050 0x000 0x000 0x05 0x000
-+
-+#define MX25_PAD_CS4__CS4 0x054 0x264 0x000 0x10 0x000
-+#define MX25_PAD_CS4__NF_CE1 0x054 0x264 0x000 0x01 0x000
-+#define MX25_PAD_CS4__UART5_CTS 0x054 0x264 0x000 0x13 0x000
-+#define MX25_PAD_CS4__GPIO_3_20 0x054 0x264 0x000 0x15 0x000
-+
-+#define MX25_PAD_CS5__CS5 0x058 0x268 0x000 0x10 0x000
-+#define MX25_PAD_CS5__NF_CE2 0x058 0x268 0x000 0x01 0x000
-+#define MX25_PAD_CS5__UART5_RTS 0x058 0x268 0x574 0x13 0x000
-+#define MX25_PAD_CS5__GPIO_3_21 0x058 0x268 0x000 0x15 0x000
-+
-+#define MX25_PAD_NF_CE0__NF_CE0 0x05c 0x26c 0x000 0x10 0x000
-+#define MX25_PAD_NF_CE0__GPIO_3_22 0x05c 0x26c 0x000 0x15 0x000
-+
-+#define MX25_PAD_ECB__ECB 0x060 0x270 0x000 0x10 0x000
-+#define MX25_PAD_ECB__UART5_TXD_MUX 0x060 0x270 0x000 0x13 0x000
-+#define MX25_PAD_ECB__GPIO_3_23 0x060 0x270 0x000 0x15 0x000
-+
-+#define MX25_PAD_LBA__LBA 0x064 0x274 0x000 0x10 0x000
-+#define MX25_PAD_LBA__UART5_RXD_MUX 0x064 0x274 0x578 0x13 0x000
-+#define MX25_PAD_LBA__GPIO_3_24 0x064 0x274 0x000 0x15 0x000
-+
-+#define MX25_PAD_BCLK__BCLK 0x068 0x000 0x000 0x00 0x000
-+#define MX25_PAD_BCLK__GPIO_4_4 0x068 0x000 0x000 0x05 0x000
-+
-+#define MX25_PAD_RW__RW 0x06c 0x278 0x000 0x10 0x000
-+#define MX25_PAD_RW__AUD4_TXFS 0x06c 0x278 0x474 0x14 0x000
-+#define MX25_PAD_RW__GPIO_3_25 0x06c 0x278 0x000 0x15 0x000
-+
-+#define MX25_PAD_NFWE_B__NFWE_B 0x070 0x000 0x000 0x10 0x000
-+#define MX25_PAD_NFWE_B__GPIO_3_26 0x070 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_NFRE_B__NFRE_B 0x074 0x000 0x000 0x10 0x000
-+#define MX25_PAD_NFRE_B__GPIO_3_27 0x074 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_NFALE__NFALE 0x078 0x000 0x000 0x10 0x000
-+#define MX25_PAD_NFALE__GPIO_3_28 0x078 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_NFCLE__NFCLE 0x07c 0x000 0x000 0x10 0x000
-+#define MX25_PAD_NFCLE__GPIO_3_29 0x07c 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_NFWP_B__NFWP_B 0x080 0x000 0x000 0x10 0x000
-+#define MX25_PAD_NFWP_B__GPIO_3_30 0x080 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_NFRB__NFRB 0x084 0x27c 0x000 0x10 0x000
-+#define MX25_PAD_NFRB__GPIO_3_31 0x084 0x27c 0x000 0x15 0x000
-+
-+#define MX25_PAD_D15__D15 0x088 0x280 0x000 0x00 0x000
-+#define MX25_PAD_D15__LD16 0x088 0x280 0x000 0x01 0x000
-+#define MX25_PAD_D15__GPIO_4_5 0x088 0x280 0x000 0x05 0x000
-+
-+#define MX25_PAD_D14__D14 0x08c 0x284 0x000 0x00 0x000
-+#define MX25_PAD_D14__LD17 0x08c 0x284 0x000 0x01 0x000
-+#define MX25_PAD_D14__GPIO_4_6 0x08c 0x284 0x000 0x05 0x000
-+
-+#define MX25_PAD_D13__D13 0x090 0x288 0x000 0x00 0x000
-+#define MX25_PAD_D13__LD18 0x090 0x288 0x000 0x01 0x000
-+#define MX25_PAD_D13__GPIO_4_7 0x090 0x288 0x000 0x05 0x000
-+
-+#define MX25_PAD_D12__D12 0x094 0x28c 0x000 0x00 0x000
-+#define MX25_PAD_D12__GPIO_4_8 0x094 0x28c 0x000 0x05 0x000
-+
-+#define MX25_PAD_D11__D11 0x098 0x290 0x000 0x00 0x000
-+#define MX25_PAD_D11__GPIO_4_9 0x098 0x290 0x000 0x05 0x000
-+
-+#define MX25_PAD_D10__D10 0x09c 0x294 0x000 0x00 0x000
-+#define MX25_PAD_D10__GPIO_4_10 0x09c 0x294 0x000 0x05 0x000
-+#define MX25_PAD_D10__USBOTG_OC 0x09c 0x294 0x57c 0x06 0x000
-+
-+#define MX25_PAD_D9__D9 0x0a0 0x298 0x000 0x00 0x000
-+#define MX25_PAD_D9__GPIO_4_11 0x0a0 0x298 0x000 0x05 0x000
-+#define MX25_PAD_D9__USBH2_PWR 0x0a0 0x298 0x000 0x06 0x000
-+
-+#define MX25_PAD_D8__D8 0x0a4 0x29c 0x000 0x00 0x000
-+#define MX25_PAD_D8__GPIO_4_12 0x0a4 0x29c 0x000 0x05 0x000
-+#define MX25_PAD_D8__USBH2_OC 0x0a4 0x29c 0x580 0x06 0x000
-+
-+#define MX25_PAD_D7__D7 0x0a8 0x2a0 0x000 0x00 0x000
-+#define MX25_PAD_D7__GPIO_4_13 0x0a8 0x2a0 0x000 0x05 0x000
-+
-+#define MX25_PAD_D6__D6 0x0ac 0x2a4 0x000 0x00 0x000
-+#define MX25_PAD_D6__GPIO_4_14 0x0ac 0x2a4 0x000 0x05 0x000
-+
-+#define MX25_PAD_D5__D5 0x0b0 0x2a8 0x000 0x00 0x000
-+#define MX25_PAD_D5__GPIO_4_15 0x0b0 0x2a8 0x000 0x05 0x000
-+
-+#define MX25_PAD_D4__D4 0x0b4 0x2ac 0x000 0x00 0x000
-+#define MX25_PAD_D4__GPIO_4_16 0x0b4 0x2ac 0x000 0x05 0x000
-+
-+#define MX25_PAD_D3__D3 0x0b8 0x2b0 0x000 0x00 0x000
-+#define MX25_PAD_D3__GPIO_4_17 0x0b8 0x2b0 0x000 0x05 0x000
-+
-+#define MX25_PAD_D2__D2 0x0bc 0x2b4 0x000 0x00 0x000
-+#define MX25_PAD_D2__GPIO_4_18 0x0bc 0x2b4 0x000 0x05 0x000
-+
-+#define MX25_PAD_D1__D1 0x0c0 0x2b8 0x000 0x00 0x000
-+#define MX25_PAD_D1__GPIO_4_19 0x0c0 0x2b8 0x000 0x05 0x000
-+
-+#define MX25_PAD_D0__D0 0x0c4 0x2bc 0x000 0x00 0x000
-+#define MX25_PAD_D0__GPIO_4_20 0x0c4 0x2bc 0x000 0x05 0x000
-+
-+#define MX25_PAD_LD0__LD0 0x0c8 0x2c0 0x000 0x10 0x000
-+#define MX25_PAD_LD0__CSI_D0 0x0c8 0x2c0 0x488 0x12 0x000
-+#define MX25_PAD_LD0__GPIO_2_15 0x0c8 0x2c0 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD1__LD1 0x0cc 0x2c4 0x000 0x10 0x000
-+#define MX25_PAD_LD1__CSI_D1 0x0cc 0x2c4 0x48c 0x12 0x000
-+#define MX25_PAD_LD1__GPIO_2_16 0x0cc 0x2c4 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD2__LD2 0x0d0 0x2c8 0x000 0x10 0x000
-+#define MX25_PAD_LD2__GPIO_2_17 0x0d0 0x2c8 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD3__LD3 0x0d4 0x2cc 0x000 0x10 0x000
-+#define MX25_PAD_LD3__GPIO_2_18 0x0d4 0x2cc 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD4__LD4 0x0d8 0x2d0 0x000 0x10 0x000
-+#define MX25_PAD_LD4__GPIO_2_19 0x0d8 0x2d0 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD5__LD5 0x0dc 0x2d4 0x000 0x10 0x000
-+#define MX25_PAD_LD5__GPIO_1_19 0x0dc 0x2d4 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD6__LD6 0x0e0 0x2d8 0x000 0x10 0x000
-+#define MX25_PAD_LD6__GPIO_1_20 0x0e0 0x2d8 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD7__LD7 0x0e4 0x2dc 0x000 0x10 0x000
-+#define MX25_PAD_LD7__GPIO_1_21 0x0e4 0x2dc 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD8__LD8 0x0e8 0x2e0 0x000 0x10 0x000
-+#define MX25_PAD_LD8__FEC_TX_ERR 0x0e8 0x2e0 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD9__LD9 0x0ec 0x2e4 0x000 0x10 0x000
-+#define MX25_PAD_LD9__FEC_COL 0x0ec 0x2e4 0x504 0x15 0x001
-+
-+#define MX25_PAD_LD10__LD10 0x0f0 0x2e8 0x000 0x10 0x000
-+#define MX25_PAD_LD10__FEC_RX_ER 0x0f0 0x2e8 0x518 0x15 0x001
-+
-+#define MX25_PAD_LD11__LD11 0x0f4 0x2ec 0x000 0x10 0x000
-+#define MX25_PAD_LD11__FEC_RDATA2 0x0f4 0x2ec 0x50c 0x15 0x001
-+
-+#define MX25_PAD_LD12__LD12 0x0f8 0x2f0 0x000 0x10 0x000
-+#define MX25_PAD_LD12__FEC_RDATA3 0x0f8 0x2f0 0x510 0x15 0x001
-+
-+#define MX25_PAD_LD13__LD13 0x0fc 0x2f4 0x000 0x10 0x000
-+#define MX25_PAD_LD13__FEC_TDATA2 0x0fc 0x2f4 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD14__LD14 0x100 0x2f8 0x000 0x10 0x000
-+#define MX25_PAD_LD14__FEC_TDATA3 0x100 0x2f8 0x000 0x15 0x000
-+
-+#define MX25_PAD_LD15__LD15 0x104 0x2fc 0x000 0x10 0x000
-+#define MX25_PAD_LD15__FEC_RX_CLK 0x104 0x2fc 0x514 0x15 0x001
-+
-+#define MX25_PAD_HSYNC__HSYNC 0x108 0x300 0x000 0x10 0x000
-+#define MX25_PAD_HSYNC__GPIO_1_22 0x108 0x300 0x000 0x15 0x000
-+
-+#define MX25_PAD_VSYNC__VSYNC 0x10c 0x304 0x000 0x10 0x000
-+#define MX25_PAD_VSYNC__GPIO_1_23 0x10c 0x304 0x000 0x15 0x000
-+
-+#define MX25_PAD_LSCLK__LSCLK 0x110 0x308 0x000 0x10 0x000
-+#define MX25_PAD_LSCLK__GPIO_1_24 0x110 0x308 0x000 0x15 0x000
-+
-+#define MX25_PAD_OE_ACD__OE_ACD 0x114 0x30c 0x000 0x10 0x000
-+#define MX25_PAD_OE_ACD__GPIO_1_25 0x114 0x30c 0x000 0x15 0x000
-+
-+#define MX25_PAD_CONTRAST__CONTRAST 0x118 0x310 0x000 0x10 0x000
-+#define MX25_PAD_CONTRAST__PWM4_PWMO 0x118 0x310 0x000 0x14 0x000
-+#define MX25_PAD_CONTRAST__FEC_CRS 0x118 0x310 0x508 0x15 0x001
-+
-+#define MX25_PAD_PWM__PWM 0x11c 0x314 0x000 0x10 0x000
-+#define MX25_PAD_PWM__GPIO_1_26 0x11c 0x314 0x000 0x15 0x000
-+#define MX25_PAD_PWM__USBH2_OC 0x11c 0x314 0x580 0x16 0x001
-+
-+#define MX25_PAD_CSI_D2__CSI_D2 0x120 0x318 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D2__UART5_RXD_MUX 0x120 0x318 0x578 0x11 0x001
-+#define MX25_PAD_CSI_D2__GPIO_1_27 0x120 0x318 0x000 0x15 0x000
-+#define MX25_PAD_CSI_D2__CSPI3_MOSI 0x120 0x318 0x000 0x17 0x000
-+
-+#define MX25_PAD_CSI_D3__CSI_D3 0x124 0x31c 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D3__GPIO_1_28 0x124 0x31c 0x000 0x15 0x000
-+#define MX25_PAD_CSI_D3__CSPI3_MISO 0x124 0x31c 0x4b4 0x17 0x001
-+
-+#define MX25_PAD_CSI_D4__CSI_D4 0x128 0x320 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D4__UART5_RTS 0x128 0x320 0x574 0x11 0x001
-+#define MX25_PAD_CSI_D4__GPIO_1_29 0x128 0x320 0x000 0x15 0x000
-+#define MX25_PAD_CSI_D4__CSPI3_SCLK 0x128 0x320 0x000 0x17 0x000
-+
-+#define MX25_PAD_CSI_D5__CSI_D5 0x12c 0x324 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D5__GPIO_1_30 0x12c 0x324 0x000 0x15 0x000
-+#define MX25_PAD_CSI_D5__CSPI3_RDY 0x12c 0x324 0x000 0x17 0x000
-+
-+#define MX25_PAD_CSI_D6__CSI_D6 0x130 0x328 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D6__GPIO_1_31 0x130 0x328 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSI_D7__CSI_D7 0x134 0x32c 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D7__GPIO_1_6 0x134 0x32c 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSI_D8__CSI_D8 0x138 0x330 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D8__GPIO_1_7 0x138 0x330 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSI_D9__CSI_D9 0x13c 0x334 0x000 0x10 0x000
-+#define MX25_PAD_CSI_D9__GPIO_4_21 0x13c 0x334 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSI_MCLK__CSI_MCLK 0x140 0x338 0x000 0x10 0x000
-+#define MX25_PAD_CSI_MCLK__GPIO_1_8 0x140 0x338 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSI_VSYNC__CSI_VSYNC 0x144 0x33c 0x000 0x10 0x000
-+#define MX25_PAD_CSI_VSYNC__GPIO_1_9 0x144 0x33c 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSI_HSYNC__CSI_HSYNC 0x148 0x340 0x000 0x10 0x000
-+#define MX25_PAD_CSI_HSYNC__GPIO_1_10 0x148 0x340 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSI_PIXCLK__CSI_PIXCLK 0x14c 0x344 0x000 0x10 0x000
-+#define MX25_PAD_CSI_PIXCLK__GPIO_1_11 0x14c 0x344 0x000 0x15 0x000
-+
-+#define MX25_PAD_I2C1_CLK__I2C1_CLK 0x150 0x348 0x000 0x10 0x000
-+#define MX25_PAD_I2C1_CLK__GPIO_1_12 0x150 0x348 0x000 0x15 0x000
-+
-+#define MX25_PAD_I2C1_DAT__I2C1_DAT 0x154 0x34c 0x000 0x10 0x000
-+#define MX25_PAD_I2C1_DAT__GPIO_1_13 0x154 0x34c 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSPI1_MOSI__CSPI1_MOSI 0x158 0x350 0x000 0x10 0x000
-+#define MX25_PAD_CSPI1_MOSI__GPIO_1_14 0x158 0x350 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSPI1_MISO__CSPI1_MISO 0x15c 0x354 0x000 0x10 0x000
-+#define MX25_PAD_CSPI1_MISO__GPIO_1_15 0x15c 0x354 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSPI1_SS0__CSPI1_SS0 0x160 0x358 0x000 0x10 0x000
-+#define MX25_PAD_CSPI1_SS0__GPIO_1_16 0x160 0x358 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSPI1_SS1__CSPI1_SS1 0x164 0x35c 0x000 0x10 0x000
-+#define MX25_PAD_CSPI1_SS1__GPIO_1_17 0x164 0x35c 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSPI1_SCLK__CSPI1_SCLK 0x168 0x360 0x000 0x10 0x000
-+#define MX25_PAD_CSPI1_SCLK__GPIO_1_18 0x168 0x360 0x000 0x15 0x000
-+
-+#define MX25_PAD_CSPI1_RDY__CSPI1_RDY 0x16c 0x364 0x000 0x10 0x000
-+#define MX25_PAD_CSPI1_RDY__GPIO_2_22 0x16c 0x364 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART1_RXD__UART1_RXD 0x170 0x368 0x000 0x10 0x000
-+#define MX25_PAD_UART1_RXD__GPIO_4_22 0x170 0x368 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART1_TXD__UART1_TXD 0x174 0x36c 0x000 0x10 0x000
-+#define MX25_PAD_UART1_TXD__GPIO_4_23 0x174 0x36c 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART1_RTS__UART1_RTS 0x178 0x370 0x000 0x10 0x000
-+#define MX25_PAD_UART1_RTS__CSI_D0 0x178 0x370 0x488 0x11 0x001
-+#define MX25_PAD_UART1_RTS__GPIO_4_24 0x178 0x370 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART1_CTS__UART1_CTS 0x17c 0x374 0x000 0x10 0x000
-+#define MX25_PAD_UART1_CTS__CSI_D1 0x17c 0x374 0x48c 0x11 0x001
-+#define MX25_PAD_UART1_CTS__GPIO_4_25 0x17c 0x374 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART2_RXD__UART2_RXD 0x180 0x378 0x000 0x10 0x000
-+#define MX25_PAD_UART2_RXD__GPIO_4_26 0x180 0x378 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART2_TXD__UART2_TXD 0x184 0x37c 0x000 0x10 0x000
-+#define MX25_PAD_UART2_TXD__GPIO_4_27 0x184 0x37c 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART2_RTS__UART2_RTS 0x188 0x380 0x000 0x10 0x000
-+#define MX25_PAD_UART2_RTS__FEC_COL 0x188 0x380 0x504 0x12 0x002
-+#define MX25_PAD_UART2_RTS__GPIO_4_28 0x188 0x380 0x000 0x15 0x000
-+
-+#define MX25_PAD_UART2_CTS__FEC_RX_ER 0x18c 0x384 0x518 0x12 0x002
-+#define MX25_PAD_UART2_CTS__UART2_CTS 0x18c 0x384 0x000 0x10 0x000
-+#define MX25_PAD_UART2_CTS__GPIO_4_29 0x18c 0x384 0x000 0x15 0x000
-+
-+#define MX25_PAD_SD1_CMD__SD1_CMD 0x190 0x388 0x000 0x10 0x000
-+#define MX25_PAD_SD1_CMD__FEC_RDATA2 0x190 0x388 0x50c 0x12 0x002
-+#define MX25_PAD_SD1_CMD__GPIO_2_23 0x190 0x388 0x000 0x15 0x000
-+
-+#define MX25_PAD_SD1_CLK__SD1_CLK 0x194 0x38c 0x000 0x10 0x000
-+#define MX25_PAD_SD1_CLK__FEC_RDATA3 0x194 0x38c 0x510 0x12 0x002
-+#define MX25_PAD_SD1_CLK__GPIO_2_24 0x194 0x38c 0x000 0x15 0x000
-+
-+#define MX25_PAD_SD1_DATA0__SD1_DATA0 0x198 0x390 0x000 0x10 0x000
-+#define MX25_PAD_SD1_DATA0__GPIO_2_25 0x198 0x390 0x000 0x15 0x000
-+
-+#define MX25_PAD_SD1_DATA1__SD1_DATA1 0x19c 0x394 0x000 0x10 0x000
-+#define MX25_PAD_SD1_DATA1__AUD7_RXD 0x19c 0x394 0x478 0x13 0x000
-+#define MX25_PAD_SD1_DATA1__GPIO_2_26 0x19c 0x394 0x000 0x15 0x000
-+
-+#define MX25_PAD_SD1_DATA2__SD1_DATA2 0x1a0 0x398 0x000 0x10 0x000
-+#define MX25_PAD_SD1_DATA2__FEC_RX_CLK 0x1a0 0x398 0x514 0x15 0x002
-+#define MX25_PAD_SD1_DATA2__GPIO_2_27 0x1a0 0x398 0x000 0x15 0x000
-+
-+#define MX25_PAD_SD1_DATA3__SD1_DATA3 0x1a4 0x39c 0x000 0x10 0x000
-+#define MX25_PAD_SD1_DATA3__FEC_CRS 0x1a4 0x39c 0x508 0x10 0x002
-+#define MX25_PAD_SD1_DATA3__GPIO_2_28 0x1a4 0x39c 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_ROW0__KPP_ROW0 0x1a8 0x3a0 0x000 0x10 0x000
-+#define MX25_PAD_KPP_ROW0__GPIO_2_29 0x1a8 0x3a0 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_ROW1__KPP_ROW1 0x1ac 0x3a4 0x000 0x10 0x000
-+#define MX25_PAD_KPP_ROW1__GPIO_2_30 0x1ac 0x3a4 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_ROW2__KPP_ROW2 0x1b0 0x3a8 0x000 0x10 0x000
-+#define MX25_PAD_KPP_ROW2__CSI_D0 0x1b0 0x3a8 0x488 0x13 0x002
-+#define MX25_PAD_KPP_ROW2__GPIO_2_31 0x1b0 0x3a8 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_ROW3__KPP_ROW3 0x1b4 0x3ac 0x000 0x10 0x000
-+#define MX25_PAD_KPP_ROW3__CSI_LD1 0x1b4 0x3ac 0x48c 0x13 0x002
-+#define MX25_PAD_KPP_ROW3__GPIO_3_0 0x1b4 0x3ac 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_COL0__KPP_COL0 0x1b8 0x3b0 0x000 0x10 0x000
-+#define MX25_PAD_KPP_COL0__UART4_RXD_MUX 0x1b8 0x3b0 0x570 0x11 0x001
-+#define MX25_PAD_KPP_COL0__AUD5_TXD 0x1b8 0x3b0 0x000 0x12 0x000
-+#define MX25_PAD_KPP_COL0__GPIO_3_1 0x1b8 0x3b0 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_COL1__KPP_COL1 0x1bc 0x3b4 0x000 0x10 0x000
-+#define MX25_PAD_KPP_COL1__UART4_TXD_MUX 0x1bc 0x3b4 0x000 0x11 0x000
-+#define MX25_PAD_KPP_COL1__AUD5_RXD 0x1bc 0x3b4 0x000 0x12 0x000
-+#define MX25_PAD_KPP_COL1__GPIO_3_2 0x1bc 0x3b4 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_COL2__KPP_COL2 0x1c0 0x3b8 0x000 0x10 0x000
-+#define MX25_PAD_KPP_COL2__UART4_RTS 0x1c0 0x3b8 0x000 0x11 0x000
-+#define MX25_PAD_KPP_COL2__AUD5_TXC 0x1c0 0x3b8 0x000 0x12 0x000
-+#define MX25_PAD_KPP_COL2__GPIO_3_3 0x1c0 0x3b8 0x000 0x15 0x000
-+
-+#define MX25_PAD_KPP_COL3__KPP_COL3 0x1c4 0x3bc 0x000 0x10 0x000
-+#define MX25_PAD_KPP_COL3__UART4_CTS 0x1c4 0x3bc 0x000 0x11 0x000
-+#define MX25_PAD_KPP_COL3__AUD5_TXFS 0x1c4 0x3bc 0x000 0x12 0x000
-+#define MX25_PAD_KPP_COL3__GPIO_3_4 0x1c4 0x3bc 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_MDC__FEC_MDC 0x1c8 0x3c0 0x000 0x10 0x000
-+#define MX25_PAD_FEC_MDC__AUD4_TXD 0x1c8 0x3c0 0x464 0x12 0x001
-+#define MX25_PAD_FEC_MDC__GPIO_3_5 0x1c8 0x3c0 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_MDIO__FEC_MDIO 0x1cc 0x3c4 0x000 0x10 0x000
-+#define MX25_PAD_FEC_MDIO__AUD4_RXD 0x1cc 0x3c4 0x460 0x12 0x001
-+#define MX25_PAD_FEC_MDIO__GPIO_3_6 0x1cc 0x3c4 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x1d0 0x3c8 0x000 0x10 0x000
-+#define MX25_PAD_FEC_TDATA0__GPIO_3_7 0x1d0 0x3c8 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x1d4 0x3cc 0x000 0x10 0x000
-+#define MX25_PAD_FEC_TDATA1__AUD4_TXFS 0x1d4 0x3cc 0x474 0x12 0x001
-+#define MX25_PAD_FEC_TDATA1__GPIO_3_8 0x1d4 0x3cc 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x1d8 0x3d0 0x000 0x10 0x000
-+#define MX25_PAD_FEC_TX_EN__GPIO_3_9 0x1d8 0x3d0 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x1dc 0x3d4 0x000 0x10 0x000
-+#define MX25_PAD_FEC_RDATA0__GPIO_3_10 0x1dc 0x3d4 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x1e0 0x3d8 0x000 0x10 0x000
-+#define MX25_PAD_FEC_RDATA1__GPIO_3_11 0x1e0 0x3d8 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x1e4 0x3dc 0x000 0x10 0x000
-+#define MX25_PAD_FEC_RX_DV__CAN2_RX 0x1e4 0x3dc 0x484 0x14 0x000
-+#define MX25_PAD_FEC_RX_DV__GPIO_3_12 0x1e4 0x3dc 0x000 0x15 0x000
-+
-+#define MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x1e8 0x3e0 0x000 0x10 0x000
-+#define MX25_PAD_FEC_TX_CLK__GPIO_3_13 0x1e8 0x3e0 0x000 0x15 0x000
-+
-+#define MX25_PAD_RTCK__RTCK 0x1ec 0x3e4 0x000 0x10 0x000
-+#define MX25_PAD_RTCK__OWIRE 0x1ec 0x3e4 0x000 0x11 0x000
-+#define MX25_PAD_RTCK__GPIO_3_14 0x1ec 0x3e4 0x000 0x15 0x000
-+
-+#define MX25_PAD_DE_B__DE_B 0x1f0 0x3ec 0x000 0x10 0x000
-+#define MX25_PAD_DE_B__GPIO_2_20 0x1f0 0x3ec 0x000 0x15 0x000
-+
-+#define MX25_PAD_TDO__TDO 0x000 0x3e8 0x000 0x00 0x000
-+
-+#define MX25_PAD_GPIO_A__GPIO_A 0x1f4 0x3f0 0x000 0x10 0x000
-+#define MX25_PAD_GPIO_A__CAN1_TX 0x1f4 0x3f0 0x000 0x16 0x000
-+#define MX25_PAD_GPIO_A__USBOTG_PWR 0x1f4 0x3f0 0x000 0x12 0x000
-+
-+#define MX25_PAD_GPIO_B__GPIO_B 0x1f8 0x3f4 0x000 0x10 0x000
-+#define MX25_PAD_GPIO_B__CAN1_RX 0x1f8 0x3f4 0x480 0x16 0x001
-+#define MX25_PAD_GPIO_B__USBOTG_OC 0x1f8 0x3f4 0x57c 0x12 0x001
-+
-+#define MX25_PAD_GPIO_C__GPIO_C 0x1fc 0x3f8 0x000 0x10 0x000
-+#define MX25_PAD_GPIO_C__CAN2_TX 0x1fc 0x3f8 0x000 0x16 0x000
-+
-+#define MX25_PAD_GPIO_D__GPIO_D 0x200 0x3fc 0x000 0x10 0x000
-+#define MX25_PAD_GPIO_E__LD16 0x204 0x400 0x000 0x02 0x000
-+#define MX25_PAD_GPIO_D__CAN2_RX 0x200 0x3fc 0x484 0x16 0x001
-+
-+#define MX25_PAD_GPIO_E__GPIO_E 0x204 0x400 0x000 0x10 0x000
-+#define MX25_PAD_GPIO_F__LD17 0x208 0x404 0x000 0x02 0x000
-+#define MX25_PAD_GPIO_E__AUD7_TXD 0x204 0x400 0x000 0x14 0x000
-+
-+#define MX25_PAD_GPIO_F__GPIO_F 0x208 0x404 0x000 0x10 0x000
-+#define MX25_PAD_GPIO_F__AUD7_TXC 0x208 0x404 0x000 0x14 0x000
-+
-+#define MX25_PAD_EXT_ARMCLK__EXT_ARMCLK 0x20c 0x000 0x000 0x10 0x000
-+#define MX25_PAD_EXT_ARMCLK__GPIO_3_15 0x20c 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_UPLL_BYPCLK__UPLL_BYPCLK 0x210 0x000 0x000 0x10 0x000
-+#define MX25_PAD_UPLL_BYPCLK__GPIO_3_16 0x210 0x000 0x000 0x15 0x000
-+
-+#define MX25_PAD_VSTBY_REQ__VSTBY_REQ 0x214 0x408 0x000 0x10 0x000
-+#define MX25_PAD_VSTBY_REQ__AUD7_TXFS 0x214 0x408 0x000 0x14 0x000
-+#define MX25_PAD_VSTBY_REQ__GPIO_3_17 0x214 0x408 0x000 0x15 0x000
-+#define MX25_PAD_VSTBY_ACK__VSTBY_ACK 0x218 0x40c 0x000 0x10 0x000
-+#define MX25_PAD_VSTBY_ACK__GPIO_3_18 0x218 0x40c 0x000 0x15 0x000
-+
-+#define MX25_PAD_POWER_FAIL__POWER_FAIL 0x21c 0x410 0x000 0x10 0x000
-+#define MX25_PAD_POWER_FAIL__AUD7_RXD 0x21c 0x410 0x478 0x14 0x001
-+#define MX25_PAD_POWER_FAIL__GPIO_3_19 0x21c 0x410 0x000 0x15 0x000
-+
-+#define MX25_PAD_CLKO__CLKO 0x220 0x414 0x000 0x10 0x000
-+#define MX25_PAD_CLKO__GPIO_2_21 0x220 0x414 0x000 0x15 0x000
-+
-+#define MX25_PAD_BOOT_MODE0__BOOT_MODE0 0x224 0x000 0x000 0x00 0x000
-+#define MX25_PAD_BOOT_MODE0__GPIO_4_30 0x224 0x000 0x000 0x05 0x000
-+#define MX25_PAD_BOOT_MODE1__BOOT_MODE1 0x228 0x000 0x000 0x00 0x000
-+#define MX25_PAD_BOOT_MODE1__GPIO_4_31 0x228 0x000 0x000 0x05 0x000
-+
-+#endif /* __DTS_IMX25_PINFUNC_H */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27-apf27dev.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27dev.dts
---- linux-3.10.36/arch/arm/boot/dts/imx27-apf27dev.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27dev.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -16,22 +16,46 @@
- model = "Armadeus Systems APF27Dev docking/development board";
- compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
-
-+ display: display {
-+ model = "Chimei-LW700AT9003";
-+ native-mode = <&timing0>;
-+ bits-per-pixel = <16>; /* non-standard but required */
-+ fsl,pcr = <0xfae80083>; /* non-standard but required */
-+ display-timings {
-+ timing0: 800x480 {
-+ clock-frequency = <33000033>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <96>;
-+ hfront-porch = <96>;
-+ vback-porch = <20>;
-+ vfront-porch = <21>;
-+ hsync-len = <64>;
-+ vsync-len = <4>;
-+ };
-+ };
-+ };
-+
- gpio-keys {
- compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_keys>;
-
- user-key {
- label = "user";
-- gpios = <&gpio6 13 0>;
-+ gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;
- linux,code = <276>; /* BTN_EXTRA */
- };
- };
-
- leds {
- compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_leds>;
-
- user {
- label = "Heartbeat";
-- gpios = <&gpio6 14 0>;
-+ gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat";
- };
- };
-@@ -39,22 +63,164 @@
-
- &cspi1 {
- fsl,spi-num-chipselects = <1>;
-- cs-gpios = <&gpio4 28 1>;
-+ cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cspi1 &pinctrl_cspi1_cs>;
- status = "okay";
- };
-
- &cspi2 {
- fsl,spi-num-chipselects = <3>;
-- cs-gpios = <&gpio4 21 1>, <&gpio4 27 1>,
-- <&gpio2 17 1>;
-+ cs-gpios = <&gpio4 21 GPIO_ACTIVE_LOW>,
-+ <&gpio4 27 GPIO_ACTIVE_LOW>,
-+ <&gpio2 17 GPIO_ACTIVE_LOW>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cspi2 &pinctrl_cspi2_cs>;
-+ status = "okay";
-+};
-+
-+&fb {
-+ display = <&display>;
-+ fsl,dmacr = <0x00020010>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_imxfb1>;
- status = "okay";
- };
-
- &i2c1 {
- clock-frequency = <400000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
- status = "okay";
-+
-+ rtc@68 {
-+ compatible = "dallas,ds1374";
-+ reg = <0x68>;
-+ };
- };
-
- &i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
- status = "okay";
- };
-+
-+&iomuxc {
-+ imx27-apf27dev {
-+ pinctrl_cspi1: cspi1grp {
-+ fsl,pins = <
-+ MX27_PAD_CSPI1_MISO__CSPI1_MISO 0x0
-+ MX27_PAD_CSPI1_MOSI__CSPI1_MOSI 0x0
-+ MX27_PAD_CSPI1_SCLK__CSPI1_SCLK 0x0
-+ >;
-+ };
-+
-+ pinctrl_cspi1_cs: cspi1csgrp {
-+ fsl,pins = <MX27_PAD_CSPI1_SS0__GPIO4_28 0x0>;
-+ };
-+
-+ pinctrl_cspi2: cspi2grp {
-+ fsl,pins = <
-+ MX27_PAD_CSPI2_MISO__CSPI2_MISO 0x0
-+ MX27_PAD_CSPI2_MOSI__CSPI2_MOSI 0x0
-+ MX27_PAD_CSPI2_SCLK__CSPI2_SCLK 0x0
-+ >;
-+ };
-+
-+ pinctrl_cspi2_cs: cspi2csgrp {
-+ fsl,pins = <
-+ MX27_PAD_CSI_D5__GPIO2_17 0x0
-+ MX27_PAD_CSPI2_SS0__GPIO4_21 0x0
-+ MX27_PAD_CSPI1_SS1__GPIO4_27 0x0
-+ >;
-+ };
-+
-+ pinctrl_gpio_leds: gpioledsgrp {
-+ fsl,pins = <MX27_PAD_PC_VS1__GPIO6_14 0x0>;
-+ };
-+
-+ pinctrl_gpio_keys: gpiokeysgrp {
-+ fsl,pins = <MX27_PAD_PC_VS2__GPIO6_13 0x0>;
-+ };
-+
-+ pinctrl_imxfb1: imxfbgrp {
-+ fsl,pins = <
-+ MX27_PAD_CLS__CLS 0x0
-+ MX27_PAD_CONTRAST__CONTRAST 0x0
-+ MX27_PAD_LD0__LD0 0x0
-+ MX27_PAD_LD1__LD1 0x0
-+ MX27_PAD_LD2__LD2 0x0
-+ MX27_PAD_LD3__LD3 0x0
-+ MX27_PAD_LD4__LD4 0x0
-+ MX27_PAD_LD5__LD5 0x0
-+ MX27_PAD_LD6__LD6 0x0
-+ MX27_PAD_LD7__LD7 0x0
-+ MX27_PAD_LD8__LD8 0x0
-+ MX27_PAD_LD9__LD9 0x0
-+ MX27_PAD_LD10__LD10 0x0
-+ MX27_PAD_LD11__LD11 0x0
-+ MX27_PAD_LD12__LD12 0x0
-+ MX27_PAD_LD13__LD13 0x0
-+ MX27_PAD_LD14__LD14 0x0
-+ MX27_PAD_LD15__LD15 0x0
-+ MX27_PAD_LD16__LD16 0x0
-+ MX27_PAD_LD17__LD17 0x0
-+ MX27_PAD_LSCLK__LSCLK 0x0
-+ MX27_PAD_OE_ACD__OE_ACD 0x0
-+ MX27_PAD_PS__PS 0x0
-+ MX27_PAD_REV__REV 0x0
-+ MX27_PAD_SPL_SPR__SPL_SPR 0x0
-+ MX27_PAD_HSYNC__HSYNC 0x0
-+ MX27_PAD_VSYNC__VSYNC 0x0
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX27_PAD_I2C_DATA__I2C_DATA 0x0
-+ MX27_PAD_I2C_CLK__I2C_CLK 0x0
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
-+ MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
-+ >;
-+ };
-+
-+ pinctrl_pwm: pwmgrp {
-+ fsl,pins = <
-+ MX27_PAD_PWMO__PWMO 0x0
-+ >;
-+ };
-+
-+ pinctrl_sdhc2: sdhc2grp {
-+ fsl,pins = <
-+ MX27_PAD_SD2_CLK__SD2_CLK 0x0
-+ MX27_PAD_SD2_CMD__SD2_CMD 0x0
-+ MX27_PAD_SD2_D0__SD2_D0 0x0
-+ MX27_PAD_SD2_D1__SD2_D1 0x0
-+ MX27_PAD_SD2_D2__SD2_D2 0x0
-+ MX27_PAD_SD2_D3__SD2_D3 0x0
-+ >;
-+ };
-+
-+ pinctrl_sdhc2_cd: sdhc2cdgrp {
-+ fsl,pins = <MX27_PAD_TOUT__GPIO3_14 0x0>;
-+ };
-+ };
-+};
-+
-+&sdhci2 {
-+ bus-width = <4>;
-+ cd-gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_sdhc2 &pinctrl_sdhc2_cd>;
-+ status = "okay";
-+};
-+
-+&pwm {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm>;
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27-apf27.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts
---- linux-3.10.36/arch/arm/boot/dts/imx27-apf27.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -34,11 +34,49 @@
- };
- };
-
-+&iomuxc {
-+ imx27-apf27 {
-+ pinctrl_fec1: fec1grp {
-+ fsl,pins = <
-+ MX27_PAD_SD3_CMD__FEC_TXD0 0x0
-+ MX27_PAD_SD3_CLK__FEC_TXD1 0x0
-+ MX27_PAD_ATA_DATA0__FEC_TXD2 0x0
-+ MX27_PAD_ATA_DATA1__FEC_TXD3 0x0
-+ MX27_PAD_ATA_DATA2__FEC_RX_ER 0x0
-+ MX27_PAD_ATA_DATA3__FEC_RXD1 0x0
-+ MX27_PAD_ATA_DATA4__FEC_RXD2 0x0
-+ MX27_PAD_ATA_DATA5__FEC_RXD3 0x0
-+ MX27_PAD_ATA_DATA6__FEC_MDIO 0x0
-+ MX27_PAD_ATA_DATA7__FEC_MDC 0x0
-+ MX27_PAD_ATA_DATA8__FEC_CRS 0x0
-+ MX27_PAD_ATA_DATA9__FEC_TX_CLK 0x0
-+ MX27_PAD_ATA_DATA10__FEC_RXD0 0x0
-+ MX27_PAD_ATA_DATA11__FEC_RX_DV 0x0
-+ MX27_PAD_ATA_DATA12__FEC_RX_CLK 0x0
-+ MX27_PAD_ATA_DATA13__FEC_COL 0x0
-+ MX27_PAD_ATA_DATA14__FEC_TX_ER 0x0
-+ MX27_PAD_ATA_DATA15__FEC_TX_EN 0x0
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX27_PAD_UART1_TXD__UART1_TXD 0x0
-+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
-+ >;
-+ };
-+ };
-+};
-+
- &uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
- status = "okay";
- };
-
- &fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec1>;
- status = "okay";
- };
-
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx27.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -10,25 +10,34 @@
- */
-
- #include "skeleton.dtsi"
-+#include "imx27-pinfunc.h"
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/gpio/gpio.h>
-
- / {
- aliases {
-- serial0 = &uart1;
-- serial1 = &uart2;
-- serial2 = &uart3;
-- serial3 = &uart4;
-- serial4 = &uart5;
-- serial5 = &uart6;
-+ ethernet0 = &fec;
- gpio0 = &gpio1;
- gpio1 = &gpio2;
- gpio2 = &gpio3;
- gpio3 = &gpio4;
- gpio4 = &gpio5;
- gpio5 = &gpio6;
-+ i2c0 = &i2c1;
-+ i2c1 = &i2c2;
-+ serial0 = &uart1;
-+ serial1 = &uart2;
-+ serial2 = &uart3;
-+ serial3 = &uart4;
-+ serial4 = &uart5;
-+ serial5 = &uart6;
-+ spi0 = &cspi1;
-+ spi1 = &cspi2;
-+ spi2 = &cspi3;
- };
-
-- avic: avic-interrupt-controller@e0000000 {
-- compatible = "fsl,imx27-avic", "fsl,avic";
-+ aitc: aitc-interrupt-controller@e0000000 {
-+ compatible = "fsl,imx27-aitc", "fsl,avic";
- interrupt-controller;
- #interrupt-cells = <1>;
- reg = <0x10040000 0x1000>;
-@@ -44,11 +53,49 @@
- };
- };
-
-+ cpus {
-+ #size-cells = <0>;
-+ #address-cells = <1>;
-+
-+ cpu: cpu@0 {
-+ device_type = "cpu";
-+ compatible = "arm,arm926ej-s";
-+ operating-points = <
-+ /* kHz uV */
-+ 266000 1300000
-+ 399000 1450000
-+ >;
-+ clock-latency = <62500>;
-+ clocks = <&clks 18>;
-+ voltage-tolerance = <5>;
-+ };
-+ };
-+
-+ usbphy {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ usbphy0: usbphy@0 {
-+ compatible = "usb-nop-xceiv";
-+ reg = <0>;
-+ clocks = <&clks 75>;
-+ clock-names = "main_clk";
-+ };
-+
-+ usbphy2: usbphy@2 {
-+ compatible = "usb-nop-xceiv";
-+ reg = <2>;
-+ clocks = <&clks 75>;
-+ clock-names = "main_clk";
-+ };
-+ };
-+
- soc {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "simple-bus";
-- interrupt-parent = <&avic>;
-+ interrupt-parent = <&aitc>;
- ranges;
-
- aipi@10000000 { /* AIPI1 */
-@@ -58,11 +105,21 @@
- reg = <0x10000000 0x20000>;
- ranges;
-
-+ dma: dma@10001000 {
-+ compatible = "fsl,imx27-dma";
-+ reg = <0x10001000 0x1000>;
-+ interrupts = <32>;
-+ clocks = <&clks 50>, <&clks 70>;
-+ clock-names = "ipg", "ahb";
-+ #dma-cells = <1>;
-+ #dma-channels = <16>;
-+ };
-+
- wdog: wdog@10002000 {
- compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";
- reg = <0x10002000 0x1000>;
- interrupts = <27>;
-- clocks = <&clks 0>;
-+ clocks = <&clks 74>;
- };
-
- gpt1: timer@10003000 {
-@@ -89,6 +146,30 @@
- clock-names = "ipg", "per";
- };
-
-+ pwm: pwm@10006000 {
-+ #pwm-cells = <2>;
-+ compatible = "fsl,imx27-pwm";
-+ reg = <0x10006000 0x1000>;
-+ interrupts = <23>;
-+ clocks = <&clks 34>, <&clks 61>;
-+ clock-names = "ipg", "per";
-+ };
-+
-+ kpp: kpp@10008000 {
-+ compatible = "fsl,imx27-kpp", "fsl,imx21-kpp";
-+ reg = <0x10008000 0x1000>;
-+ interrupts = <21>;
-+ clocks = <&clks 37>;
-+ status = "disabled";
-+ };
-+
-+ owire: owire@10009000 {
-+ compatible = "fsl,imx27-owire", "fsl,imx21-owire";
-+ reg = <0x10009000 0x1000>;
-+ clocks = <&clks 35>;
-+ status = "disabled";
-+ };
-+
- uart1: serial@1000a000 {
- compatible = "fsl,imx27-uart", "fsl,imx21-uart";
- reg = <0x1000a000 0x1000>;
-@@ -131,7 +212,7 @@
- compatible = "fsl,imx27-cspi";
- reg = <0x1000e000 0x1000>;
- interrupts = <16>;
-- clocks = <&clks 53>, <&clks 53>;
-+ clocks = <&clks 53>, <&clks 60>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -142,11 +223,35 @@
- compatible = "fsl,imx27-cspi";
- reg = <0x1000f000 0x1000>;
- interrupts = <15>;
-- clocks = <&clks 52>, <&clks 52>;
-+ clocks = <&clks 52>, <&clks 60>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-
-+ ssi1: ssi@10010000 {
-+ #sound-dai-cells = <0>;
-+ compatible = "fsl,imx27-ssi", "fsl,imx21-ssi";
-+ reg = <0x10010000 0x1000>;
-+ interrupts = <14>;
-+ clocks = <&clks 26>;
-+ dmas = <&dma 12>, <&dma 13>, <&dma 14>, <&dma 15>;
-+ dma-names = "rx0", "tx0", "rx1", "tx1";
-+ fsl,fifo-depth = <8>;
-+ status = "disabled";
-+ };
-+
-+ ssi2: ssi@10011000 {
-+ #sound-dai-cells = <0>;
-+ compatible = "fsl,imx27-ssi", "fsl,imx21-ssi";
-+ reg = <0x10011000 0x1000>;
-+ interrupts = <13>;
-+ clocks = <&clks 25>;
-+ dmas = <&dma 8>, <&dma 9>, <&dma 10>, <&dma 11>;
-+ dma-names = "rx0", "tx0", "rx1", "tx1";
-+ fsl,fifo-depth = <8>;
-+ status = "disabled";
-+ };
-+
- i2c1: i2c@10012000 {
- #address-cells = <1>;
- #size-cells = <0>;
-@@ -157,64 +262,102 @@
- status = "disabled";
- };
-
-- gpio1: gpio@10015000 {
-- compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-- reg = <0x10015000 0x100>;
-- interrupts = <8>;
-- gpio-controller;
-- #gpio-cells = <2>;
-- interrupt-controller;
-- #interrupt-cells = <2>;
-- };
--
-- gpio2: gpio@10015100 {
-- compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-- reg = <0x10015100 0x100>;
-- interrupts = <8>;
-- gpio-controller;
-- #gpio-cells = <2>;
-- interrupt-controller;
-- #interrupt-cells = <2>;
-- };
--
-- gpio3: gpio@10015200 {
-- compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-- reg = <0x10015200 0x100>;
-- interrupts = <8>;
-- gpio-controller;
-- #gpio-cells = <2>;
-- interrupt-controller;
-- #interrupt-cells = <2>;
-- };
--
-- gpio4: gpio@10015300 {
-- compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-- reg = <0x10015300 0x100>;
-- interrupts = <8>;
-- gpio-controller;
-- #gpio-cells = <2>;
-- interrupt-controller;
-- #interrupt-cells = <2>;
-- };
--
-- gpio5: gpio@10015400 {
-- compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-- reg = <0x10015400 0x100>;
-- interrupts = <8>;
-- gpio-controller;
-- #gpio-cells = <2>;
-- interrupt-controller;
-- #interrupt-cells = <2>;
-- };
--
-- gpio6: gpio@10015500 {
-- compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-- reg = <0x10015500 0x100>;
-- interrupts = <8>;
-- gpio-controller;
-- #gpio-cells = <2>;
-- interrupt-controller;
-- #interrupt-cells = <2>;
-+ sdhci1: sdhci@10013000 {
-+ compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";
-+ reg = <0x10013000 0x1000>;
-+ interrupts = <11>;
-+ clocks = <&clks 30>, <&clks 60>;
-+ clock-names = "ipg", "per";
-+ dmas = <&dma 7>;
-+ dma-names = "rx-tx";
-+ status = "disabled";
-+ };
-+
-+ sdhci2: sdhci@10014000 {
-+ compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";
-+ reg = <0x10014000 0x1000>;
-+ interrupts = <10>;
-+ clocks = <&clks 29>, <&clks 60>;
-+ clock-names = "ipg", "per";
-+ dmas = <&dma 6>;
-+ dma-names = "rx-tx";
-+ status = "disabled";
-+ };
-+
-+ iomuxc: iomuxc@10015000 {
-+ compatible = "fsl,imx27-iomuxc";
-+ reg = <0x10015000 0x600>;
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ ranges;
-+
-+ gpio1: gpio@10015000 {
-+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-+ reg = <0x10015000 0x100>;
-+ interrupts = <8>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio2: gpio@10015100 {
-+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-+ reg = <0x10015100 0x100>;
-+ interrupts = <8>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio3: gpio@10015200 {
-+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-+ reg = <0x10015200 0x100>;
-+ interrupts = <8>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio4: gpio@10015300 {
-+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-+ reg = <0x10015300 0x100>;
-+ interrupts = <8>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio5: gpio@10015400 {
-+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-+ reg = <0x10015400 0x100>;
-+ interrupts = <8>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio6: gpio@10015500 {
-+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-+ reg = <0x10015500 0x100>;
-+ interrupts = <8>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+ };
-+
-+ audmux: audmux@10016000 {
-+ compatible = "fsl,imx27-audmux", "fsl,imx21-audmux";
-+ reg = <0x10016000 0x1000>;
-+ clocks = <&clks 0>;
-+ clock-names = "audmux";
-+ status = "disabled";
- };
-
- cspi3: cspi@10017000 {
-@@ -223,7 +366,7 @@
- compatible = "fsl,imx27-cspi";
- reg = <0x10017000 0x1000>;
- interrupts = <6>;
-- clocks = <&clks 51>, <&clks 51>;
-+ clocks = <&clks 51>, <&clks 60>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -272,6 +415,17 @@
- status = "disabled";
- };
-
-+ sdhci3: sdhci@1001e000 {
-+ compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";
-+ reg = <0x1001e000 0x1000>;
-+ interrupts = <9>;
-+ clocks = <&clks 28>, <&clks 60>;
-+ clock-names = "ipg", "per";
-+ dmas = <&dma 36>;
-+ dma-names = "rx-tx";
-+ status = "disabled";
-+ };
-+
- gpt6: timer@1001f000 {
- compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
- reg = <0x1001f000 0x1000>;
-@@ -288,32 +442,121 @@
- reg = <0x10020000 0x20000>;
- ranges;
-
-- fec: ethernet@1002b000 {
-- compatible = "fsl,imx27-fec";
-- reg = <0x1002b000 0x4000>;
-- interrupts = <50>;
-- clocks = <&clks 48>, <&clks 67>, <&clks 0>;
-- clock-names = "ipg", "ahb", "ptp";
-+ fb: fb@10021000 {
-+ compatible = "fsl,imx27-fb", "fsl,imx21-fb";
-+ interrupts = <61>;
-+ reg = <0x10021000 0x1000>;
-+ clocks = <&clks 36>, <&clks 65>, <&clks 59>;
-+ clock-names = "ipg", "ahb", "per";
-+ status = "disabled";
-+ };
-+
-+ coda: coda@10023000 {
-+ compatible = "fsl,imx27-vpu";
-+ reg = <0x10023000 0x0200>;
-+ interrupts = <53>;
-+ clocks = <&clks 57>, <&clks 66>;
-+ clock-names = "per", "ahb";
-+ iram = <&iram>;
-+ };
-+
-+ usbotg: usb@10024000 {
-+ compatible = "fsl,imx27-usb";
-+ reg = <0x10024000 0x200>;
-+ interrupts = <56>;
-+ clocks = <&clks 15>;
-+ fsl,usbmisc = <&usbmisc 0>;
-+ fsl,usbphy = <&usbphy0>;
-+ status = "disabled";
-+ };
-+
-+ usbh1: usb@10024200 {
-+ compatible = "fsl,imx27-usb";
-+ reg = <0x10024200 0x200>;
-+ interrupts = <54>;
-+ clocks = <&clks 15>;
-+ fsl,usbmisc = <&usbmisc 1>;
- status = "disabled";
- };
-
-+ usbh2: usb@10024400 {
-+ compatible = "fsl,imx27-usb";
-+ reg = <0x10024400 0x200>;
-+ interrupts = <55>;
-+ clocks = <&clks 15>;
-+ fsl,usbmisc = <&usbmisc 2>;
-+ fsl,usbphy = <&usbphy2>;
-+ status = "disabled";
-+ };
-+
-+ usbmisc: usbmisc@10024600 {
-+ #index-cells = <1>;
-+ compatible = "fsl,imx27-usbmisc";
-+ reg = <0x10024600 0x200>;
-+ clocks = <&clks 62>;
-+ };
-+
-+ sahara2: sahara@10025000 {
-+ compatible = "fsl,imx27-sahara";
-+ reg = <0x10025000 0x1000>;
-+ interrupts = <59>;
-+ clocks = <&clks 32>, <&clks 64>;
-+ clock-names = "ipg", "ahb";
-+ };
-+
- clks: ccm@10027000{
- compatible = "fsl,imx27-ccm";
- reg = <0x10027000 0x1000>;
- #clock-cells = <1>;
- };
-- };
-
-+ iim: iim@10028000 {
-+ compatible = "fsl,imx27-iim";
-+ reg = <0x10028000 0x1000>;
-+ interrupts = <62>;
-+ clocks = <&clks 38>;
-+ };
-+
-+ fec: ethernet@1002b000 {
-+ compatible = "fsl,imx27-fec";
-+ reg = <0x1002b000 0x4000>;
-+ interrupts = <50>;
-+ clocks = <&clks 48>, <&clks 67>;
-+ clock-names = "ipg", "ahb";
-+ status = "disabled";
-+ };
-+ };
-
- nfc: nand@d8000000 {
- #address-cells = <1>;
- #size-cells = <1>;
--
- compatible = "fsl,imx27-nand";
- reg = <0xd8000000 0x1000>;
- interrupts = <29>;
- clocks = <&clks 54>;
- status = "disabled";
- };
-+
-+ weim: weim@d8002000 {
-+ #address-cells = <2>;
-+ #size-cells = <1>;
-+ compatible = "fsl,imx27-weim";
-+ reg = <0xd8002000 0x1000>;
-+ clocks = <&clks 0>;
-+ ranges = <
-+ 0 0 0xc0000000 0x08000000
-+ 1 0 0xc8000000 0x08000000
-+ 2 0 0xd0000000 0x02000000
-+ 3 0 0xd2000000 0x02000000
-+ 4 0 0xd4000000 0x02000000
-+ 5 0 0xd6000000 0x02000000
-+ >;
-+ status = "disabled";
-+ };
-+
-+ iram: iram@ffff4c00 {
-+ compatible = "mmio-sram";
-+ reg = <0xffff4c00 0xb400>;
-+ };
- };
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,164 @@
-+/*
-+ * Copyright 2012 Markus Pargmann, Pengutronix
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "imx27-phytec-phycard-s-som.dtsi"
-+
-+/ {
-+ model = "Phytec pca100 rapid development kit";
-+ compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
-+
-+ display: display {
-+ model = "Primeview-PD050VL1";
-+ native-mode = <&timing0>;
-+ bits-per-pixel = <16>; /* non-standard but required */
-+ fsl,pcr = <0xf0c88080>; /* non-standard but required */
-+ display-timings {
-+ timing0: 640x480 {
-+ hactive = <640>;
-+ vactive = <480>;
-+ hback-porch = <112>;
-+ hfront-porch = <36>;
-+ hsync-len = <32>;
-+ vback-porch = <33>;
-+ vfront-porch = <33>;
-+ vsync-len = <2>;
-+ clock-frequency = <25000000>;
-+ };
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3v3: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+};
-+
-+&fb {
-+ display = <&display>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ rtc@51 {
-+ compatible = "nxp,pcf8563";
-+ reg = <0x51>;
-+ };
-+
-+ adc@64 {
-+ compatible = "maxim,max1037";
-+ vcc-supply = <&reg_3v3>;
-+ reg = <0x64>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx27-phycard-s-rdk {
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
-+ MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
-+ >;
-+ };
-+
-+ pinctrl_owire1: owire1grp {
-+ fsl,pins = <
-+ MX27_PAD_RTCK__OWIRE 0x0
-+ >;
-+ };
-+
-+ pinctrl_sdhc2: sdhc2grp {
-+ fsl,pins = <
-+ MX27_PAD_SD2_CLK__SD2_CLK 0x0
-+ MX27_PAD_SD2_CMD__SD2_CMD 0x0
-+ MX27_PAD_SD2_D0__SD2_D0 0x0
-+ MX27_PAD_SD2_D1__SD2_D1 0x0
-+ MX27_PAD_SD2_D2__SD2_D2 0x0
-+ MX27_PAD_SD2_D3__SD2_D3 0x0
-+ MX27_PAD_SSI3_RXDAT__GPIO3_29 0x0 /* CD */
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX27_PAD_UART1_TXD__UART1_TXD 0x0
-+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
-+ MX27_PAD_UART1_CTS__UART1_CTS 0x0
-+ MX27_PAD_UART1_RTS__UART1_RTS 0x0
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX27_PAD_UART2_TXD__UART2_TXD 0x0
-+ MX27_PAD_UART2_RXD__UART2_RXD 0x0
-+ MX27_PAD_UART2_CTS__UART2_CTS 0x0
-+ MX27_PAD_UART2_RTS__UART2_RTS 0x0
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX27_PAD_UART3_TXD__UART3_TXD 0x0
-+ MX27_PAD_UART3_RXD__UART3_RXD 0x0
-+ MX27_PAD_UART3_CTS__UART3_CTS 0x0
-+ MX27_PAD_UART3_RTS__UART3_RTS 0x0
-+ >;
-+ };
-+ };
-+};
-+
-+&owire {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_owire1>;
-+ status = "okay";
-+};
-+
-+&sdhci2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_sdhc2>;
-+ cd-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ fsl,uart-has-rtscts;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ fsl,uart-has-rtscts;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ fsl,uart-has-rtscts;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,103 @@
-+/*
-+ * Copyright 2012 Sascha Hauer, Uwe Kleine-König, Steffen Trumtrar
-+ * and Markus Pargmann, Pengutronix
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx27.dtsi"
-+
-+/ {
-+ model = "Phytec pca100";
-+ compatible = "phytec,imx27-pca100", "fsl,imx27";
-+
-+ memory {
-+ reg = <0xa0000000 0x08000000>; /* 128MB */
-+ };
-+};
-+
-+&cspi1 {
-+ fsl,spi-num-chipselects = <2>;
-+ cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>,
-+ <&gpio4 27 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec1>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ at24@52 {
-+ compatible = "at,24c32";
-+ pagesize = <32>;
-+ reg = <0x52>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx27-phycard-s-som {
-+ pinctrl_fec1: fec1grp {
-+ fsl,pins = <
-+ MX27_PAD_SD3_CMD__FEC_TXD0 0x0
-+ MX27_PAD_SD3_CLK__FEC_TXD1 0x0
-+ MX27_PAD_ATA_DATA0__FEC_TXD2 0x0
-+ MX27_PAD_ATA_DATA1__FEC_TXD3 0x0
-+ MX27_PAD_ATA_DATA2__FEC_RX_ER 0x0
-+ MX27_PAD_ATA_DATA3__FEC_RXD1 0x0
-+ MX27_PAD_ATA_DATA4__FEC_RXD2 0x0
-+ MX27_PAD_ATA_DATA5__FEC_RXD3 0x0
-+ MX27_PAD_ATA_DATA6__FEC_MDIO 0x0
-+ MX27_PAD_ATA_DATA7__FEC_MDC 0x0
-+ MX27_PAD_ATA_DATA8__FEC_CRS 0x0
-+ MX27_PAD_ATA_DATA9__FEC_TX_CLK 0x0
-+ MX27_PAD_ATA_DATA10__FEC_RXD0 0x0
-+ MX27_PAD_ATA_DATA11__FEC_RX_DV 0x0
-+ MX27_PAD_ATA_DATA12__FEC_RX_CLK 0x0
-+ MX27_PAD_ATA_DATA13__FEC_COL 0x0
-+ MX27_PAD_ATA_DATA14__FEC_TX_ER 0x0
-+ MX27_PAD_ATA_DATA15__FEC_TX_EN 0x0
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
-+ MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
-+ >;
-+ };
-+
-+ pinctrl_nfc: nfcgrp {
-+ fsl,pins = <
-+ MX27_PAD_NFRB__NFRB 0x0
-+ MX27_PAD_NFCLE__NFCLE 0x0
-+ MX27_PAD_NFWP_B__NFWP_B 0x0
-+ MX27_PAD_NFCE_B__NFCE_B 0x0
-+ MX27_PAD_NFALE__NFALE 0x0
-+ MX27_PAD_NFRE_B__NFRE_B 0x0
-+ MX27_PAD_NFWE_B__NFWE_B 0x0
-+ >;
-+ };
-+ };
-+};
-+
-+&nfc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_nfc>;
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,289 @@
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "imx27-phytec-phycore-som.dtsi"
-+
-+/ {
-+ model = "Phytec pcm970";
-+ compatible = "phytec,imx27-pcm970", "phytec,imx27-pcm038", "fsl,imx27";
-+
-+ display0: LQ035Q7 {
-+ model = "Sharp-LQ035Q7";
-+ native-mode = <&timing0>;
-+ bits-per-pixel = <16>;
-+ fsl,pcr = <0xf00080c0>;
-+
-+ display-timings {
-+ timing0: 240x320 {
-+ clock-frequency = <5500000>;
-+ hactive = <240>;
-+ vactive = <320>;
-+ hback-porch = <5>;
-+ hsync-len = <7>;
-+ hfront-porch = <16>;
-+ vback-porch = <7>;
-+ vsync-len = <1>;
-+ vfront-porch = <9>;
-+ };
-+ };
-+ };
-+};
-+
-+&cspi1 {
-+ pinctrl-0 = <&pinctrl_cspi1>, <&pinctrl_cspi1cs1>;
-+ fsl,spi-num-chipselects = <2>;
-+ cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>,
-+ <&gpio4 27 GPIO_ACTIVE_LOW>;
-+};
-+
-+&fb {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_imxfb1>;
-+ display = <&display0>;
-+ lcd-supply = <&reg_5v0>;
-+ fsl,dmacr = <0x00020010>;
-+ fsl,lscr1 = <0x00120300>;
-+ fsl,lpccr = <0x00a903ff>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <400000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ camgpio: pca9536@41 {
-+ compatible = "nxp,pca9536";
-+ reg = <0x41>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx27_phycore_rdk {
-+ pinctrl_cspi1cs1: cspi1cs1grp {
-+ fsl,pins = <
-+ MX27_PAD_CSPI1_SS1__GPIO4_27 0x0
-+ >;
-+ };
-+
-+ pinctrl_imxfb1: imxfbgrp {
-+ fsl,pins = <
-+ MX27_PAD_LD0__LD0 0x0
-+ MX27_PAD_LD1__LD1 0x0
-+ MX27_PAD_LD2__LD2 0x0
-+ MX27_PAD_LD3__LD3 0x0
-+ MX27_PAD_LD4__LD4 0x0
-+ MX27_PAD_LD5__LD5 0x0
-+ MX27_PAD_LD6__LD6 0x0
-+ MX27_PAD_LD7__LD7 0x0
-+ MX27_PAD_LD8__LD8 0x0
-+ MX27_PAD_LD9__LD9 0x0
-+ MX27_PAD_LD10__LD10 0x0
-+ MX27_PAD_LD11__LD11 0x0
-+ MX27_PAD_LD12__LD12 0x0
-+ MX27_PAD_LD13__LD13 0x0
-+ MX27_PAD_LD14__LD14 0x0
-+ MX27_PAD_LD15__LD15 0x0
-+ MX27_PAD_LD16__LD16 0x0
-+ MX27_PAD_LD17__LD17 0x0
-+ MX27_PAD_CLS__CLS 0x0
-+ MX27_PAD_CONTRAST__CONTRAST 0x0
-+ MX27_PAD_LSCLK__LSCLK 0x0
-+ MX27_PAD_OE_ACD__OE_ACD 0x0
-+ MX27_PAD_PS__PS 0x0
-+ MX27_PAD_REV__REV 0x0
-+ MX27_PAD_SPL_SPR__SPL_SPR 0x0
-+ MX27_PAD_HSYNC__HSYNC 0x0
-+ MX27_PAD_VSYNC__VSYNC 0x0
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ /* Add pullup to DATA line */
-+ fsl,pins = <
-+ MX27_PAD_I2C_DATA__I2C_DATA 0x1
-+ MX27_PAD_I2C_CLK__I2C_CLK 0x0
-+ >;
-+ };
-+
-+ pinctrl_owire1: owire1grp {
-+ fsl,pins = <
-+ MX27_PAD_RTCK__OWIRE 0x0
-+ >;
-+ };
-+
-+ pinctrl_sdhc2: sdhc2grp {
-+ fsl,pins = <
-+ MX27_PAD_SD2_CLK__SD2_CLK 0x0
-+ MX27_PAD_SD2_CMD__SD2_CMD 0x0
-+ MX27_PAD_SD2_D0__SD2_D0 0x0
-+ MX27_PAD_SD2_D1__SD2_D1 0x0
-+ MX27_PAD_SD2_D2__SD2_D2 0x0
-+ MX27_PAD_SD2_D3__SD2_D3 0x0
-+ MX27_PAD_SSI3_FS__GPIO3_28 0x0 /* WP */
-+ MX27_PAD_SSI3_RXDAT__GPIO3_29 0x0 /* CD */
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX27_PAD_UART1_TXD__UART1_TXD 0x0
-+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
-+ MX27_PAD_UART1_CTS__UART1_CTS 0x0
-+ MX27_PAD_UART1_RTS__UART1_RTS 0x0
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX27_PAD_UART2_TXD__UART2_TXD 0x0
-+ MX27_PAD_UART2_RXD__UART2_RXD 0x0
-+ MX27_PAD_UART2_CTS__UART2_CTS 0x0
-+ MX27_PAD_UART2_RTS__UART2_RTS 0x0
-+ >;
-+ };
-+
-+ pinctrl_usbh2: usbh2grp {
-+ fsl,pins = <
-+ MX27_PAD_USBH2_CLK__USBH2_CLK 0x0
-+ MX27_PAD_USBH2_DIR__USBH2_DIR 0x0
-+ MX27_PAD_USBH2_NXT__USBH2_NXT 0x0
-+ MX27_PAD_USBH2_STP__USBH2_STP 0x0
-+ MX27_PAD_CSPI2_SCLK__USBH2_DATA0 0x0
-+ MX27_PAD_CSPI2_MOSI__USBH2_DATA1 0x0
-+ MX27_PAD_CSPI2_MISO__USBH2_DATA2 0x0
-+ MX27_PAD_CSPI2_SS1__USBH2_DATA3 0x0
-+ MX27_PAD_CSPI2_SS2__USBH2_DATA4 0x0
-+ MX27_PAD_CSPI1_SS2__USBH2_DATA5 0x0
-+ MX27_PAD_CSPI2_SS0__USBH2_DATA6 0x0
-+ MX27_PAD_USBH2_DATA7__USBH2_DATA7 0x0
-+ >;
-+ };
-+
-+ pinctrl_weim: weimgrp {
-+ fsl,pins = <
-+ MX27_PAD_CS4_B__CS4_B 0x0 /* CS4 */
-+ MX27_PAD_SD1_D1__GPIO5_19 0x0 /* CAN IRQ */
-+ >;
-+ };
-+ };
-+};
-+
-+&owire {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_owire1>;
-+ status = "okay";
-+};
-+
-+&pmicleds {
-+ ledr1: led@3 {
-+ reg = <3>;
-+ label = "system:red1:user";
-+ };
-+
-+ ledg1: led@4 {
-+ reg = <4>;
-+ label = "system:green1:user";
-+ };
-+
-+ ledb1: led@5 {
-+ reg = <5>;
-+ label = "system:blue1:user";
-+ };
-+
-+ ledr2: led@6 {
-+ reg = <6>;
-+ label = "system:red2:user";
-+ };
-+
-+ ledg2: led@7 {
-+ reg = <7>;
-+ label = "system:green2:user";
-+ };
-+
-+ ledb2: led@8 {
-+ reg = <8>;
-+ label = "system:blue2:user";
-+ };
-+
-+ ledr3: led@9 {
-+ reg = <9>;
-+ label = "system:red3:nand";
-+ linux,default-trigger = "nand-disk";
-+ };
-+
-+ ledg3: led@10 {
-+ reg = <10>;
-+ label = "system:green3:live";
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ ledb3: led@11 {
-+ reg = <11>;
-+ label = "system:blue3:cpu";
-+ linux,default-trigger = "cpu0";
-+ };
-+};
-+
-+&sdhci2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_sdhc2>;
-+ bus-width = <4>;
-+ cd-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-+ wp-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
-+ vmmc-supply = <&vmmc1_reg>;
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ fsl,uart-has-rtscts;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ fsl,uart-has-rtscts;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&usbh2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh2>;
-+ dr_mode = "host";
-+ phy_type = "ulpi";
-+ vbus-supply = <&reg_5v0>;
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usbphy2 {
-+ vcc-supply = <&reg_5v0>;
-+};
-+
-+&weim {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_weim>;
-+
-+ can@d4000000 {
-+ compatible = "nxp,sja1000";
-+ reg = <4 0x00000000 0x00000100>;
-+ interrupt-parent = <&gpio5>;
-+ interrupts = <19 IRQ_TYPE_EDGE_FALLING>;
-+ nxp,external-clock-frequency = <16000000>;
-+ nxp,tx-output-config = <0x16>;
-+ nxp,no-comparator-bypass;
-+ fsl,weim-cs-timing = <0x0000dcf6 0x444a0301 0x44443302>;
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi 2014-04-21 13:50:39.054713631 +0200
-@@ -0,0 +1,333 @@
-+/*
-+ * Copyright 2012 Sascha Hauer, Pengutronix
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx27.dtsi"
-+
-+/ {
-+ model = "Phytec pcm038";
-+ compatible = "phytec,imx27-pcm038", "fsl,imx27";
-+
-+ memory {
-+ reg = <0xa0000000 0x08000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3v3: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ reg_5v0: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "5V0";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ };
-+ };
-+};
-+
-+&audmux {
-+ status = "okay";
-+
-+ /* SSI0 <=> PINS_4 (MC13783 Audio) */
-+ ssi0 {
-+ fsl,audmux-port = <0>;
-+ fsl,port-config = <0xcb205000>;
-+ };
-+
-+ pins4 {
-+ fsl,audmux-port = <2>;
-+ fsl,port-config = <0x00001000>;
-+ };
-+};
-+
-+&cspi1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cspi1>;
-+ fsl,spi-num-chipselects = <1>;
-+ cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
-+
-+ pmic: mc13783@0 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,mc13783";
-+ reg = <0>;
-+ spi-cs-high;
-+ spi-max-frequency = <20000000>;
-+ interrupt-parent = <&gpio2>;
-+ interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
-+ fsl,mc13xxx-uses-adc;
-+ fsl,mc13xxx-uses-rtc;
-+
-+ pmicleds: leds {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ led-control = <0x001 0x000 0x000 0x000 0x000 0x000>;
-+ };
-+
-+ regulators {
-+ /* SW1A and SW1B joined operation */
-+ sw1_reg: sw1a {
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <1520000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ /* SW2A and SW2B joined operation */
-+ sw2_reg: sw2a {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ sw3_reg: sw3 {
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ vaudio_reg: vaudio {
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ violo_reg: violo {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ viohi_reg: viohi {
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ vgen_reg: vgen {
-+ regulator-min-microvolt = <1500000>;
-+ regulator-max-microvolt = <1500000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ vcam_reg: vcam {
-+ regulator-min-microvolt = <2800000>;
-+ regulator-max-microvolt = <2800000>;
-+ };
-+
-+ vrf1_reg: vrf1 {
-+ regulator-min-microvolt = <2775000>;
-+ regulator-max-microvolt = <2775000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ vrf2_reg: vrf2 {
-+ regulator-min-microvolt = <2775000>;
-+ regulator-max-microvolt = <2775000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
-+
-+ vmmc1_reg: vmmc1 {
-+ regulator-min-microvolt = <1600000>;
-+ regulator-max-microvolt = <3000000>;
-+ };
-+
-+ gpo1_reg: gpo1 { };
-+
-+ pwgt1spi_reg: pwgt1spi {
-+ regulator-always-on;
-+ };
-+ };
-+ };
-+};
-+
-+&fec {
-+ phy-mode = "mii";
-+ phy-reset-gpios = <&gpio3 30 GPIO_ACTIVE_HIGH>;
-+ phy-supply = <&reg_3v3>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec1>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ clock-frequency = <400000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ at24@52 {
-+ compatible = "at,24c32";
-+ pagesize = <32>;
-+ reg = <0x52>;
-+ };
-+
-+ pcf8563@51 {
-+ compatible = "nxp,pcf8563";
-+ reg = <0x51>;
-+ };
-+
-+ lm75@4a {
-+ compatible = "national,lm75";
-+ reg = <0x4a>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx27_phycore_som {
-+ pinctrl_cspi1: cspi1grp {
-+ fsl,pins = <
-+ MX27_PAD_CSPI1_MISO__CSPI1_MISO 0x0
-+ MX27_PAD_CSPI1_MOSI__CSPI1_MOSI 0x0
-+ MX27_PAD_CSPI1_SCLK__CSPI1_SCLK 0x0
-+ MX27_PAD_CSPI1_SS0__GPIO4_28 0x0 /* SPI1 CS0 */
-+ MX27_PAD_USB_PWR__GPIO2_23 0x0 /* PMIC IRQ */
-+ >;
-+ };
-+
-+ pinctrl_fec1: fec1grp {
-+ fsl,pins = <
-+ MX27_PAD_SD3_CMD__FEC_TXD0 0x0
-+ MX27_PAD_SD3_CLK__FEC_TXD1 0x0
-+ MX27_PAD_ATA_DATA0__FEC_TXD2 0x0
-+ MX27_PAD_ATA_DATA1__FEC_TXD3 0x0
-+ MX27_PAD_ATA_DATA2__FEC_RX_ER 0x0
-+ MX27_PAD_ATA_DATA3__FEC_RXD1 0x0
-+ MX27_PAD_ATA_DATA4__FEC_RXD2 0x0
-+ MX27_PAD_ATA_DATA5__FEC_RXD3 0x0
-+ MX27_PAD_ATA_DATA6__FEC_MDIO 0x0
-+ MX27_PAD_ATA_DATA7__FEC_MDC 0x0
-+ MX27_PAD_ATA_DATA8__FEC_CRS 0x0
-+ MX27_PAD_ATA_DATA9__FEC_TX_CLK 0x0
-+ MX27_PAD_ATA_DATA10__FEC_RXD0 0x0
-+ MX27_PAD_ATA_DATA11__FEC_RX_DV 0x0
-+ MX27_PAD_ATA_DATA12__FEC_RX_CLK 0x0
-+ MX27_PAD_ATA_DATA13__FEC_COL 0x0
-+ MX27_PAD_ATA_DATA14__FEC_TX_ER 0x0
-+ MX27_PAD_ATA_DATA15__FEC_TX_EN 0x0
-+ MX27_PAD_SSI3_TXDAT__GPIO3_30 0x0 /* FEC RST */
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
-+ MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
-+ >;
-+ };
-+
-+ pinctrl_nfc: nfcgrp {
-+ fsl,pins = <
-+ MX27_PAD_NFRB__NFRB 0x0
-+ MX27_PAD_NFCLE__NFCLE 0x0
-+ MX27_PAD_NFWP_B__NFWP_B 0x0
-+ MX27_PAD_NFCE_B__NFCE_B 0x0
-+ MX27_PAD_NFALE__NFALE 0x0
-+ MX27_PAD_NFRE_B__NFRE_B 0x0
-+ MX27_PAD_NFWE_B__NFWE_B 0x0
-+ >;
-+ };
-+
-+ pinctrl_ssi1: ssi1grp {
-+ fsl,pins = <
-+ MX27_PAD_SSI1_FS__SSI1_FS 0x0
-+ MX27_PAD_SSI1_RXDAT__SSI1_RXDAT 0x0
-+ MX27_PAD_SSI1_TXDAT__SSI1_TXDAT 0x0
-+ MX27_PAD_SSI1_CLK__SSI1_CLK 0x0
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0
-+ MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0
-+ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
-+ MX27_PAD_USBOTG_STP__USBOTG_STP 0x0
-+ MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0
-+ MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0
-+ MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0
-+ MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0
-+ MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0
-+ MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0
-+ MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0
-+ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
-+ >;
-+ };
-+ };
-+};
-+
-+&nfc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_nfc>;
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-+
-+&ssi1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ssi1>;
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ dr_mode = "otg";
-+ phy_type = "ulpi";
-+ vbus-supply = <&sw3_reg>;
-+ status = "okay";
-+};
-+
-+&usbphy0 {
-+ vcc-supply = <&sw3_reg>;
-+};
-+
-+&weim {
-+ status = "okay";
-+
-+ nor: nor@c0000000 {
-+ compatible = "cfi-flash";
-+ reg = <0 0x00000000 0x02000000>;
-+ bank-width = <2>;
-+ linux,mtd-name = "physmap-flash.0";
-+ fsl,weim-cs-timing = <0x22c2cf00 0x75000d01 0x00000900>;
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ };
-+
-+ sram: sram@c8000000 {
-+ compatible = "mtd-ram";
-+ reg = <1 0x00000000 0x00800000>;
-+ bank-width = <2>;
-+ linux,mtd-name = "mtd-ram.0";
-+ fsl,weim-cs-timing = <0x0000d843 0x22252521 0x22220a00>;
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx27-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-pinfunc.h
---- linux-3.10.36/arch/arm/boot/dts/imx27-pinfunc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-pinfunc.h 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,526 @@
-+/*
-+ * Copyright 2013 Markus Pargmann <mpa@pengutronix.de>, Pengutronix
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#ifndef __DTS_IMX27_PINFUNC_H
-+#define __DTS_IMX27_PINFUNC_H
-+
-+/*
-+ * The pin function ID is a tuple of
-+ * <pin mux_id>
-+ * mux_id consists of
-+ * function + (direction << 2) + (gpio_oconf << 4) + (gpio_iconfa << 8) + (gpio_iconfb << 10)
-+ *
-+ * function: 0 - Primary function
-+ * 1 - Alternate function
-+ * 2 - GPIO
-+ * direction: 0 - Input
-+ * 1 - Output
-+ * gpio_oconf: 0 - A_IN
-+ * 1 - B_IN
-+ * 2 - C_IN
-+ * 3 - Data Register
-+ * gpio_iconfa/b: 0 - GPIO_IN
-+ * 1 - Interrupt Status Register
-+ * 2 - 0
-+ * 3 - 1
-+ *
-+ * 'pin' is an integer between 0 and 0xbf. imx27 has 6 ports with 32 configurable
-+ * configurable pins each. 'pin' is PORT * 32 + PORT_PIN, PORT_PIN is the pin
-+ * number on the specific port (between 0 and 31).
-+ */
-+
-+#define MX27_PAD_USBH2_CLK__USBH2_CLK 0x00 0x000
-+#define MX27_PAD_USBH2_CLK__GPIO1_0 0x00 0x032
-+#define MX27_PAD_USBH2_DIR__USBH2_DIR 0x01 0x000
-+#define MX27_PAD_USBH2_DIR__GPIO1_1 0x01 0x032
-+#define MX27_PAD_USBH2_DATA7__USBH2_DATA7 0x02 0x004
-+#define MX27_PAD_USBH2_DATA7__GPIO1_2 0x02 0x032
-+#define MX27_PAD_USBH2_NXT__USBH2_NXT 0x03 0x000
-+#define MX27_PAD_USBH2_NXT__GPIO1_3 0x03 0x032
-+#define MX27_PAD_USBH2_STP__USBH2_STP 0x04 0x004
-+#define MX27_PAD_USBH2_STP__GPIO1_4 0x04 0x032
-+#define MX27_PAD_LSCLK__LSCLK 0x05 0x004
-+#define MX27_PAD_LSCLK__GPIO1_5 0x05 0x032
-+#define MX27_PAD_LD0__LD0 0x06 0x004
-+#define MX27_PAD_LD0__GPIO1_6 0x06 0x032
-+#define MX27_PAD_LD1__LD1 0x07 0x004
-+#define MX27_PAD_LD1__GPIO1_7 0x07 0x032
-+#define MX27_PAD_LD2__LD2 0x08 0x004
-+#define MX27_PAD_LD2__GPIO1_8 0x08 0x032
-+#define MX27_PAD_LD3__LD3 0x09 0x004
-+#define MX27_PAD_LD3__GPIO1_9 0x09 0x032
-+#define MX27_PAD_LD4__LD4 0x0a 0x004
-+#define MX27_PAD_LD4__GPIO1_10 0x0a 0x032
-+#define MX27_PAD_LD5__LD5 0x0b 0x004
-+#define MX27_PAD_LD5__GPIO1_11 0x0b 0x032
-+#define MX27_PAD_LD6__LD6 0x0c 0x004
-+#define MX27_PAD_LD6__GPIO1_12 0x0c 0x032
-+#define MX27_PAD_LD7__LD7 0x0d 0x004
-+#define MX27_PAD_LD7__GPIO1_13 0x0d 0x032
-+#define MX27_PAD_LD8__LD8 0x0e 0x004
-+#define MX27_PAD_LD8__GPIO1_14 0x0e 0x032
-+#define MX27_PAD_LD9__LD9 0x0f 0x004
-+#define MX27_PAD_LD9__GPIO1_15 0x0f 0x032
-+#define MX27_PAD_LD10__LD10 0x10 0x004
-+#define MX27_PAD_LD10__GPIO1_16 0x10 0x032
-+#define MX27_PAD_LD11__LD11 0x11 0x004
-+#define MX27_PAD_LD11__GPIO1_17 0x11 0x032
-+#define MX27_PAD_LD12__LD12 0x12 0x004
-+#define MX27_PAD_LD12__GPIO1_18 0x12 0x032
-+#define MX27_PAD_LD13__LD13 0x13 0x004
-+#define MX27_PAD_LD13__GPIO1_19 0x13 0x032
-+#define MX27_PAD_LD14__LD14 0x14 0x004
-+#define MX27_PAD_LD14__GPIO1_20 0x14 0x032
-+#define MX27_PAD_LD15__LD15 0x15 0x004
-+#define MX27_PAD_LD15__GPIO1_21 0x15 0x032
-+#define MX27_PAD_LD16__LD16 0x16 0x004
-+#define MX27_PAD_LD16__GPIO1_22 0x16 0x032
-+#define MX27_PAD_LD17__LD17 0x17 0x004
-+#define MX27_PAD_LD17__GPIO1_23 0x17 0x032
-+#define MX27_PAD_REV__REV 0x18 0x004
-+#define MX27_PAD_REV__GPIO1_24 0x18 0x032
-+#define MX27_PAD_CLS__CLS 0x19 0x004
-+#define MX27_PAD_CLS__GPIO1_25 0x19 0x032
-+#define MX27_PAD_PS__PS 0x1a 0x004
-+#define MX27_PAD_PS__GPIO1_26 0x1a 0x032
-+#define MX27_PAD_SPL_SPR__SPL_SPR 0x1b 0x004
-+#define MX27_PAD_SPL_SPR__GPIO1_27 0x1b 0x032
-+#define MX27_PAD_HSYNC__HSYNC 0x1c 0x004
-+#define MX27_PAD_HSYNC__GPIO1_28 0x1c 0x032
-+#define MX27_PAD_VSYNC__VSYNC 0x1d 0x004
-+#define MX27_PAD_VSYNC__GPIO1_29 0x1d 0x032
-+#define MX27_PAD_CONTRAST__CONTRAST 0x1e 0x004
-+#define MX27_PAD_CONTRAST__GPIO1_30 0x1e 0x032
-+#define MX27_PAD_OE_ACD__OE_ACD 0x1f 0x004
-+#define MX27_PAD_OE_ACD__GPIO1_31 0x1f 0x032
-+#define MX27_PAD_UNUSED0__UNUSED0 0x20 0x004
-+#define MX27_PAD_UNUSED0__GPIO2_0 0x20 0x032
-+#define MX27_PAD_UNUSED1__UNUSED1 0x21 0x004
-+#define MX27_PAD_UNUSED1__GPIO2_1 0x21 0x032
-+#define MX27_PAD_UNUSED2__UNUSED2 0x22 0x004
-+#define MX27_PAD_UNUSED2__GPIO2_2 0x22 0x032
-+#define MX27_PAD_UNUSED3__UNUSED3 0x23 0x004
-+#define MX27_PAD_UNUSED3__GPIO2_3 0x23 0x032
-+#define MX27_PAD_SD2_D0__SD2_D0 0x24 0x004
-+#define MX27_PAD_SD2_D0__MSHC_DATA0 0x24 0x005
-+#define MX27_PAD_SD2_D0__GPIO2_4 0x24 0x032
-+#define MX27_PAD_SD2_D1__SD2_D1 0x25 0x004
-+#define MX27_PAD_SD2_D1__MSHC_DATA1 0x25 0x005
-+#define MX27_PAD_SD2_D1__GPIO2_5 0x25 0x032
-+#define MX27_PAD_SD2_D2__SD2_D2 0x26 0x004
-+#define MX27_PAD_SD2_D2__MSHC_DATA2 0x26 0x005
-+#define MX27_PAD_SD2_D2__GPIO2_6 0x26 0x032
-+#define MX27_PAD_SD2_D3__SD2_D3 0x27 0x004
-+#define MX27_PAD_SD2_D3__MSHC_DATA3 0x27 0x005
-+#define MX27_PAD_SD2_D3__GPIO2_7 0x27 0x032
-+#define MX27_PAD_SD2_CMD__SD2_CMD 0x28 0x004
-+#define MX27_PAD_SD2_CMD__MSHC_BS 0x28 0x005
-+#define MX27_PAD_SD2_CMD__GPIO2_8 0x28 0x032
-+#define MX27_PAD_SD2_CLK__SD2_CLK 0x29 0x004
-+#define MX27_PAD_SD2_CLK__MSHC_SCLK 0x29 0x005
-+#define MX27_PAD_SD2_CLK__GPIO2_9 0x29 0x032
-+#define MX27_PAD_CSI_D0__CSI_D0 0x2a 0x000
-+#define MX27_PAD_CSI_D0__UART6_TXD 0x2a 0x005
-+#define MX27_PAD_CSI_D0__GPIO2_10 0x2a 0x032
-+#define MX27_PAD_CSI_D1__CSI_D1 0x2b 0x000
-+#define MX27_PAD_CSI_D1__UART6_RXD 0x2b 0x001
-+#define MX27_PAD_CSI_D1__GPIO2_11 0x2b 0x032
-+#define MX27_PAD_CSI_D2__CSI_D2 0x2c 0x000
-+#define MX27_PAD_CSI_D2__UART6_CTS 0x2c 0x005
-+#define MX27_PAD_CSI_D2__GPIO2_12 0x2c 0x032
-+#define MX27_PAD_CSI_D3__CSI_D3 0x2d 0x000
-+#define MX27_PAD_CSI_D3__UART6_RTS 0x2d 0x001
-+#define MX27_PAD_CSI_D3__GPIO2_13 0x2d 0x032
-+#define MX27_PAD_CSI_D4__CSI_D4 0x2e 0x000
-+#define MX27_PAD_CSI_D4__GPIO2_14 0x2e 0x032
-+#define MX27_PAD_CSI_MCLK__CSI_MCLK 0x2f 0x004
-+#define MX27_PAD_CSI_MCLK__GPIO2_15 0x2f 0x032
-+#define MX27_PAD_CSI_PIXCLK__CSI_PIXCLK 0x30 0x000
-+#define MX27_PAD_CSI_PIXCLK__GPIO2_16 0x30 0x032
-+#define MX27_PAD_CSI_D5__CSI_D5 0x31 0x000
-+#define MX27_PAD_CSI_D5__GPIO2_17 0x31 0x032
-+#define MX27_PAD_CSI_D6__CSI_D6 0x32 0x000
-+#define MX27_PAD_CSI_D6__UART5_TXD 0x32 0x005
-+#define MX27_PAD_CSI_D6__GPIO2_18 0x32 0x032
-+#define MX27_PAD_CSI_D7__CSI_D7 0x33 0x000
-+#define MX27_PAD_CSI_D7__UART5_RXD 0x33 0x001
-+#define MX27_PAD_CSI_D7__GPIO2_19 0x33 0x032
-+#define MX27_PAD_CSI_VSYNC__CSI_VSYNC 0x34 0x000
-+#define MX27_PAD_CSI_VSYNC__UART5_CTS 0x34 0x005
-+#define MX27_PAD_CSI_VSYNC__GPIO2_20 0x34 0x032
-+#define MX27_PAD_CSI_HSYNC__CSI_HSYNC 0x35 0x000
-+#define MX27_PAD_CSI_HSYNC__UART5_RTS 0x35 0x001
-+#define MX27_PAD_CSI_HSYNC__GPIO2_21 0x35 0x032
-+#define MX27_PAD_USBH1_SUSP__USBH1_SUSP 0x36 0x004
-+#define MX27_PAD_USBH1_SUSP__GPIO2_22 0x36 0x032
-+#define MX27_PAD_USB_PWR__USB_PWR 0x37 0x004
-+#define MX27_PAD_USB_PWR__GPIO2_23 0x37 0x032
-+#define MX27_PAD_USB_OC_B__USB_OC_B 0x38 0x000
-+#define MX27_PAD_USB_OC_B__GPIO2_24 0x38 0x032
-+#define MX27_PAD_USBH1_RCV__USBH1_RCV 0x39 0x004
-+#define MX27_PAD_USBH1_RCV__GPIO2_25 0x39 0x032
-+#define MX27_PAD_USBH1_FS__USBH1_FS 0x3a 0x004
-+#define MX27_PAD_USBH1_FS__UART4_RTS 0x3a 0x001
-+#define MX27_PAD_USBH1_FS__GPIO2_26 0x3a 0x032
-+#define MX27_PAD_USBH1_OE_B__USBH1_OE_B 0x3b 0x004
-+#define MX27_PAD_USBH1_OE_B__GPIO2_27 0x3b 0x032
-+#define MX27_PAD_USBH1_TXDM__USBH1_TXDM 0x3c 0x004
-+#define MX27_PAD_USBH1_TXDM__UART4_TXD 0x3c 0x005
-+#define MX27_PAD_USBH1_TXDM__GPIO2_28 0x3c 0x032
-+#define MX27_PAD_USBH1_TXDP__USBH1_TXDP 0x3d 0x004
-+#define MX27_PAD_USBH1_TXDP__UART4_CTS 0x3d 0x005
-+#define MX27_PAD_USBH1_TXDP__GPIO2_29 0x3d 0x032
-+#define MX27_PAD_USBH1_RXDM__USBH1_RXDM 0x3e 0x004
-+#define MX27_PAD_USBH1_RXDM__GPIO2_30 0x3e 0x032
-+#define MX27_PAD_USBH1_RXDP__USBH1_RXDP 0x3f 0x004
-+#define MX27_PAD_USBH1_RXDP__UART4_RXD 0x3f 0x001
-+#define MX27_PAD_USBH1_RXDP__GPIO2_31 0x3f 0x032
-+#define MX27_PAD_UNUSED4__UNUSED4 0x40 0x004
-+#define MX27_PAD_UNUSED4__GPIO3_0 0x40 0x032
-+#define MX27_PAD_UNUSED5__UNUSED5 0x41 0x004
-+#define MX27_PAD_UNUSED5__GPIO3_1 0x41 0x032
-+#define MX27_PAD_UNUSED6__UNUSED6 0x42 0x004
-+#define MX27_PAD_UNUSED6__GPIO3_2 0x42 0x032
-+#define MX27_PAD_UNUSED7__UNUSED7 0x43 0x004
-+#define MX27_PAD_UNUSED7__GPIO3_3 0x43 0x032
-+#define MX27_PAD_UNUSED8__UNUSED8 0x44 0x004
-+#define MX27_PAD_UNUSED8__GPIO3_4 0x44 0x032
-+#define MX27_PAD_I2C2_SDA__I2C2_SDA 0x45 0x004
-+#define MX27_PAD_I2C2_SDA__GPIO3_5 0x45 0x032
-+#define MX27_PAD_I2C2_SCL__I2C2_SCL 0x46 0x004
-+#define MX27_PAD_I2C2_SCL__GPIO3_6 0x46 0x032
-+#define MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x47 0x004
-+#define MX27_PAD_USBOTG_DATA5__GPIO3_7 0x47 0x032
-+#define MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x48 0x004
-+#define MX27_PAD_USBOTG_DATA6__GPIO3_8 0x48 0x032
-+#define MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x49 0x004
-+#define MX27_PAD_USBOTG_DATA0__GPIO3_9 0x49 0x032
-+#define MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x4a 0x004
-+#define MX27_PAD_USBOTG_DATA2__GPIO3_10 0x4a 0x032
-+#define MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x4b 0x004
-+#define MX27_PAD_USBOTG_DATA1__GPIO3_11 0x4b 0x032
-+#define MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x4c 0x004
-+#define MX27_PAD_USBOTG_DATA4__GPIO3_12 0x4c 0x032
-+#define MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x4d 0x004
-+#define MX27_PAD_USBOTG_DATA3__GPIO3_13 0x4d 0x032
-+#define MX27_PAD_TOUT__TOUT 0x4e 0x004
-+#define MX27_PAD_TOUT__GPIO3_14 0x4e 0x032
-+#define MX27_PAD_TIN__TIN 0x4f 0x000
-+#define MX27_PAD_TIN__GPIO3_15 0x4f 0x032
-+#define MX27_PAD_SSI4_FS__SSI4_FS 0x50 0x004
-+#define MX27_PAD_SSI4_FS__GPIO3_16 0x50 0x032
-+#define MX27_PAD_SSI4_RXDAT__SSI4_RXDAT 0x51 0x004
-+#define MX27_PAD_SSI4_RXDAT__GPIO3_17 0x51 0x032
-+#define MX27_PAD_SSI4_TXDAT__SSI4_TXDAT 0x52 0x004
-+#define MX27_PAD_SSI4_TXDAT__GPIO3_18 0x52 0x032
-+#define MX27_PAD_SSI4_CLK__SSI4_CLK 0x53 0x004
-+#define MX27_PAD_SSI4_CLK__GPIO3_19 0x53 0x032
-+#define MX27_PAD_SSI1_FS__SSI1_FS 0x54 0x004
-+#define MX27_PAD_SSI1_FS__GPIO3_20 0x54 0x032
-+#define MX27_PAD_SSI1_RXDAT__SSI1_RXDAT 0x55 0x004
-+#define MX27_PAD_SSI1_RXDAT__GPIO3_21 0x55 0x032
-+#define MX27_PAD_SSI1_TXDAT__SSI1_TXDAT 0x56 0x004
-+#define MX27_PAD_SSI1_TXDAT__GPIO3_22 0x56 0x032
-+#define MX27_PAD_SSI1_CLK__SSI1_CLK 0x57 0x004
-+#define MX27_PAD_SSI1_CLK__GPIO3_23 0x57 0x032
-+#define MX27_PAD_SSI2_FS__SSI2_FS 0x58 0x004
-+#define MX27_PAD_SSI2_FS__GPT5_TOUT 0x58 0x005
-+#define MX27_PAD_SSI2_FS__GPIO3_24 0x58 0x032
-+#define MX27_PAD_SSI2_RXDAT__SSI2_RXDAT 0x59 0x004
-+#define MX27_PAD_SSI2_RXDAT__GPTS_TIN 0x59 0x001
-+#define MX27_PAD_SSI2_RXDAT__GPIO3_25 0x59 0x032
-+#define MX27_PAD_SSI2_TXDAT__SSI2_TXDAT 0x5a 0x004
-+#define MX27_PAD_SSI2_TXDAT__GPT4_TOUT 0x5a 0x005
-+#define MX27_PAD_SSI2_TXDAT__GPIO3_26 0x5a 0x032
-+#define MX27_PAD_SSI2_CLK__SSI2_CLK 0x5b 0x004
-+#define MX27_PAD_SSI2_CLK__GPT4_TIN 0x5b 0x001
-+#define MX27_PAD_SSI2_CLK__GPIO3_27 0x5b 0x032
-+#define MX27_PAD_SSI3_FS__SSI3_FS 0x5c 0x004
-+#define MX27_PAD_SSI3_FS__SLCDC2_D0 0x5c 0x001
-+#define MX27_PAD_SSI3_FS__GPIO3_28 0x5c 0x032
-+#define MX27_PAD_SSI3_RXDAT__SSI3_RXDAT 0x5d 0x004
-+#define MX27_PAD_SSI3_RXDAT__SLCDC2_RS 0x5d 0x001
-+#define MX27_PAD_SSI3_RXDAT__GPIO3_29 0x5d 0x032
-+#define MX27_PAD_SSI3_TXDAT__SSI3_TXDAT 0x5e 0x004
-+#define MX27_PAD_SSI3_TXDAT__SLCDC2_CS 0x5e 0x001
-+#define MX27_PAD_SSI3_TXDAT__GPIO3_30 0x5e 0x032
-+#define MX27_PAD_SSI3_CLK__SSI3_CLK 0x5f 0x004
-+#define MX27_PAD_SSI3_CLK__SLCDC2_CLK 0x5f 0x001
-+#define MX27_PAD_SSI3_CLK__GPIO3_31 0x5f 0x032
-+#define MX27_PAD_SD3_CMD__SD3_CMD 0x60 0x004
-+#define MX27_PAD_SD3_CMD__FEC_TXD0 0x60 0x006
-+#define MX27_PAD_SD3_CMD__GPIO4_0 0x60 0x032
-+#define MX27_PAD_SD3_CLK__SD3_CLK 0x61 0x004
-+#define MX27_PAD_SD3_CLK__ETMTRACEPKT15 0x61 0x005
-+#define MX27_PAD_SD3_CLK__FEC_TXD1 0x61 0x006
-+#define MX27_PAD_SD3_CLK__GPIO4_1 0x61 0x032
-+#define MX27_PAD_ATA_DATA0__ATA_DATA0 0x62 0x004
-+#define MX27_PAD_ATA_DATA0__SD3_D0 0x62 0x005
-+#define MX27_PAD_ATA_DATA0__FEC_TXD2 0x62 0x006
-+#define MX27_PAD_ATA_DATA0__GPIO4_2 0x62 0x032
-+#define MX27_PAD_ATA_DATA1__ATA_DATA1 0x63 0x004
-+#define MX27_PAD_ATA_DATA1__SD3_D1 0x63 0x005
-+#define MX27_PAD_ATA_DATA1__FEC_TXD3 0x63 0x006
-+#define MX27_PAD_ATA_DATA1__GPIO4_3 0x63 0x032
-+#define MX27_PAD_ATA_DATA2__ATA_DATA2 0x64 0x004
-+#define MX27_PAD_ATA_DATA2__SD3_D2 0x64 0x005
-+#define MX27_PAD_ATA_DATA2__FEC_RX_ER 0x64 0x002
-+#define MX27_PAD_ATA_DATA2__GPIO4_4 0x64 0x032
-+#define MX27_PAD_ATA_DATA3__ATA_DATA3 0x65 0x004
-+#define MX27_PAD_ATA_DATA3__SD3_D3 0x65 0x005
-+#define MX27_PAD_ATA_DATA3__FEC_RXD1 0x65 0x002
-+#define MX27_PAD_ATA_DATA3__GPIO4_5 0x65 0x032
-+#define MX27_PAD_ATA_DATA4__ATA_DATA4 0x66 0x004
-+#define MX27_PAD_ATA_DATA4__ETMTRACEPKT14 0x66 0x005
-+#define MX27_PAD_ATA_DATA4__FEC_RXD2 0x66 0x002
-+#define MX27_PAD_ATA_DATA4__GPIO4_6 0x66 0x032
-+#define MX27_PAD_ATA_DATA5__ATA_DATA5 0x67 0x004
-+#define MX27_PAD_ATA_DATA5__ETMTRACEPKT13 0x67 0x005
-+#define MX27_PAD_ATA_DATA5__FEC_RXD3 0x67 0x002
-+#define MX27_PAD_ATA_DATA5__GPIO4_7 0x67 0x032
-+#define MX27_PAD_ATA_DATA6__ATA_DATA6 0x68 0x004
-+#define MX27_PAD_ATA_DATA6__FEC_MDIO 0x68 0x005
-+#define MX27_PAD_ATA_DATA6__GPIO4_8 0x68 0x032
-+#define MX27_PAD_ATA_DATA7__ATA_DATA7 0x69 0x004
-+#define MX27_PAD_ATA_DATA7__ETMTRACEPKT12 0x69 0x005
-+#define MX27_PAD_ATA_DATA7__FEC_MDC 0x69 0x006
-+#define MX27_PAD_ATA_DATA7__GPIO4_9 0x69 0x032
-+#define MX27_PAD_ATA_DATA8__ATA_DATA8 0x6a 0x004
-+#define MX27_PAD_ATA_DATA8__ETMTRACEPKT11 0x6a 0x005
-+#define MX27_PAD_ATA_DATA8__FEC_CRS 0x6a 0x002
-+#define MX27_PAD_ATA_DATA8__GPIO4_10 0x6a 0x032
-+#define MX27_PAD_ATA_DATA9__ATA_DATA9 0x6b 0x004
-+#define MX27_PAD_ATA_DATA9__ETMTRACEPKT10 0x6b 0x005
-+#define MX27_PAD_ATA_DATA9__FEC_TX_CLK 0x6b 0x002
-+#define MX27_PAD_ATA_DATA9__GPIO4_11 0x6b 0x032
-+#define MX27_PAD_ATA_DATA10__ATA_DATA10 0x6c 0x004
-+#define MX27_PAD_ATA_DATA10__ETMTRACEPKT9 0x6c 0x005
-+#define MX27_PAD_ATA_DATA10__FEC_RXD0 0x6c 0x002
-+#define MX27_PAD_ATA_DATA10__GPIO4_12 0x6c 0x032
-+#define MX27_PAD_ATA_DATA11__ATA_DATA11 0x6d 0x004
-+#define MX27_PAD_ATA_DATA11__ETMTRACEPKT8 0x6d 0x005
-+#define MX27_PAD_ATA_DATA11__FEC_RX_DV 0x6d 0x002
-+#define MX27_PAD_ATA_DATA11__GPIO4_13 0x6d 0x032
-+#define MX27_PAD_ATA_DATA12__ATA_DATA12 0x6e 0x004
-+#define MX27_PAD_ATA_DATA12__ETMTRACEPKT7 0x6e 0x005
-+#define MX27_PAD_ATA_DATA12__FEC_RX_CLK 0x6e 0x002
-+#define MX27_PAD_ATA_DATA12__GPIO4_14 0x6e 0x032
-+#define MX27_PAD_ATA_DATA13__ATA_DATA13 0x6f 0x004
-+#define MX27_PAD_ATA_DATA13__ETMTRACEPKT6 0x6f 0x005
-+#define MX27_PAD_ATA_DATA13__FEC_COL 0x6f 0x002
-+#define MX27_PAD_ATA_DATA13__GPIO4_15 0x6f 0x032
-+#define MX27_PAD_ATA_DATA14__ATA_DATA14 0x70 0x004
-+#define MX27_PAD_ATA_DATA14__ETMTRACEPKT5 0x70 0x005
-+#define MX27_PAD_ATA_DATA14__FEC_TX_ER 0x70 0x006
-+#define MX27_PAD_ATA_DATA14__GPIO4_16 0x70 0x032
-+#define MX27_PAD_I2C_DATA__I2C_DATA 0x71 0x004
-+#define MX27_PAD_I2C_DATA__GPIO4_17 0x71 0x032
-+#define MX27_PAD_I2C_CLK__I2C_CLK 0x72 0x004
-+#define MX27_PAD_I2C_CLK__GPIO4_18 0x72 0x032
-+#define MX27_PAD_CSPI2_SS2__CSPI2_SS2 0x73 0x004
-+#define MX27_PAD_CSPI2_SS2__USBH2_DATA4 0x73 0x005
-+#define MX27_PAD_CSPI2_SS2__GPIO4_19 0x73 0x032
-+#define MX27_PAD_CSPI2_SS1__CSPI2_SS1 0x74 0x004
-+#define MX27_PAD_CSPI2_SS1__USBH2_DATA3 0x74 0x005
-+#define MX27_PAD_CSPI2_SS1__GPIO4_20 0x74 0x032
-+#define MX27_PAD_CSPI2_SS0__CSPI2_SS0 0x75 0x004
-+#define MX27_PAD_CSPI2_SS0__USBH2_DATA6 0x75 0x005
-+#define MX27_PAD_CSPI2_SS0__GPIO4_21 0x75 0x032
-+#define MX27_PAD_CSPI2_SCLK__CSPI2_SCLK 0x76 0x004
-+#define MX27_PAD_CSPI2_SCLK__USBH2_DATA0 0x76 0x005
-+#define MX27_PAD_CSPI2_SCLK__GPIO4_22 0x76 0x032
-+#define MX27_PAD_CSPI2_MISO__CSPI2_MISO 0x77 0x004
-+#define MX27_PAD_CSPI2_MISO__USBH2_DATA2 0x77 0x005
-+#define MX27_PAD_CSPI2_MISO__GPIO4_23 0x77 0x032
-+#define MX27_PAD_CSPI2_MOSI__CSPI2_MOSI 0x78 0x004
-+#define MX27_PAD_CSPI2_MOSI__USBH2_DATA1 0x78 0x005
-+#define MX27_PAD_CSPI2_MOSI__GPIO4_24 0x78 0x032
-+#define MX27_PAD_CSPI1_RDY__CSPI1_RDY 0x79 0x000
-+#define MX27_PAD_CSPI1_RDY__GPIO4_25 0x79 0x032
-+#define MX27_PAD_CSPI1_SS2__CSPI1_SS2 0x7a 0x004
-+#define MX27_PAD_CSPI1_SS2__USBH2_DATA5 0x7a 0x005
-+#define MX27_PAD_CSPI1_SS2__GPIO4_26 0x7a 0x032
-+#define MX27_PAD_CSPI1_SS1__CSPI1_SS1 0x7b 0x004
-+#define MX27_PAD_CSPI1_SS1__GPIO4_27 0x7b 0x032
-+#define MX27_PAD_CSPI1_SS0__CSPI1_SS0 0x7c 0x004
-+#define MX27_PAD_CSPI1_SS0__GPIO4_28 0x7c 0x032
-+#define MX27_PAD_CSPI1_SCLK__CSPI1_SCLK 0x7d 0x004
-+#define MX27_PAD_CSPI1_SCLK__GPIO4_29 0x7d 0x032
-+#define MX27_PAD_CSPI1_MISO__CSPI1_MISO 0x7e 0x004
-+#define MX27_PAD_CSPI1_MISO__GPIO4_30 0x7e 0x032
-+#define MX27_PAD_CSPI1_MOSI__CSPI1_MOSI 0x7f 0x004
-+#define MX27_PAD_CSPI1_MOSI__GPIO4_31 0x7f 0x032
-+#define MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x80 0x000
-+#define MX27_PAD_USBOTG_NXT__KP_COL6A 0x80 0x005
-+#define MX27_PAD_USBOTG_NXT__GPIO5_0 0x80 0x032
-+#define MX27_PAD_USBOTG_STP__USBOTG_STP 0x81 0x004
-+#define MX27_PAD_USBOTG_STP__KP_ROW6A 0x81 0x005
-+#define MX27_PAD_USBOTG_STP__GPIO5_1 0x81 0x032
-+#define MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x82 0x000
-+#define MX27_PAD_USBOTG_DIR__KP_ROW7A 0x82 0x005
-+#define MX27_PAD_USBOTG_DIR__GPIO5_2 0x82 0x032
-+#define MX27_PAD_UART2_CTS__UART2_CTS 0x83 0x004
-+#define MX27_PAD_UART2_CTS__KP_COL7 0x83 0x005
-+#define MX27_PAD_UART2_CTS__GPIO5_3 0x83 0x032
-+#define MX27_PAD_UART2_RTS__UART2_RTS 0x84 0x000
-+#define MX27_PAD_UART2_RTS__KP_ROW7 0x84 0x005
-+#define MX27_PAD_UART2_RTS__GPIO5_4 0x84 0x032
-+#define MX27_PAD_PWMO__PWMO 0x85 0x004
-+#define MX27_PAD_PWMO__GPIO5_5 0x85 0x032
-+#define MX27_PAD_UART2_TXD__UART2_TXD 0x86 0x004
-+#define MX27_PAD_UART2_TXD__KP_COL6 0x86 0x005
-+#define MX27_PAD_UART2_TXD__GPIO5_6 0x86 0x032
-+#define MX27_PAD_UART2_RXD__UART2_RXD 0x87 0x000
-+#define MX27_PAD_UART2_RXD__KP_ROW6 0x87 0x005
-+#define MX27_PAD_UART2_RXD__GPIO5_7 0x87 0x032
-+#define MX27_PAD_UART3_TXD__UART3_TXD 0x88 0x004
-+#define MX27_PAD_UART3_TXD__GPIO5_8 0x88 0x032
-+#define MX27_PAD_UART3_RXD__UART3_RXD 0x89 0x000
-+#define MX27_PAD_UART3_RXD__GPIO5_9 0x89 0x032
-+#define MX27_PAD_UART3_CTS__UART3_CTS 0x8a 0x004
-+#define MX27_PAD_UART3_CTS__GPIO5_10 0x8a 0x032
-+#define MX27_PAD_UART3_RTS__UART3_RTS 0x8b 0x000
-+#define MX27_PAD_UART3_RTS__GPIO5_11 0x8b 0x032
-+#define MX27_PAD_UART1_TXD__UART1_TXD 0x8c 0x004
-+#define MX27_PAD_UART1_TXD__GPIO5_12 0x8c 0x032
-+#define MX27_PAD_UART1_RXD__UART1_RXD 0x8d 0x000
-+#define MX27_PAD_UART1_RXD__GPIO5_13 0x8d 0x032
-+#define MX27_PAD_UART1_CTS__UART1_CTS 0x8e 0x004
-+#define MX27_PAD_UART1_CTS__GPIO5_14 0x8e 0x032
-+#define MX27_PAD_UART1_RTS__UART1_RTS 0x8f 0x000
-+#define MX27_PAD_UART1_RTS__GPIO5_15 0x8f 0x032
-+#define MX27_PAD_RTCK__RTCK 0x90 0x004
-+#define MX27_PAD_RTCK__OWIRE 0x90 0x005
-+#define MX27_PAD_RTCK__GPIO5_16 0x90 0x032
-+#define MX27_PAD_RESET_OUT_B__RESET_OUT_B 0x91 0x004
-+#define MX27_PAD_RESET_OUT_B__GPIO5_17 0x91 0x032
-+#define MX27_PAD_SD1_D0__SD1_D0 0x92 0x004
-+#define MX27_PAD_SD1_D0__CSPI3_MISO 0x92 0x001
-+#define MX27_PAD_SD1_D0__GPIO5_18 0x92 0x032
-+#define MX27_PAD_SD1_D1__SD1_D1 0x93 0x004
-+#define MX27_PAD_SD1_D1__GPIO5_19 0x93 0x032
-+#define MX27_PAD_SD1_D2__SD1_D2 0x94 0x004
-+#define MX27_PAD_SD1_D2__GPIO5_20 0x94 0x032
-+#define MX27_PAD_SD1_D3__SD1_D3 0x95 0x004
-+#define MX27_PAD_SD1_D3__CSPI3_SS 0x95 0x005
-+#define MX27_PAD_SD1_D3__GPIO5_21 0x95 0x032
-+#define MX27_PAD_SD1_CMD__SD1_CMD 0x96 0x004
-+#define MX27_PAD_SD1_CMD__CSPI3_MOSI 0x96 0x005
-+#define MX27_PAD_SD1_CMD__GPIO5_22 0x96 0x032
-+#define MX27_PAD_SD1_CLK__SD1_CLK 0x97 0x004
-+#define MX27_PAD_SD1_CLK__CSPI3_SCLK 0x97 0x005
-+#define MX27_PAD_SD1_CLK__GPIO5_23 0x97 0x032
-+#define MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x98 0x000
-+#define MX27_PAD_USBOTG_CLK__GPIO5_24 0x98 0x032
-+#define MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x99 0x004
-+#define MX27_PAD_USBOTG_DATA7__GPIO5_25 0x99 0x032
-+#define MX27_PAD_UNUSED9__UNUSED9 0x9a 0x004
-+#define MX27_PAD_UNUSED9__GPIO5_26 0x9a 0x032
-+#define MX27_PAD_UNUSED10__UNUSED10 0x9b 0x004
-+#define MX27_PAD_UNUSED10__GPIO5_27 0x9b 0x032
-+#define MX27_PAD_UNUSED11__UNUSED11 0x9c 0x004
-+#define MX27_PAD_UNUSED11__GPIO5_28 0x9c 0x032
-+#define MX27_PAD_UNUSED12__UNUSED12 0x9d 0x004
-+#define MX27_PAD_UNUSED12__GPIO5_29 0x9d 0x032
-+#define MX27_PAD_UNUSED13__UNUSED13 0x9e 0x004
-+#define MX27_PAD_UNUSED13__GPIO5_30 0x9e 0x032
-+#define MX27_PAD_UNUSED14__UNUSED14 0x9f 0x004
-+#define MX27_PAD_UNUSED14__GPIO5_31 0x9f 0x032
-+#define MX27_PAD_NFRB__NFRB 0xa0 0x000
-+#define MX27_PAD_NFRB__ETMTRACEPKT3 0xa0 0x005
-+#define MX27_PAD_NFRB__GPIO6_0 0xa0 0x032
-+#define MX27_PAD_NFCLE__NFCLE 0xa1 0x004
-+#define MX27_PAD_NFCLE__ETMTRACEPKT0 0xa1 0x005
-+#define MX27_PAD_NFCLE__GPIO6_1 0xa1 0x032
-+#define MX27_PAD_NFWP_B__NFWP_B 0xa2 0x004
-+#define MX27_PAD_NFWP_B__ETMTRACEPKT1 0xa2 0x005
-+#define MX27_PAD_NFWP_B__GPIO6_2 0xa2 0x032
-+#define MX27_PAD_NFCE_B__NFCE_B 0xa3 0x004
-+#define MX27_PAD_NFCE_B__ETMTRACEPKT2 0xa3 0x005
-+#define MX27_PAD_NFCE_B__GPIO6_3 0xa3 0x032
-+#define MX27_PAD_NFALE__NFALE 0xa4 0x004
-+#define MX27_PAD_NFALE__ETMPIPESTAT0 0xa4 0x005
-+#define MX27_PAD_NFALE__GPIO6_4 0xa4 0x032
-+#define MX27_PAD_NFRE_B__NFRE_B 0xa5 0x004
-+#define MX27_PAD_NFRE_B__ETMPIPESTAT1 0xa5 0x005
-+#define MX27_PAD_NFRE_B__GPIO6_5 0xa5 0x032
-+#define MX27_PAD_NFWE_B__NFWE_B 0xa6 0x004
-+#define MX27_PAD_NFWE_B__ETMPIPESTAT2 0xa6 0x005
-+#define MX27_PAD_NFWE_B__GPIO6_6 0xa6 0x032
-+#define MX27_PAD_PC_POE__PC_POE 0xa7 0x004
-+#define MX27_PAD_PC_POE__ATA_BUFFER_EN 0xa7 0x005
-+#define MX27_PAD_PC_POE__GPIO6_7 0xa7 0x032
-+#define MX27_PAD_PC_RW_B__PC_RW_B 0xa8 0x004
-+#define MX27_PAD_PC_RW_B__ATA_IORDY 0xa8 0x001
-+#define MX27_PAD_PC_RW_B__GPIO6_8 0xa8 0x032
-+#define MX27_PAD_IOIS16__IOIS16 0xa9 0x000
-+#define MX27_PAD_IOIS16__ATA_INTRQ 0xa9 0x001
-+#define MX27_PAD_IOIS16__GPIO6_9 0xa9 0x032
-+#define MX27_PAD_PC_RST__PC_RST 0xaa 0x004
-+#define MX27_PAD_PC_RST__ATA_RESET_B 0xaa 0x005
-+#define MX27_PAD_PC_RST__GPIO6_10 0xaa 0x032
-+#define MX27_PAD_PC_BVD2__PC_BVD2 0xab 0x000
-+#define MX27_PAD_PC_BVD2__ATA_DMACK 0xab 0x005
-+#define MX27_PAD_PC_BVD2__GPIO6_11 0xab 0x032
-+#define MX27_PAD_PC_BVD1__PC_BVD1 0xac 0x000
-+#define MX27_PAD_PC_BVD1__ATA_DMARQ 0xac 0x001
-+#define MX27_PAD_PC_BVD1__GPIO6_12 0xac 0x032
-+#define MX27_PAD_PC_VS2__PC_VS2 0xad 0x000
-+#define MX27_PAD_PC_VS2__ATA_DA0 0xad 0x005
-+#define MX27_PAD_PC_VS2__GPIO6_13 0xad 0x032
-+#define MX27_PAD_PC_VS1__PC_VS1 0xae 0x000
-+#define MX27_PAD_PC_VS1__ATA_DA1 0xae 0x005
-+#define MX27_PAD_PC_VS1__GPIO6_14 0xae 0x032
-+#define MX27_PAD_CLKO__CLKO 0xaf 0x004
-+#define MX27_PAD_CLKO__GPIO6_15 0xaf 0x032
-+#define MX27_PAD_PC_PWRON__PC_PWRON 0xb0 0x000
-+#define MX27_PAD_PC_PWRON__ATA_DA2 0xb0 0x005
-+#define MX27_PAD_PC_PWRON__GPIO6_16 0xb0 0x032
-+#define MX27_PAD_PC_READY__PC_READY 0xb1 0x000
-+#define MX27_PAD_PC_READY__ATA_CS0 0xb1 0x005
-+#define MX27_PAD_PC_READY__GPIO6_17 0xb1 0x032
-+#define MX27_PAD_PC_WAIT_B__PC_WAIT_B 0xb2 0x000
-+#define MX27_PAD_PC_WAIT_B__ATA_CS1 0xb2 0x005
-+#define MX27_PAD_PC_WAIT_B__GPIO6_18 0xb2 0x032
-+#define MX27_PAD_PC_CD2_B__PC_CD2_B 0xb3 0x000
-+#define MX27_PAD_PC_CD2_B__ATA_DIOW 0xb3 0x005
-+#define MX27_PAD_PC_CD2_B__GPIO6_19 0xb3 0x032
-+#define MX27_PAD_PC_CD1_B__PC_CD1_B 0xb4 0x000
-+#define MX27_PAD_PC_CD1_B__ATA_DIOR 0xb4 0x005
-+#define MX27_PAD_PC_CD1_B__GPIO6_20 0xb4 0x032
-+#define MX27_PAD_CS4_B__CS4_B 0xb5 0x004
-+#define MX27_PAD_CS4_B__ETMTRACESYNC 0xb5 0x005
-+#define MX27_PAD_CS4_B__GPIO6_21 0xb5 0x032
-+#define MX27_PAD_CS5_B__CS5_B 0xb6 0x004
-+#define MX27_PAD_CS5_B__ETMTRACECLK 0xb6 0x005
-+#define MX27_PAD_CS5_B__GPIO6_22 0xb6 0x032
-+#define MX27_PAD_ATA_DATA15__ATA_DATA15 0xb7 0x004
-+#define MX27_PAD_ATA_DATA15__ETMTRACEPKT4 0xb7 0x005
-+#define MX27_PAD_ATA_DATA15__FEC_TX_EN 0xb7 0x006
-+#define MX27_PAD_ATA_DATA15__GPIO6_23 0xb7 0x032
-+#define MX27_PAD_UNUSED15__UNUSED15 0xb8 0x004
-+#define MX27_PAD_UNUSED15__GPIO6_24 0xb8 0x032
-+#define MX27_PAD_UNUSED16__UNUSED16 0xb9 0x004
-+#define MX27_PAD_UNUSED16__GPIO6_25 0xb9 0x032
-+#define MX27_PAD_UNUSED17__UNUSED17 0xba 0x004
-+#define MX27_PAD_UNUSED17__GPIO6_26 0xba 0x032
-+#define MX27_PAD_UNUSED18__UNUSED18 0xbb 0x004
-+#define MX27_PAD_UNUSED18__GPIO6_27 0xbb 0x032
-+#define MX27_PAD_UNUSED19__UNUSED19 0xbc 0x004
-+#define MX27_PAD_UNUSED19__GPIO6_28 0xbc 0x032
-+#define MX27_PAD_UNUSED20__UNUSED20 0xbd 0x004
-+#define MX27_PAD_UNUSED20__GPIO6_29 0xbd 0x032
-+#define MX27_PAD_UNUSED21__UNUSED21 0xbe 0x004
-+#define MX27_PAD_UNUSED21__GPIO6_30 0xbe 0x032
-+#define MX27_PAD_UNUSED22__UNUSED22 0xbf 0x004
-+#define MX27_PAD_UNUSED22__GPIO6_31 0xbf 0x032
-+
-+#endif /* __DTS_IMX27_PINFUNC_H */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-apf28dev.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-apf28dev.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-apf28dev.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-apf28dev.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -10,7 +10,7 @@
- */
-
- /* APF28Dev is a docking board for the APF28 SOM */
--/include/ "imx28-apf28.dts"
-+#include "imx28-apf28.dts"
-
- / {
- model = "Armadeus Systems APF28Dev docking/development board";
-@@ -41,30 +41,41 @@
- hog_pins_apf28dev: hog@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1103 /* MX28_PAD_LCD_D16__GPIO_1_16 */
-- 0x1113 /* MX28_PAD_LCD_D17__GPIO_1_17 */
-- 0x1123 /* MX28_PAD_LCD_D18__GPIO_1_18 */
-- 0x1133 /* MX28_PAD_LCD_D19__GPIO_1_19 */
-- 0x1143 /* MX28_PAD_LCD_D20__GPIO_1_20 */
-- 0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */
-- 0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */
-+ MX28_PAD_LCD_D16__GPIO_1_16
-+ MX28_PAD_LCD_D17__GPIO_1_17
-+ MX28_PAD_LCD_D18__GPIO_1_18
-+ MX28_PAD_LCD_D19__GPIO_1_19
-+ MX28_PAD_LCD_D20__GPIO_1_20
-+ MX28_PAD_LCD_D21__GPIO_1_21
-+ MX28_PAD_LCD_D22__GPIO_1_22
-+ MX28_PAD_GPMI_CE1N__GPIO_0_17
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_pins_apf28dev: lcdif-apf28dev@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
-- 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
-- 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
-- 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ usb0_otg_apf28dev: otg-apf28dev@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D23__GPIO_1_23
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
-
-@@ -103,6 +114,7 @@
-
- apbx@80040000 {
- lradc@80050000 {
-+ fsl,lradc-touchscreen-wires = <4>;
- status = "okay";
- };
-
-@@ -130,6 +142,8 @@
-
- ahb@80080000 {
- usb0: usb@80080000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb0_otg_apf28dev>;
- vbus-supply = <&reg_usb0_vbus>;
- status = "okay";
- };
-@@ -149,13 +163,17 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_usb0_vbus: usb0_vbus {
-+ reg_usb0_vbus: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "usb0_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio1 23 1>;
-+ enable-active-high;
- };
- };
-
-@@ -176,4 +194,14 @@
- brightness-levels = <0 4 8 16 32 64 128 255>;
- default-brightness-level = <6>;
- };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+
-+ user-button {
-+ label = "User button";
-+ gpios = <&gpio0 17 0>;
-+ linux,code = <0x100>;
-+ };
-+ };
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-apf28.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-apf28.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-apf28.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-apf28.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -10,7 +10,7 @@
- */
-
- /dts-v1/;
--/include/ "imx28.dtsi"
-+#include "imx28.dtsi"
-
- / {
- model = "Armadeus Systems APF28 module";
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-apx4devkit.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-apx4devkit.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-apx4devkit.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-apx4devkit.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -1,5 +1,5 @@
- /dts-v1/;
--/include/ "imx28.dtsi"
-+#include "imx28.dtsi"
-
- / {
- model = "Bluegiga APX4 Development Kit";
-@@ -40,53 +40,53 @@
- hog_pins_a: hog@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */
-- 0x0153 /* MX28_PAD_GPMI_RDY1__GPIO_0_21 */
-- 0x2123 /* MX28_PAD_SSP2_MISO__GPIO_2_18 */
-- 0x2131 /* MX28_PAD_SSP2_SS0__GPIO_2_19 */
-- 0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */
-- 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
-- 0x4143 /* MX28_PAD_JTAG_RTCK__GPIO_4_20 */
-+ MX28_PAD_GPMI_CE1N__GPIO_0_17
-+ MX28_PAD_GPMI_RDY1__GPIO_0_21
-+ MX28_PAD_SSP2_MISO__GPIO_2_18
-+ MX28_PAD_SSP2_SS0__AUART3_TX /* was: 0x2131 - MX28_PAD_SSP2_SS0__GPIO_2_19 */
-+ MX28_PAD_PWM3__GPIO_3_28
-+ MX28_PAD_LCD_RESET__GPIO_3_30
-+ MX28_PAD_JTAG_RTCK__GPIO_4_20
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_pins_apx4: lcdif-apx4@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
-- 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
-- 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
-- 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- mmc2_4bit_pins_apx4: mmc2-4bit-apx4@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2041 /* MX28_PAD_SSP0_DATA4__SSP2_D0 */
-- 0x2051 /* MX28_PAD_SSP0_DATA5__SSP2_D3 */
-- 0x2061 /* MX28_PAD_SSP0_DATA6__SSP2_CMD */
-- 0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */
-- 0x2141 /* MX28_PAD_SSP2_SS1__SSP2_D1 */
-- 0x2151 /* MX28_PAD_SSP2_SS2__SSP2_D2 */
-+ MX28_PAD_SSP0_DATA4__SSP2_D0
-+ MX28_PAD_SSP0_DATA5__SSP2_D3
-+ MX28_PAD_SSP0_DATA6__SSP2_CMD
-+ MX28_PAD_SSP0_DATA7__SSP2_SCK
-+ MX28_PAD_SSP2_SS1__SSP2_D1
-+ MX28_PAD_SSP2_SS2__SSP2_D2
- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- mmc2_sck_cfg_apx4: mmc2-sck-cfg-apx4 {
- fsl,pinmux-ids = <
-- 0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */
-+ MX28_PAD_SSP0_DATA7__SSP2_SCK
- >;
-- fsl,drive-strength = <2>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
-
-@@ -147,7 +147,7 @@
- reg = <0x0a>;
- VDDA-supply = <&reg_3p3v>;
- VDDIO-supply = <&reg_3p3v>;
--
-+ clocks = <&saif0>;
- };
-
- pcf8563: rtc@51 {
-@@ -193,9 +193,12 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_3p3v: 3p3v {
-+ reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-cfa10036.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10036.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-cfa10036.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10036.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -10,7 +10,7 @@
- */
-
- /dts-v1/;
--/include/ "imx28.dtsi"
-+#include "imx28.dtsi"
-
- / {
- model = "Crystalfontz CFA-10036 Board";
-@@ -23,28 +23,36 @@
- apb@80000000 {
- apbh@80000000 {
- pinctrl@80018000 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&hog_pins_cfa10036>;
--
-- hog_pins_cfa10036: hog-10036@0 {
-+ ssd1306_cfa10036: ssd1306-10036@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2073 /* MX28_PAD_SSP0_D7__GPIO_2_7 */
-+ MX28_PAD_SSP0_DATA7__GPIO_2_7
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- led_pins_cfa10036: leds-10036@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3043 /* MX28_PAD_AUART1_RX__GPIO_3_4 */
-+ MX28_PAD_AUART1_RX__GPIO_3_4
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-+
-+ usb0_otg_cfa10036: otg-10036@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_GPMI_RDY0__USB0_ID
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
- };
-
- ssp0: ssp@80010000 {
-@@ -58,12 +66,6 @@
- };
-
- apbx@80040000 {
-- pwm: pwm@80064000 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pwm4_pins_a>;
-- status = "okay";
-- };
--
- duart: serial@80074000 {
- pinctrl-names = "default";
- pinctrl-0 = <&duart_pins_b>;
-@@ -73,15 +75,34 @@
- i2c0: i2c@80058000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_b>;
-+ clock-frequency = <400000>;
- status = "okay";
-
-- ssd1307: oled@3c {
-- compatible = "solomon,ssd1307fb-i2c";
-+ ssd1306: oled@3c {
-+ compatible = "solomon,ssd1306fb-i2c";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&ssd1306_cfa10036>;
- reg = <0x3c>;
-- pwms = <&pwm 4 3000>;
- reset-gpios = <&gpio2 7 0>;
-+ solomon,height = <32>;
-+ solomon,width = <128>;
-+ solomon,page-offset = <0>;
- };
- };
-+
-+ usbphy0: usbphy@8007c000 {
-+ status = "okay";
-+ };
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ usb0: usb@80080000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb0_otg_cfa10036>;
-+ dr_mode = "peripheral";
-+ phy_type = "utmi";
-+ status = "okay";
- };
- };
-
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-cfa10037.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10037.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-cfa10037.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10037.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -13,7 +13,7 @@
- * The CFA-10049 is an expansion board for the CFA-10036 module, thus we
- * need to include the CFA-10036 DTS.
- */
--/include/ "imx28-cfa10036.dts"
-+#include "imx28-cfa10036.dts"
-
- / {
- model = "Crystalfontz CFA-10037 Board";
-@@ -22,18 +22,24 @@
- apb@80000000 {
- apbh@80000000 {
- pinctrl@80018000 {
-- pinctrl-names = "default", "default";
-- pinctrl-1 = <&hog_pins_cfa10037>;
-+ usb_pins_cfa10037: usb-10037@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_GPMI_D07__GPIO_0_7
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-
-- hog_pins_cfa10037: hog-10037@0 {
-+ mac0_pins_cfa10037: mac0-10037@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */
-- 0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */
-+ MX28_PAD_SSP2_SS2__GPIO_2_21
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
- };
-@@ -48,7 +54,7 @@
- ahb@80080000 {
- usb1: usb@80090000 {
- vbus-supply = <&reg_usb1_vbus>;
-- pinctrl-0 = <&usbphy1_pins_a>;
-+ pinctrl-0 = <&usb1_pins_a>;
- pinctrl-names = "default";
- status = "okay";
- };
-@@ -56,7 +62,8 @@
- mac0: ethernet@800f0000 {
- phy-mode = "rmii";
- pinctrl-names = "default";
-- pinctrl-0 = <&mac0_pins_a>;
-+ pinctrl-0 = <&mac0_pins_a
-+ &mac0_pins_cfa10037>;
- phy-reset-gpios = <&gpio2 21 0>;
- phy-reset-duration = <100>;
- status = "okay";
-@@ -65,9 +72,14 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_usb1_vbus: usb1_vbus {
-+ reg_usb1_vbus: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb_pins_cfa10037>;
- regulator-name = "usb1_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-cfa10049.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10049.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-cfa10049.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10049.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -13,7 +13,7 @@
- * The CFA-10049 is an expansion board for the CFA-10036 module, thus we
- * need to include the CFA-10036 DTS.
- */
--/include/ "imx28-cfa10036.dts"
-+#include "imx28-cfa10036.dts"
-
- / {
- model = "Crystalfontz CFA-10049 Board";
-@@ -22,119 +22,161 @@
- apb@80000000 {
- apbh@80000000 {
- pinctrl@80018000 {
-- pinctrl-names = "default", "default";
-- pinctrl-1 = <&hog_pins_cfa10049
-- &hog_pins_cfa10049_pullup>;
-+ usb_pins_cfa10049: usb-10049@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_GPMI_D07__GPIO_0_7
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ i2cmux_pins_cfa10049: i2cmux-10049@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D22__GPIO_1_22
-+ MX28_PAD_LCD_D23__GPIO_1_23
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ mac0_pins_cfa10049: mac0-10049@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP2_SS2__GPIO_2_21
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ pca_pins_cfa10049: pca-10049@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP2_SS0__GPIO_2_19
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-
-- hog_pins_cfa10049: hog-10049@0 {
-+ rotary_pins_cfa10049: rotary-10049@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */
-- 0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */
-- 0x1173 /* MX28_PAD_LCD_D22__GPIO_1_23 */
-- 0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */
-- 0x3173 /* MX28_PAD_LCD_RESET__GPIO_3_23 */
-+ MX28_PAD_I2C0_SCL__GPIO_3_24
-+ MX28_PAD_I2C0_SDA__GPIO_3_25
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
-- hog_pins_cfa10049_pullup: hog-10049-pullup@0 {
-+ rotary_btn_pins_cfa10049: rotary-btn-10049@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */
-- 0x3183 /* MX28_PAD_I2C0_SCL__GPIO_3_24 */
-- 0x3193 /* MX28_PAD_I2C0_SDA__GPIO_3_25 */
-- 0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
-- 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
-+ MX28_PAD_SAIF1_SDATA0__GPIO_3_26
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- spi2_pins_cfa10049: spi2-cfa10049@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2103 /* MX28_PAD_SSP2_SCK__GPIO_2_16 */
-- 0x2113 /* MX28_PAD_SSP2_CMD__GPIO_2_17 */
-- 0x2123 /* MX28_PAD_SSP2_D0__GPIO_2_18 */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX28_PAD_SSP2_SCK__GPIO_2_16
-+ MX28_PAD_SSP2_MOSI__GPIO_2_17
-+ MX28_PAD_SSP2_MISO__GPIO_2_18
-+ MX28_PAD_AUART1_TX__GPIO_3_5
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- spi3_pins_cfa10049: spi3-cfa10049@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0183 /* MX28_PAD_GPMI_RDN__GPIO_0_24 */
-- 0x01c3 /* MX28_PAD_GPMI_RESETN__GPIO_0_28 */
-- 0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */
-- 0x01a3 /* MX28_PAD_GPMI_ALE__GPIO_0_26 */
-- 0x01b3 /* MX28_PAD_GPMI_CLE__GPIO_0_27 */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX28_PAD_GPMI_RDN__GPIO_0_24
-+ MX28_PAD_GPMI_RESETN__GPIO_0_28
-+ MX28_PAD_GPMI_CE1N__GPIO_0_17
-+ MX28_PAD_GPMI_ALE__GPIO_0_26
-+ MX28_PAD_GPMI_CLE__GPIO_0_27
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- lcdif_18bit_pins_cfa10049: lcdif-18bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */
-- 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */
-- 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */
-- 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */
-- 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */
-- 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */
-- 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */
-- 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */
-- 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */
-- 0x1090 /* MX28_PAD_LCD_D09__LCD_D9 */
-- 0x10a0 /* MX28_PAD_LCD_D10__LCD_D10 */
-- 0x10b0 /* MX28_PAD_LCD_D11__LCD_D11 */
-- 0x10c0 /* MX28_PAD_LCD_D12__LCD_D12 */
-- 0x10d0 /* MX28_PAD_LCD_D13__LCD_D13 */
-- 0x10e0 /* MX28_PAD_LCD_D14__LCD_D14 */
-- 0x10f0 /* MX28_PAD_LCD_D15__LCD_D15 */
-- 0x1100 /* MX28_PAD_LCD_D16__LCD_D16 */
-- 0x1110 /* MX28_PAD_LCD_D17__LCD_D17 */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_LCD_D00__LCD_D0
-+ MX28_PAD_LCD_D01__LCD_D1
-+ MX28_PAD_LCD_D02__LCD_D2
-+ MX28_PAD_LCD_D03__LCD_D3
-+ MX28_PAD_LCD_D04__LCD_D4
-+ MX28_PAD_LCD_D05__LCD_D5
-+ MX28_PAD_LCD_D06__LCD_D6
-+ MX28_PAD_LCD_D07__LCD_D7
-+ MX28_PAD_LCD_D08__LCD_D8
-+ MX28_PAD_LCD_D09__LCD_D9
-+ MX28_PAD_LCD_D10__LCD_D10
-+ MX28_PAD_LCD_D11__LCD_D11
-+ MX28_PAD_LCD_D12__LCD_D12
-+ MX28_PAD_LCD_D13__LCD_D13
-+ MX28_PAD_LCD_D14__LCD_D14
-+ MX28_PAD_LCD_D15__LCD_D15
-+ MX28_PAD_LCD_D16__LCD_D16
-+ MX28_PAD_LCD_D17__LCD_D17
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_pins_cfa10049: lcdif-evk@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
-- 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
-- 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
-- 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_cfa10049_pullup: lcdif-10049-pullup@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RESET__GPIO_3_30
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- w1_gpio_pins: w1-gpio@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */
-+ MX28_PAD_LCD_D21__GPIO_1_21
- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>; /* 0 will enable the keeper */
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>; /* 0 will enable the keeper */
- };
- };
-
- lcdif@80030000 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcdif_18bit_pins_cfa10049
-- &lcdif_pins_cfa10049>;
-+ &lcdif_pins_cfa10049
-+ &lcdif_pins_cfa10049_pullup>;
- display = <&display>;
- status = "okay";
-
-@@ -166,8 +208,8 @@
-
- apbx@80040000 {
- pwm: pwm@80064000 {
-- pinctrl-names = "default", "default";
-- pinctrl-1 = <&pwm3_pins_b>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm3_pins_b>;
- status = "okay";
- };
-
-@@ -181,19 +223,45 @@
- compatible = "i2c-mux-gpio";
- #address-cells = <1>;
- #size-cells = <0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&i2cmux_pins_cfa10049>;
- mux-gpios = <&gpio1 22 0 &gpio1 23 0>;
- i2c-parent = <&i2c1>;
-
- i2c@0 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- reg = <0>;
-+
-+ adc0: nau7802@2a {
-+ compatible = "nuvoton,nau7802";
-+ reg = <0x2a>;
-+ nuvoton,vldo = <3000>;
-+ };
- };
-
- i2c@1 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- reg = <1>;
-+
-+ adc1: nau7802@2a {
-+ compatible = "nuvoton,nau7802";
-+ reg = <0x2a>;
-+ nuvoton,vldo = <3000>;
-+ };
- };
-
- i2c@2 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- reg = <2>;
-+
-+ adc2: nau7802@2a {
-+ compatible = "nuvoton,nau7802";
-+ reg = <0x2a>;
-+ nuvoton,vldo = <3000>;
-+ };
- };
-
- i2c@3 {
-@@ -203,6 +271,8 @@
-
- pca9555: pca9555@20 {
- compatible = "nxp,pca9555";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pca_pins_cfa10049>;
- interrupt-parent = <&gpio2>;
- interrupts = <19 0x2>;
- gpio-controller;
-@@ -228,7 +298,7 @@
- ahb@80080000 {
- usb1: usb@80090000 {
- vbus-supply = <&reg_usb1_vbus>;
-- pinctrl-0 = <&usbphy1_pins_a>;
-+ pinctrl-0 = <&usb1_pins_a>;
- pinctrl-names = "default";
- status = "okay";
- };
-@@ -236,9 +306,14 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_usb1_vbus: usb1_vbus {
-+ reg_usb1_vbus: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb_pins_cfa10049>;
- regulator-name = "usb1_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
-@@ -250,7 +325,8 @@
- mac0: ethernet@800f0000 {
- phy-mode = "rmii";
- pinctrl-names = "default";
-- pinctrl-0 = <&mac0_pins_a>;
-+ pinctrl-0 = <&mac0_pins_a
-+ &mac0_pins_cfa10049>;
- phy-reset-gpios = <&gpio2 21 0>;
- phy-reset-duration = <100>;
- status = "okay";
-@@ -265,7 +341,7 @@
- gpio-sck = <&gpio2 16 0>;
- gpio-mosi = <&gpio2 17 0>;
- gpio-miso = <&gpio2 18 0>;
-- cs-gpios = <&gpio3 23 0>;
-+ cs-gpios = <&gpio3 5 0>;
- num-chipselects = <1>;
- #address-cells = <1>;
- #size-cells = <0>;
-@@ -320,6 +396,8 @@
-
- gpio_keys {
- compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&rotary_btn_pins_cfa10049>;
- #address-cells = <1>;
- #size-cells = <0>;
-
-@@ -333,6 +411,8 @@
-
- rotary {
- compatible = "rotary-encoder";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&rotary_pins_cfa10049>;
- gpios = <&gpio3 24 1>, <&gpio3 25 1>;
- linux,axis = <1>; /* REL_Y */
- rotary-encoder,relative-axis;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-cfa10055.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10055.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-cfa10055.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10055.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,167 @@
-+/*
-+ * Copyright 2013 Crystalfontz America, Inc.
-+ * Free Electrons
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/*
-+ * The CFA-10055 is an expansion board for the CFA-10036 module and
-+ * CFA-10037, thus we need to include the CFA-10037 DTS.
-+ */
-+#include "imx28-cfa10037.dts"
-+
-+/ {
-+ model = "Crystalfontz CFA-10055 Board";
-+ compatible = "crystalfontz,cfa10055", "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";
-+
-+ apb@80000000 {
-+ apbh@80000000 {
-+ pinctrl@80018000 {
-+ spi2_pins_cfa10055: spi2-cfa10055@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP2_SCK__GPIO_2_16
-+ MX28_PAD_SSP2_MOSI__GPIO_2_17
-+ MX28_PAD_SSP2_MISO__GPIO_2_18
-+ MX28_PAD_AUART1_TX__GPIO_3_5
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+
-+ lcdif_18bit_pins_cfa10055: lcdif-18bit@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D00__LCD_D0
-+ MX28_PAD_LCD_D01__LCD_D1
-+ MX28_PAD_LCD_D02__LCD_D2
-+ MX28_PAD_LCD_D03__LCD_D3
-+ MX28_PAD_LCD_D04__LCD_D4
-+ MX28_PAD_LCD_D05__LCD_D5
-+ MX28_PAD_LCD_D06__LCD_D6
-+ MX28_PAD_LCD_D07__LCD_D7
-+ MX28_PAD_LCD_D08__LCD_D8
-+ MX28_PAD_LCD_D09__LCD_D9
-+ MX28_PAD_LCD_D10__LCD_D10
-+ MX28_PAD_LCD_D11__LCD_D11
-+ MX28_PAD_LCD_D12__LCD_D12
-+ MX28_PAD_LCD_D13__LCD_D13
-+ MX28_PAD_LCD_D14__LCD_D14
-+ MX28_PAD_LCD_D15__LCD_D15
-+ MX28_PAD_LCD_D16__LCD_D16
-+ MX28_PAD_LCD_D17__LCD_D17
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_cfa10055: lcdif-evk@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_cfa10055_pullup: lcdif-10055-pullup@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RESET__GPIO_3_30
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+ };
-+
-+ lcdif@80030000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&lcdif_18bit_pins_cfa10055
-+ &lcdif_pins_cfa10055
-+ &lcdif_pins_cfa10055_pullup>;
-+ display = <&display>;
-+ status = "okay";
-+
-+ display: display {
-+ bits-per-pixel = <32>;
-+ bus-width = <18>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: timing0 {
-+ clock-frequency = <9216000>;
-+ hactive = <320>;
-+ vactive = <480>;
-+ hback-porch = <2>;
-+ hfront-porch = <2>;
-+ vback-porch = <2>;
-+ vfront-porch = <2>;
-+ hsync-len = <15>;
-+ vsync-len = <15>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+ };
-+ };
-+ };
-+ };
-+
-+ apbx@80040000 {
-+ lradc@80050000 {
-+ fsl,lradc-touchscreen-wires = <4>;
-+ status = "okay";
-+ };
-+
-+ pwm: pwm@80064000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm3_pins_b>;
-+ status = "okay";
-+ };
-+ };
-+ };
-+
-+ spi2 {
-+ compatible = "spi-gpio";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&spi2_pins_cfa10055>;
-+ status = "okay";
-+ gpio-sck = <&gpio2 16 0>;
-+ gpio-mosi = <&gpio2 17 0>;
-+ gpio-miso = <&gpio2 18 0>;
-+ cs-gpios = <&gpio3 5 0>;
-+ num-chipselects = <1>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ hx8357: hx8357@0 {
-+ compatible = "himax,hx8357b", "himax,hx8357";
-+ reg = <0>;
-+ spi-max-frequency = <100000>;
-+ spi-cpol;
-+ spi-cpha;
-+ gpios-reset = <&gpio3 30 0>;
-+ };
-+ };
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm 3 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <6>;
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-cfa10056.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10056.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-cfa10056.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10056.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,119 @@
-+/*
-+ * Copyright 2013 Free Electrons
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/*
-+ * The CFA-10055 is an expansion board for the CFA-10036 module and
-+ * CFA-10037, thus we need to include the CFA-10037 DTS.
-+ */
-+#include "imx28-cfa10037.dts"
-+
-+/ {
-+ model = "Crystalfontz CFA-10056 Board";
-+ compatible = "crystalfontz,cfa10056", "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";
-+
-+ apb@80000000 {
-+ apbh@80000000 {
-+ pinctrl@80018000 {
-+ spi2_pins_cfa10056: spi2-cfa10056@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP2_SCK__GPIO_2_16
-+ MX28_PAD_SSP2_MOSI__GPIO_2_17
-+ MX28_PAD_SSP2_MISO__GPIO_2_18
-+ MX28_PAD_AUART1_TX__GPIO_3_5
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+
-+ lcdif_pins_cfa10056: lcdif-10056@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_cfa10056_pullup: lcdif-10056-pullup@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RESET__GPIO_3_30
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+ };
-+
-+ lcdif@80030000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&lcdif_24bit_pins_a
-+ &lcdif_pins_cfa10056
-+ &lcdif_pins_cfa10056_pullup >;
-+ display = <&display>;
-+ status = "okay";
-+
-+ display: display {
-+ bits-per-pixel = <32>;
-+ bus-width = <24>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: timing0 {
-+ clock-frequency = <32000000>;
-+ hactive = <480>;
-+ vactive = <800>;
-+ hback-porch = <2>;
-+ hfront-porch = <2>;
-+ vback-porch = <2>;
-+ vfront-porch = <2>;
-+ hsync-len = <5>;
-+ vsync-len = <5>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+ };
-+ };
-+ };
-+ };
-+ };
-+
-+ spi2 {
-+ compatible = "spi-gpio";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&spi2_pins_cfa10056>;
-+ status = "okay";
-+ gpio-sck = <&gpio2 16 0>;
-+ gpio-mosi = <&gpio2 17 0>;
-+ gpio-miso = <&gpio2 18 0>;
-+ cs-gpios = <&gpio3 5 0>;
-+ num-chipselects = <1>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ hx8369: hx8369@0 {
-+ compatible = "himax,hx8369a", "himax,hx8369";
-+ reg = <0>;
-+ spi-max-frequency = <100000>;
-+ spi-cpol;
-+ spi-cpha;
-+ gpios-reset = <&gpio3 30 0>;
-+ };
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-cfa10057.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10057.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-cfa10057.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10057.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,177 @@
-+/*
-+ * Copyright 2013 Crystalfontz America, Inc.
-+ * Copyright 2012 Free Electrons
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/*
-+ * The CFA-10057 is an expansion board for the CFA-10036 module, thus we
-+ * need to include the CFA-10036 DTS.
-+ */
-+#include "imx28-cfa10036.dts"
-+
-+/ {
-+ model = "Crystalfontz CFA-10057 Board";
-+ compatible = "crystalfontz,cfa10057", "crystalfontz,cfa10036", "fsl,imx28";
-+
-+ apb@80000000 {
-+ apbh@80000000 {
-+ pinctrl@80018000 {
-+ usb_pins_cfa10057: usb-10057@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_GPMI_D07__GPIO_0_7
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_18bit_pins_cfa10057: lcdif-18bit@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D00__LCD_D0
-+ MX28_PAD_LCD_D01__LCD_D1
-+ MX28_PAD_LCD_D02__LCD_D2
-+ MX28_PAD_LCD_D03__LCD_D3
-+ MX28_PAD_LCD_D04__LCD_D4
-+ MX28_PAD_LCD_D05__LCD_D5
-+ MX28_PAD_LCD_D06__LCD_D6
-+ MX28_PAD_LCD_D07__LCD_D7
-+ MX28_PAD_LCD_D08__LCD_D8
-+ MX28_PAD_LCD_D09__LCD_D9
-+ MX28_PAD_LCD_D10__LCD_D10
-+ MX28_PAD_LCD_D11__LCD_D11
-+ MX28_PAD_LCD_D12__LCD_D12
-+ MX28_PAD_LCD_D13__LCD_D13
-+ MX28_PAD_LCD_D14__LCD_D14
-+ MX28_PAD_LCD_D15__LCD_D15
-+ MX28_PAD_LCD_D16__LCD_D16
-+ MX28_PAD_LCD_D17__LCD_D17
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_cfa10057: lcdif-evk@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+ };
-+
-+ lcdif@80030000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&lcdif_18bit_pins_cfa10057
-+ &lcdif_pins_cfa10057>;
-+ display = <&display>;
-+ status = "okay";
-+
-+ display: display {
-+ bits-per-pixel = <32>;
-+ bus-width = <18>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: timing0 {
-+ clock-frequency = <30000000>;
-+ hactive = <480>;
-+ vactive = <800>;
-+ hfront-porch = <12>;
-+ hback-porch = <2>;
-+ vfront-porch = <5>;
-+ vback-porch = <3>;
-+ hsync-len = <2>;
-+ vsync-len = <2>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+ };
-+ };
-+ };
-+ };
-+
-+ apbx@80040000 {
-+ lradc@80050000 {
-+ fsl,lradc-touchscreen-wires = <4>;
-+ status = "okay";
-+ };
-+
-+ pwm: pwm@80064000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm3_pins_b>;
-+ status = "okay";
-+ };
-+
-+ i2c1: i2c@8005a000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&i2c1_pins_a>;
-+ status = "okay";
-+ };
-+
-+ usbphy1: usbphy@8007e000 {
-+ status = "okay";
-+ };
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ usb1: usb@80090000 {
-+ vbus-supply = <&reg_usb1_vbus>;
-+ pinctrl-0 = <&usb1_pins_a>;
-+ pinctrl-names = "default";
-+ status = "okay";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_usb1_vbus: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb_pins_cfa10057>;
-+ regulator-name = "usb1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio0 7 1>;
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ mac0: ethernet@800f0000 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac0_pins_a>;
-+ phy-reset-gpios = <&gpio2 21 0>;
-+ phy-reset-duration = <100>;
-+ status = "okay";
-+ };
-+ };
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm 3 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <7>;
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-cfa10058.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10058.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-cfa10058.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-cfa10058.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,144 @@
-+/*
-+ * Copyright 2013 Crystalfontz America, Inc.
-+ * Copyright 2013 Free Electrons
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/*
-+ * The CFA-10058 is an expansion board for the CFA-10036 module, thus we
-+ * need to include the CFA-10036 DTS.
-+ */
-+#include "imx28-cfa10036.dts"
-+
-+/ {
-+ model = "Crystalfontz CFA-10058 Board";
-+ compatible = "crystalfontz,cfa10058", "crystalfontz,cfa10036", "fsl,imx28";
-+
-+ apb@80000000 {
-+ apbh@80000000 {
-+ pinctrl@80018000 {
-+ usb_pins_cfa10058: usb-10058@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_GPMI_D07__GPIO_0_7
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_cfa10058: lcdif-10058@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+ };
-+
-+ lcdif@80030000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&lcdif_24bit_pins_a
-+ &lcdif_pins_cfa10058>;
-+ display = <&display>;
-+ status = "okay";
-+
-+ display: display {
-+ bits-per-pixel = <32>;
-+ bus-width = <24>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: timing0 {
-+ clock-frequency = <30000000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <40>;
-+ hfront-porch = <40>;
-+ vback-porch = <13>;
-+ vfront-porch = <29>;
-+ hsync-len = <8>;
-+ vsync-len = <8>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+ };
-+ };
-+ };
-+ };
-+
-+ apbx@80040000 {
-+ lradc@80050000 {
-+ fsl,lradc-touchscreen-wires = <4>;
-+ status = "okay";
-+ };
-+
-+ pwm: pwm@80064000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm3_pins_b>;
-+ status = "okay";
-+ };
-+
-+ usbphy1: usbphy@8007e000 {
-+ status = "okay";
-+ };
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ usb1: usb@80090000 {
-+ vbus-supply = <&reg_usb1_vbus>;
-+ pinctrl-0 = <&usb1_pins_a>;
-+ pinctrl-names = "default";
-+ status = "okay";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_usb1_vbus: regulator@0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb_pins_cfa10058>;
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "usb1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio0 7 1>;
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ mac0: ethernet@800f0000 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac0_pins_a>;
-+ phy-reset-gpios = <&gpio2 21 0>;
-+ phy-reset-duration = <100>;
-+ status = "okay";
-+ };
-+ };
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm 3 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <6>;
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28.dtsi linux-solidrun/arch/arm/boot/dts/imx28.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx28.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -9,12 +9,15 @@
- * http://www.gnu.org/copyleft/gpl.html
- */
-
--/include/ "skeleton.dtsi"
-+#include "skeleton.dtsi"
-+#include "imx28-pinfunc.h"
-
- / {
- interrupt-parent = <&icoll>;
-
- aliases {
-+ ethernet0 = &mac0;
-+ ethernet1 = &mac1;
- gpio0 = &gpio0;
- gpio1 = &gpio1;
- gpio2 = &gpio2;
-@@ -27,8 +30,10 @@
- serial2 = &auart2;
- serial3 = &auart3;
++++ linux-solidrun/arch/arm/boot/dts/imx28.dtsi 2014-04-24 07:58:12.852168744 +0200
+@@ -29,6 +29,8 @@
serial4 = &auart4;
-- ethernet0 = &mac0;
-- ethernet1 = &mac1;
-+ spi0 = &ssp1;
-+ spi1 = &ssp2;
+ ethernet0 = &mac0;
+ ethernet1 = &mac1;
+ usbphy0 = &usbphy0;
+ usbphy1 = &usbphy1;
};
cpus {
-@@ -62,9 +67,9 @@
- reg = <0x80000000 0x2000>;
- };
-
-- hsadc@80002000 {
-+ hsadc: hsadc@80002000 {
- reg = <0x80002000 0x2000>;
-- interrupts = <13 87>;
-+ interrupts = <13>;
- dmas = <&dma_apbh 12>;
- dma-names = "rx";
- status = "disabled";
-@@ -86,25 +91,24 @@
- clocks = <&clks 25>;
- };
-
-- perfmon@80006000 {
-+ perfmon: perfmon@80006000 {
- reg = <0x80006000 0x800>;
- interrupts = <27>;
- status = "disabled";
- };
-
-- gpmi-nand@8000c000 {
-+ gpmi: gpmi-nand@8000c000 {
- compatible = "fsl,imx28-gpmi-nand";
- #address-cells = <1>;
- #size-cells = <1>;
- reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
- reg-names = "gpmi-nand", "bch";
-- interrupts = <88>, <41>;
-- interrupt-names = "gpmi-dma", "bch";
-+ interrupts = <41>;
-+ interrupt-names = "bch";
- clocks = <&clks 50>;
- clock-names = "gpmi_io";
- dmas = <&dma_apbh 4>;
- dma-names = "rx-tx";
-- fsl,gpmi-dma-channel = <4>;
- status = "disabled";
- };
-
-@@ -112,11 +116,10 @@
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x80010000 0x2000>;
-- interrupts = <96 82>;
-+ interrupts = <96>;
- clocks = <&clks 46>;
- dmas = <&dma_apbh 0>;
- dma-names = "rx-tx";
-- fsl,ssp-dma-channel = <0>;
- status = "disabled";
- };
-
-@@ -124,11 +127,10 @@
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x80012000 0x2000>;
-- interrupts = <97 83>;
-+ interrupts = <97>;
- clocks = <&clks 47>;
- dmas = <&dma_apbh 1>;
- dma-names = "rx-tx";
-- fsl,ssp-dma-channel = <1>;
- status = "disabled";
- };
-
-@@ -136,11 +138,10 @@
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x80014000 0x2000>;
-- interrupts = <98 84>;
-+ interrupts = <98>;
- clocks = <&clks 48>;
- dmas = <&dma_apbh 2>;
- dma-names = "rx-tx";
-- fsl,ssp-dma-channel = <2>;
- status = "disabled";
- };
-
-@@ -148,15 +149,14 @@
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x80016000 0x2000>;
-- interrupts = <99 85>;
-+ interrupts = <99>;
- clocks = <&clks 49>;
- dmas = <&dma_apbh 3>;
- dma-names = "rx-tx";
-- fsl,ssp-dma-channel = <3>;
- status = "disabled";
- };
-
-- pinctrl@80018000 {
-+ pinctrl: pinctrl@80018000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "fsl,imx28-pinctrl", "simple-bus";
-@@ -210,476 +210,641 @@
- duart_pins_a: duart@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3102 /* MX28_PAD_PWM0__DUART_RX */
-- 0x3112 /* MX28_PAD_PWM1__DUART_TX */
-+ MX28_PAD_PWM0__DUART_RX
-+ MX28_PAD_PWM1__DUART_TX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- duart_pins_b: duart@1 {
- reg = <1>;
- fsl,pinmux-ids = <
-- 0x3022 /* MX28_PAD_AUART0_CTS__DUART_RX */
-- 0x3032 /* MX28_PAD_AUART0_RTS__DUART_TX */
-+ MX28_PAD_AUART0_CTS__DUART_RX
-+ MX28_PAD_AUART0_RTS__DUART_TX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- duart_4pins_a: duart-4pins@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3022 /* MX28_PAD_AUART0_CTS__DUART_RX */
-- 0x3032 /* MX28_PAD_AUART0_RTS__DUART_TX */
-- 0x3002 /* MX28_PAD_AUART0_RX__DUART_CTS */
-- 0x3012 /* MX28_PAD_AUART0_TX__DUART_RTS */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_AUART0_CTS__DUART_RX
-+ MX28_PAD_AUART0_RTS__DUART_TX
-+ MX28_PAD_AUART0_RX__DUART_CTS
-+ MX28_PAD_AUART0_TX__DUART_RTS
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- gpmi_pins_a: gpmi-nand@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0000 /* MX28_PAD_GPMI_D00__GPMI_D0 */
-- 0x0010 /* MX28_PAD_GPMI_D01__GPMI_D1 */
-- 0x0020 /* MX28_PAD_GPMI_D02__GPMI_D2 */
-- 0x0030 /* MX28_PAD_GPMI_D03__GPMI_D3 */
-- 0x0040 /* MX28_PAD_GPMI_D04__GPMI_D4 */
-- 0x0050 /* MX28_PAD_GPMI_D05__GPMI_D5 */
-- 0x0060 /* MX28_PAD_GPMI_D06__GPMI_D6 */
-- 0x0070 /* MX28_PAD_GPMI_D07__GPMI_D7 */
-- 0x0100 /* MX28_PAD_GPMI_CE0N__GPMI_CE0N */
-- 0x0140 /* MX28_PAD_GPMI_RDY0__GPMI_READY0 */
-- 0x0180 /* MX28_PAD_GPMI_RDN__GPMI_RDN */
-- 0x0190 /* MX28_PAD_GPMI_WRN__GPMI_WRN */
-- 0x01a0 /* MX28_PAD_GPMI_ALE__GPMI_ALE */
-- 0x01b0 /* MX28_PAD_GPMI_CLE__GPMI_CLE */
-- 0x01c0 /* MX28_PAD_GPMI_RESETN__GPMI_RESETN */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_GPMI_D00__GPMI_D0
-+ MX28_PAD_GPMI_D01__GPMI_D1
-+ MX28_PAD_GPMI_D02__GPMI_D2
-+ MX28_PAD_GPMI_D03__GPMI_D3
-+ MX28_PAD_GPMI_D04__GPMI_D4
-+ MX28_PAD_GPMI_D05__GPMI_D5
-+ MX28_PAD_GPMI_D06__GPMI_D6
-+ MX28_PAD_GPMI_D07__GPMI_D7
-+ MX28_PAD_GPMI_CE0N__GPMI_CE0N
-+ MX28_PAD_GPMI_RDY0__GPMI_READY0
-+ MX28_PAD_GPMI_RDN__GPMI_RDN
-+ MX28_PAD_GPMI_WRN__GPMI_WRN
-+ MX28_PAD_GPMI_ALE__GPMI_ALE
-+ MX28_PAD_GPMI_CLE__GPMI_CLE
-+ MX28_PAD_GPMI_RESETN__GPMI_RESETN
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- gpmi_status_cfg: gpmi-status-cfg {
- fsl,pinmux-ids = <
-- 0x0180 /* MX28_PAD_GPMI_RDN__GPMI_RDN */
-- 0x0190 /* MX28_PAD_GPMI_WRN__GPMI_WRN */
-- 0x01c0 /* MX28_PAD_GPMI_RESETN__GPMI_RESETN */
-+ MX28_PAD_GPMI_RDN__GPMI_RDN
-+ MX28_PAD_GPMI_WRN__GPMI_WRN
-+ MX28_PAD_GPMI_RESETN__GPMI_RESETN
- >;
-- fsl,drive-strength = <2>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
- };
-
- auart0_pins_a: auart0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3000 /* MX28_PAD_AUART0_RX__AUART0_RX */
-- 0x3010 /* MX28_PAD_AUART0_TX__AUART0_TX */
-- 0x3020 /* MX28_PAD_AUART0_CTS__AUART0_CTS */
-- 0x3030 /* MX28_PAD_AUART0_RTS__AUART0_RTS */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_AUART0_RX__AUART0_RX
-+ MX28_PAD_AUART0_TX__AUART0_TX
-+ MX28_PAD_AUART0_CTS__AUART0_CTS
-+ MX28_PAD_AUART0_RTS__AUART0_RTS
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart0_2pins_a: auart0-2pins@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3000 /* MX28_PAD_AUART0_RX__AUART0_RX */
-- 0x3010 /* MX28_PAD_AUART0_TX__AUART0_TX */
-+ MX28_PAD_AUART0_RX__AUART0_RX
-+ MX28_PAD_AUART0_TX__AUART0_TX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart1_pins_a: auart1@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3040 /* MX28_PAD_AUART1_RX__AUART1_RX */
-- 0x3050 /* MX28_PAD_AUART1_TX__AUART1_TX */
-- 0x3060 /* MX28_PAD_AUART1_CTS__AUART1_CTS */
-- 0x3070 /* MX28_PAD_AUART1_RTS__AUART1_RTS */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_AUART1_RX__AUART1_RX
-+ MX28_PAD_AUART1_TX__AUART1_TX
-+ MX28_PAD_AUART1_CTS__AUART1_CTS
-+ MX28_PAD_AUART1_RTS__AUART1_RTS
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart1_2pins_a: auart1-2pins@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3040 /* MX28_PAD_AUART1_RX__AUART1_RX */
-- 0x3050 /* MX28_PAD_AUART1_TX__AUART1_TX */
-+ MX28_PAD_AUART1_RX__AUART1_RX
-+ MX28_PAD_AUART1_TX__AUART1_TX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart2_2pins_a: auart2-2pins@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2101 /* MX28_PAD_SSP2_SCK__AUART2_RX */
-- 0x2111 /* MX28_PAD_SSP2_MOSI__AUART2_TX */
-+ MX28_PAD_SSP2_SCK__AUART2_RX
-+ MX28_PAD_SSP2_MOSI__AUART2_TX
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ auart2_2pins_b: auart2-2pins@1 {
-+ reg = <1>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_AUART2_RX__AUART2_RX
-+ MX28_PAD_AUART2_TX__AUART2_TX
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ auart2_pins_a: auart2-pins@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_AUART2_RX__AUART2_RX
-+ MX28_PAD_AUART2_TX__AUART2_TX
-+ MX28_PAD_AUART2_CTS__AUART2_CTS
-+ MX28_PAD_AUART2_RTS__AUART2_RTS
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart3_pins_a: auart3@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x30c0 /* MX28_PAD_AUART3_RX__AUART3_RX */
-- 0x30d0 /* MX28_PAD_AUART3_TX__AUART3_TX */
-- 0x30e0 /* MX28_PAD_AUART3_CTS__AUART3_CTS */
-- 0x30f0 /* MX28_PAD_AUART3_RTS__AUART3_RTS */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_AUART3_RX__AUART3_RX
-+ MX28_PAD_AUART3_TX__AUART3_TX
-+ MX28_PAD_AUART3_CTS__AUART3_CTS
-+ MX28_PAD_AUART3_RTS__AUART3_RTS
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- auart3_2pins_a: auart3-2pins@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2121 /* MX28_PAD_SSP2_MISO__AUART3_RX */
-- 0x2131 /* MX28_PAD_SSP2_SS0__AUART3_TX */
-+ MX28_PAD_SSP2_MISO__AUART3_RX
-+ MX28_PAD_SSP2_SS0__AUART3_TX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ auart3_2pins_b: auart3-2pins@1 {
-+ reg = <1>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_AUART3_RX__AUART3_RX
-+ MX28_PAD_AUART3_TX__AUART3_TX
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ auart4_2pins_a: auart4@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP3_SCK__AUART4_TX
-+ MX28_PAD_SSP3_MOSI__AUART4_RX
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- mac0_pins_a: mac0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x4000 /* MX28_PAD_ENET0_MDC__ENET0_MDC */
-- 0x4010 /* MX28_PAD_ENET0_MDIO__ENET0_MDIO */
-- 0x4020 /* MX28_PAD_ENET0_RX_EN__ENET0_RX_EN */
-- 0x4030 /* MX28_PAD_ENET0_RXD0__ENET0_RXD0 */
-- 0x4040 /* MX28_PAD_ENET0_RXD1__ENET0_RXD1 */
-- 0x4060 /* MX28_PAD_ENET0_TX_EN__ENET0_TX_EN */
-- 0x4070 /* MX28_PAD_ENET0_TXD0__ENET0_TXD0 */
-- 0x4080 /* MX28_PAD_ENET0_TXD1__ENET0_TXD1 */
-- 0x4100 /* MX28_PAD_ENET_CLK__CLKCTRL_ENET */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX28_PAD_ENET0_MDC__ENET0_MDC
-+ MX28_PAD_ENET0_MDIO__ENET0_MDIO
-+ MX28_PAD_ENET0_RX_EN__ENET0_RX_EN
-+ MX28_PAD_ENET0_RXD0__ENET0_RXD0
-+ MX28_PAD_ENET0_RXD1__ENET0_RXD1
-+ MX28_PAD_ENET0_TX_EN__ENET0_TX_EN
-+ MX28_PAD_ENET0_TXD0__ENET0_TXD0
-+ MX28_PAD_ENET0_TXD1__ENET0_TXD1
-+ MX28_PAD_ENET_CLK__CLKCTRL_ENET
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- mac1_pins_a: mac1@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x40f1 /* MX28_PAD_ENET0_CRS__ENET1_RX_EN */
-- 0x4091 /* MX28_PAD_ENET0_RXD2__ENET1_RXD0 */
-- 0x40a1 /* MX28_PAD_ENET0_RXD3__ENET1_RXD1 */
-- 0x40e1 /* MX28_PAD_ENET0_COL__ENET1_TX_EN */
-- 0x40b1 /* MX28_PAD_ENET0_TXD2__ENET1_TXD0 */
-- 0x40c1 /* MX28_PAD_ENET0_TXD3__ENET1_TXD1 */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX28_PAD_ENET0_CRS__ENET1_RX_EN
-+ MX28_PAD_ENET0_RXD2__ENET1_RXD0
-+ MX28_PAD_ENET0_RXD3__ENET1_RXD1
-+ MX28_PAD_ENET0_COL__ENET1_TX_EN
-+ MX28_PAD_ENET0_TXD2__ENET1_TXD0
-+ MX28_PAD_ENET0_TXD3__ENET1_TXD1
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- mmc0_8bit_pins_a: mmc0-8bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2000 /* MX28_PAD_SSP0_DATA0__SSP0_D0 */
-- 0x2010 /* MX28_PAD_SSP0_DATA1__SSP0_D1 */
-- 0x2020 /* MX28_PAD_SSP0_DATA2__SSP0_D2 */
-- 0x2030 /* MX28_PAD_SSP0_DATA3__SSP0_D3 */
-- 0x2040 /* MX28_PAD_SSP0_DATA4__SSP0_D4 */
-- 0x2050 /* MX28_PAD_SSP0_DATA5__SSP0_D5 */
-- 0x2060 /* MX28_PAD_SSP0_DATA6__SSP0_D6 */
-- 0x2070 /* MX28_PAD_SSP0_DATA7__SSP0_D7 */
-- 0x2080 /* MX28_PAD_SSP0_CMD__SSP0_CMD */
-- 0x2090 /* MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT */
-- 0x20a0 /* MX28_PAD_SSP0_SCK__SSP0_SCK */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX28_PAD_SSP0_DATA0__SSP0_D0
-+ MX28_PAD_SSP0_DATA1__SSP0_D1
-+ MX28_PAD_SSP0_DATA2__SSP0_D2
-+ MX28_PAD_SSP0_DATA3__SSP0_D3
-+ MX28_PAD_SSP0_DATA4__SSP0_D4
-+ MX28_PAD_SSP0_DATA5__SSP0_D5
-+ MX28_PAD_SSP0_DATA6__SSP0_D6
-+ MX28_PAD_SSP0_DATA7__SSP0_D7
-+ MX28_PAD_SSP0_CMD__SSP0_CMD
-+ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT
-+ MX28_PAD_SSP0_SCK__SSP0_SCK
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- mmc0_4bit_pins_a: mmc0-4bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2000 /* MX28_PAD_SSP0_DATA0__SSP0_D0 */
-- 0x2010 /* MX28_PAD_SSP0_DATA1__SSP0_D1 */
-- 0x2020 /* MX28_PAD_SSP0_DATA2__SSP0_D2 */
-- 0x2030 /* MX28_PAD_SSP0_DATA3__SSP0_D3 */
-- 0x2080 /* MX28_PAD_SSP0_CMD__SSP0_CMD */
-- 0x2090 /* MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT */
-- 0x20a0 /* MX28_PAD_SSP0_SCK__SSP0_SCK */
-- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX28_PAD_SSP0_DATA0__SSP0_D0
-+ MX28_PAD_SSP0_DATA1__SSP0_D1
-+ MX28_PAD_SSP0_DATA2__SSP0_D2
-+ MX28_PAD_SSP0_DATA3__SSP0_D3
-+ MX28_PAD_SSP0_CMD__SSP0_CMD
-+ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT
-+ MX28_PAD_SSP0_SCK__SSP0_SCK
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- mmc0_cd_cfg: mmc0-cd-cfg {
- fsl,pinmux-ids = <
-- 0x2090 /* MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT */
-+ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT
- >;
-- fsl,pull-up = <0>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- mmc0_sck_cfg: mmc0-sck-cfg {
- fsl,pinmux-ids = <
-- 0x20a0 /* MX28_PAD_SSP0_SCK__SSP0_SCK */
-+ MX28_PAD_SSP0_SCK__SSP0_SCK
- >;
-- fsl,drive-strength = <2>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ mmc2_4bit_pins_a: mmc2-4bit@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP0_DATA4__SSP2_D0
-+ MX28_PAD_SSP1_SCK__SSP2_D1
-+ MX28_PAD_SSP1_CMD__SSP2_D2
-+ MX28_PAD_SSP0_DATA5__SSP2_D3
-+ MX28_PAD_SSP0_DATA6__SSP2_CMD
-+ MX28_PAD_AUART1_RX__SSP2_CARD_DETECT
-+ MX28_PAD_SSP0_DATA7__SSP2_SCK
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+
-+ mmc2_cd_cfg: mmc2-cd-cfg {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_AUART1_RX__SSP2_CARD_DETECT
-+ >;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ mmc2_sck_cfg: mmc2-sck-cfg {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP0_DATA7__SSP2_SCK
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- i2c0_pins_a: i2c0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3180 /* MX28_PAD_I2C0_SCL__I2C0_SCL */
-- 0x3190 /* MX28_PAD_I2C0_SDA__I2C0_SDA */
-+ MX28_PAD_I2C0_SCL__I2C0_SCL
-+ MX28_PAD_I2C0_SDA__I2C0_SDA
- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- i2c0_pins_b: i2c0@1 {
- reg = <1>;
- fsl,pinmux-ids = <
-- 0x3001 /* MX28_PAD_AUART0_RX__I2C0_SCL */
-- 0x3011 /* MX28_PAD_AUART0_TX__I2C0_SDA */
-+ MX28_PAD_AUART0_RX__I2C0_SCL
-+ MX28_PAD_AUART0_TX__I2C0_SDA
- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- i2c1_pins_a: i2c1@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3101 /* MX28_PAD_PWM0__I2C1_SCL */
-- 0x3111 /* MX28_PAD_PWM1__I2C1_SDA */
-+ MX28_PAD_PWM0__I2C1_SCL
-+ MX28_PAD_PWM1__I2C1_SDA
- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- saif0_pins_a: saif0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3140 /* MX28_PAD_SAIF0_MCLK__SAIF0_MCLK */
-- 0x3150 /* MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK */
-- 0x3160 /* MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK */
-- 0x3170 /* MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0 */
-- >;
-- fsl,drive-strength = <2>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ MX28_PAD_SAIF0_MCLK__SAIF0_MCLK
-+ MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK
-+ MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK
-+ MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+
-+ saif0_pins_b: saif0@1 {
-+ reg = <1>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK
-+ MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK
-+ MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- saif1_pins_a: saif1@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x31a0 /* MX28_PAD_SAIF1_SDATA0__SAIF1_SDATA0 */
-+ MX28_PAD_SAIF1_SDATA0__SAIF1_SDATA0
- >;
-- fsl,drive-strength = <2>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-
- pwm0_pins_a: pwm0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3100 /* MX28_PAD_PWM0__PWM_0 */
-+ MX28_PAD_PWM0__PWM_0
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- pwm2_pins_a: pwm2@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3120 /* MX28_PAD_PWM2__PWM_2 */
-+ MX28_PAD_PWM2__PWM_2
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- pwm3_pins_a: pwm3@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x31c0 /* MX28_PAD_PWM3__PWM_3 */
-+ MX28_PAD_PWM3__PWM_3
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- pwm3_pins_b: pwm3@1 {
- reg = <1>;
- fsl,pinmux-ids = <
-- 0x3141 /* MX28_PAD_SAIF0_MCLK__PWM3 */
-+ MX28_PAD_SAIF0_MCLK__PWM_3
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- pwm4_pins_a: pwm4@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x31d0 /* MX28_PAD_PWM4__PWM_4 */
-+ MX28_PAD_PWM4__PWM_4
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_24bit_pins_a: lcdif-24bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */
-- 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */
-- 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */
-- 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */
-- 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */
-- 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */
-- 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */
-- 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */
-- 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */
-- 0x1090 /* MX28_PAD_LCD_D09__LCD_D9 */
-- 0x10a0 /* MX28_PAD_LCD_D10__LCD_D10 */
-- 0x10b0 /* MX28_PAD_LCD_D11__LCD_D11 */
-- 0x10c0 /* MX28_PAD_LCD_D12__LCD_D12 */
-- 0x10d0 /* MX28_PAD_LCD_D13__LCD_D13 */
-- 0x10e0 /* MX28_PAD_LCD_D14__LCD_D14 */
-- 0x10f0 /* MX28_PAD_LCD_D15__LCD_D15 */
-- 0x1100 /* MX28_PAD_LCD_D16__LCD_D16 */
-- 0x1110 /* MX28_PAD_LCD_D17__LCD_D17 */
-- 0x1120 /* MX28_PAD_LCD_D18__LCD_D18 */
-- 0x1130 /* MX28_PAD_LCD_D19__LCD_D19 */
-- 0x1140 /* MX28_PAD_LCD_D20__LCD_D20 */
-- 0x1150 /* MX28_PAD_LCD_D21__LCD_D21 */
-- 0x1160 /* MX28_PAD_LCD_D22__LCD_D22 */
-- 0x1170 /* MX28_PAD_LCD_D23__LCD_D23 */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_LCD_D00__LCD_D0
-+ MX28_PAD_LCD_D01__LCD_D1
-+ MX28_PAD_LCD_D02__LCD_D2
-+ MX28_PAD_LCD_D03__LCD_D3
-+ MX28_PAD_LCD_D04__LCD_D4
-+ MX28_PAD_LCD_D05__LCD_D5
-+ MX28_PAD_LCD_D06__LCD_D6
-+ MX28_PAD_LCD_D07__LCD_D7
-+ MX28_PAD_LCD_D08__LCD_D8
-+ MX28_PAD_LCD_D09__LCD_D9
-+ MX28_PAD_LCD_D10__LCD_D10
-+ MX28_PAD_LCD_D11__LCD_D11
-+ MX28_PAD_LCD_D12__LCD_D12
-+ MX28_PAD_LCD_D13__LCD_D13
-+ MX28_PAD_LCD_D14__LCD_D14
-+ MX28_PAD_LCD_D15__LCD_D15
-+ MX28_PAD_LCD_D16__LCD_D16
-+ MX28_PAD_LCD_D17__LCD_D17
-+ MX28_PAD_LCD_D18__LCD_D18
-+ MX28_PAD_LCD_D19__LCD_D19
-+ MX28_PAD_LCD_D20__LCD_D20
-+ MX28_PAD_LCD_D21__LCD_D21
-+ MX28_PAD_LCD_D22__LCD_D22
-+ MX28_PAD_LCD_D23__LCD_D23
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_18bit_pins_a: lcdif-18bit@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D00__LCD_D0
-+ MX28_PAD_LCD_D01__LCD_D1
-+ MX28_PAD_LCD_D02__LCD_D2
-+ MX28_PAD_LCD_D03__LCD_D3
-+ MX28_PAD_LCD_D04__LCD_D4
-+ MX28_PAD_LCD_D05__LCD_D5
-+ MX28_PAD_LCD_D06__LCD_D6
-+ MX28_PAD_LCD_D07__LCD_D7
-+ MX28_PAD_LCD_D08__LCD_D8
-+ MX28_PAD_LCD_D09__LCD_D9
-+ MX28_PAD_LCD_D10__LCD_D10
-+ MX28_PAD_LCD_D11__LCD_D11
-+ MX28_PAD_LCD_D12__LCD_D12
-+ MX28_PAD_LCD_D13__LCD_D13
-+ MX28_PAD_LCD_D14__LCD_D14
-+ MX28_PAD_LCD_D15__LCD_D15
-+ MX28_PAD_LCD_D16__LCD_D16
-+ MX28_PAD_LCD_D17__LCD_D17
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_16bit_pins_a: lcdif-16bit@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */
-- 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */
-- 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */
-- 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */
-- 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */
-- 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */
-- 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */
-- 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */
-- 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */
-- 0x1090 /* MX28_PAD_LCD_D09__LCD_D9 */
-- 0x10a0 /* MX28_PAD_LCD_D10__LCD_D10 */
-- 0x10b0 /* MX28_PAD_LCD_D11__LCD_D11 */
-- 0x10c0 /* MX28_PAD_LCD_D12__LCD_D12 */
-- 0x10d0 /* MX28_PAD_LCD_D13__LCD_D13 */
-- 0x10e0 /* MX28_PAD_LCD_D14__LCD_D14 */
-- 0x10f0 /* MX28_PAD_LCD_D15__LCD_D15 */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ MX28_PAD_LCD_D00__LCD_D0
-+ MX28_PAD_LCD_D01__LCD_D1
-+ MX28_PAD_LCD_D02__LCD_D2
-+ MX28_PAD_LCD_D03__LCD_D3
-+ MX28_PAD_LCD_D04__LCD_D4
-+ MX28_PAD_LCD_D05__LCD_D5
-+ MX28_PAD_LCD_D06__LCD_D6
-+ MX28_PAD_LCD_D07__LCD_D7
-+ MX28_PAD_LCD_D08__LCD_D8
-+ MX28_PAD_LCD_D09__LCD_D9
-+ MX28_PAD_LCD_D10__LCD_D10
-+ MX28_PAD_LCD_D11__LCD_D11
-+ MX28_PAD_LCD_D12__LCD_D12
-+ MX28_PAD_LCD_D13__LCD_D13
-+ MX28_PAD_LCD_D14__LCD_D14
-+ MX28_PAD_LCD_D15__LCD_D15
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_sync_pins_a: lcdif-sync@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- can0_pins_a: can0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0161 /* MX28_PAD_GPMI_RDY2__CAN0_TX */
-- 0x0171 /* MX28_PAD_GPMI_RDY3__CAN0_RX */
-+ MX28_PAD_GPMI_RDY2__CAN0_TX
-+ MX28_PAD_GPMI_RDY3__CAN0_RX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- can1_pins_a: can1@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0121 /* MX28_PAD_GPMI_CE2N__CAN1_TX */
-- 0x0131 /* MX28_PAD_GPMI_CE3N__CAN1_RX */
-+ MX28_PAD_GPMI_CE2N__CAN1_TX
-+ MX28_PAD_GPMI_CE3N__CAN1_RX
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- spi2_pins_a: spi2@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2100 /* MX28_PAD_SSP2_SCK__SSP2_SCK */
-- 0x2110 /* MX28_PAD_SSP2_MOSI__SSP2_CMD */
-- 0x2120 /* MX28_PAD_SSP2_MISO__SSP2_D0 */
-- 0x2130 /* MX28_PAD_SSP2_SS0__SSP2_D3 */
-+ MX28_PAD_SSP2_SCK__SSP2_SCK
-+ MX28_PAD_SSP2_MOSI__SSP2_CMD
-+ MX28_PAD_SSP2_MISO__SSP2_D0
-+ MX28_PAD_SSP2_SS0__SSP2_D3
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+
-+ spi3_pins_a: spi3@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_AUART2_RX__SSP3_D4
-+ MX28_PAD_AUART2_TX__SSP3_D5
-+ MX28_PAD_SSP3_SCK__SSP3_SCK
-+ MX28_PAD_SSP3_MOSI__SSP3_CMD
-+ MX28_PAD_SSP3_MISO__SSP3_D0
-+ MX28_PAD_SSP3_SS0__SSP3_D3
- >;
-- fsl,drive-strength = <1>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <1>;
-+ fsl,drive-strength = <MXS_DRIVE_8mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
-- usbphy0_pins_a: usbphy0@0 {
-+ usb0_pins_a: usb0@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2152 /* MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
-+ MX28_PAD_SSP2_SS2__USB0_OVERCURRENT
- >;
-- fsl,drive-strength = <2>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
-- usbphy0_pins_b: usbphy0@1 {
-+ usb0_pins_b: usb0@1 {
- reg = <1>;
- fsl,pinmux-ids = <
-- 0x3061 /* MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
-+ MX28_PAD_AUART1_CTS__USB0_OVERCURRENT
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ usb1_pins_a: usb1@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP2_SS1__USB1_OVERCURRENT
- >;
-- fsl,drive-strength = <2>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
-- usbphy1_pins_a: usbphy1@0 {
-+ usb0_id_pins_a: usb0id@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x2142 /* MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
-+ MX28_PAD_AUART1_RTS__USB0_ID
- >;
-- fsl,drive-strength = <2>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
- };
-+
-+ usb0_id_pins_b: usb0id1@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_PWM2__USB0_ID
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+
- };
-
-- digctl@8001c000 {
-- compatible = "fsl,imx28-digctl";
-+ digctl: digctl@8001c000 {
-+ compatible = "fsl,imx28-digctl", "fsl,imx23-digctl";
- reg = <0x8001c000 0x2000>;
- interrupts = <89>;
- status = "disabled";
- };
-
-- etm@80022000 {
-+ etm: etm@80022000 {
- reg = <0x80022000 0x2000>;
- status = "disabled";
- };
-@@ -700,19 +865,20 @@
- clocks = <&clks 26>;
- };
-
-- dcp@80028000 {
-+ dcp: dcp@80028000 {
-+ compatible = "fsl,imx28-dcp", "fsl,imx23-dcp";
- reg = <0x80028000 0x2000>;
- interrupts = <52 53 54>;
-- status = "disabled";
-+ status = "okay";
- };
-
-- pxp@8002a000 {
-+ pxp: pxp@8002a000 {
- reg = <0x8002a000 0x2000>;
- interrupts = <39>;
- status = "disabled";
- };
-
-- ocotp@8002c000 {
-+ ocotp: ocotp@8002c000 {
- compatible = "fsl,ocotp";
- reg = <0x8002c000 0x2000>;
- status = "disabled";
-@@ -723,10 +889,10 @@
- status = "disabled";
- };
-
-- lcdif@80030000 {
-+ lcdif: lcdif@80030000 {
+@@ -727,7 +729,8 @@
compatible = "fsl,imx28-lcdif";
reg = <0x80030000 0x2000>;
-- interrupts = <38 86>;
-+ interrupts = <38>;
- clocks = <&clks 55>;
+ interrupts = <38 86>;
+- clocks = <&clks 55>;
++ clocks = <&clks 55>, <&clks 55>;
++ clock-names = "pix", "axi";
dmas = <&dma_apbh 13>;
dma-names = "rx";
-@@ -751,41 +917,41 @@
- status = "disabled";
- };
-
-- simdbg@8003c000 {
-+ simdbg: simdbg@8003c000 {
- reg = <0x8003c000 0x200>;
- status = "disabled";
- };
-
-- simgpmisel@8003c200 {
-+ simgpmisel: simgpmisel@8003c200 {
- reg = <0x8003c200 0x100>;
- status = "disabled";
- };
-
-- simsspsel@8003c300 {
-+ simsspsel: simsspsel@8003c300 {
- reg = <0x8003c300 0x100>;
- status = "disabled";
- };
-
-- simmemsel@8003c400 {
-+ simmemsel: simmemsel@8003c400 {
- reg = <0x8003c400 0x100>;
- status = "disabled";
- };
-
-- gpiomon@8003c500 {
-+ gpiomon: gpiomon@8003c500 {
- reg = <0x8003c500 0x100>;
- status = "disabled";
- };
-
-- simenet@8003c700 {
-+ simenet: simenet@8003c700 {
- reg = <0x8003c700 0x100>;
- status = "disabled";
- };
-
-- armjtag@8003c800 {
-+ armjtag: armjtag@8003c800 {
- reg = <0x8003c800 0x100>;
- status = "disabled";
- };
-- };
-+ };
-
- apbx@80040000 {
- compatible = "simple-bus";
-@@ -803,15 +969,15 @@
- saif0: saif@80042000 {
- compatible = "fsl,imx28-saif";
- reg = <0x80042000 0x2000>;
-- interrupts = <59 80>;
-+ interrupts = <59>;
-+ #clock-cells = <0>;
- clocks = <&clks 53>;
- dmas = <&dma_apbx 4>;
- dma-names = "rx-tx";
-- fsl,saif-dma-channel = <4>;
- status = "disabled";
- };
-
-- power@80044000 {
-+ power: power@80044000 {
- reg = <0x80044000 0x2000>;
- status = "disabled";
- };
-@@ -819,31 +985,32 @@
- saif1: saif@80046000 {
- compatible = "fsl,imx28-saif";
- reg = <0x80046000 0x2000>;
-- interrupts = <58 81>;
-+ interrupts = <58>;
- clocks = <&clks 54>;
- dmas = <&dma_apbx 5>;
- dma-names = "rx-tx";
-- fsl,saif-dma-channel = <5>;
- status = "disabled";
- };
-
-- lradc@80050000 {
-+ lradc: lradc@80050000 {
- compatible = "fsl,imx28-lradc";
- reg = <0x80050000 0x2000>;
- interrupts = <10 14 15 16 17 18 19
- 20 21 22 23 24 25>;
- status = "disabled";
-+ clocks = <&clks 41>;
-+ #io-channel-cells = <1>;
- };
-
-- spdif@80054000 {
-+ spdif: spdif@80054000 {
- reg = <0x80054000 0x2000>;
-- interrupts = <45 66>;
-+ interrupts = <45>;
- dmas = <&dma_apbx 2>;
- dma-names = "tx";
- status = "disabled";
- };
-
-- rtc@80056000 {
-+ mxs_rtc: rtc@80056000 {
- compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
- reg = <0x80056000 0x2000>;
- interrupts = <29>;
-@@ -854,11 +1021,10 @@
- #size-cells = <0>;
- compatible = "fsl,imx28-i2c";
- reg = <0x80058000 0x2000>;
-- interrupts = <111 68>;
-+ interrupts = <111>;
- clock-frequency = <100000>;
- dmas = <&dma_apbx 6>;
- dma-names = "rx-tx";
-- fsl,i2c-dma-channel = <6>;
- status = "disabled";
- };
-
-@@ -867,11 +1033,10 @@
- #size-cells = <0>;
- compatible = "fsl,imx28-i2c";
- reg = <0x8005a000 0x2000>;
-- interrupts = <110 69>;
-+ interrupts = <110>;
- clock-frequency = <100000>;
- dmas = <&dma_apbx 7>;
- dma-names = "rx-tx";
-- fsl,i2c-dma-channel = <7>;
- status = "disabled";
- };
-
-@@ -884,7 +1049,7 @@
- status = "disabled";
- };
-
-- timrot@80068000 {
-+ timer: timrot@80068000 {
- compatible = "fsl,imx28-timrot", "fsl,timrot";
- reg = <0x80068000 0x2000>;
- interrupts = <48 49 50 51>;
-@@ -894,10 +1059,9 @@
- auart0: serial@8006a000 {
- compatible = "fsl,imx28-auart", "fsl,imx23-auart";
- reg = <0x8006a000 0x2000>;
-- interrupts = <112 70 71>;
-+ interrupts = <112>;
- dmas = <&dma_apbx 8>, <&dma_apbx 9>;
- dma-names = "rx", "tx";
-- fsl,auart-dma-channel = <8 9>;
- clocks = <&clks 45>;
- status = "disabled";
- };
-@@ -905,7 +1069,7 @@
- auart1: serial@8006c000 {
- compatible = "fsl,imx28-auart", "fsl,imx23-auart";
- reg = <0x8006c000 0x2000>;
-- interrupts = <113 72 73>;
-+ interrupts = <113>;
- dmas = <&dma_apbx 10>, <&dma_apbx 11>;
- dma-names = "rx", "tx";
- clocks = <&clks 45>;
-@@ -915,7 +1079,7 @@
- auart2: serial@8006e000 {
- compatible = "fsl,imx28-auart", "fsl,imx23-auart";
- reg = <0x8006e000 0x2000>;
-- interrupts = <114 74 75>;
-+ interrupts = <114>;
- dmas = <&dma_apbx 12>, <&dma_apbx 13>;
- dma-names = "rx", "tx";
- clocks = <&clks 45>;
-@@ -925,7 +1089,7 @@
- auart3: serial@80070000 {
- compatible = "fsl,imx28-auart", "fsl,imx23-auart";
- reg = <0x80070000 0x2000>;
-- interrupts = <115 76 77>;
-+ interrupts = <115>;
- dmas = <&dma_apbx 14>, <&dma_apbx 15>;
- dma-names = "rx", "tx";
- clocks = <&clks 45>;
-@@ -935,7 +1099,7 @@
- auart4: serial@80072000 {
- compatible = "fsl,imx28-auart", "fsl,imx23-auart";
- reg = <0x80072000 0x2000>;
-- interrupts = <116 78 79>;
-+ interrupts = <116>;
- dmas = <&dma_apbx 0>, <&dma_apbx 1>;
- dma-names = "rx", "tx";
- clocks = <&clks 45>;
-@@ -992,7 +1156,7 @@
- status = "disabled";
- };
-
-- dflpt@800c0000 {
-+ dflpt: dflpt@800c0000 {
- reg = <0x800c0000 0x10000>;
- status = "disabled";
- };
-@@ -1015,10 +1179,14 @@
- status = "disabled";
- };
-
-- switch@800f8000 {
-+ etn_switch: switch@800f8000 {
- reg = <0x800f8000 0x8000>;
- status = "disabled";
- };
-+ };
-
-+ iio_hwmon {
-+ compatible = "iio-hwmon";
-+ io-channels = <&lradc 8>;
- };
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-duckbill.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-duckbill.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-duckbill.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-duckbill.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,121 @@
-+/*
-+ * Copyright (C) 2013 Michael Heimpold <mhei@heimpold.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx28.dtsi"
-+
-+/ {
-+ model = "I2SE Duckbill";
-+ compatible = "i2se,duckbill", "fsl,imx28";
-+
-+ memory {
-+ reg = <0x40000000 0x08000000>;
-+ };
-+
-+ apb@80000000 {
-+ apbh@80000000 {
-+ ssp0: ssp@80010000 {
-+ compatible = "fsl,imx28-mmc";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mmc0_8bit_pins_a
-+ &mmc0_cd_cfg &mmc0_sck_cfg>;
-+ bus-width = <8>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+ };
-+
-+ pinctrl@80018000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&hog_pins_a>;
-+
-+ hog_pins_a: hog@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_ENET0_RX_CLK__GPIO_4_13 /* PHY Reset */
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ led_pins_a: led_gpio@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_AUART1_RX__GPIO_3_4
-+ MX28_PAD_AUART1_TX__GPIO_3_5
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+ };
-+ };
-+
-+ apbx@80040000 {
-+ duart: serial@80074000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&duart_pins_a>;
-+ status = "okay";
-+ };
-+
-+ usbphy0: usbphy@8007c000 {
-+ status = "okay";
-+ };
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ usb0: usb@80080000 {
-+ status = "okay";
-+ };
-+
-+ mac0: ethernet@800f0000 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac0_pins_a>;
-+ phy-supply = <&reg_3p3v>;
-+ phy-reset-gpios = <&gpio4 13 0>;
-+ phy-reset-duration = <100>;
-+ status = "okay";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p3v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&led_pins_a>;
-+
-+ status {
-+ label = "duckbill:green:status";
-+ gpios = <&gpio3 5 0>;
-+ };
-+
-+ failure {
-+ label = "duckbill:red:status";
-+ gpios = <&gpio3 4 0>;
-+ };
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,71 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <eric@eukrea.com>
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+/*
-+ * Module contains : i.MX282 + 64MB DDR2 + NAND + Ethernet PHY + RTC
-+ */
-+
-+/dts-v1/;
-+#include "imx28-eukrea-mbmx28lc.dtsi"
-+
-+/ {
-+ model = "Eukrea Electromatique MBMX283LC";
-+ compatible = "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
-+
-+ memory {
-+ reg = <0x40000000 0x04000000>;
-+ };
-+};
-+
-+&gpmi {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&gpmi_pins_a>;
-+ status = "okay";
-+};
-+
-+&i2c0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&i2c0_pins_a>;
-+ status = "okay";
-+
-+ pcf8563: rtc@51 {
-+ compatible = "nxp,pcf8563";
-+ reg = <0x51>;
-+ };
-+};
-+
-+
-+&mac0 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac0_pins_a>;
-+ phy-reset-gpios = <&gpio4 13 GPIO_ACTIVE_LOW>;
-+ status = "okay";
-+};
-+
-+&pinctrl{
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&hog_pins_cpuimx283>;
-+
-+ hog_pins_cpuimx283: hog-cpuimx283@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_ENET0_RX_CLK__GPIO_4_13
-+ MX28_PAD_ENET0_TX_CLK__GPIO_4_5
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,50 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <eric@eukrea.com>
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+/*
-+ * Module contains : i.MX287 + 128MB DDR2 + NAND + 2 x Ethernet PHY + RTC
-+ */
-+
-+#include "imx28-eukrea-mbmx283lc.dts"
-+
-+/ {
-+ model = "Eukrea Electromatique MBMX287LC";
-+ compatible = "eukrea,mbmx287lc", "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
-+
-+ memory {
-+ reg = <0x40000000 0x08000000>;
-+ };
-+};
-+
-+&mac1 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac1_pins_a>;
-+ phy-reset-gpios = <&gpio3 27 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
-+};
-+
-+&pinctrl {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&hog_pins_cpuimx283 &hog_pins_cpuimx287>;
-+ hog_pins_cpuimx287: hog-cpuimx287@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SPDIF__GPIO_3_27
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,326 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <eric@eukrea.com>
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/gpio/gpio.h>
-+#include "imx28.dtsi"
-+
-+/ {
-+ model = "Eukrea Electromatique MBMX28LC";
-+ compatible = "eukrea,mbmx28lc", "fsl,imx28";
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm 4 1000000>;
-+ brightness-levels = <0 25 50 75 100 125 150 175 200 225 255>;
-+ default-brightness-level = <10>;
-+ };
-+
-+ button-sw3 {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&gpio_button_sw3_pins_mbmx28lc>;
-+
-+ sw3 {
-+ label = "SW3";
-+ gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
-+ linux,code = <BTN_MISC>;
-+ gpio-key,wakeup;
-+ };
-+ };
-+
-+ button-sw4 {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&gpio_button_sw4_pins_mbmx28lc>;
-+
-+ sw4 {
-+ label = "SW4";
-+ gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
-+ linux,code = <BTN_MISC>;
-+ gpio-key,wakeup;
-+ };
-+ };
-+
-+ led-d6 {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&led_d6_pins_mbmx28lc>;
-+
-+ led1 {
-+ label = "d6";
-+ gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ led-d7 {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&led_d7_pins_mbmx28lc>;
-+
-+ led1 {
-+ label = "d7";
-+ gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
-+ linux,default-trigger = "default-on";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p3v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_lcd_3v3: regulator@1 {
-+ compatible = "regulator-fixed";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&reg_lcd_3v3_pins_mbmx28lc>;
-+ regulator-name = "lcd-3v3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+
-+ reg_usb0_vbus: regulator@2 {
-+ compatible = "regulator-fixed";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&reg_usb0_vbus_pins_mbmx28lc>;
-+ regulator-name = "usb0_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+
-+ reg_usb1_vbus: regulator@3 {
-+ compatible = "regulator-fixed";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&reg_usb1_vbus_pins_mbmx28lc>;
-+ regulator-name = "usb1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio1 19 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx28-mbmx28lc-sgtl5000",
-+ "fsl,mxs-audio-sgtl5000";
-+ model = "imx28-mbmx28lc-sgtl5000";
-+ saif-controllers = <&saif0 &saif1>;
-+ audio-codec = <&sgtl5000>;
-+ };
-+};
-+
-+&duart {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&duart_4pins_a>;
-+ status = "okay";
-+};
-+
-+&i2c0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&i2c0_pins_a>;
-+ status = "okay";
-+
-+ sgtl5000: codec@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ VDDA-supply = <&reg_3p3v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ clocks = <&saif0>;
-+ };
-+};
-+
-+&lcdif {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&lcdif_18bit_pins_a &lcdif_pins_mbmx28lc>;
-+ lcd-supply = <&reg_lcd_3v3>;
-+ display = <&display0>;
-+ status = "okay";
-+
-+ display0: display0 {
-+ model = "43WVF1G-0";
-+ bits-per-pixel = <16>;
-+ bus-width = <18>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: timing0 {
-+ clock-frequency = <9072000>;
-+ hactive = <480>;
-+ vactive = <272>;
-+ hback-porch = <10>;
-+ hfront-porch = <5>;
-+ vback-porch = <8>;
-+ vfront-porch = <8>;
-+ hsync-len = <40>;
-+ vsync-len = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+ };
-+ };
-+};
-+
-+&lradc {
-+ fsl,lradc-touchscreen-wires = <4>;
-+ status = "okay";
-+};
-+
-+&pinctrl {
-+ gpio_button_sw3_pins_mbmx28lc: gpio-button-sw3-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D21__GPIO_1_21
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ gpio_button_sw4_pins_mbmx28lc: gpio-button-sw4-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D20__GPIO_1_20
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_mbmx28lc: lcdif-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_VSYNC__LCD_VSYNC
-+ MX28_PAD_LCD_HSYNC__LCD_HSYNC
-+ MX28_PAD_LCD_DOTCLK__LCD_DOTCLK
-+ MX28_PAD_LCD_ENABLE__LCD_ENABLE
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ led_d6_pins_mbmx28lc: led-d6-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D23__GPIO_1_23
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ led_d7_pins_mbmx28lc: led-d7-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D22__GPIO_1_22
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ reg_lcd_3v3_pins_mbmx28lc: lcd-3v3-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_RESET__GPIO_3_30
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ reg_usb0_vbus_pins_mbmx28lc: reg-usb0-vbus-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D18__GPIO_1_18
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ reg_usb1_vbus_pins_mbmx28lc: reg-usb1-vbus-mbmx28lc@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D19__GPIO_1_19
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+};
-+
-+&pwm {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm4_pins_a>;
-+ status = "okay";
-+};
-+
-+&saif0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&saif0_pins_a>;
-+ status = "okay";
-+};
-+
-+&saif1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&saif1_pins_a>;
-+ fsl,saif-master = <&saif0>;
-+ status = "okay";
-+};
-+
-+&ssp0 {
-+ compatible = "fsl,imx28-mmc";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_cd_cfg &mmc0_sck_cfg>;
-+ bus-width = <4>;
-+ cd-inverted;
-+ status = "okay";
-+};
-+
-+&usb0 {
-+ disable-over-current;
-+ vbus-supply = <&reg_usb0_vbus>;
-+ status = "okay";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb0_id_pins_b>;
-+};
-+
-+&usb1 {
-+ vbus-supply = <&reg_usb1_vbus>;
-+ status = "okay";
-+};
-+
-+&usbphy0 {
-+ status = "okay";
-+};
-+
-+&usbphy1 {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-evk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-evk.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-evk.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -10,7 +10,7 @@
- */
-
- /dts-v1/;
--/include/ "imx28.dtsi"
-+#include "imx28.dtsi"
-
- / {
- model = "Freescale i.MX28 Evaluation Kit";
-@@ -70,52 +70,52 @@
- hog_pins_a: hog@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x20d3 /* MX28_PAD_SSP1_CMD__GPIO_2_13 */
-- 0x20f3 /* MX28_PAD_SSP1_DATA3__GPIO_2_15 */
-- 0x40d3 /* MX28_PAD_ENET0_RX_CLK__GPIO_4_13 */
-- 0x20c3 /* MX28_PAD_SSP1_SCK__GPIO_2_12 */
-- 0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */
-- 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
-- 0x3083 /* MX28_PAD_AUART2_RX__GPIO_3_8 */
-- 0x3093 /* MX28_PAD_AUART2_TX__GPIO_3_9 */
-+ MX28_PAD_SSP1_CMD__GPIO_2_13
-+ MX28_PAD_SSP1_DATA3__GPIO_2_15
-+ MX28_PAD_ENET0_RX_CLK__GPIO_4_13
-+ MX28_PAD_SSP1_SCK__GPIO_2_12
-+ MX28_PAD_PWM3__GPIO_3_28
-+ MX28_PAD_LCD_RESET__GPIO_3_30
-+ MX28_PAD_AUART2_RX__GPIO_3_8
-+ MX28_PAD_AUART2_TX__GPIO_3_9
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- led_pin_gpio3_5: led_gpio3_5@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
-+ MX28_PAD_AUART1_TX__GPIO_3_5
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- gpmi_pins_evk: gpmi-nand-evk@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0110 /* MX28_PAD_GPMI_CE1N__GPMI_CE1N */
-- 0x0150 /* MX28_PAD_GPMI_RDY1__GPMI_READY1 */
-+ MX28_PAD_GPMI_CE1N__GPMI_CE1N
-+ MX28_PAD_GPMI_RDY1__GPMI_READY1
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_pins_evk: lcdif-evk@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
-- 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
-- 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
-- 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
-+ MX28_PAD_LCD_RD_E__LCD_VSYNC
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC
-+ MX28_PAD_LCD_RS__LCD_DOTCLK
-+ MX28_PAD_LCD_CS__LCD_ENABLE
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
-
-@@ -155,12 +155,14 @@
- can0: can@80032000 {
- pinctrl-names = "default";
- pinctrl-0 = <&can0_pins_a>;
-+ xceiver-supply = <&reg_can_3v3>;
- status = "okay";
- };
-
- can1: can@80034000 {
- pinctrl-names = "default";
- pinctrl-0 = <&can1_pins_a>;
-+ xceiver-supply = <&reg_can_3v3>;
- status = "okay";
- };
- };
-@@ -180,12 +182,18 @@
- };
-
- lradc@80050000 {
-+ fsl,lradc-touchscreen-wires = <4>;
- status = "okay";
-+ fsl,lradc-touchscreen-wires = <4>;
-+ fsl,ave-ctrl = <4>;
-+ fsl,ave-delay = <2>;
-+ fsl,settling = <10>;
- };
-
- i2c0: i2c@80058000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
-+ clock-frequency = <400000>;
- status = "okay";
-
- sgtl5000: codec@0a {
-@@ -193,7 +201,7 @@
- reg = <0x0a>;
- VDDA-supply = <&reg_3p3v>;
- VDDIO-supply = <&reg_3p3v>;
--
-+ clocks = <&saif0>;
- };
-
- at24@51 {
-@@ -218,6 +226,7 @@
- auart0: serial@8006a000 {
- pinctrl-names = "default";
- pinctrl-0 = <&auart0_pins_a>;
-+ fsl,uart-has-rtscts;
- status = "okay";
- };
-
-@@ -239,6 +248,8 @@
-
- ahb@80080000 {
- usb0: usb@80080000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb0_id_pins_a>;
- vbus-supply = <&reg_usb0_vbus>;
- status = "okay";
- };
-@@ -268,33 +279,39 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_3p3v: 3p3v {
-+ reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
-- reg_vddio_sd0: vddio-sd0 {
-+ reg_vddio_sd0: regulator@1 {
- compatible = "regulator-fixed";
-+ reg = <1>;
- regulator-name = "vddio-sd0";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio3 28 0>;
- };
-
-- reg_fec_3v3: fec-3v3 {
-+ reg_fec_3v3: regulator@2 {
- compatible = "regulator-fixed";
-+ reg = <2>;
- regulator-name = "fec-3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio2 15 0>;
- };
-
-- reg_usb0_vbus: usb0_vbus {
-+ reg_usb0_vbus: regulator@3 {
- compatible = "regulator-fixed";
-+ reg = <3>;
- regulator-name = "usb0_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
-@@ -302,8 +319,9 @@
- enable-active-high;
- };
-
-- reg_usb1_vbus: usb1_vbus {
-+ reg_usb1_vbus: regulator@4 {
- compatible = "regulator-fixed";
-+ reg = <4>;
- regulator-name = "usb1_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
-@@ -311,14 +329,26 @@
- enable-active-high;
- };
-
-- reg_lcd_3v3: lcd-3v3 {
-+ reg_lcd_3v3: regulator@5 {
- compatible = "regulator-fixed";
-+ reg = <5>;
- regulator-name = "lcd-3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio3 30 0>;
- enable-active-high;
- };
-+
-+ reg_can_3v3: regulator@6 {
-+ compatible = "regulator-fixed";
-+ reg = <6>;
-+ regulator-name = "can-3v3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio2 13 0>;
-+ enable-active-high;
-+ };
-+
- };
-
- sound {
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-m28cu3.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-m28cu3.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-m28cu3.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-m28cu3.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,271 @@
-+/*
-+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx28.dtsi"
-+
-+/ {
-+ model = "MSR M28CU3";
-+ compatible = "msr,m28cu3", "fsl,imx28";
-+
-+ memory {
-+ reg = <0x40000000 0x08000000>;
-+ };
-+
-+ apb@80000000 {
-+ apbh@80000000 {
-+ gpmi-nand@8000c000 {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
-+ status = "okay";
-+
-+ partition@0 {
-+ label = "gpmi-nfc-0-boot";
-+ reg = <0x00000000 0x01400000>;
-+ read-only;
-+ };
-+
-+ partition@1 {
-+ label = "gpmi-nfc-general-use";
-+ reg = <0x01400000 0x0ec00000>;
-+ };
-+ };
-+
-+ ssp0: ssp@80010000 {
-+ compatible = "fsl,imx28-mmc";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mmc0_4bit_pins_a
-+ &mmc0_cd_cfg
-+ &mmc0_sck_cfg>;
-+ bus-width = <4>;
-+ vmmc-supply = <&reg_vddio_sd0>;
-+ status = "okay";
-+ };
-+
-+ ssp2: ssp@80014000 {
-+ compatible = "fsl,imx28-mmc";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mmc2_4bit_pins_a
-+ &mmc2_cd_cfg
-+ &mmc2_sck_cfg>;
-+ bus-width = <4>;
-+ vmmc-supply = <&reg_vddio_sd1>;
-+ status = "okay";
-+ };
-+
-+ pinctrl@80018000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&hog_pins_a>;
-+
-+ hog_pins_a: hog@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP2_SS0__GPIO_2_19
-+ MX28_PAD_PWM4__GPIO_3_29
-+ MX28_PAD_AUART2_RX__GPIO_3_8
-+ MX28_PAD_ENET0_RX_CLK__GPIO_4_13
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ lcdif_pins_m28: lcdif-m28@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_VSYNC__LCD_VSYNC
-+ MX28_PAD_LCD_HSYNC__LCD_HSYNC
-+ MX28_PAD_LCD_DOTCLK__LCD_DOTCLK
-+ MX28_PAD_LCD_RESET__LCD_RESET
-+ MX28_PAD_LCD_CS__LCD_ENABLE
-+ MX28_PAD_AUART1_TX__GPIO_3_5
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ led_pins_gpio: leds-m28@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP3_MISO__GPIO_2_26
-+ MX28_PAD_SSP3_SCK__GPIO_2_24
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+ };
-+
-+ ocotp@8002c000 {
-+ status = "okay";
-+ };
-+
-+ lcdif@80030000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&lcdif_24bit_pins_a
-+ &lcdif_pins_m28>;
-+ display = <&display>;
-+ status = "okay";
-+
-+ display: display0 {
-+ bits-per-pixel = <32>;
-+ bus-width = <24>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: timing0 {
-+ clock-frequency = <6410256>;
-+ hactive = <320>;
-+ vactive = <240>;
-+ hback-porch = <38>;
-+ hfront-porch = <20>;
-+ vback-porch = <15>;
-+ vfront-porch = <5>;
-+ hsync-len = <30>;
-+ vsync-len = <3>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+ };
-+ };
-+ };
-+ };
-+
-+ apbx@80040000 {
-+ duart: serial@80074000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&duart_pins_b>;
-+ status = "okay";
-+ };
-+
-+ usbphy1: usbphy@8007e000 {
-+ status = "okay";
-+ };
-+
-+ auart0: serial@8006a000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart0_2pins_a>;
-+ status = "okay";
-+ };
-+
-+ auart3: serial@80070000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart3_2pins_b>;
-+ status = "okay";
-+ };
-+
-+ pwm: pwm@80064000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm3_pins_a>;
-+ status = "okay";
-+ };
-+ };
-+ };
-+
-+ ahb@80080000 {
-+ usb1: usb@80090000 {
-+ vbus-supply = <&reg_usb1_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&usb1_pins_a>;
-+ disable-over-current;
-+ status = "okay";
-+ };
-+
-+ mac0: ethernet@800f0000 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac0_pins_a>;
-+ phy-reset-gpios = <&gpio4 13 0>;
-+ phy-reset-duration = <100>;
-+ status = "okay";
-+ };
-+
-+ mac1: ethernet@800f4000 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac1_pins_a>;
-+ status = "okay";
-+ };
-+ };
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm 3 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <6>;
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&led_pins_gpio>;
-+
-+ user1 {
-+ label = "sd0-led";
-+ gpios = <&gpio2 26 0>;
-+ linux,default-trigger = "mmc0";
-+ };
-+
-+ user2 {
-+ label = "sd1-led";
-+ gpios = <&gpio2 24 0>;
-+ linux,default-trigger = "mmc2";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p3v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_vddio_sd0: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "vddio-sd0";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio3 29 0>;
-+ };
-+
-+ reg_vddio_sd1: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "vddio-sd1";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio2 19 0>;
-+ };
-+
-+ reg_usb1_vbus: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "usb1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 8 0>;
-+ enable-active-high;
-+ };
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-m28evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-m28evk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-m28evk.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-m28evk.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -10,7 +10,7 @@
- */
-
- /dts-v1/;
--/include/ "imx28.dtsi"
-+#include "imx28.dtsi"
-
- / {
- model = "DENX M28EVK";
-@@ -92,26 +92,26 @@
- hog_pins_a: hog@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */
-- 0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */
-- 0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */
-- 0x30c3 /* MX28_PAD_AUART3_RX__GPIO_3_12 */
-- 0x30d3 /* MX28_PAD_AUART3_TX__GPIO_3_13 */
-+ MX28_PAD_PWM3__GPIO_3_28
-+ MX28_PAD_AUART2_CTS__GPIO_3_10
-+ MX28_PAD_AUART2_RTS__GPIO_3_11
-+ MX28_PAD_AUART3_RX__GPIO_3_12
-+ MX28_PAD_AUART3_TX__GPIO_3_13
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- lcdif_pins_m28: lcdif-m28@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x11e0 /* MX28_PAD_LCD_DOTCLK__LCD_DOTCLK */
-- 0x11f0 /* MX28_PAD_LCD_ENABLE__LCD_ENABLE */
-+ MX28_PAD_LCD_DOTCLK__LCD_DOTCLK
-+ MX28_PAD_LCD_ENABLE__LCD_ENABLE
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
- };
-
-@@ -184,7 +184,7 @@
- reg = <0x0a>;
- VDDA-supply = <&reg_3p3v>;
- VDDIO-supply = <&reg_3p3v>;
--
-+ clocks = <&saif0>;
- };
-
- eeprom: eeprom@51 {
-@@ -194,7 +194,7 @@
- };
-
- rtc: rtc@68 {
-- compatible = "stm,mt41t62";
-+ compatible = "stm,m41t62";
- reg = <0x68>;
- };
- };
-@@ -220,7 +220,25 @@
-
- auart0: serial@8006a000 {
- pinctrl-names = "default";
-- pinctrl-0 = <&auart0_2pins_a>;
-+ pinctrl-0 = <&auart0_pins_a>;
-+ status = "okay";
-+ };
-+
-+ auart1: serial@8006c000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart1_pins_a>;
-+ status = "okay";
-+ };
-+
-+ auart2: serial@8006e000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart2_2pins_b>;
-+ status = "okay";
-+ };
-+
-+ pwm: pwm@80064000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm4_pins_a>;
- status = "okay";
- };
- };
-@@ -230,14 +248,14 @@
- usb0: usb@80080000 {
- vbus-supply = <&reg_usb0_vbus>;
- pinctrl-names = "default";
-- pinctrl-0 = <&usbphy0_pins_a>;
-+ pinctrl-0 = <&usb0_pins_a>;
- status = "okay";
- };
-
- usb1: usb@80090000 {
- vbus-supply = <&reg_usb1_vbus>;
- pinctrl-names = "default";
-- pinctrl-0 = <&usbphy1_pins_a>;
-+ pinctrl-0 = <&usb1_pins_a>;
- status = "okay";
- };
-
-@@ -258,35 +276,48 @@
- };
- };
-
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm 4 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <6>;
-+ };
-+
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_3p3v: 3p3v {
-+ reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
-- reg_vddio_sd0: vddio-sd0 {
-+ reg_vddio_sd0: regulator@1 {
- compatible = "regulator-fixed";
-+ reg = <1>;
- regulator-name = "vddio-sd0";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio3 28 0>;
- };
-
-- reg_usb0_vbus: usb0_vbus {
-+ reg_usb0_vbus: regulator@2 {
- compatible = "regulator-fixed";
-+ reg = <2>;
- regulator-name = "usb0_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio3 12 0>;
- };
-
-- reg_usb1_vbus: usb1_vbus {
-+ reg_usb1_vbus: regulator@3 {
- compatible = "regulator-fixed";
-+ reg = <3>;
- regulator-name = "usb1_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-pinfunc.h
---- linux-3.10.36/arch/arm/boot/dts/imx28-pinfunc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-pinfunc.h 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,506 @@
-+/*
-+ * Header providing constants for i.MX28 pinctrl bindings.
-+ *
-+ * Copyright (C) 2013 Lothar Waßmann <LW@KARO-electronics.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#ifndef __DT_BINDINGS_MX28_PINCTRL_H__
-+#define __DT_BINDINGS_MX28_PINCTRL_H__
-+
-+#include "mxs-pinfunc.h"
-+
-+#define MX28_PAD_GPMI_D00__GPMI_D0 0x0000
-+#define MX28_PAD_GPMI_D01__GPMI_D1 0x0010
-+#define MX28_PAD_GPMI_D02__GPMI_D2 0x0020
-+#define MX28_PAD_GPMI_D03__GPMI_D3 0x0030
-+#define MX28_PAD_GPMI_D04__GPMI_D4 0x0040
-+#define MX28_PAD_GPMI_D05__GPMI_D5 0x0050
-+#define MX28_PAD_GPMI_D06__GPMI_D6 0x0060
-+#define MX28_PAD_GPMI_D07__GPMI_D7 0x0070
-+#define MX28_PAD_GPMI_CE0N__GPMI_CE0N 0x0100
-+#define MX28_PAD_GPMI_CE1N__GPMI_CE1N 0x0110
-+#define MX28_PAD_GPMI_CE2N__GPMI_CE2N 0x0120
-+#define MX28_PAD_GPMI_CE3N__GPMI_CE3N 0x0130
-+#define MX28_PAD_GPMI_RDY0__GPMI_READY0 0x0140
-+#define MX28_PAD_GPMI_RDY1__GPMI_READY1 0x0150
-+#define MX28_PAD_GPMI_RDY2__GPMI_READY2 0x0160
-+#define MX28_PAD_GPMI_RDY3__GPMI_READY3 0x0170
-+#define MX28_PAD_GPMI_RDN__GPMI_RDN 0x0180
-+#define MX28_PAD_GPMI_WRN__GPMI_WRN 0x0190
-+#define MX28_PAD_GPMI_ALE__GPMI_ALE 0x01a0
-+#define MX28_PAD_GPMI_CLE__GPMI_CLE 0x01b0
-+#define MX28_PAD_GPMI_RESETN__GPMI_RESETN 0x01c0
-+#define MX28_PAD_LCD_D00__LCD_D0 0x1000
-+#define MX28_PAD_LCD_D01__LCD_D1 0x1010
-+#define MX28_PAD_LCD_D02__LCD_D2 0x1020
-+#define MX28_PAD_LCD_D03__LCD_D3 0x1030
-+#define MX28_PAD_LCD_D04__LCD_D4 0x1040
-+#define MX28_PAD_LCD_D05__LCD_D5 0x1050
-+#define MX28_PAD_LCD_D06__LCD_D6 0x1060
-+#define MX28_PAD_LCD_D07__LCD_D7 0x1070
-+#define MX28_PAD_LCD_D08__LCD_D8 0x1080
-+#define MX28_PAD_LCD_D09__LCD_D9 0x1090
-+#define MX28_PAD_LCD_D10__LCD_D10 0x10a0
-+#define MX28_PAD_LCD_D11__LCD_D11 0x10b0
-+#define MX28_PAD_LCD_D12__LCD_D12 0x10c0
-+#define MX28_PAD_LCD_D13__LCD_D13 0x10d0
-+#define MX28_PAD_LCD_D14__LCD_D14 0x10e0
-+#define MX28_PAD_LCD_D15__LCD_D15 0x10f0
-+#define MX28_PAD_LCD_D16__LCD_D16 0x1100
-+#define MX28_PAD_LCD_D17__LCD_D17 0x1110
-+#define MX28_PAD_LCD_D18__LCD_D18 0x1120
-+#define MX28_PAD_LCD_D19__LCD_D19 0x1130
-+#define MX28_PAD_LCD_D20__LCD_D20 0x1140
-+#define MX28_PAD_LCD_D21__LCD_D21 0x1150
-+#define MX28_PAD_LCD_D22__LCD_D22 0x1160
-+#define MX28_PAD_LCD_D23__LCD_D23 0x1170
-+#define MX28_PAD_LCD_RD_E__LCD_RD_E 0x1180
-+#define MX28_PAD_LCD_WR_RWN__LCD_WR_RWN 0x1190
-+#define MX28_PAD_LCD_RS__LCD_RS 0x11a0
-+#define MX28_PAD_LCD_CS__LCD_CS 0x11b0
-+#define MX28_PAD_LCD_VSYNC__LCD_VSYNC 0x11c0
-+#define MX28_PAD_LCD_HSYNC__LCD_HSYNC 0x11d0
-+#define MX28_PAD_LCD_DOTCLK__LCD_DOTCLK 0x11e0
-+#define MX28_PAD_LCD_ENABLE__LCD_ENABLE 0x11f0
-+#define MX28_PAD_SSP0_DATA0__SSP0_D0 0x2000
-+#define MX28_PAD_SSP0_DATA1__SSP0_D1 0x2010
-+#define MX28_PAD_SSP0_DATA2__SSP0_D2 0x2020
-+#define MX28_PAD_SSP0_DATA3__SSP0_D3 0x2030
-+#define MX28_PAD_SSP0_DATA4__SSP0_D4 0x2040
-+#define MX28_PAD_SSP0_DATA5__SSP0_D5 0x2050
-+#define MX28_PAD_SSP0_DATA6__SSP0_D6 0x2060
-+#define MX28_PAD_SSP0_DATA7__SSP0_D7 0x2070
-+#define MX28_PAD_SSP0_CMD__SSP0_CMD 0x2080
-+#define MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT 0x2090
-+#define MX28_PAD_SSP0_SCK__SSP0_SCK 0x20a0
-+#define MX28_PAD_SSP1_SCK__SSP1_SCK 0x20c0
-+#define MX28_PAD_SSP1_CMD__SSP1_CMD 0x20d0
-+#define MX28_PAD_SSP1_DATA0__SSP1_D0 0x20e0
-+#define MX28_PAD_SSP1_DATA3__SSP1_D3 0x20f0
-+#define MX28_PAD_SSP2_SCK__SSP2_SCK 0x2100
-+#define MX28_PAD_SSP2_MOSI__SSP2_CMD 0x2110
-+#define MX28_PAD_SSP2_MISO__SSP2_D0 0x2120
-+#define MX28_PAD_SSP2_SS0__SSP2_D3 0x2130
-+#define MX28_PAD_SSP2_SS1__SSP2_D4 0x2140
-+#define MX28_PAD_SSP2_SS2__SSP2_D5 0x2150
-+#define MX28_PAD_SSP3_SCK__SSP3_SCK 0x2180
-+#define MX28_PAD_SSP3_MOSI__SSP3_CMD 0x2190
-+#define MX28_PAD_SSP3_MISO__SSP3_D0 0x21a0
-+#define MX28_PAD_SSP3_SS0__SSP3_D3 0x21b0
-+#define MX28_PAD_AUART0_RX__AUART0_RX 0x3000
-+#define MX28_PAD_AUART0_TX__AUART0_TX 0x3010
-+#define MX28_PAD_AUART0_CTS__AUART0_CTS 0x3020
-+#define MX28_PAD_AUART0_RTS__AUART0_RTS 0x3030
-+#define MX28_PAD_AUART1_RX__AUART1_RX 0x3040
-+#define MX28_PAD_AUART1_TX__AUART1_TX 0x3050
-+#define MX28_PAD_AUART1_CTS__AUART1_CTS 0x3060
-+#define MX28_PAD_AUART1_RTS__AUART1_RTS 0x3070
-+#define MX28_PAD_AUART2_RX__AUART2_RX 0x3080
-+#define MX28_PAD_AUART2_TX__AUART2_TX 0x3090
-+#define MX28_PAD_AUART2_CTS__AUART2_CTS 0x30a0
-+#define MX28_PAD_AUART2_RTS__AUART2_RTS 0x30b0
-+#define MX28_PAD_AUART3_RX__AUART3_RX 0x30c0
-+#define MX28_PAD_AUART3_TX__AUART3_TX 0x30d0
-+#define MX28_PAD_AUART3_CTS__AUART3_CTS 0x30e0
-+#define MX28_PAD_AUART3_RTS__AUART3_RTS 0x30f0
-+#define MX28_PAD_PWM0__PWM_0 0x3100
-+#define MX28_PAD_PWM1__PWM_1 0x3110
-+#define MX28_PAD_PWM2__PWM_2 0x3120
-+#define MX28_PAD_SAIF0_MCLK__SAIF0_MCLK 0x3140
-+#define MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK 0x3150
-+#define MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK 0x3160
-+#define MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0 0x3170
-+#define MX28_PAD_I2C0_SCL__I2C0_SCL 0x3180
-+#define MX28_PAD_I2C0_SDA__I2C0_SDA 0x3190
-+#define MX28_PAD_SAIF1_SDATA0__SAIF1_SDATA0 0x31a0
-+#define MX28_PAD_SPDIF__SPDIF_TX 0x31b0
-+#define MX28_PAD_PWM3__PWM_3 0x31c0
-+#define MX28_PAD_PWM4__PWM_4 0x31d0
-+#define MX28_PAD_LCD_RESET__LCD_RESET 0x31e0
-+#define MX28_PAD_ENET0_MDC__ENET0_MDC 0x4000
-+#define MX28_PAD_ENET0_MDIO__ENET0_MDIO 0x4010
-+#define MX28_PAD_ENET0_RX_EN__ENET0_RX_EN 0x4020
-+#define MX28_PAD_ENET0_RXD0__ENET0_RXD0 0x4030
-+#define MX28_PAD_ENET0_RXD1__ENET0_RXD1 0x4040
-+#define MX28_PAD_ENET0_TX_CLK__ENET0_TX_CLK 0x4050
-+#define MX28_PAD_ENET0_TX_EN__ENET0_TX_EN 0x4060
-+#define MX28_PAD_ENET0_TXD0__ENET0_TXD0 0x4070
-+#define MX28_PAD_ENET0_TXD1__ENET0_TXD1 0x4080
-+#define MX28_PAD_ENET0_RXD2__ENET0_RXD2 0x4090
-+#define MX28_PAD_ENET0_RXD3__ENET0_RXD3 0x40a0
-+#define MX28_PAD_ENET0_TXD2__ENET0_TXD2 0x40b0
-+#define MX28_PAD_ENET0_TXD3__ENET0_TXD3 0x40c0
-+#define MX28_PAD_ENET0_RX_CLK__ENET0_RX_CLK 0x40d0
-+#define MX28_PAD_ENET0_COL__ENET0_COL 0x40e0
-+#define MX28_PAD_ENET0_CRS__ENET0_CRS 0x40f0
-+#define MX28_PAD_ENET_CLK__CLKCTRL_ENET 0x4100
-+#define MX28_PAD_JTAG_RTCK__JTAG_RTCK 0x4140
-+#define MX28_PAD_EMI_D00__EMI_DATA0 0x5000
-+#define MX28_PAD_EMI_D01__EMI_DATA1 0x5010
-+#define MX28_PAD_EMI_D02__EMI_DATA2 0x5020
-+#define MX28_PAD_EMI_D03__EMI_DATA3 0x5030
-+#define MX28_PAD_EMI_D04__EMI_DATA4 0x5040
-+#define MX28_PAD_EMI_D05__EMI_DATA5 0x5050
-+#define MX28_PAD_EMI_D06__EMI_DATA6 0x5060
-+#define MX28_PAD_EMI_D07__EMI_DATA7 0x5070
-+#define MX28_PAD_EMI_D08__EMI_DATA8 0x5080
-+#define MX28_PAD_EMI_D09__EMI_DATA9 0x5090
-+#define MX28_PAD_EMI_D10__EMI_DATA10 0x50a0
-+#define MX28_PAD_EMI_D11__EMI_DATA11 0x50b0
-+#define MX28_PAD_EMI_D12__EMI_DATA12 0x50c0
-+#define MX28_PAD_EMI_D13__EMI_DATA13 0x50d0
-+#define MX28_PAD_EMI_D14__EMI_DATA14 0x50e0
-+#define MX28_PAD_EMI_D15__EMI_DATA15 0x50f0
-+#define MX28_PAD_EMI_ODT0__EMI_ODT0 0x5100
-+#define MX28_PAD_EMI_DQM0__EMI_DQM0 0x5110
-+#define MX28_PAD_EMI_ODT1__EMI_ODT1 0x5120
-+#define MX28_PAD_EMI_DQM1__EMI_DQM1 0x5130
-+#define MX28_PAD_EMI_DDR_OPEN_FB__EMI_DDR_OPEN_FEEDBACK 0x5140
-+#define MX28_PAD_EMI_CLK__EMI_CLK 0x5150
-+#define MX28_PAD_EMI_DQS0__EMI_DQS0 0x5160
-+#define MX28_PAD_EMI_DQS1__EMI_DQS1 0x5170
-+#define MX28_PAD_EMI_DDR_OPEN__EMI_DDR_OPEN 0x51a0
-+#define MX28_PAD_EMI_A00__EMI_ADDR0 0x6000
-+#define MX28_PAD_EMI_A01__EMI_ADDR1 0x6010
-+#define MX28_PAD_EMI_A02__EMI_ADDR2 0x6020
-+#define MX28_PAD_EMI_A03__EMI_ADDR3 0x6030
-+#define MX28_PAD_EMI_A04__EMI_ADDR4 0x6040
-+#define MX28_PAD_EMI_A05__EMI_ADDR5 0x6050
-+#define MX28_PAD_EMI_A06__EMI_ADDR6 0x6060
-+#define MX28_PAD_EMI_A07__EMI_ADDR7 0x6070
-+#define MX28_PAD_EMI_A08__EMI_ADDR8 0x6080
-+#define MX28_PAD_EMI_A09__EMI_ADDR9 0x6090
-+#define MX28_PAD_EMI_A10__EMI_ADDR10 0x60a0
-+#define MX28_PAD_EMI_A11__EMI_ADDR11 0x60b0
-+#define MX28_PAD_EMI_A12__EMI_ADDR12 0x60c0
-+#define MX28_PAD_EMI_A13__EMI_ADDR13 0x60d0
-+#define MX28_PAD_EMI_A14__EMI_ADDR14 0x60e0
-+#define MX28_PAD_EMI_BA0__EMI_BA0 0x6100
-+#define MX28_PAD_EMI_BA1__EMI_BA1 0x6110
-+#define MX28_PAD_EMI_BA2__EMI_BA2 0x6120
-+#define MX28_PAD_EMI_CASN__EMI_CASN 0x6130
-+#define MX28_PAD_EMI_RASN__EMI_RASN 0x6140
-+#define MX28_PAD_EMI_WEN__EMI_WEN 0x6150
-+#define MX28_PAD_EMI_CE0N__EMI_CE0N 0x6160
-+#define MX28_PAD_EMI_CE1N__EMI_CE1N 0x6170
-+#define MX28_PAD_EMI_CKE__EMI_CKE 0x6180
-+#define MX28_PAD_GPMI_D00__SSP1_D0 0x0001
-+#define MX28_PAD_GPMI_D01__SSP1_D1 0x0011
-+#define MX28_PAD_GPMI_D02__SSP1_D2 0x0021
-+#define MX28_PAD_GPMI_D03__SSP1_D3 0x0031
-+#define MX28_PAD_GPMI_D04__SSP1_D4 0x0041
-+#define MX28_PAD_GPMI_D05__SSP1_D5 0x0051
-+#define MX28_PAD_GPMI_D06__SSP1_D6 0x0061
-+#define MX28_PAD_GPMI_D07__SSP1_D7 0x0071
-+#define MX28_PAD_GPMI_CE0N__SSP3_D0 0x0101
-+#define MX28_PAD_GPMI_CE1N__SSP3_D3 0x0111
-+#define MX28_PAD_GPMI_CE2N__CAN1_TX 0x0121
-+#define MX28_PAD_GPMI_CE3N__CAN1_RX 0x0131
-+#define MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT 0x0141
-+#define MX28_PAD_GPMI_RDY1__SSP1_CMD 0x0151
-+#define MX28_PAD_GPMI_RDY2__CAN0_TX 0x0161
-+#define MX28_PAD_GPMI_RDY3__CAN0_RX 0x0171
-+#define MX28_PAD_GPMI_RDN__SSP3_SCK 0x0181
-+#define MX28_PAD_GPMI_WRN__SSP1_SCK 0x0191
-+#define MX28_PAD_GPMI_ALE__SSP3_D1 0x01a1
-+#define MX28_PAD_GPMI_CLE__SSP3_D2 0x01b1
-+#define MX28_PAD_GPMI_RESETN__SSP3_CMD 0x01c1
-+#define MX28_PAD_LCD_D03__ETM_DA8 0x1031
-+#define MX28_PAD_LCD_D04__ETM_DA9 0x1041
-+#define MX28_PAD_LCD_D08__ETM_DA3 0x1081
-+#define MX28_PAD_LCD_D09__ETM_DA4 0x1091
-+#define MX28_PAD_LCD_D20__ENET1_1588_EVENT2_OUT 0x1141
-+#define MX28_PAD_LCD_D21__ENET1_1588_EVENT2_IN 0x1151
-+#define MX28_PAD_LCD_D22__ENET1_1588_EVENT3_OUT 0x1161
-+#define MX28_PAD_LCD_D23__ENET1_1588_EVENT3_IN 0x1171
-+#define MX28_PAD_LCD_RD_E__LCD_VSYNC 0x1181
-+#define MX28_PAD_LCD_WR_RWN__LCD_HSYNC 0x1191
-+#define MX28_PAD_LCD_RS__LCD_DOTCLK 0x11a1
-+#define MX28_PAD_LCD_CS__LCD_ENABLE 0x11b1
-+#define MX28_PAD_LCD_VSYNC__SAIF1_SDATA0 0x11c1
-+#define MX28_PAD_LCD_HSYNC__SAIF1_SDATA1 0x11d1
-+#define MX28_PAD_LCD_DOTCLK__SAIF1_MCLK 0x11e1
-+#define MX28_PAD_SSP0_DATA4__SSP2_D0 0x2041
-+#define MX28_PAD_SSP0_DATA5__SSP2_D3 0x2051
-+#define MX28_PAD_SSP0_DATA6__SSP2_CMD 0x2061
-+#define MX28_PAD_SSP0_DATA7__SSP2_SCK 0x2071
-+#define MX28_PAD_SSP1_SCK__SSP2_D1 0x20c1
-+#define MX28_PAD_SSP1_CMD__SSP2_D2 0x20d1
-+#define MX28_PAD_SSP1_DATA0__SSP2_D6 0x20e1
-+#define MX28_PAD_SSP1_DATA3__SSP2_D7 0x20f1
-+#define MX28_PAD_SSP2_SCK__AUART2_RX 0x2101
-+#define MX28_PAD_SSP2_MOSI__AUART2_TX 0x2111
-+#define MX28_PAD_SSP2_MISO__AUART3_RX 0x2121
-+#define MX28_PAD_SSP2_SS0__AUART3_TX 0x2131
-+#define MX28_PAD_SSP2_SS1__SSP2_D1 0x2141
-+#define MX28_PAD_SSP2_SS2__SSP2_D2 0x2151
-+#define MX28_PAD_SSP3_SCK__AUART4_TX 0x2181
-+#define MX28_PAD_SSP3_MOSI__AUART4_RX 0x2191
-+#define MX28_PAD_SSP3_MISO__AUART4_RTS 0x21a1
-+#define MX28_PAD_SSP3_SS0__AUART4_CTS 0x21b1
-+#define MX28_PAD_AUART0_RX__I2C0_SCL 0x3001
-+#define MX28_PAD_AUART0_TX__I2C0_SDA 0x3011
-+#define MX28_PAD_AUART0_CTS__AUART4_RX 0x3021
-+#define MX28_PAD_AUART0_RTS__AUART4_TX 0x3031
-+#define MX28_PAD_AUART1_RX__SSP2_CARD_DETECT 0x3041
-+#define MX28_PAD_AUART1_TX__SSP3_CARD_DETECT 0x3051
-+#define MX28_PAD_AUART1_CTS__USB0_OVERCURRENT 0x3061
-+#define MX28_PAD_AUART1_RTS__USB0_ID 0x3071
-+#define MX28_PAD_AUART2_RX__SSP3_D1 0x3081
-+#define MX28_PAD_AUART2_TX__SSP3_D2 0x3091
-+#define MX28_PAD_AUART2_CTS__I2C1_SCL 0x30a1
-+#define MX28_PAD_AUART2_RTS__I2C1_SDA 0x30b1
-+#define MX28_PAD_AUART3_RX__CAN0_TX 0x30c1
-+#define MX28_PAD_AUART3_TX__CAN0_RX 0x30d1
-+#define MX28_PAD_AUART3_CTS__CAN1_TX 0x30e1
-+#define MX28_PAD_AUART3_RTS__CAN1_RX 0x30f1
-+#define MX28_PAD_PWM0__I2C1_SCL 0x3101
-+#define MX28_PAD_PWM1__I2C1_SDA 0x3111
-+#define MX28_PAD_PWM2__USB0_ID 0x3121
-+#define MX28_PAD_SAIF0_MCLK__PWM_3 0x3141
-+#define MX28_PAD_SAIF0_LRCLK__PWM_4 0x3151
-+#define MX28_PAD_SAIF0_BITCLK__PWM_5 0x3161
-+#define MX28_PAD_SAIF0_SDATA0__PWM_6 0x3171
-+#define MX28_PAD_I2C0_SCL__TIMROT_ROTARYA 0x3181
-+#define MX28_PAD_I2C0_SDA__TIMROT_ROTARYB 0x3191
-+#define MX28_PAD_SAIF1_SDATA0__PWM_7 0x31a1
-+#define MX28_PAD_LCD_RESET__LCD_VSYNC 0x31e1
-+#define MX28_PAD_ENET0_MDC__GPMI_CE4N 0x4001
-+#define MX28_PAD_ENET0_MDIO__GPMI_CE5N 0x4011
-+#define MX28_PAD_ENET0_RX_EN__GPMI_CE6N 0x4021
-+#define MX28_PAD_ENET0_RXD0__GPMI_CE7N 0x4031
-+#define MX28_PAD_ENET0_RXD1__GPMI_READY4 0x4041
-+#define MX28_PAD_ENET0_TX_CLK__HSADC_TRIGGER 0x4051
-+#define MX28_PAD_ENET0_TX_EN__GPMI_READY5 0x4061
-+#define MX28_PAD_ENET0_TXD0__GPMI_READY6 0x4071
-+#define MX28_PAD_ENET0_TXD1__GPMI_READY7 0x4081
-+#define MX28_PAD_ENET0_RXD2__ENET1_RXD0 0x4091
-+#define MX28_PAD_ENET0_RXD3__ENET1_RXD1 0x40a1
-+#define MX28_PAD_ENET0_TXD2__ENET1_TXD0 0x40b1
-+#define MX28_PAD_ENET0_TXD3__ENET1_TXD1 0x40c1
-+#define MX28_PAD_ENET0_RX_CLK__ENET0_RX_ER 0x40d1
-+#define MX28_PAD_ENET0_COL__ENET1_TX_EN 0x40e1
-+#define MX28_PAD_ENET0_CRS__ENET1_RX_EN 0x40f1
-+#define MX28_PAD_GPMI_CE2N__ENET0_RX_ER 0x0122
-+#define MX28_PAD_GPMI_CE3N__SAIF1_MCLK 0x0132
-+#define MX28_PAD_GPMI_RDY0__USB0_ID 0x0142
-+#define MX28_PAD_GPMI_RDY2__ENET0_TX_ER 0x0162
-+#define MX28_PAD_GPMI_RDY3__HSADC_TRIGGER 0x0172
-+#define MX28_PAD_GPMI_ALE__SSP3_D4 0x01a2
-+#define MX28_PAD_GPMI_CLE__SSP3_D5 0x01b2
-+#define MX28_PAD_LCD_D00__ETM_DA0 0x1002
-+#define MX28_PAD_LCD_D01__ETM_DA1 0x1012
-+#define MX28_PAD_LCD_D02__ETM_DA2 0x1022
-+#define MX28_PAD_LCD_D03__ETM_DA3 0x1032
-+#define MX28_PAD_LCD_D04__ETM_DA4 0x1042
-+#define MX28_PAD_LCD_D05__ETM_DA5 0x1052
-+#define MX28_PAD_LCD_D06__ETM_DA6 0x1062
-+#define MX28_PAD_LCD_D07__ETM_DA7 0x1072
-+#define MX28_PAD_LCD_D08__ETM_DA8 0x1082
-+#define MX28_PAD_LCD_D09__ETM_DA9 0x1092
-+#define MX28_PAD_LCD_D10__ETM_DA10 0x10a2
-+#define MX28_PAD_LCD_D11__ETM_DA11 0x10b2
-+#define MX28_PAD_LCD_D12__ETM_DA12 0x10c2
-+#define MX28_PAD_LCD_D13__ETM_DA13 0x10d2
-+#define MX28_PAD_LCD_D14__ETM_DA14 0x10e2
-+#define MX28_PAD_LCD_D15__ETM_DA15 0x10f2
-+#define MX28_PAD_LCD_D16__ETM_DA7 0x1102
-+#define MX28_PAD_LCD_D17__ETM_DA6 0x1112
-+#define MX28_PAD_LCD_D18__ETM_DA5 0x1122
-+#define MX28_PAD_LCD_D19__ETM_DA4 0x1132
-+#define MX28_PAD_LCD_D20__ETM_DA3 0x1142
-+#define MX28_PAD_LCD_D21__ETM_DA2 0x1152
-+#define MX28_PAD_LCD_D22__ETM_DA1 0x1162
-+#define MX28_PAD_LCD_D23__ETM_DA0 0x1172
-+#define MX28_PAD_LCD_RD_E__ETM_TCTL 0x1182
-+#define MX28_PAD_LCD_WR_RWN__ETM_TCLK 0x1192
-+#define MX28_PAD_LCD_HSYNC__ETM_TCTL 0x11d2
-+#define MX28_PAD_LCD_DOTCLK__ETM_TCLK 0x11e2
-+#define MX28_PAD_SSP1_SCK__ENET0_1588_EVENT2_OUT 0x20c2
-+#define MX28_PAD_SSP1_CMD__ENET0_1588_EVENT2_IN 0x20d2
-+#define MX28_PAD_SSP1_DATA0__ENET0_1588_EVENT3_OUT 0x20e2
-+#define MX28_PAD_SSP1_DATA3__ENET0_1588_EVENT3_IN 0x20f2
-+#define MX28_PAD_SSP2_SCK__SAIF0_SDATA1 0x2102
-+#define MX28_PAD_SSP2_MOSI__SAIF0_SDATA2 0x2112
-+#define MX28_PAD_SSP2_MISO__SAIF1_SDATA1 0x2122
-+#define MX28_PAD_SSP2_SS0__SAIF1_SDATA2 0x2132
-+#define MX28_PAD_SSP2_SS1__USB1_OVERCURRENT 0x2142
-+#define MX28_PAD_SSP2_SS2__USB0_OVERCURRENT 0x2152
-+#define MX28_PAD_SSP3_SCK__ENET1_1588_EVENT0_OUT 0x2182
-+#define MX28_PAD_SSP3_MOSI__ENET1_1588_EVENT0_IN 0x2192
-+#define MX28_PAD_SSP3_MISO__ENET1_1588_EVENT1_OUT 0x21a2
-+#define MX28_PAD_SSP3_SS0__ENET1_1588_EVENT1_IN 0x21b2
-+#define MX28_PAD_AUART0_RX__DUART_CTS 0x3002
-+#define MX28_PAD_AUART0_TX__DUART_RTS 0x3012
-+#define MX28_PAD_AUART0_CTS__DUART_RX 0x3022
-+#define MX28_PAD_AUART0_RTS__DUART_TX 0x3032
-+#define MX28_PAD_AUART1_RX__PWM_0 0x3042
-+#define MX28_PAD_AUART1_TX__PWM_1 0x3052
-+#define MX28_PAD_AUART1_CTS__TIMROT_ROTARYA 0x3062
-+#define MX28_PAD_AUART1_RTS__TIMROT_ROTARYB 0x3072
-+#define MX28_PAD_AUART2_RX__SSP3_D4 0x3082
-+#define MX28_PAD_AUART2_TX__SSP3_D5 0x3092
-+#define MX28_PAD_AUART2_CTS__SAIF1_BITCLK 0x30a2
-+#define MX28_PAD_AUART2_RTS__SAIF1_LRCLK 0x30b2
-+#define MX28_PAD_AUART3_RX__ENET0_1588_EVENT0_OUT 0x30c2
-+#define MX28_PAD_AUART3_TX__ENET0_1588_EVENT0_IN 0x30d2
-+#define MX28_PAD_AUART3_CTS__ENET0_1588_EVENT1_OUT 0x30e2
-+#define MX28_PAD_AUART3_RTS__ENET0_1588_EVENT1_IN 0x30f2
-+#define MX28_PAD_PWM0__DUART_RX 0x3102
-+#define MX28_PAD_PWM1__DUART_TX 0x3112
-+#define MX28_PAD_PWM2__USB1_OVERCURRENT 0x3122
-+#define MX28_PAD_SAIF0_MCLK__AUART4_CTS 0x3142
-+#define MX28_PAD_SAIF0_LRCLK__AUART4_RTS 0x3152
-+#define MX28_PAD_SAIF0_BITCLK__AUART4_RX 0x3162
-+#define MX28_PAD_SAIF0_SDATA0__AUART4_TX 0x3172
-+#define MX28_PAD_I2C0_SCL__DUART_RX 0x3182
-+#define MX28_PAD_I2C0_SDA__DUART_TX 0x3192
-+#define MX28_PAD_SAIF1_SDATA0__SAIF0_SDATA1 0x31a2
-+#define MX28_PAD_SPDIF__ENET1_RX_ER 0x31b2
-+#define MX28_PAD_ENET0_MDC__SAIF0_SDATA1 0x4002
-+#define MX28_PAD_ENET0_MDIO__SAIF0_SDATA2 0x4012
-+#define MX28_PAD_ENET0_RX_EN__SAIF1_SDATA1 0x4022
-+#define MX28_PAD_ENET0_RXD0__SAIF1_SDATA2 0x4032
-+#define MX28_PAD_ENET0_TX_CLK__ENET0_1588_EVENT2_OUT 0x4052
-+#define MX28_PAD_ENET0_RXD2__ENET0_1588_EVENT0_OUT 0x4092
-+#define MX28_PAD_ENET0_RXD3__ENET0_1588_EVENT0_IN 0x40a2
-+#define MX28_PAD_ENET0_TXD2__ENET0_1588_EVENT1_OUT 0x40b2
-+#define MX28_PAD_ENET0_TXD3__ENET0_1588_EVENT1_IN 0x40c2
-+#define MX28_PAD_ENET0_RX_CLK__ENET0_1588_EVENT2_IN 0x40d2
-+#define MX28_PAD_ENET0_COL__ENET0_1588_EVENT3_OUT 0x40e2
-+#define MX28_PAD_ENET0_CRS__ENET0_1588_EVENT3_IN 0x40f2
-+#define MX28_PAD_GPMI_D00__GPIO_0_0 0x0003
-+#define MX28_PAD_GPMI_D01__GPIO_0_1 0x0013
-+#define MX28_PAD_GPMI_D02__GPIO_0_2 0x0023
-+#define MX28_PAD_GPMI_D03__GPIO_0_3 0x0033
-+#define MX28_PAD_GPMI_D04__GPIO_0_4 0x0043
-+#define MX28_PAD_GPMI_D05__GPIO_0_5 0x0053
-+#define MX28_PAD_GPMI_D06__GPIO_0_6 0x0063
-+#define MX28_PAD_GPMI_D07__GPIO_0_7 0x0073
-+#define MX28_PAD_GPMI_CE0N__GPIO_0_16 0x0103
-+#define MX28_PAD_GPMI_CE1N__GPIO_0_17 0x0113
-+#define MX28_PAD_GPMI_CE2N__GPIO_0_18 0x0123
-+#define MX28_PAD_GPMI_CE3N__GPIO_0_19 0x0133
-+#define MX28_PAD_GPMI_RDY0__GPIO_0_20 0x0143
-+#define MX28_PAD_GPMI_RDY1__GPIO_0_21 0x0153
-+#define MX28_PAD_GPMI_RDY2__GPIO_0_22 0x0163
-+#define MX28_PAD_GPMI_RDY3__GPIO_0_23 0x0173
-+#define MX28_PAD_GPMI_RDN__GPIO_0_24 0x0183
-+#define MX28_PAD_GPMI_WRN__GPIO_0_25 0x0193
-+#define MX28_PAD_GPMI_ALE__GPIO_0_26 0x01a3
-+#define MX28_PAD_GPMI_CLE__GPIO_0_27 0x01b3
-+#define MX28_PAD_GPMI_RESETN__GPIO_0_28 0x01c3
-+#define MX28_PAD_LCD_D00__GPIO_1_0 0x1003
-+#define MX28_PAD_LCD_D01__GPIO_1_1 0x1013
-+#define MX28_PAD_LCD_D02__GPIO_1_2 0x1023
-+#define MX28_PAD_LCD_D03__GPIO_1_3 0x1033
-+#define MX28_PAD_LCD_D04__GPIO_1_4 0x1043
-+#define MX28_PAD_LCD_D05__GPIO_1_5 0x1053
-+#define MX28_PAD_LCD_D06__GPIO_1_6 0x1063
-+#define MX28_PAD_LCD_D07__GPIO_1_7 0x1073
-+#define MX28_PAD_LCD_D08__GPIO_1_8 0x1083
-+#define MX28_PAD_LCD_D09__GPIO_1_9 0x1093
-+#define MX28_PAD_LCD_D10__GPIO_1_10 0x10a3
-+#define MX28_PAD_LCD_D11__GPIO_1_11 0x10b3
-+#define MX28_PAD_LCD_D12__GPIO_1_12 0x10c3
-+#define MX28_PAD_LCD_D13__GPIO_1_13 0x10d3
-+#define MX28_PAD_LCD_D14__GPIO_1_14 0x10e3
-+#define MX28_PAD_LCD_D15__GPIO_1_15 0x10f3
-+#define MX28_PAD_LCD_D16__GPIO_1_16 0x1103
-+#define MX28_PAD_LCD_D17__GPIO_1_17 0x1113
-+#define MX28_PAD_LCD_D18__GPIO_1_18 0x1123
-+#define MX28_PAD_LCD_D19__GPIO_1_19 0x1133
-+#define MX28_PAD_LCD_D20__GPIO_1_20 0x1143
-+#define MX28_PAD_LCD_D21__GPIO_1_21 0x1153
-+#define MX28_PAD_LCD_D22__GPIO_1_22 0x1163
-+#define MX28_PAD_LCD_D23__GPIO_1_23 0x1173
-+#define MX28_PAD_LCD_RD_E__GPIO_1_24 0x1183
-+#define MX28_PAD_LCD_WR_RWN__GPIO_1_25 0x1193
-+#define MX28_PAD_LCD_RS__GPIO_1_26 0x11a3
-+#define MX28_PAD_LCD_CS__GPIO_1_27 0x11b3
-+#define MX28_PAD_LCD_VSYNC__GPIO_1_28 0x11c3
-+#define MX28_PAD_LCD_HSYNC__GPIO_1_29 0x11d3
-+#define MX28_PAD_LCD_DOTCLK__GPIO_1_30 0x11e3
-+#define MX28_PAD_LCD_ENABLE__GPIO_1_31 0x11f3
-+#define MX28_PAD_SSP0_DATA0__GPIO_2_0 0x2003
-+#define MX28_PAD_SSP0_DATA1__GPIO_2_1 0x2013
-+#define MX28_PAD_SSP0_DATA2__GPIO_2_2 0x2023
-+#define MX28_PAD_SSP0_DATA3__GPIO_2_3 0x2033
-+#define MX28_PAD_SSP0_DATA4__GPIO_2_4 0x2043
-+#define MX28_PAD_SSP0_DATA5__GPIO_2_5 0x2053
-+#define MX28_PAD_SSP0_DATA6__GPIO_2_6 0x2063
-+#define MX28_PAD_SSP0_DATA7__GPIO_2_7 0x2073
-+#define MX28_PAD_SSP0_CMD__GPIO_2_8 0x2083
-+#define MX28_PAD_SSP0_DETECT__GPIO_2_9 0x2093
-+#define MX28_PAD_SSP0_SCK__GPIO_2_10 0x20a3
-+#define MX28_PAD_SSP1_SCK__GPIO_2_12 0x20c3
-+#define MX28_PAD_SSP1_CMD__GPIO_2_13 0x20d3
-+#define MX28_PAD_SSP1_DATA0__GPIO_2_14 0x20e3
-+#define MX28_PAD_SSP1_DATA3__GPIO_2_15 0x20f3
-+#define MX28_PAD_SSP2_SCK__GPIO_2_16 0x2103
-+#define MX28_PAD_SSP2_MOSI__GPIO_2_17 0x2113
-+#define MX28_PAD_SSP2_MISO__GPIO_2_18 0x2123
-+#define MX28_PAD_SSP2_SS0__GPIO_2_19 0x2133
-+#define MX28_PAD_SSP2_SS1__GPIO_2_20 0x2143
-+#define MX28_PAD_SSP2_SS2__GPIO_2_21 0x2153
-+#define MX28_PAD_SSP3_SCK__GPIO_2_24 0x2183
-+#define MX28_PAD_SSP3_MOSI__GPIO_2_25 0x2193
-+#define MX28_PAD_SSP3_MISO__GPIO_2_26 0x21a3
-+#define MX28_PAD_SSP3_SS0__GPIO_2_27 0x21b3
-+#define MX28_PAD_AUART0_RX__GPIO_3_0 0x3003
-+#define MX28_PAD_AUART0_TX__GPIO_3_1 0x3013
-+#define MX28_PAD_AUART0_CTS__GPIO_3_2 0x3023
-+#define MX28_PAD_AUART0_RTS__GPIO_3_3 0x3033
-+#define MX28_PAD_AUART1_RX__GPIO_3_4 0x3043
-+#define MX28_PAD_AUART1_TX__GPIO_3_5 0x3053
-+#define MX28_PAD_AUART1_CTS__GPIO_3_6 0x3063
-+#define MX28_PAD_AUART1_RTS__GPIO_3_7 0x3073
-+#define MX28_PAD_AUART2_RX__GPIO_3_8 0x3083
-+#define MX28_PAD_AUART2_TX__GPIO_3_9 0x3093
-+#define MX28_PAD_AUART2_CTS__GPIO_3_10 0x30a3
-+#define MX28_PAD_AUART2_RTS__GPIO_3_11 0x30b3
-+#define MX28_PAD_AUART3_RX__GPIO_3_12 0x30c3
-+#define MX28_PAD_AUART3_TX__GPIO_3_13 0x30d3
-+#define MX28_PAD_AUART3_CTS__GPIO_3_14 0x30e3
-+#define MX28_PAD_AUART3_RTS__GPIO_3_15 0x30f3
-+#define MX28_PAD_PWM0__GPIO_3_16 0x3103
-+#define MX28_PAD_PWM1__GPIO_3_17 0x3113
-+#define MX28_PAD_PWM2__GPIO_3_18 0x3123
-+#define MX28_PAD_SAIF0_MCLK__GPIO_3_20 0x3143
-+#define MX28_PAD_SAIF0_LRCLK__GPIO_3_21 0x3153
-+#define MX28_PAD_SAIF0_BITCLK__GPIO_3_22 0x3163
-+#define MX28_PAD_SAIF0_SDATA0__GPIO_3_23 0x3173
-+#define MX28_PAD_I2C0_SCL__GPIO_3_24 0x3183
-+#define MX28_PAD_I2C0_SDA__GPIO_3_25 0x3193
-+#define MX28_PAD_SAIF1_SDATA0__GPIO_3_26 0x31a3
-+#define MX28_PAD_SPDIF__GPIO_3_27 0x31b3
-+#define MX28_PAD_PWM3__GPIO_3_28 0x31c3
-+#define MX28_PAD_PWM4__GPIO_3_29 0x31d3
-+#define MX28_PAD_LCD_RESET__GPIO_3_30 0x31e3
-+#define MX28_PAD_ENET0_MDC__GPIO_4_0 0x4003
-+#define MX28_PAD_ENET0_MDIO__GPIO_4_1 0x4013
-+#define MX28_PAD_ENET0_RX_EN__GPIO_4_2 0x4023
-+#define MX28_PAD_ENET0_RXD0__GPIO_4_3 0x4033
-+#define MX28_PAD_ENET0_RXD1__GPIO_4_4 0x4043
-+#define MX28_PAD_ENET0_TX_CLK__GPIO_4_5 0x4053
-+#define MX28_PAD_ENET0_TX_EN__GPIO_4_6 0x4063
-+#define MX28_PAD_ENET0_TXD0__GPIO_4_7 0x4073
-+#define MX28_PAD_ENET0_TXD1__GPIO_4_8 0x4083
-+#define MX28_PAD_ENET0_RXD2__GPIO_4_9 0x4093
-+#define MX28_PAD_ENET0_RXD3__GPIO_4_10 0x40a3
-+#define MX28_PAD_ENET0_TXD2__GPIO_4_11 0x40b3
-+#define MX28_PAD_ENET0_TXD3__GPIO_4_12 0x40c3
-+#define MX28_PAD_ENET0_RX_CLK__GPIO_4_13 0x40d3
-+#define MX28_PAD_ENET0_COL__GPIO_4_14 0x40e3
-+#define MX28_PAD_ENET0_CRS__GPIO_4_15 0x40f3
-+#define MX28_PAD_ENET_CLK__GPIO_4_16 0x4103
-+#define MX28_PAD_JTAG_RTCK__GPIO_4_20 0x4143
-+
-+#endif /* __DT_BINDINGS_MX28_PINCTRL_H__ */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-sps1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-sps1.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-sps1.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-sps1.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -10,7 +10,7 @@
- */
-
- /dts-v1/;
--/include/ "imx28.dtsi"
-+#include "imx28.dtsi"
-
- / {
- model = "SchulerControl GmbH, SC SPS 1";
-@@ -29,13 +29,13 @@
- hog_pins_a: hog-gpios@0 {
- reg = <0>;
- fsl,pinmux-ids = <
-- 0x0003 /* MX28_PAD_GPMI_D00__GPIO_0_0 */
-- 0x0033 /* MX28_PAD_GPMI_D03__GPIO_0_3 */
-- 0x0063 /* MX28_PAD_GPMI_D06__GPIO_0_6 */
-+ MX28_PAD_GPMI_D00__GPIO_0_0
-+ MX28_PAD_GPMI_D03__GPIO_0_3
-+ MX28_PAD_GPMI_D06__GPIO_0_6
- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-
- };
-@@ -106,7 +106,7 @@
- usb0: usb@80080000 {
- vbus-supply = <&reg_usb0_vbus>;
- pinctrl-names = "default";
-- pinctrl-0 = <&usbphy0_pins_b>;
-+ pinctrl-0 = <&usb0_pins_b>;
- status = "okay";
- };
-
-@@ -127,9 +127,12 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_usb0_vbus: usb0_vbus {
-+ reg_usb0_vbus: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "usb0_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx28-tx28.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-tx28.dts
---- linux-3.10.36/arch/arm/boot/dts/imx28-tx28.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28-tx28.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -1,106 +1,147 @@
-+/*
-+ * Copyright 2012 Shawn Guo <shawn.guo@linaro.org>
-+ * Copyright 2013 Lothar Waßmann <LW@KARO-electronics.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
- /dts-v1/;
--/include/ "imx28.dtsi"
-+#include "imx28.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-
- / {
- model = "Ka-Ro electronics TX28 module";
- compatible = "karo,tx28", "fsl,imx28";
-
-+ aliases {
-+ can0 = &can0;
-+ can1 = &can1;
-+ display = &display;
-+ ds1339 = &ds1339;
-+ gpio5 = &gpio5;
-+ lcdif = &lcdif;
-+ lcdif_23bit_pins = &tx28_lcdif_23bit_pins;
-+ lcdif_24bit_pins = &lcdif_24bit_pins_a;
-+ stk5led = &user_led;
-+ usbotg = &usb0;
-+ };
-+
- memory {
-- reg = <0x40000000 0x08000000>;
-+ reg = <0 0>; /* will be filled in by U-Boot */
-+ };
-+
-+ onewire {
-+ compatible = "w1-gpio";
-+ gpios = <&gpio2 7 0>;
-+ status = "disabled";
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_usb0_vbus: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "usb0_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio0 18 0>;
-+ enable-active-high;
-+ };
-+
-+ reg_usb1_vbus: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "usb1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 27 0>;
-+ enable-active-high;
-+ };
-+
-+ reg_2p5v: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_3p3v: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_can_xcvr: regulator@4 {
-+ compatible = "regulator-fixed";
-+ reg = <4>;
-+ regulator-name = "CAN XCVR";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio1 0 0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&tx28_flexcan_xcvr_pins>;
-+ };
-+
-+ reg_lcd: regulator@5 {
-+ compatible = "regulator-fixed";
-+ reg = <5>;
-+ regulator-name = "LCD POWER";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio1 31 0>;
-+ enable-active-high;
-+ };
-+
-+ reg_lcd_reset: regulator@6 {
-+ compatible = "regulator-fixed";
-+ reg = <6>;
-+ regulator-name = "LCD RESET";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio3 30 0>;
-+ startup-delay-us = <300000>;
-+ enable-active-high;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
- };
-
-- apb@80000000 {
-- apbh@80000000 {
-- ssp0: ssp@80010000 {
-- compatible = "fsl,imx28-mmc";
-- pinctrl-names = "default";
-- pinctrl-0 = <&mmc0_4bit_pins_a
-- &mmc0_cd_cfg
-- &mmc0_sck_cfg>;
-- bus-width = <4>;
-- status = "okay";
-- };
--
-- pinctrl@80018000 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&hog_pins_a>;
--
-- hog_pins_a: hog@0 {
-- reg = <0>;
-- fsl,pinmux-ids = <
-- 0x40a3 /* MX28_PAD_ENET0_RXD3__GPIO_4_10 */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-- };
--
-- mac0_pins_gpio: mac0-gpio-mode@0 {
-- reg = <0>;
-- fsl,pinmux-ids = <
-- 0x4003 /* MX28_PAD_ENET0_MDC__GPIO_4_0 */
-- 0x4013 /* MX28_PAD_ENET0_MDIO__GPIO_4_1 */
-- 0x4023 /* MX28_PAD_ENET0_RX_EN__GPIO_4_2 */
-- 0x4033 /* MX28_PAD_ENET0_RXD0__GPIO_4_3 */
-- 0x4043 /* MX28_PAD_ENET0_RXD1__GPIO_4_4 */
-- 0x4063 /* MX28_PAD_ENET0_TX_EN__GPIO_4_6 */
-- 0x4073 /* MX28_PAD_ENET0_TXD0__GPIO_4_7 */
-- 0x4083 /* MX28_PAD_ENET0_TXD1__GPIO_4_8 */
-- 0x4103 /* MX28_PAD_ENET_CLK__GPIO_4_16 */
-- >;
-- fsl,drive-strength = <0>;
-- fsl,voltage = <1>;
-- fsl,pull-up = <0>;
-- };
-- };
-- };
--
-- apbx@80040000 {
-- i2c0: i2c@80058000 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&i2c0_pins_a>;
-- status = "okay";
--
-- ds1339: rtc@68 {
-- compatible = "mxim,ds1339";
-- reg = <0x68>;
-- };
-- };
--
-- pwm: pwm@80064000 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pwm0_pins_a>;
-- status = "okay";
-- };
--
-- duart: serial@80074000 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&duart_4pins_a>;
-- status = "okay";
-- };
--
-- auart1: serial@8006c000 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&auart1_pins_a>;
-- status = "okay";
-- };
-- };
-- };
--
-- ahb@80080000 {
-- mac0: ethernet@800f0000 {
-- phy-mode = "rmii";
-- pinctrl-names = "default", "gpio_mode";
-- pinctrl-0 = <&mac0_pins_a>;
-- pinctrl-1 = <&mac0_pins_gpio>;
-- status = "okay";
-+ clocks {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ mclk: clock@0 {
-+ compatible = "fixed-clock";
-+ reg = <0>;
-+ #clock-cells = <0>;
-+ clock-frequency = <27000000>;
- };
- };
-
-+ sound {
-+ compatible = "fsl,imx28-tx28-sgtl5000",
-+ "fsl,mxs-audio-sgtl5000";
-+ model = "imx28-tx28-sgtl5000";
-+ saif-controllers = <&saif0 &saif1>;
-+ audio-codec = <&sgtl5000>;
-+ };
-+
- leds {
- compatible = "gpio-leds";
-
-- user {
-+ user_led: user {
- label = "Heartbeat";
- gpios = <&gpio4 10 0>;
- linux,default-trigger = "heartbeat";
-@@ -109,8 +150,512 @@
-
- backlight {
- compatible = "pwm-backlight";
-- pwms = <&pwm 0 5000000>;
-- brightness-levels = <0 4 8 16 32 64 128 255>;
-- default-brightness-level = <6>;
-+ pwms = <&pwm 0 500000>;
-+ /*
-+ * a silly way to create a 1:1 relationship between the
-+ * PWM value and the actual duty cycle
-+ */
-+ brightness-levels = < 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32 33 34 35 36 37 38 39
-+ 40 41 42 43 44 45 46 47 48 49
-+ 50 51 52 53 54 55 56 57 58 59
-+ 60 61 62 63 64 65 66 67 68 69
-+ 70 71 72 73 74 75 76 77 78 79
-+ 80 81 82 83 84 85 86 87 88 89
-+ 90 91 92 93 94 95 96 97 98 99
-+ 100>;
-+ default-brightness-level = <50>;
- };
-+
-+ matrix_keypad: matrix-keypad@0 {
-+ compatible = "gpio-matrix-keypad";
-+ col-gpios = <
-+ &gpio5 0 0
-+ &gpio5 1 0
-+ &gpio5 2 0
-+ &gpio5 3 0
-+ >;
-+ row-gpios = <
-+ &gpio5 4 0
-+ &gpio5 5 0
-+ &gpio5 6 0
-+ &gpio5 7 0
-+ >;
-+ /* sample keymap */
-+ linux,keymap = <
-+ 0x00000074 /* row 0, col 0, KEY_POWER */
-+ 0x00010052 /* row 0, col 1, KEY_KP0 */
-+ 0x0002004f /* row 0, col 2, KEY_KP1 */
-+ 0x00030050 /* row 0, col 3, KEY_KP2 */
-+ 0x01000051 /* row 1, col 0, KEY_KP3 */
-+ 0x0101004b /* row 1, col 1, KEY_KP4 */
-+ 0x0102004c /* row 1, col 2, KEY_KP5 */
-+ 0x0103004d /* row 1, col 3, KEY_KP6 */
-+ 0x02000047 /* row 2, col 0, KEY_KP7 */
-+ 0x02010048 /* row 2, col 1, KEY_KP8 */
-+ 0x02020049 /* row 2, col 2, KEY_KP9 */
-+ >;
-+ gpio-activelow;
-+ linux,wakeup;
-+ debounce-delay-ms = <100>;
-+ col-scan-delay-us = <5000>;
-+ linux,no-autorepeat;
-+ };
-+};
-+
-+/* 2nd TX-Std UART - (A)UART1 */
-+&auart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart1_pins_a>;
-+ status = "okay";
-+};
-+
-+/* 3rd TX-Std UART - (A)UART3 */
-+&auart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart3_pins_a>;
-+ status = "okay";
-+};
-+
-+&can0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&can0_pins_a>;
-+ xceiver-supply = <&reg_can_xcvr>;
-+ status = "okay";
-+};
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&can1_pins_a>;
-+ xceiver-supply = <&reg_can_xcvr>;
-+ status = "okay";
-+};
-+
-+&digctl {
-+ status = "okay";
-+};
-+
-+/* 1st TX-Std UART - (D)UART */
-+&duart {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&duart_4pins_a>;
-+ status = "okay";
-+};
-+
-+&gpmi {
-+ pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-+
-+&i2c0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&i2c0_pins_a>;
-+ clock-frequency = <400000>;
-+ status = "okay";
-+
-+ sgtl5000: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ VDDA-supply = <&reg_2p5v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ clocks = <&mclk>;
-+ };
-+
-+ gpio5: pca953x@20 {
-+ compatible = "nxp,pca9554";
-+ reg = <0x20>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&tx28_pca9554_pins>;
-+ interrupt-parent = <&gpio3>;
-+ interrupts = <28 0>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ polytouch: edt-ft5x06@38 {
-+ compatible = "edt,edt-ft5x06";
-+ reg = <0x38>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&tx28_edt_ft5x06_pins>;
-+ interrupt-parent = <&gpio2>;
-+ interrupts = <5 0>;
-+ reset-gpios = <&gpio2 6 1>;
-+ wake-gpios = <&gpio4 9 0>;
-+ };
-+
-+ touchscreen: tsc2007@48 {
-+ compatible = "ti,tsc2007";
-+ reg = <0x48>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&tx28_tsc2007_pins>;
-+ interrupt-parent = <&gpio3>;
-+ interrupts = <20 0>;
-+ pendown-gpio = <&gpio3 20 1>;
-+ ti,x-plate-ohms = /bits/ 16 <660>;
-+ };
-+
-+ ds1339: rtc@68 {
-+ compatible = "mxim,ds1339";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&lcdif {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &tx28_lcdif_ctrl_pins>;
-+ lcd-supply = <&reg_lcd>;
-+ display = <&display>;
-+ status = "okay";
-+
-+ display: display@0 {
-+ bits-per-pixel = <32>;
-+ bus-width = <24>;
-+ display-timings {
-+ native-mode = <&timing5>;
-+ timing0: timing0 {
-+ panel-name = "VGA";
-+ clock-frequency = <25175000>;
-+ hactive = <640>;
-+ vactive = <480>;
-+ hback-porch = <48>;
-+ hsync-len = <96>;
-+ hfront-porch = <16>;
-+ vback-porch = <33>;
-+ vsync-len = <2>;
-+ vfront-porch = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+
-+ timing1: timing1 {
-+ panel-name = "ETV570";
-+ clock-frequency = <25175000>;
-+ hactive = <640>;
-+ vactive = <480>;
-+ hback-porch = <114>;
-+ hsync-len = <30>;
-+ hfront-porch = <16>;
-+ vback-porch = <32>;
-+ vsync-len = <3>;
-+ vfront-porch = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+
-+ timing2: timing2 {
-+ panel-name = "ET0350";
-+ clock-frequency = <6500000>;
-+ hactive = <320>;
-+ vactive = <240>;
-+ hback-porch = <34>;
-+ hsync-len = <34>;
-+ hfront-porch = <20>;
-+ vback-porch = <15>;
-+ vsync-len = <3>;
-+ vfront-porch = <4>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+
-+ timing3: timing3 {
-+ panel-name = "ET0430";
-+ clock-frequency = <9000000>;
-+ hactive = <480>;
-+ vactive = <272>;
-+ hback-porch = <2>;
-+ hsync-len = <41>;
-+ hfront-porch = <2>;
-+ vback-porch = <2>;
-+ vsync-len = <10>;
-+ vfront-porch = <2>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+
-+ timing4: timing4 {
-+ panel-name = "ET0500", "ET0700";
-+ clock-frequency = <33260000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <88>;
-+ hsync-len = <128>;
-+ hfront-porch = <40>;
-+ vback-porch = <33>;
-+ vsync-len = <2>;
-+ vfront-porch = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+
-+ timing5: timing5 {
-+ panel-name = "ETQ570";
-+ clock-frequency = <6400000>;
-+ hactive = <320>;
-+ vactive = <240>;
-+ hback-porch = <38>;
-+ hsync-len = <30>;
-+ hfront-porch = <30>;
-+ vback-porch = <16>;
-+ vsync-len = <3>;
-+ vfront-porch = <4>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+ };
-+ };
-+};
-+
-+&lradc {
-+ fsl,lradc-touchscreen-wires = <4>;
-+ status = "okay";
-+};
-+
-+&mac0 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default", "gpio_mode";
-+ pinctrl-0 = <&mac0_pins_a>;
-+ pinctrl-1 = <&tx28_mac0_pins_gpio>;
-+ status = "okay";
-+};
-+
-+&mac1 {
-+ phy-mode = "rmii";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mac1_pins_a>;
-+ /* not enabled by default */
-+};
-+
-+&mxs_rtc {
-+ status = "okay";
-+};
-+
-+&ocotp {
-+ status = "okay";
-+};
-+
-+&pwm {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwm0_pins_a>;
-+ status = "okay";
-+};
-+
-+&pinctrl {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&hog_pins_a>;
-+
-+ hog_pins_a: hog@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_ENET0_RXD3__GPIO_4_10 /* module LED */
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_edt_ft5x06_pins: tx28-edt-ft5x06-pins {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SSP0_DATA6__GPIO_2_6 /* RESET */
-+ MX28_PAD_SSP0_DATA5__GPIO_2_5 /* IRQ */
-+ MX28_PAD_ENET0_RXD2__GPIO_4_9 /* WAKE */
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_flexcan_xcvr_pins: tx28-flexcan-xcvr-pins {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_D00__GPIO_1_0
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_lcdif_23bit_pins: tx28-lcdif-23bit {
-+ fsl,pinmux-ids = <
-+ /* LCD_D00 may be used as Flexcan Transceiver Enable on STK5-V5 */
-+ MX28_PAD_LCD_D01__LCD_D1
-+ MX28_PAD_LCD_D02__LCD_D2
-+ MX28_PAD_LCD_D03__LCD_D3
-+ MX28_PAD_LCD_D04__LCD_D4
-+ MX28_PAD_LCD_D05__LCD_D5
-+ MX28_PAD_LCD_D06__LCD_D6
-+ MX28_PAD_LCD_D07__LCD_D7
-+ MX28_PAD_LCD_D08__LCD_D8
-+ MX28_PAD_LCD_D09__LCD_D9
-+ MX28_PAD_LCD_D10__LCD_D10
-+ MX28_PAD_LCD_D11__LCD_D11
-+ MX28_PAD_LCD_D12__LCD_D12
-+ MX28_PAD_LCD_D13__LCD_D13
-+ MX28_PAD_LCD_D14__LCD_D14
-+ MX28_PAD_LCD_D15__LCD_D15
-+ MX28_PAD_LCD_D16__LCD_D16
-+ MX28_PAD_LCD_D17__LCD_D17
-+ MX28_PAD_LCD_D18__LCD_D18
-+ MX28_PAD_LCD_D19__LCD_D19
-+ MX28_PAD_LCD_D20__LCD_D20
-+ MX28_PAD_LCD_D21__LCD_D21
-+ MX28_PAD_LCD_D22__LCD_D22
-+ MX28_PAD_LCD_D23__LCD_D23
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_lcdif_ctrl_pins: tx28-lcdif-ctrl {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_LCD_ENABLE__GPIO_1_31 /* Enable */
-+ MX28_PAD_LCD_RESET__GPIO_3_30 /* Reset */
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_mac0_pins_gpio: tx28-mac0-gpio-pins {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_ENET0_MDC__GPIO_4_0
-+ MX28_PAD_ENET0_MDIO__GPIO_4_1
-+ MX28_PAD_ENET0_RX_EN__GPIO_4_2
-+ MX28_PAD_ENET0_RXD0__GPIO_4_3
-+ MX28_PAD_ENET0_RXD1__GPIO_4_4
-+ MX28_PAD_ENET0_TX_EN__GPIO_4_6
-+ MX28_PAD_ENET0_TXD0__GPIO_4_7
-+ MX28_PAD_ENET0_TXD1__GPIO_4_8
-+ MX28_PAD_ENET_CLK__GPIO_4_16
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_pca9554_pins: tx28-pca9554-pins {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_PWM3__GPIO_3_28
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_tsc2007_pins: tx28-tsc2007-pins {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SAIF0_MCLK__GPIO_3_20 /* TSC2007 IRQ */
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_4mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+
-+ tx28_usbphy0_pins: tx28-usbphy0-pins {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_GPMI_CE2N__GPIO_0_18 /* USBOTG_VBUSEN */
-+ MX28_PAD_GPMI_CE3N__GPIO_0_19 /* USBOTH_OC */
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+
-+ tx28_usbphy1_pins: tx28-usbphy1-pins {
-+ fsl,pinmux-ids = <
-+ MX28_PAD_SPDIF__GPIO_3_27 /* USBH_VBUSEN */
-+ MX28_PAD_JTAG_RTCK__GPIO_4_20 /* USBH_OC */
-+ >;
-+ fsl,drive-strength = <MXS_DRIVE_12mA>;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_DISABLE>;
-+ };
-+};
-+
-+&saif0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&saif0_pins_b>;
-+ fsl,saif-master;
-+ status = "okay";
-+};
-+
-+&saif1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&saif1_pins_a>;
-+ status = "okay";
-+};
-+
-+&ssp0 {
-+ compatible = "fsl,imx28-mmc";
-+ pinctrl-names = "default", "special";
-+ pinctrl-0 = <&mmc0_4bit_pins_a
-+ &mmc0_cd_cfg
-+ &mmc0_sck_cfg>;
-+ bus-width = <4>;
-+ status = "okay";
-+};
-+
-+&ssp3 {
-+ compatible = "fsl,imx28-spi";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&spi3_pins_a>;
-+ clock-frequency = <57600000>;
-+ status = "okay";
-+
-+ spidev0: spi@0 {
-+ compatible = "spidev";
-+ reg = <0>;
-+ spi-max-frequency = <57600000>;
-+ };
-+
-+ spidev1: spi@1 {
-+ compatible = "spidev";
-+ reg = <1>;
-+ spi-max-frequency = <57600000>;
-+ };
-+};
-+
-+&usb0 {
-+ vbus-supply = <&reg_usb0_vbus>;
-+ disable-over-current;
-+ dr_mode = "peripheral";
-+ status = "okay";
-+};
-+
-+&usb1 {
-+ vbus-supply = <&reg_usb1_vbus>;
-+ disable-over-current;
-+ dr_mode = "host";
-+ status = "okay";
-+};
-+
-+&usbphy0 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&tx28_usbphy0_pins>;
-+ phy_type = "utmi";
-+ status = "okay";
-+};
-+
-+&usbphy1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&tx28_usbphy1_pins>;
-+ phy_type = "utmi";
-+ status = "okay";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx31.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx31.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx31.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx31.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -20,6 +20,16 @@
- serial4 = &uart5;
- };
-
-+ cpus {
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+
-+ cpu {
-+ compatible = "arm,arm1136";
-+ device_type = "cpu";
-+ };
-+ };
-+
- avic: avic-interrupt-controller@60000000 {
- compatible = "fsl,imx31-avic", "fsl,avic";
- interrupt-controller;
-@@ -94,6 +104,13 @@
status = "disabled";
- };
-
-+ iim: iim@5001c000 {
-+ compatible = "fsl,imx31-iim", "fsl,imx27-iim";
-+ reg = <0x5001c000 0x1000>;
-+ interrupts = <19>;
-+ clocks = <&clks 25>;
-+ };
-+
- clks: ccm@53f80000{
- compatible = "fsl,imx31-ccm";
- reg = <0x53f80000 0x4000>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx35.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx35.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx35.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx35.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,376 @@
-+/*
-+ * Copyright 2012 Steffen Trumtrar, Pengutronix
-+ *
-+ * based on imx27.dtsi
-+ *
-+ * This program is free software; you can redistribute it and/or modify it under
-+ * the terms of the GNU General Public License version 2 as published by the
-+ * Free Software Foundation.
-+ */
-+
-+#include "skeleton.dtsi"
-+#include "imx35-pinfunc.h"
-+
-+/ {
-+ aliases {
-+ ethernet0 = &fec;
-+ gpio0 = &gpio1;
-+ gpio1 = &gpio2;
-+ gpio2 = &gpio3;
-+ serial0 = &uart1;
-+ serial1 = &uart2;
-+ serial2 = &uart3;
-+ spi0 = &spi1;
-+ spi1 = &spi2;
-+ };
-+
-+ cpus {
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+
-+ cpu {
-+ compatible = "arm,arm1136";
-+ device_type = "cpu";
-+ };
-+ };
-+
-+ avic: avic-interrupt-controller@68000000 {
-+ compatible = "fsl,imx35-avic", "fsl,avic";
-+ interrupt-controller;
-+ #interrupt-cells = <1>;
-+ reg = <0x68000000 0x10000000>;
-+ };
-+
-+ soc {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ compatible = "simple-bus";
-+ interrupt-parent = <&avic>;
-+ ranges;
-+
-+ L2: l2-cache@30000000 {
-+ compatible = "arm,l210-cache";
-+ reg = <0x30000000 0x1000>;
-+ cache-unified;
-+ cache-level = <2>;
-+ };
-+
-+ aips1: aips@43f00000 {
-+ compatible = "fsl,aips", "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x43f00000 0x100000>;
-+ ranges;
-+
-+ i2c1: i2c@43f80000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx35-i2c", "fsl,imx1-i2c";
-+ reg = <0x43f80000 0x4000>;
-+ clocks = <&clks 51>;
-+ clock-names = "ipg_per";
-+ interrupts = <10>;
-+ status = "disabled";
-+ };
-+
-+ i2c3: i2c@43f84000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx35-i2c", "fsl,imx1-i2c";
-+ reg = <0x43f84000 0x4000>;
-+ clocks = <&clks 53>;
-+ clock-names = "ipg_per";
-+ interrupts = <3>;
-+ status = "disabled";
-+ };
-+
-+ uart1: serial@43f90000 {
-+ compatible = "fsl,imx35-uart", "fsl,imx21-uart";
-+ reg = <0x43f90000 0x4000>;
-+ clocks = <&clks 9>, <&clks 70>;
-+ clock-names = "ipg", "per";
-+ interrupts = <45>;
-+ status = "disabled";
-+ };
-+
-+ uart2: serial@43f94000 {
-+ compatible = "fsl,imx35-uart", "fsl,imx21-uart";
-+ reg = <0x43f94000 0x4000>;
-+ clocks = <&clks 9>, <&clks 71>;
-+ clock-names = "ipg", "per";
-+ interrupts = <32>;
-+ status = "disabled";
-+ };
-+
-+ i2c2: i2c@43f98000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx35-i2c", "fsl,imx1-i2c";
-+ reg = <0x43f98000 0x4000>;
-+ clocks = <&clks 52>;
-+ clock-names = "ipg_per";
-+ interrupts = <4>;
-+ status = "disabled";
-+ };
-+
-+ ssi1: ssi@43fa0000 {
-+ compatible = "fsl,imx35-ssi", "fsl,imx21-ssi";
-+ reg = <0x43fa0000 0x4000>;
-+ interrupts = <11>;
-+ clocks = <&clks 68>;
-+ dmas = <&sdma 28 0 0>,
-+ <&sdma 29 0 0>;
-+ dma-names = "rx", "tx";
-+ fsl,fifo-depth = <15>;
-+ status = "disabled";
-+ };
-+
-+ spi1: cspi@43fa4000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx35-cspi";
-+ reg = <0x43fa4000 0x4000>;
-+ clocks = <&clks 35 &clks 35>;
-+ clock-names = "ipg", "per";
-+ interrupts = <14>;
-+ status = "disabled";
-+ };
-+
-+ iomuxc: iomuxc@43fac000 {
-+ compatible = "fsl,imx35-iomuxc";
-+ reg = <0x43fac000 0x4000>;
-+ };
-+ };
-+
-+ spba: spba-bus@50000000 {
-+ compatible = "fsl,spba-bus", "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x50000000 0x100000>;
-+ ranges;
-+
-+ uart3: serial@5000c000 {
-+ compatible = "fsl,imx35-uart", "fsl,imx21-uart";
-+ reg = <0x5000c000 0x4000>;
-+ clocks = <&clks 9>, <&clks 72>;
-+ clock-names = "ipg", "per";
-+ interrupts = <18>;
-+ status = "disabled";
-+ };
-+
-+ spi2: cspi@50010000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx35-cspi";
-+ reg = <0x50010000 0x4000>;
-+ interrupts = <13>;
-+ clocks = <&clks 36 &clks 36>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ fec: fec@50038000 {
-+ compatible = "fsl,imx35-fec", "fsl,imx27-fec";
-+ reg = <0x50038000 0x4000>;
-+ clocks = <&clks 46>, <&clks 8>;
-+ clock-names = "ipg", "ahb";
-+ interrupts = <57>;
-+ status = "disabled";
-+ };
-+ };
-+
-+ aips2: aips@53f00000 {
-+ compatible = "fsl,aips", "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x53f00000 0x100000>;
-+ ranges;
-+
-+ clks: ccm@53f80000 {
-+ compatible = "fsl,imx35-ccm";
-+ reg = <0x53f80000 0x4000>;
-+ interrupts = <31>;
-+ #clock-cells = <1>;
-+ };
-+
-+ gpio3: gpio@53fa4000 {
-+ compatible = "fsl,imx35-gpio", "fsl,imx31-gpio";
-+ reg = <0x53fa4000 0x4000>;
-+ interrupts = <56>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ esdhc1: esdhc@53fb4000 {
-+ compatible = "fsl,imx35-esdhc";
-+ reg = <0x53fb4000 0x4000>;
-+ interrupts = <7>;
-+ clocks = <&clks 9>, <&clks 8>, <&clks 43>;
-+ clock-names = "ipg", "ahb", "per";
-+ status = "disabled";
-+ };
-+
-+ esdhc2: esdhc@53fb8000 {
-+ compatible = "fsl,imx35-esdhc";
-+ reg = <0x53fb8000 0x4000>;
-+ interrupts = <8>;
-+ clocks = <&clks 9>, <&clks 8>, <&clks 44>;
-+ clock-names = "ipg", "ahb", "per";
-+ status = "disabled";
-+ };
-+
-+ esdhc3: esdhc@53fbc000 {
-+ compatible = "fsl,imx35-esdhc";
-+ reg = <0x53fbc000 0x4000>;
-+ interrupts = <9>;
-+ clocks = <&clks 9>, <&clks 8>, <&clks 45>;
-+ clock-names = "ipg", "ahb", "per";
-+ status = "disabled";
-+ };
-+
-+ audmux: audmux@53fc4000 {
-+ compatible = "fsl,imx35-audmux", "fsl,imx31-audmux";
-+ reg = <0x53fc4000 0x4000>;
-+ status = "disabled";
-+ };
-+
-+ gpio1: gpio@53fcc000 {
-+ compatible = "fsl,imx35-gpio", "fsl,imx31-gpio";
-+ reg = <0x53fcc000 0x4000>;
-+ interrupts = <52>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio2: gpio@53fd0000 {
-+ compatible = "fsl,imx35-gpio", "fsl,imx31-gpio";
-+ reg = <0x53fd0000 0x4000>;
-+ interrupts = <51>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ sdma: sdma@53fd4000 {
-+ compatible = "fsl,imx35-sdma";
-+ reg = <0x53fd4000 0x4000>;
-+ clocks = <&clks 9>, <&clks 65>;
-+ clock-names = "ipg", "ahb";
-+ #dma-cells = <3>;
-+ interrupts = <34>;
-+ fsl,sdma-ram-script-name = "imx/sdma/sdma-imx35.bin";
-+ };
-+
-+ wdog: wdog@53fdc000 {
-+ compatible = "fsl,imx35-wdt", "fsl,imx21-wdt";
-+ reg = <0x53fdc000 0x4000>;
-+ clocks = <&clks 74>;
-+ clock-names = "";
-+ interrupts = <55>;
-+ };
-+
-+ can1: can@53fe4000 {
-+ compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
-+ reg = <0x53fe4000 0x1000>;
-+ clocks = <&clks 33>;
-+ clock-names = "ipg";
-+ interrupts = <43>;
-+ status = "disabled";
-+ };
-+
-+ can2: can@53fe8000 {
-+ compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
-+ reg = <0x53fe8000 0x1000>;
-+ clocks = <&clks 34>;
-+ clock-names = "ipg";
-+ interrupts = <44>;
-+ status = "disabled";
-+ };
-+
-+ usbotg: usb@53ff4000 {
-+ compatible = "fsl,imx35-usb", "fsl,imx27-usb";
-+ reg = <0x53ff4000 0x0200>;
-+ interrupts = <37>;
-+ clocks = <&clks 73>;
-+ fsl,usbmisc = <&usbmisc 0>;
-+ fsl,usbphy = <&usbphy0>;
-+ status = "disabled";
-+ };
-+
-+ usbhost1: usb@53ff4400 {
-+ compatible = "fsl,imx35-usb", "fsl,imx27-usb";
-+ reg = <0x53ff4400 0x0200>;
-+ interrupts = <35>;
-+ clocks = <&clks 73>;
-+ fsl,usbmisc = <&usbmisc 1>;
-+ fsl,usbphy = <&usbphy1>;
-+ status = "disabled";
-+ };
-+
-+ usbmisc: usbmisc@53ff4600 {
-+ #index-cells = <1>;
-+ compatible = "fsl,imx35-usbmisc";
-+ clocks = <&clks 9>, <&clks 73>, <&clks 28>;
-+ clock-names = "ipg", "ahb", "per";
-+ reg = <0x53ff4600 0x00f>;
-+ };
-+ };
-+
-+ emi@80000000 { /* External Memory Interface */
-+ compatible = "fsl,emi", "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x80000000 0x40000000>;
-+ ranges;
-+
-+ nfc: nand@bb000000 {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ compatible = "fsl,imx35-nand", "fsl,imx25-nand";
-+ reg = <0xbb000000 0x2000>;
-+ clocks = <&clks 29>;
-+ clock-names = "";
-+ interrupts = <33>;
-+ status = "disabled";
-+ };
-+
-+ weim: weim@b8002000 {
-+ #address-cells = <2>;
-+ #size-cells = <1>;
-+ clocks = <&clks 0>;
-+ compatible = "fsl,imx35-weim", "fsl,imx27-weim";
-+ reg = <0xb8002000 0x1000>;
-+ ranges = <
-+ 0 0 0xa0000000 0x8000000
-+ 1 0 0xa8000000 0x8000000
-+ 2 0 0xb0000000 0x2000000
-+ 3 0 0xb2000000 0x2000000
-+ 4 0 0xb4000000 0x2000000
-+ 5 0 0xb6000000 0x2000000
-+ >;
-+ status = "disabled";
-+ };
-+ };
-+ };
-+
-+ usbphy {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ usbphy0: usb-phy@0 {
-+ reg = <0>;
-+ compatible = "usb-nop-xceiv";
-+ };
-+
-+ usbphy1: usb-phy@1 {
-+ reg = <1>;
-+ compatible = "usb-nop-xceiv";
-+ };
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,81 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include "imx35.dtsi"
-+
-+/ {
-+ model = "Eukrea CPUIMX35";
-+ compatible = "eukrea,cpuimx35", "fsl,imx35";
-+
-+ memory {
-+ reg = <0x80000000 0x8000000>; /* 128M */
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ pcf8563@51 {
-+ compatible = "nxp,pcf8563";
-+ reg = <0x51>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx35-eukrea {
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX35_PAD_FEC_TX_CLK__FEC_TX_CLK 0x80000000
-+ MX35_PAD_FEC_RX_CLK__FEC_RX_CLK 0x80000000
-+ MX35_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000
-+ MX35_PAD_FEC_COL__FEC_COL 0x80000000
-+ MX35_PAD_FEC_RDATA0__FEC_RDATA_0 0x80000000
-+ MX35_PAD_FEC_TDATA0__FEC_TDATA_0 0x80000000
-+ MX35_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX35_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX35_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-+ MX35_PAD_FEC_TX_ERR__FEC_TX_ERR 0x80000000
-+ MX35_PAD_FEC_RX_ERR__FEC_RX_ERR 0x80000000
-+ MX35_PAD_FEC_CRS__FEC_CRS 0x80000000
-+ MX35_PAD_FEC_RDATA1__FEC_RDATA_1 0x80000000
-+ MX35_PAD_FEC_TDATA1__FEC_TDATA_1 0x80000000
-+ MX35_PAD_FEC_RDATA2__FEC_RDATA_2 0x80000000
-+ MX35_PAD_FEC_TDATA2__FEC_TDATA_2 0x80000000
-+ MX35_PAD_FEC_RDATA3__FEC_RDATA_3 0x80000000
-+ MX35_PAD_FEC_TDATA3__FEC_TDATA_3 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX35_PAD_I2C1_CLK__I2C1_SCL 0x80000000
-+ MX35_PAD_I2C1_DAT__I2C1_SDA 0x80000000
-+ >;
-+ };
-+ };
-+};
-+
-+&nfc {
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
---- linux-3.10.36/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,165 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+/dts-v1/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+#include "imx35-eukrea-cpuimx35.dtsi"
-+
-+/ {
-+ model = "Eukrea CPUIMX35";
-+ compatible = "eukrea,mbimxsd35-baseboard", "eukrea,cpuimx35", "fsl,imx35";
-+
-+ gpio_keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_bp1>;
-+
-+ bp1 {
-+ label = "BP1";
-+ gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
-+ linux,code = <BTN_MISC>;
-+ gpio-key,wakeup;
-+ linux,input-type = <1>;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_led1>;
-+
-+ led1 {
-+ label = "led1";
-+ gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ sound {
-+ compatible = "eukrea,asoc-tlv320";
-+ eukrea,model = "imx35-eukrea-tlv320aic23";
-+ ssi-controller = <&ssi1>;
-+ fsl,mux-int-port = <1>;
-+ fsl,mux-ext-port = <4>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&esdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ cd-gpios = <&gpio3 24>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ tlv320aic23: codec@1a {
-+ compatible = "ti,tlv320aic23";
-+ reg = <0x1a>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx35-eukrea {
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS 0x80000000
-+ MX35_PAD_STXD4__AUDMUX_AUD4_TXD 0x80000000
-+ MX35_PAD_SRXD4__AUDMUX_AUD4_RXD 0x80000000
-+ MX35_PAD_SCK4__AUDMUX_AUD4_TXC 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_bp1: bp1grp {
-+ fsl,pins = <MX35_PAD_LD19__GPIO3_25 0x80000000>;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX35_PAD_SD1_CMD__ESDHC1_CMD 0x80000000
-+ MX35_PAD_SD1_CLK__ESDHC1_CLK 0x80000000
-+ MX35_PAD_SD1_DATA0__ESDHC1_DAT0 0x80000000
-+ MX35_PAD_SD1_DATA1__ESDHC1_DAT1 0x80000000
-+ MX35_PAD_SD1_DATA2__ESDHC1_DAT2 0x80000000
-+ MX35_PAD_SD1_DATA3__ESDHC1_DAT3 0x80000000
-+ MX35_PAD_LD18__GPIO3_24 0x80000000 /* CD */
-+ >;
-+ };
-+
-+ pinctrl_led1: led1grp {
-+ fsl,pins = <MX35_PAD_LD23__GPIO3_29 0x80000000>;
-+ };
-+
-+ pinctrl_reg_lcd_3v3: reg-lcd-3v3 {
-+ fsl,pins = <MX35_PAD_D3_CLS__GPIO1_4 0x80000000>;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX35_PAD_TXD1__UART1_TXD_MUX 0x1c5
-+ MX35_PAD_RXD1__UART1_RXD_MUX 0x1c5
-+ MX35_PAD_CTS1__UART1_CTS 0x1c5
-+ MX35_PAD_RTS1__UART1_RTS 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX35_PAD_RXD2__UART2_RXD_MUX 0x1c5
-+ MX35_PAD_TXD2__UART2_TXD_MUX 0x1c5
-+ MX35_PAD_RTS2__UART2_RTS 0x1c5
-+ MX35_PAD_CTS2__UART2_CTS 0x1c5
-+ >;
-+ };
-+ };
-+};
-+
-+&ssi1 {
-+ codec-handle = <&tlv320aic23>;
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&usbhost1 {
-+ phy_type = "serial";
-+ dr_mode = "host";
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ phy_type = "utmi";
-+ dr_mode = "otg";
-+ external-vbus-divider;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx50.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx50.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx50.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx50.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,479 @@
-+/*
-+ * Copyright 2013 Greg Ungerer <gerg@uclinux.org>
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "skeleton.dtsi"
-+#include "imx50-pinfunc.h"
-+#include <dt-bindings/clock/imx5-clock.h>
-+
-+/ {
-+ aliases {
-+ ethernet0 = &fec;
-+ gpio0 = &gpio1;
-+ gpio1 = &gpio2;
-+ gpio2 = &gpio3;
-+ gpio3 = &gpio4;
-+ gpio4 = &gpio5;
-+ gpio5 = &gpio6;
-+ serial0 = &uart1;
-+ serial1 = &uart2;
-+ serial2 = &uart3;
-+ serial3 = &uart4;
-+ serial4 = &uart5;
-+ };
-+
-+ cpus {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ cpu@0 {
-+ device_type = "cpu";
-+ compatible = "arm,cortex-a8";
-+ reg = <0x0>;
-+ };
-+ };
-+
-+ tzic: tz-interrupt-controller@0fffc000 {
-+ compatible = "fsl,imx50-tzic", "fsl,imx53-tzic", "fsl,tzic";
-+ interrupt-controller;
-+ #interrupt-cells = <1>;
-+ reg = <0x0fffc000 0x4000>;
-+ };
-+
-+ clocks {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ ckil {
-+ compatible = "fsl,imx-ckil", "fixed-clock";
-+ clock-frequency = <32768>;
-+ };
-+
-+ ckih1 {
-+ compatible = "fsl,imx-ckih1", "fixed-clock";
-+ clock-frequency = <22579200>;
-+ };
-+
-+ ckih2 {
-+ compatible = "fsl,imx-ckih2", "fixed-clock";
-+ clock-frequency = <0>;
-+ };
-+
-+ osc {
-+ compatible = "fsl,imx-osc", "fixed-clock";
-+ clock-frequency = <24000000>;
-+ };
-+ };
-+
-+ soc {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ compatible = "simple-bus";
-+ interrupt-parent = <&tzic>;
-+ ranges;
-+
-+ aips@50000000 { /* AIPS1 */
-+ compatible = "fsl,aips-bus", "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x50000000 0x10000000>;
-+ ranges;
-+
-+ spba@50000000 {
-+ compatible = "fsl,spba-bus", "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x50000000 0x40000>;
-+ ranges;
-+
-+ esdhc1: esdhc@50004000 {
-+ compatible = "fsl,imx50-esdhc";
-+ reg = <0x50004000 0x4000>;
-+ interrupts = <1>;
-+ clocks = <&clks IMX5_CLK_ESDHC1_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC1_PER_GATE>;
-+ clock-names = "ipg", "ahb", "per";
-+ bus-width = <4>;
-+ status = "disabled";
-+ };
-+
-+ esdhc2: esdhc@50008000 {
-+ compatible = "fsl,imx50-esdhc";
-+ reg = <0x50008000 0x4000>;
-+ interrupts = <2>;
-+ clocks = <&clks IMX5_CLK_ESDHC2_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC2_PER_GATE>;
-+ clock-names = "ipg", "ahb", "per";
-+ bus-width = <4>;
-+ status = "disabled";
-+ };
-+
-+ uart3: serial@5000c000 {
-+ compatible = "fsl,imx50-uart", "fsl,imx21-uart";
-+ reg = <0x5000c000 0x4000>;
-+ interrupts = <33>;
-+ clocks = <&clks IMX5_CLK_UART3_IPG_GATE>,
-+ <&clks IMX5_CLK_UART3_PER_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ ecspi1: ecspi@50010000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx50-ecspi", "fsl,imx51-ecspi";
-+ reg = <0x50010000 0x4000>;
-+ interrupts = <36>;
-+ clocks = <&clks IMX5_CLK_ECSPI1_IPG_GATE>,
-+ <&clks IMX5_CLK_ECSPI1_PER_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ ssi2: ssi@50014000 {
-+ compatible = "fsl,imx50-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
-+ reg = <0x50014000 0x4000>;
-+ interrupts = <30>;
-+ clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
-+ fsl,fifo-depth = <15>;
-+ fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
-+ status = "disabled";
-+ };
-+
-+ esdhc3: esdhc@50020000 {
-+ compatible = "fsl,imx50-esdhc";
-+ reg = <0x50020000 0x4000>;
-+ interrupts = <3>;
-+ clocks = <&clks IMX5_CLK_ESDHC3_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC3_PER_GATE>;
-+ clock-names = "ipg", "ahb", "per";
-+ bus-width = <4>;
-+ status = "disabled";
-+ };
-+
-+ esdhc4: esdhc@50024000 {
-+ compatible = "fsl,imx50-esdhc";
-+ reg = <0x50024000 0x4000>;
-+ interrupts = <4>;
-+ clocks = <&clks IMX5_CLK_ESDHC4_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC4_PER_GATE>;
-+ clock-names = "ipg", "ahb", "per";
-+ bus-width = <4>;
-+ status = "disabled";
-+ };
-+ };
-+
-+ usbotg: usb@53f80000 {
-+ compatible = "fsl,imx50-usb", "fsl,imx27-usb";
-+ reg = <0x53f80000 0x0200>;
-+ interrupts = <18>;
-+ clocks = <&clks IMX5_CLK_USB_PHY1_GATE>;
-+ status = "disabled";
-+ };
-+
-+ usbh1: usb@53f80200 {
-+ compatible = "fsl,imx50-usb", "fsl,imx27-usb";
-+ reg = <0x53f80200 0x0200>;
-+ interrupts = <14>;
-+ clocks = <&clks IMX5_CLK_USB_PHY2_GATE>;
-+ status = "disabled";
-+ };
-+
-+ usbh2: usb@53f80400 {
-+ compatible = "fsl,imx50-usb", "fsl,imx27-usb";
-+ reg = <0x53f80400 0x0200>;
-+ interrupts = <16>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ status = "disabled";
-+ };
-+
-+ usbh3: usb@53f80600 {
-+ compatible = "fsl,imx50-usb", "fsl,imx27-usb";
-+ reg = <0x53f80600 0x0200>;
-+ interrupts = <17>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ status = "disabled";
-+ };
-+
-+ gpio1: gpio@53f84000 {
-+ compatible = "fsl,imx50-gpio", "fsl,imx35-gpio";
-+ reg = <0x53f84000 0x4000>;
-+ interrupts = <50 51>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio2: gpio@53f88000 {
-+ compatible = "fsl,imx50-gpio", "fsl,imx35-gpio";
-+ reg = <0x53f88000 0x4000>;
-+ interrupts = <52 53>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio3: gpio@53f8c000 {
-+ compatible = "fsl,imx50-gpio", "fsl,imx35-gpio";
-+ reg = <0x53f8c000 0x4000>;
-+ interrupts = <54 55>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio4: gpio@53f90000 {
-+ compatible = "fsl,imx50-gpio", "fsl,imx35-gpio";
-+ reg = <0x53f90000 0x4000>;
-+ interrupts = <56 57>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ wdog1: wdog@53f98000 {
-+ compatible = "fsl,imx50-wdt", "fsl,imx21-wdt";
-+ reg = <0x53f98000 0x4000>;
-+ interrupts = <58>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
-+ };
-+
-+ gpt: timer@53fa0000 {
-+ compatible = "fsl,imx50-gpt", "fsl,imx31-gpt";
-+ reg = <0x53fa0000 0x4000>;
-+ interrupts = <39>;
-+ clocks = <&clks IMX5_CLK_GPT_IPG_GATE>,
-+ <&clks IMX5_CLK_GPT_HF_GATE>;
-+ clock-names = "ipg", "per";
-+ };
-+
-+ iomuxc: iomuxc@53fa8000 {
-+ compatible = "fsl,imx50-iomuxc", "fsl,imx53-iomuxc";
-+ reg = <0x53fa8000 0x4000>;
-+ };
-+
-+ gpr: iomuxc-gpr@53fa8000 {
-+ compatible = "fsl,imx50-iomuxc-gpr", "syscon";
-+ reg = <0x53fa8000 0xc>;
-+ };
-+
-+ pwm1: pwm@53fb4000 {
-+ #pwm-cells = <2>;
-+ compatible = "fsl,imx50-pwm", "fsl,imx27-pwm";
-+ reg = <0x53fb4000 0x4000>;
-+ clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>,
-+ <&clks IMX5_CLK_PWM1_HF_GATE>;
-+ clock-names = "ipg", "per";
-+ interrupts = <61>;
-+ };
-+
-+ pwm2: pwm@53fb8000 {
-+ #pwm-cells = <2>;
-+ compatible = "fsl,imx50-pwm", "fsl,imx27-pwm";
-+ reg = <0x53fb8000 0x4000>;
-+ clocks = <&clks IMX5_CLK_PWM2_IPG_GATE>,
-+ <&clks IMX5_CLK_PWM2_HF_GATE>;
-+ clock-names = "ipg", "per";
-+ interrupts = <94>;
-+ };
-+
-+ uart1: serial@53fbc000 {
-+ compatible = "fsl,imx50-uart", "fsl,imx21-uart";
-+ reg = <0x53fbc000 0x4000>;
-+ interrupts = <31>;
-+ clocks = <&clks IMX5_CLK_UART1_IPG_GATE>,
-+ <&clks IMX5_CLK_UART1_PER_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ uart2: serial@53fc0000 {
-+ compatible = "fsl,imx50-uart", "fsl,imx21-uart";
-+ reg = <0x53fc0000 0x4000>;
-+ interrupts = <32>;
-+ clocks = <&clks IMX5_CLK_UART2_IPG_GATE>,
-+ <&clks IMX5_CLK_UART2_PER_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ src: src@53fd0000 {
-+ compatible = "fsl,imx50-src", "fsl,imx51-src";
-+ reg = <0x53fd0000 0x4000>;
-+ #reset-cells = <1>;
-+ };
-+
-+ clks: ccm@53fd4000{
-+ compatible = "fsl,imx50-ccm";
-+ reg = <0x53fd4000 0x4000>;
-+ interrupts = <0 71 0x04 0 72 0x04>;
-+ #clock-cells = <1>;
-+ };
-+
-+ gpio5: gpio@53fdc000 {
-+ compatible = "fsl,imx50-gpio", "fsl,imx35-gpio";
-+ reg = <0x53fdc000 0x4000>;
-+ interrupts = <103 104>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ gpio6: gpio@53fe0000 {
-+ compatible = "fsl,imx50-gpio", "fsl,imx35-gpio";
-+ reg = <0x53fe0000 0x4000>;
-+ interrupts = <105 106>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ i2c3: i2c@53fec000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx50-i2c", "fsl,imx21-i2c";
-+ reg = <0x53fec000 0x4000>;
-+ interrupts = <64>;
-+ clocks = <&clks IMX5_CLK_I2C3_GATE>;
-+ status = "disabled";
-+ };
-+
-+ uart4: serial@53ff0000 {
-+ compatible = "fsl,imx50-uart", "fsl,imx21-uart";
-+ reg = <0x53ff0000 0x4000>;
-+ interrupts = <13>;
-+ clocks = <&clks IMX5_CLK_UART4_IPG_GATE>,
-+ <&clks IMX5_CLK_UART4_PER_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+ };
-+
-+ aips@60000000 { /* AIPS2 */
-+ compatible = "fsl,aips-bus", "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x60000000 0x10000000>;
-+ ranges;
-+
-+ uart5: serial@63f90000 {
-+ compatible = "fsl,imx50-uart", "fsl,imx21-uart";
-+ reg = <0x63f90000 0x4000>;
-+ interrupts = <86>;
-+ clocks = <&clks IMX5_CLK_UART5_IPG_GATE>,
-+ <&clks IMX5_CLK_UART5_PER_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ owire: owire@63fa4000 {
-+ compatible = "fsl,imx50-owire", "fsl,imx21-owire";
-+ reg = <0x63fa4000 0x4000>;
-+ clocks = <&clks IMX5_CLK_OWIRE_GATE>;
-+ status = "disabled";
-+ };
-+
-+ ecspi2: ecspi@63fac000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx50-ecspi", "fsl,imx51-ecspi";
-+ reg = <0x63fac000 0x4000>;
-+ interrupts = <37>;
-+ clocks = <&clks IMX5_CLK_ECSPI2_IPG_GATE>,
-+ <&clks IMX5_CLK_ECSPI2_PER_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ sdma: sdma@63fb0000 {
-+ compatible = "fsl,imx50-sdma", "fsl,imx35-sdma";
-+ reg = <0x63fb0000 0x4000>;
-+ interrupts = <6>;
-+ clocks = <&clks IMX5_CLK_SDMA_GATE>,
-+ <&clks IMX5_CLK_SDMA_GATE>;
-+ clock-names = "ipg", "ahb";
-+ fsl,sdma-ram-script-name = "imx/sdma/sdma-imx50.bin";
-+ };
-+
-+ cspi: cspi@63fc0000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx50-cspi", "fsl,imx35-cspi";
-+ reg = <0x63fc0000 0x4000>;
-+ interrupts = <38>;
-+ clocks = <&clks IMX5_CLK_CSPI_IPG_GATE>,
-+ <&clks IMX5_CLK_CSPI_IPG_GATE>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
-+ };
-+
-+ i2c2: i2c@63fc4000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx50-i2c", "fsl,imx21-i2c";
-+ reg = <0x63fc4000 0x4000>;
-+ interrupts = <63>;
-+ clocks = <&clks IMX5_CLK_I2C2_GATE>;
-+ status = "disabled";
-+ };
-+
-+ i2c1: i2c@63fc8000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx50-i2c", "fsl,imx21-i2c";
-+ reg = <0x63fc8000 0x4000>;
-+ interrupts = <62>;
-+ clocks = <&clks IMX5_CLK_I2C1_GATE>;
-+ status = "disabled";
-+ };
-+
-+ ssi1: ssi@63fcc000 {
-+ compatible = "fsl,imx50-ssi", "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
-+ reg = <0x63fcc000 0x4000>;
-+ interrupts = <29>;
-+ clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
-+ fsl,fifo-depth = <15>;
-+ fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
-+ status = "disabled";
-+ };
-+
-+ audmux: audmux@63fd0000 {
-+ compatible = "fsl,imx50-audmux", "fsl,imx31-audmux";
-+ reg = <0x63fd0000 0x4000>;
-+ status = "disabled";
-+ };
-+
-+ fec: ethernet@63fec000 {
-+ compatible = "fsl,imx53-fec", "fsl,imx25-fec";
-+ reg = <0x63fec000 0x4000>;
-+ interrupts = <87>;
-+ clocks = <&clks IMX5_CLK_FEC_GATE>,
-+ <&clks IMX5_CLK_FEC_GATE>,
-+ <&clks IMX5_CLK_FEC_GATE>;
-+ clock-names = "ipg", "ahb", "ptp";
-+ status = "disabled";
-+ };
-+ };
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx50-evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx50-evk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx50-evk.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx50-evk.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,119 @@
-+/*
-+ * Copyright 2013 Greg Ungerer <gerg@uclinux.org>
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx50.dtsi"
-+
-+/ {
-+ model = "Freescale i.MX50 Evaluation Kit";
-+ compatible = "fsl,imx50-evk", "fsl,imx50";
-+
-+ memory {
-+ reg = <0x70000000 0x80000000>;
-+ };
-+};
-+
-+&cspi {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cspi>;
-+ fsl,spi-num-chipselects = <2>;
-+ cs-gpios = <&gpio4 11 0>, <&gpio4 13 0>;
-+ status = "okay";
-+
-+ flash: m25p32@1 {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ compatible = "m25p32", "m25p80";
-+ spi-max-frequency = <25000000>;
-+ reg = <1>;
-+
-+ partition@0 {
-+ label = "bootloader";
-+ reg = <0x0 0x100000>;
-+ read-only;
-+ };
-+
-+ partition@100000 {
-+ label = "kernel";
-+ reg = <0x100000 0x300000>;
-+ };
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ phy-mode = "rmii";
-+ phy-reset-gpios = <&gpio4 12 0>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ imx50-evk {
-+ pinctrl_cspi: cspigrp {
-+ fsl,pins = <
-+ MX50_PAD_CSPI_SCLK__CSPI_SCLK 0x00
-+ MX50_PAD_CSPI_MISO__CSPI_MISO 0x00
-+ MX50_PAD_CSPI_MOSI__CSPI_MOSI 0x00
-+ MX50_PAD_CSPI_SS0__GPIO4_11 0xc4
-+ MX50_PAD_ECSPI1_MOSI__CSPI_SS1 0xf4
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX50_PAD_SSI_RXFS__FEC_MDC 0x80
-+ MX50_PAD_SSI_RXC__FEC_MDIO 0x80
-+ MX50_PAD_DISP_D0__FEC_TX_CLK 0x80
-+ MX50_PAD_DISP_D1__FEC_RX_ERR 0x80
-+ MX50_PAD_DISP_D2__FEC_RX_DV 0x80
-+ MX50_PAD_DISP_D3__FEC_RDATA_1 0x80
-+ MX50_PAD_DISP_D4__FEC_RDATA_0 0x80
-+ MX50_PAD_DISP_D5__FEC_TX_EN 0x80
-+ MX50_PAD_DISP_D6__FEC_TDATA_1 0x80
-+ MX50_PAD_DISP_D7__FEC_TDATA_0 0x80
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX50_PAD_UART1_TXD__UART1_TXD_MUX 0x1e4
-+ MX50_PAD_UART1_RXD__UART1_RXD_MUX 0x1e4
-+ MX50_PAD_UART1_RTS__UART1_RTS 0x1e4
-+ MX50_PAD_UART1_CTS__UART1_CTS 0x1e4
-+ >;
-+ };
-+ };
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
-+};
-+
-+&usbh2 {
-+ status = "okay";
-+};
-+
-+&usbh3 {
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx50-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx50-pinfunc.h
---- linux-3.10.36/arch/arm/boot/dts/imx50-pinfunc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx50-pinfunc.h 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,923 @@
-+/*
-+ * Copyright 2013 Greg Ungerer <gerg@uclinux.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __DTS_IMX50_PINFUNC_H
-+#define __DTS_IMX50_PINFUNC_H
-+
-+/*
-+ * The pin function ID is a tuple of
-+ * <mux_reg conf_reg input_reg mux_mode input_val>
-+ */
-+#define MX50_PAD_KEY_COL0__KPP_COL_0 0x020 0x2cc 0x000 0x0 0x0
-+#define MX50_PAD_KEY_COL0__GPIO4_0 0x020 0x2cc 0x000 0x1 0x0
-+#define MX50_PAD_KEY_COL0__EIM_NANDF_CLE 0x020 0x2cc 0x000 0x2 0x0
-+#define MX50_PAD_KEY_COL0__CTI_TRIGIN7 0x020 0x2cc 0x000 0x6 0x0
-+#define MX50_PAD_KEY_COL0__USBPHY1_TXREADY 0x020 0x2cc 0x000 0x7 0x0
-+#define MX50_PAD_KEY_ROW0__KPP_ROW_0 0x024 0x2d0 0x000 0x0 0x0
-+#define MX50_PAD_KEY_ROW0__GPIO4_1 0x024 0x2d0 0x000 0x1 0x0
-+#define MX50_PAD_KEY_ROW0__EIM_NANDF_ALE 0x024 0x2d0 0x000 0x2 0x0
-+#define MX50_PAD_KEY_ROW0__CTI_TRIGIN_ACK7 0x024 0x2d0 0x000 0x6 0x0
-+#define MX50_PAD_KEY_ROW0__USBPHY1_RXVALID 0x024 0x2d0 0x000 0x7 0x0
-+#define MX50_PAD_KEY_COL1__KPP_COL_1 0x028 0x2d4 0x000 0x0 0x0
-+#define MX50_PAD_KEY_COL1__GPIO4_2 0x028 0x2d4 0x000 0x1 0x0
-+#define MX50_PAD_KEY_COL1__EIM_NANDF_CEN_0 0x028 0x2d4 0x000 0x2 0x0
-+#define MX50_PAD_KEY_COL1__CTI_TRIGOUT_ACK6 0x028 0x2d4 0x000 0x6 0x0
-+#define MX50_PAD_KEY_COL1__USBPHY1_RXACTIVE 0x028 0x2d4 0x000 0x7 0x0
-+#define MX50_PAD_KEY_ROW1__KPP_ROW_1 0x02c 0x2d8 0x000 0x0 0x0
-+#define MX50_PAD_KEY_ROW1__GPIO4_3 0x02c 0x2d8 0x000 0x1 0x0
-+#define MX50_PAD_KEY_ROW1__EIM_NANDF_CEN_1 0x02c 0x2d8 0x000 0x2 0x0
-+#define MX50_PAD_KEY_ROW1__CTI_TRIGOUT_ACK7 0x02c 0x2d8 0x000 0x6 0x0
-+#define MX50_PAD_KEY_ROW1__USBPHY1_RXERROR 0x02c 0x2d8 0x000 0x7 0x0
-+#define MX50_PAD_KEY_COL2__KPP_COL_1 0x030 0x2dc 0x000 0x0 0x0
-+#define MX50_PAD_KEY_COL2__GPIO4_4 0x030 0x2dc 0x000 0x1 0x0
-+#define MX50_PAD_KEY_COL2__EIM_NANDF_CEN_2 0x030 0x2dc 0x000 0x2 0x0
-+#define MX50_PAD_KEY_COL2__CTI_TRIGOUT6 0x030 0x2dc 0x000 0x6 0x0
-+#define MX50_PAD_KEY_COL2__USBPHY1_SIECLOCK 0x030 0x2dc 0x000 0x7 0x0
-+#define MX50_PAD_KEY_ROW2__KPP_ROW_2 0x034 0x2e0 0x000 0x0 0x0
-+#define MX50_PAD_KEY_ROW2__GPIO4_5 0x034 0x2e0 0x000 0x1 0x0
-+#define MX50_PAD_KEY_ROW2__EIM_NANDF_CEN_3 0x034 0x2e0 0x000 0x2 0x0
-+#define MX50_PAD_KEY_ROW2__CTI_TRIGOUT7 0x034 0x2e0 0x000 0x6 0x0
-+#define MX50_PAD_KEY_ROW2__USBPHY1_LINESTATE_0 0x034 0x2e0 0x000 0x7 0x0
-+#define MX50_PAD_KEY_COL3__KPP_COL_2 0x038 0x2e4 0x000 0x0 0x0
-+#define MX50_PAD_KEY_COL3__GPIO4_6 0x038 0x2e4 0x000 0x1 0x0
-+#define MX50_PAD_KEY_COL3__EIM_NANDF_READY0 0x038 0x2e4 0x7b4 0x2 0x0
-+#define MX50_PAD_KEY_COL3__SDMA_EXT_EVENT_0 0x038 0x2e4 0x7b8 0x6 0x0
-+#define MX50_PAD_KEY_COL3__USBPHY1_LINESTATE_1 0x038 0x2e4 0x000 0x7 0x0
-+#define MX50_PAD_KEY_ROW3__KPP_ROW_3 0x03c 0x2e8 0x000 0x0 0x0
-+#define MX50_PAD_KEY_ROW3__GPIO4_7 0x03c 0x2e8 0x000 0x1 0x0
-+#define MX50_PAD_KEY_ROW3__EIM_NANDF_DQS 0x03c 0x2e8 0x7b0 0x2 0x0
-+#define MX50_PAD_KEY_ROW3__SDMA_EXT_EVENT_1 0x03c 0x2e8 0x7bc 0x6 0x0
-+#define MX50_PAD_KEY_ROW3__USBPHY1_VBUSVALID 0x03c 0x2e8 0x000 0x7 0x0
-+#define MX50_PAD_I2C1_SCL__I2C1_SCL 0x040 0x2ec 0x000 0x0 0x0
-+#define MX50_PAD_I2C1_SCL__GPIO6_18 0x040 0x2ec 0x000 0x1 0x0
-+#define MX50_PAD_I2C1_SCL__UART2_TXD_MUX 0x040 0x2ec 0x7cc 0x2 0x0
-+#define MX50_PAD_I2C1_SDA__I2C1_SDA 0x044 0x2f0 0x000 0x0 0x0
-+#define MX50_PAD_I2C1_SDA__GPIO6_19 0x044 0x2f0 0x000 0x1 0x0
-+#define MX50_PAD_I2C1_SDA__UART2_RXD_MUX 0x044 0x2f0 0x7cc 0x2 0x1
-+#define MX50_PAD_I2C2_SCL__I2C2_SCL 0x048 0x2f4 0x000 0x0 0x0
-+#define MX50_PAD_I2C2_SCL__GPIO6_20 0x048 0x2f4 0x000 0x1 0x0
-+#define MX50_PAD_I2C2_SCL__UART2_CTS 0x048 0x2f4 0x000 0x2 0x0
-+#define MX50_PAD_I2C2_SDA__I2C2_SDA 0x04c 0x2f8 0x000 0x0 0x0
-+#define MX50_PAD_I2C2_SDA__GPIO6_21 0x04c 0x2f8 0x000 0x1 0x0
-+#define MX50_PAD_I2C2_SDA__UART2_RTS 0x04c 0x2f8 0x7c8 0x2 0x1
-+#define MX50_PAD_I2C3_SCL__I2C3_SCL 0x050 0x2fc 0x000 0x0 0x0
-+#define MX50_PAD_I2C3_SCL__GPIO6_22 0x050 0x2fc 0x000 0x1 0x0
-+#define MX50_PAD_I2C3_SCL__FEC_MDC 0x050 0x2fc 0x000 0x2 0x0
-+#define MX50_PAD_I2C3_SCL__GPC_PMIC_RDY 0x050 0x2fc 0x000 0x3 0x0
-+#define MX50_PAD_I2C3_SCL__GPT_CAPIN1 0x050 0x2fc 0x000 0x5 0x0
-+#define MX50_PAD_I2C3_SCL__OBSERVE_MUX_OBSRV_INT_OUT0 0x050 0x2fc 0x000 0x6 0x0
-+#define MX50_PAD_I2C3_SCL__USBOH1_USBOTG_OC 0x050 0x2fc 0x7e8 0x7 0x0
-+#define MX50_PAD_I2C3_SDA__I2C3_SDA 0x054 0x300 0x000 0x0 0x0
-+#define MX50_PAD_I2C3_SDA__GPIO6_23 0x054 0x300 0x000 0x1 0x0
-+#define MX50_PAD_I2C3_SDA__FEC_MDIO 0x054 0x300 0x774 0x2 0x0
-+#define MX50_PAD_I2C3_SDA__TZIC_PWRFAIL_INT 0x054 0x300 0x000 0x3 0x0
-+#define MX50_PAD_I2C3_SDA__SRTC_ALARM_DEB 0x054 0x300 0x000 0x4 0x0
-+#define MX50_PAD_I2C3_SDA__GPT_CAPIN2 0x054 0x300 0x000 0x5 0x0
-+#define MX50_PAD_I2C3_SDA__OBSERVE_MUX_OBSRV_INT_OUT1 0x054 0x300 0x000 0x6 0x0
-+#define MX50_PAD_I2C3_SDA__USBOH1_USBOTG_PWR 0x054 0x300 0x000 0x7 0x0
-+#define MX50_PAD_PWM1__PWM1_PWMO 0x058 0x304 0x000 0x0 0x0
-+#define MX50_PAD_PWM1__GPIO6_24 0x058 0x304 0x000 0x1 0x0
-+#define MX50_PAD_PWM1__USBOH1_USBOTG_OC 0x058 0x304 0x7e8 0x2 0x1
-+#define MX50_PAD_PWM1__GPT_CMPOUT1 0x058 0x304 0x000 0x5 0x0
-+#define MX50_PAD_PWM1__OBSERVE_MUX_OBSRV_INT_OUT2 0x058 0x304 0x000 0x6 0x0
-+#define MX50_PAD_PWM1__SJC_FAIL 0x058 0x304 0x000 0x7 0x0
-+#define MX50_PAD_PWM2__PWM2_PWMO 0x05c 0x308 0x000 0x0 0x0
-+#define MX50_PAD_PWM2__GPIO6_25 0x05c 0x308 0x000 0x1 0x0
-+#define MX50_PAD_PWM2__USBOH1_USBOTG_PWR 0x05c 0x308 0x000 0x2 0x0
-+#define MX50_PAD_PWM2__GPT_CMPOUT2 0x05c 0x308 0x000 0x5 0x0
-+#define MX50_PAD_PWM2__OBSERVE_MUX_OBSRV_INT_OUT3 0x05c 0x308 0x000 0x6 0x0
-+#define MX50_PAD_PWM2__SRC_ANY_PU_RST 0x05c 0x308 0x000 0x7 0x0
-+#define MX50_PAD_OWIRE__OWIRE_LINE 0x060 0x30c 0x000 0x0 0x0
-+#define MX50_PAD_OWIRE__GPIO6_26 0x060 0x30c 0x000 0x1 0x0
-+#define MX50_PAD_OWIRE__USBOH1_USBH1_OC 0x060 0x30c 0x000 0x2 0x0
-+#define MX50_PAD_OWIRE__CCM_SSI_EXT1_CLK 0x060 0x30c 0x000 0x3 0x0
-+#define MX50_PAD_OWIRE__EPDC_PWRIRQ 0x060 0x30c 0x000 0x4 0x0
-+#define MX50_PAD_OWIRE__GPT_CMPOUT3 0x060 0x30c 0x000 0x5 0x0
-+#define MX50_PAD_OWIRE__OBSERVE_MUX_OBSRV_INT_OUT4 0x060 0x30c 0x000 0x6 0x0
-+#define MX50_PAD_OWIRE__SJC_JTAG_ACT 0x060 0x30c 0x000 0x7 0x0
-+#define MX50_PAD_EPITO__EPIT1_EPITO 0x064 0x310 0x000 0x0 0x0
-+#define MX50_PAD_EPITO__GPIO6_27 0x064 0x310 0x000 0x1 0x0
-+#define MX50_PAD_EPITO__USBOH1_USBH1_PWR 0x064 0x310 0x000 0x2 0x0
-+#define MX50_PAD_EPITO__CCM_SSI_EXT2_CLK 0x064 0x310 0x000 0x3 0x0
-+#define MX50_PAD_EPITO__DPLLIP1_TOG_EN 0x064 0x310 0x000 0x4 0x0
-+#define MX50_PAD_EPITO__GPT_CLK_IN 0x064 0x310 0x000 0x5 0x0
-+#define MX50_PAD_EPITO__PMU_IRQ_B 0x064 0x310 0x000 0x6 0x0
-+#define MX50_PAD_EPITO__SJC_DE_B 0x064 0x310 0x000 0x7 0x0
-+#define MX50_PAD_WDOG__WDOG1_WDOG_B 0x068 0x314 0x000 0x0 0x0
-+#define MX50_PAD_WDOG__GPIO6_28 0x068 0x314 0x000 0x1 0x0
-+#define MX50_PAD_WDOG__WDOG1_WDOG_RST_B_DEB 0x068 0x314 0x000 0x2 0x0
-+#define MX50_PAD_WDOG__CCM_XTAL32K 0x068 0x314 0x000 0x6 0x0
-+#define MX50_PAD_WDOG__SJC_DONE 0x068 0x314 0x000 0x7 0x0
-+#define MX50_PAD_SSI_TXFS__AUDMUX_AUD3_TXFS 0x06c 0x318 0x000 0x0 0x0
-+#define MX50_PAD_SSI_TXFS__GPIO6_0 0x06c 0x318 0x000 0x1 0x0
-+#define MX50_PAD_SSI_TXFS__SRC_BT_FUSE_RSV_1 0x06c 0x318 0x000 0x6 0x0
-+#define MX50_PAD_SSI_TXFS__USBPHY1_DATAOUT_8 0x06c 0x318 0x000 0x7 0x0
-+#define MX50_PAD_SSI_TXC__AUDMUX_AUD3_TXC 0x070 0x31c 0x000 0x0 0x0
-+#define MX50_PAD_SSI_TXC__GPIO6_1 0x070 0x31c 0x000 0x1 0x0
-+#define MX50_PAD_SSI_TXC__SRC_BT_FUSE_RSV_0 0x070 0x31c 0x000 0x6 0x0
-+#define MX50_PAD_SSI_TXC__USBPHY1_DATAOUT_9 0x070 0x31c 0x000 0x7 0x0
-+#define MX50_PAD_SSI_TXD__AUDMUX_AUD3_TXD 0x074 0x320 0x000 0x0 0x0
-+#define MX50_PAD_SSI_TXD__GPIO6_2 0x074 0x320 0x000 0x1 0x0
-+#define MX50_PAD_SSI_TXD__CSPI_RDY 0x074 0x320 0x6e8 0x4 0x0
-+#define MX50_PAD_SSI_TXD__USBPHY1_DATAOUT_10 0x074 0x320 0x000 0x7 0x0
-+#define MX50_PAD_SSI_RXD__AUDMUX_AUD3_RXD 0x078 0x324 0x000 0x0 0x0
-+#define MX50_PAD_SSI_RXD__GPIO6_3 0x078 0x324 0x000 0x1 0x0
-+#define MX50_PAD_SSI_RXD__CSPI_SS3 0x078 0x324 0x6f4 0x4 0x0
-+#define MX50_PAD_SSI_RXD__USBPHY1_DATAOUT_11 0x078 0x324 0x000 0x7 0x0
-+#define MX50_PAD_SSI_RXFS__AUDMUX_AUD3_RXFS 0x07c 0x328 0x000 0x0 0x0
-+#define MX50_PAD_SSI_RXFS__GPIO6_4 0x07c 0x328 0x000 0x1 0x0
-+#define MX50_PAD_SSI_RXFS__UART5_TXD_MUX 0x07c 0x328 0x7e4 0x2 0x0
-+#define MX50_PAD_SSI_RXFS__EIM_WEIM_D_6 0x07c 0x328 0x804 0x3 0x0
-+#define MX50_PAD_SSI_RXFS__CSPI_SS2 0x07c 0x328 0x6f0 0x4 0x0
-+#define MX50_PAD_SSI_RXFS__FEC_COL 0x07c 0x328 0x770 0x5 0x0
-+#define MX50_PAD_SSI_RXFS__FEC_MDC 0x07c 0x328 0x000 0x6 0x0
-+#define MX50_PAD_SSI_RXFS__USBPHY1_DATAOUT_12 0x07c 0x328 0x000 0x7 0x0
-+#define MX50_PAD_SSI_RXC__AUDMUX_AUD3_RXC 0x080 0x32c 0x000 0x0 0x0
-+#define MX50_PAD_SSI_RXC__GPIO6_5 0x080 0x32c 0x000 0x1 0x0
-+#define MX50_PAD_SSI_RXC__UART5_RXD_MUX 0x080 0x32c 0x7e4 0x2 0x1
-+#define MX50_PAD_SSI_RXC__EIM_WEIM_D_7 0x080 0x32c 0x808 0x3 0x0
-+#define MX50_PAD_SSI_RXC__CSPI_SS1 0x080 0x32c 0x6ec 0x4 0x0
-+#define MX50_PAD_SSI_RXC__FEC_RX_CLK 0x080 0x32c 0x780 0x5 0x0
-+#define MX50_PAD_SSI_RXC__FEC_MDIO 0x080 0x32c 0x774 0x6 0x1
-+#define MX50_PAD_SSI_RXC__USBPHY1_DATAOUT_13 0x080 0x32c 0x000 0x7 0x0
-+#define MX50_PAD_UART1_TXD__UART1_TXD_MUX 0x084 0x330 0x7c4 0x0 0x0
-+#define MX50_PAD_UART1_TXD__GPIO6_6 0x084 0x330 0x000 0x1 0x0
-+#define MX50_PAD_UART1_TXD__USBPHY1_DATAOUT_14 0x084 0x330 0x000 0x7 0x0
-+#define MX50_PAD_UART1_RXD__UART1_RXD_MUX 0x088 0x334 0x7c4 0x0 0x1
-+#define MX50_PAD_UART1_RXD__GPIO6_7 0x088 0x334 0x000 0x1 0x0
-+#define MX50_PAD_UART1_RXD__USBPHY1_DATAOUT_15 0x088 0x334 0x000 0x7 0x0
-+#define MX50_PAD_UART1_CTS__UART1_CTS 0x08c 0x338 0x000 0x0 0x0
-+#define MX50_PAD_UART1_CTS__GPIO6_8 0x08c 0x338 0x000 0x1 0x0
-+#define MX50_PAD_UART1_CTS__UART5_TXD_MUX 0x08c 0x338 0x7e4 0x2 0x2
-+#define MX50_PAD_UART1_CTS__ESDHC4_DAT4 0x08c 0x338 0x760 0x4 0x0
-+#define MX50_PAD_UART1_CTS__ESDHC4_CMD 0x08c 0x338 0x74c 0x5 0x0
-+#define MX50_PAD_UART1_CTS__USBPHY2_DATAOUT_8 0x08c 0x338 0x000 0x7 0x0
-+#define MX50_PAD_UART1_RTS__UART1_RTS 0x090 0x33c 0x7c0 0x0 0x3
-+#define MX50_PAD_UART1_RTS__GPIO6_9 0x090 0x33c 0x000 0x1 0x0
-+#define MX50_PAD_UART1_RTS__UART5_RXD_MUX 0x090 0x33c 0x7e4 0x2 0x3
-+#define MX50_PAD_UART1_RTS__ESDHC4_DAT5 0x090 0x33c 0x764 0x4 0x0
-+#define MX50_PAD_UART1_RTS__ESDHC4_CLK 0x090 0x33c 0x748 0x5 0x0
-+#define MX50_PAD_UART1_RTS__USBPHY2_DATAOUT_9 0x090 0x33c 0x000 0x7 0x0
-+#define MX50_PAD_UART2_TXD__UART2_TXD_MUX 0x094 0x340 0x7cc 0x0 0x2
-+#define MX50_PAD_UART2_TXD__GPIO6_10 0x094 0x340 0x000 0x1 0x0
-+#define MX50_PAD_UART2_TXD__ESDHC4_DAT6 0x094 0x340 0x768 0x4 0x0
-+#define MX50_PAD_UART2_TXD__ESDHC4_DAT4 0x094 0x340 0x760 0x5 0x1
-+#define MX50_PAD_UART2_TXD__USBPHY2_DATAOUT_10 0x094 0x340 0x000 0x7 0x0
-+#define MX50_PAD_UART2_RXD__UART2_RXD_MUX 0x098 0x344 0x7cc 0x0 0x3
-+#define MX50_PAD_UART2_RXD__GPIO6_11 0x098 0x344 0x000 0x1 0x0
-+#define MX50_PAD_UART2_RXD__ESDHC4_DAT7 0x098 0x344 0x76c 0x4 0x0
-+#define MX50_PAD_UART2_RXD__ESDHC4_DAT5 0x098 0x344 0x764 0x5 0x1
-+#define MX50_PAD_UART2_RXD__USBPHY2_DATAOUT_11 0x098 0x344 0x000 0x7 0x0
-+#define MX50_PAD_UART2_CTS__UART2_CTS 0x09c 0x348 0x000 0x0 0x0
-+#define MX50_PAD_UART2_CTS__GPIO6_12 0x09c 0x348 0x000 0x1 0x0
-+#define MX50_PAD_UART2_CTS__ESDHC4_CMD 0x09c 0x348 0x74c 0x4 0x1
-+#define MX50_PAD_UART2_CTS__ESDHC4_DAT6 0x09c 0x348 0x768 0x5 0x1
-+#define MX50_PAD_UART2_CTS__USBPHY2_DATAOUT_12 0x09c 0x348 0x000 0x7 0x0
-+#define MX50_PAD_UART2_RTS__UART2_RTS 0x0a0 0x34c 0x7c8 0x0 0x2
-+#define MX50_PAD_UART2_RTS__GPIO6_13 0x0a0 0x34c 0x000 0x1 0x0
-+#define MX50_PAD_UART2_RTS__ESDHC4_CLK 0x0a0 0x34c 0x748 0x4 0x1
-+#define MX50_PAD_UART2_RTS__ESDHC4_DAT7 0x0a0 0x34c 0x76c 0x5 0x1
-+#define MX50_PAD_UART2_RTS__USBPHY2_DATAOUT_13 0x0a0 0x34c 0x000 0x7 0x0
-+#define MX50_PAD_UART3_TXD__UART3_TXD_MUX 0x0a4 0x350 0x7d4 0x0 0x0
-+#define MX50_PAD_UART3_TXD__GPIO6_14 0x0a4 0x350 0x000 0x1 0x0
-+#define MX50_PAD_UART3_TXD__ESDHC1_DAT4 0x0a4 0x350 0x000 0x3 0x0
-+#define MX50_PAD_UART3_TXD__ESDHC4_DAT0 0x0a4 0x350 0x000 0x4 0x0
-+#define MX50_PAD_UART3_TXD__ESDHC2_WP 0x0a4 0x350 0x744 0x5 0x0
-+#define MX50_PAD_UART3_TXD__EIM_WEIM_D_12 0x0a4 0x350 0x81c 0x6 0x0
-+#define MX50_PAD_UART3_TXD__USBPHY2_DATAOUT_14 0x0a4 0x350 0x000 0x7 0x0
-+#define MX50_PAD_UART3_RXD__UART3_RXD_MUX 0x0a8 0x354 0x7d4 0x0 0x1
-+#define MX50_PAD_UART3_RXD__GPIO6_15 0x0a8 0x354 0x000 0x1 0x0
-+#define MX50_PAD_UART3_RXD__ESDHC1_DAT5 0x0a8 0x354 0x000 0x3 0x0
-+#define MX50_PAD_UART3_RXD__ESDHC4_DAT1 0x0a8 0x354 0x754 0x4 0x0
-+#define MX50_PAD_UART3_RXD__ESDHC2_CD 0x0a8 0x354 0x740 0x5 0x0
-+#define MX50_PAD_UART3_RXD__EIM_WEIM_D_13 0x0a8 0x354 0x820 0x6 0x0
-+#define MX50_PAD_UART3_RXD__USBPHY2_DATAOUT_15 0x0a8 0x354 0x000 0x7 0x0
-+#define MX50_PAD_UART4_TXD__UART4_TXD_MUX 0x0ac 0x358 0x7dc 0x0 0x0
-+#define MX50_PAD_UART4_TXD__GPIO6_16 0x0ac 0x358 0x000 0x1 0x0
-+#define MX50_PAD_UART4_TXD__UART3_CTS 0x0ac 0x358 0x7d0 0x2 0x0
-+#define MX50_PAD_UART4_TXD__ESDHC1_DAT6 0x0ac 0x358 0x000 0x3 0x0
-+#define MX50_PAD_UART4_TXD__ESDHC4_DAT2 0x0ac 0x358 0x758 0x4 0x0
-+#define MX50_PAD_UART4_TXD__ESDHC2_LCTL 0x0ac 0x358 0x000 0x5 0x0
-+#define MX50_PAD_UART4_TXD__EIM_WEIM_D_14 0x0ac 0x358 0x824 0x6 0x0
-+#define MX50_PAD_UART4_RXD__UART4_RXD_MUX 0x0b0 0x35c 0x7dc 0x0 0x1
-+#define MX50_PAD_UART4_RXD__GPIO6_17 0x0b0 0x35c 0x000 0x1 0x0
-+#define MX50_PAD_UART4_RXD__UART3_RTS 0x0b0 0x35c 0x7d0 0x2 0x1
-+#define MX50_PAD_UART4_RXD__ESDHC1_DAT7 0x0b0 0x35c 0x000 0x3 0x0
-+#define MX50_PAD_UART4_RXD__ESDHC4_DAT3 0x0b0 0x35c 0x75c 0x4 0x0
-+#define MX50_PAD_UART4_RXD__ESDHC1_LCTL 0x0b0 0x35c 0x000 0x5 0x0
-+#define MX50_PAD_UART4_RXD__EIM_WEIM_D_15 0x0b0 0x35c 0x828 0x6 0x0
-+#define MX50_PAD_CSPI_SCLK__CSPI_SCLK 0x0b4 0x360 0x000 0x0 0x0
-+#define MX50_PAD_CSPI_SCLK__GPIO4_8 0x0b4 0x360 0x000 0x1 0x0
-+#define MX50_PAD_CSPI_MOSI__CSPI_MOSI 0x0b8 0x364 0x000 0x0 0x0
-+#define MX50_PAD_CSPI_MOSI__GPIO4_9 0x0b8 0x364 0x000 0x1 0x0
-+#define MX50_PAD_CSPI_MISO__CSPI_MISO 0x0bc 0x368 0x000 0x0 0x0
-+#define MX50_PAD_CSPI_MISO__GPIO4_10 0x0bc 0x368 0x000 0x1 0x0
-+#define MX50_PAD_CSPI_SS0__CSPI_SS0 0x0c0 0x36c 0x000 0x0 0x0
-+#define MX50_PAD_CSPI_SS0__GPIO4_11 0x0c0 0x36c 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI1_SCLK__ECSPI1_SCLK 0x0c4 0x370 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI1_SCLK__GPIO4_12 0x0c4 0x370 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI1_SCLK__CSPI_RDY 0x0c4 0x370 0x6e8 0x2 0x1
-+#define MX50_PAD_ECSPI1_SCLK__ECSPI2_RDY 0x0c4 0x370 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI1_SCLK__UART3_RTS 0x0c4 0x370 0x7d0 0x4 0x2
-+#define MX50_PAD_ECSPI1_SCLK__EPDC_SDCE_6 0x0c4 0x370 0x000 0x5 0x0
-+#define MX50_PAD_ECSPI1_SCLK__EIM_WEIM_D_8 0x0c4 0x370 0x80c 0x7 0x0
-+#define MX50_PAD_ECSPI1_MOSI__ECSPI1_MOSI 0x0c8 0x374 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI1_MOSI__GPIO4_13 0x0c8 0x374 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI1_MOSI__CSPI_SS1 0x0c8 0x374 0x6ec 0x2 0x1
-+#define MX50_PAD_ECSPI1_MOSI__ECSPI2_SS1 0x0c8 0x374 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI1_MOSI__UART3_CTS 0x0c8 0x374 0x000 0x4 0x0
-+#define MX50_PAD_ECSPI1_MOSI__EPDC_SDCE_7 0x0c8 0x374 0x000 0x5 0x0
-+#define MX50_PAD_ECSPI1_MOSI__EIM_WEIM_D_9 0x0c8 0x374 0x810 0x7 0x0
-+#define MX50_PAD_ECSPI1_MISO__ECSPI1_MISO 0x0cc 0x378 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI1_MISO__GPIO4_14 0x0cc 0x378 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI1_MISO__CSPI_SS2 0x0cc 0x378 0x6f0 0x2 0x1
-+#define MX50_PAD_ECSPI1_MISO__ECSPI2_SS2 0x0cc 0x378 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI1_MISO__UART4_RTS 0x0cc 0x378 0x7d8 0x4 0x0
-+#define MX50_PAD_ECSPI1_MISO__EPDC_SDCE_8 0x0cc 0x378 0x000 0x5 0x0
-+#define MX50_PAD_ECSPI1_MISO__EIM_WEIM_D_10 0x0cc 0x378 0x814 0x7 0x0
-+#define MX50_PAD_ECSPI1_SS0__ECSPI1_SS0 0x0d0 0x37c 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI1_SS0__GPIO4_15 0x0d0 0x37c 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI1_SS0__CSPI_SS3 0x0d0 0x37c 0x6f4 0x2 0x1
-+#define MX50_PAD_ECSPI1_SS0__ECSPI2_SS3 0x0d0 0x37c 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI1_SS0__UART4_CTS 0x0d0 0x37c 0x000 0x4 0x0
-+#define MX50_PAD_ECSPI1_SS0__EPDC_SDCE_9 0x0d0 0x37c 0x000 0x5 0x0
-+#define MX50_PAD_ECSPI1_SS0__EIM_WEIM_D_11 0x0d0 0x37c 0x818 0x7 0x0
-+#define MX50_PAD_ECSPI2_SCLK__ECSPI2_SCLK 0x0d4 0x380 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI2_SCLK__GPIO4_16 0x0d4 0x380 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI2_SCLK__ELCDIF_WR_RWN 0x0d4 0x380 0x000 0x2 0x0
-+#define MX50_PAD_ECSPI2_SCLK__ECSPI1_RDY 0x0d4 0x380 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI2_SCLK__UART5_RTS 0x0d4 0x380 0x7e0 0x4 0x0
-+#define MX50_PAD_ECSPI2_SCLK__ELCDIF_DOTCLK 0x0d4 0x380 0x000 0x5 0x0
-+#define MX50_PAD_ECSPI2_SCLK__EIM_NANDF_CEN_4 0x0d4 0x380 0x000 0x6 0x0
-+#define MX50_PAD_ECSPI2_SCLK__EIM_WEIM_D_8 0x0d4 0x380 0x80c 0x7 0x1
-+#define MX50_PAD_ECSPI2_MOSI__ECSPI2_MOSI 0x0d8 0x384 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI2_MOSI__GPIO4_17 0x0d8 0x384 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI2_MOSI__ELCDIF_RE_E 0x0d8 0x384 0x000 0x2 0x0
-+#define MX50_PAD_ECSPI2_MOSI__ECSPI1_SS1 0x0d8 0x384 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI2_MOSI__UART5_CTS 0x0d8 0x384 0x7e0 0x4 0x1
-+#define MX50_PAD_ECSPI2_MOSI__ELCDIF_ENABLE 0x0d8 0x384 0x000 0x5 0x0
-+#define MX50_PAD_ECSPI2_MOSI__EIM_NANDF_CEN_5 0x0d8 0x384 0x000 0x6 0x0
-+#define MX50_PAD_ECSPI2_MOSI__EIM_WEIM_D_9 0x0d8 0x384 0x810 0x7 0x1
-+#define MX50_PAD_ECSPI2_MISO__ECSPI2_MISO 0x0dc 0x388 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI2_MISO__GPIO4_18 0x0dc 0x388 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI2_MISO__ELCDIF_RS 0x0dc 0x388 0x000 0x2 0x0
-+#define MX50_PAD_ECSPI2_MISO__ECSPI1_SS2 0x0dc 0x388 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI2_MISO__UART5_TXD_MUX 0x0dc 0x388 0x7e4 0x4 0x4
-+#define MX50_PAD_ECSPI2_MISO__ELCDIF_VSYNC 0x0dc 0x388 0x73c 0x5 0x0
-+#define MX50_PAD_ECSPI2_MISO__EIM_NANDF_CEN_6 0x0dc 0x388 0x000 0x6 0x0
-+#define MX50_PAD_ECSPI2_MISO__EIM_WEIM_D_10 0x0dc 0x388 0x814 0x7 0x1
-+#define MX50_PAD_ECSPI2_SS0__ECSPI2_SS0 0x0e0 0x38c 0x000 0x0 0x0
-+#define MX50_PAD_ECSPI2_SS0__GPIO4_19 0x0e0 0x38c 0x000 0x1 0x0
-+#define MX50_PAD_ECSPI2_SS0__ELCDIF_CS 0x0e0 0x38c 0x000 0x2 0x0
-+#define MX50_PAD_ECSPI2_SS0__ECSPI2_SS3 0x0e0 0x38c 0x000 0x3 0x0
-+#define MX50_PAD_ECSPI2_SS0__UART5_RXD_MUX 0x0e0 0x38c 0x7e4 0x4 0x5
-+#define MX50_PAD_ECSPI2_SS0__ELCDIF_HSYNC 0x0e0 0x38c 0x6f8 0x5 0x0
-+#define MX50_PAD_ECSPI2_SS0__EIM_NANDF_CEN_7 0x0e0 0x38c 0x000 0x6 0x0
-+#define MX50_PAD_ECSPI2_SS0__EIM_WEIM_D_11 0x0e0 0x38c 0x818 0x7 0x1
-+#define MX50_PAD_SD1_CLK__ESDHC1_CLK 0x0e4 0x390 0x000 0x0 0x0
-+#define MX50_PAD_SD1_CLK__GPIO5_0 0x0e4 0x390 0x000 0x1 0x0
-+#define MX50_PAD_SD1_CLK__CCM_CLKO 0x0e4 0x390 0x000 0x7 0x0
-+#define MX50_PAD_SD1_CMD__ESDHC1_CMD 0x0e8 0x394 0x000 0x0 0x0
-+#define MX50_PAD_SD1_CMD__GPIO5_1 0x0e8 0x394 0x000 0x1 0x0
-+#define MX50_PAD_SD1_CMD__CCM_CLKO2 0x0e8 0x394 0x000 0x7 0x0
-+#define MX50_PAD_SD1_D0__ESDHC1_DAT0 0x0ec 0x398 0x000 0x0 0x0
-+#define MX50_PAD_SD1_D0__GPIO5_2 0x0ec 0x398 0x000 0x1 0x0
-+#define MX50_PAD_SD1_D0__CCM_PLL1_BYP 0x0ec 0x398 0x6dc 0x7 0x0
-+#define MX50_PAD_SD1_D1__ESDHC1_DAT1 0x0f0 0x39c 0x000 0x0 0x0
-+#define MX50_PAD_SD1_D1__GPIO5_3 0x0f0 0x39c 0x000 0x1 0x0
-+#define MX50_PAD_SD1_D1__CCM_PLL2_BYP 0x0f0 0x39c 0x000 0x7 0x0
-+#define MX50_PAD_SD1_D2__ESDHC1_DAT2 0x0f4 0x3a0 0x000 0x0 0x0
-+#define MX50_PAD_SD1_D2__GPIO5_4 0x0f4 0x3a0 0x000 0x1 0x0
-+#define MX50_PAD_SD1_D2__CCM_PLL3_BYP 0x0f4 0x3a0 0x6e4 0x7 0x0
-+#define MX50_PAD_SD1_D3__ESDHC1_DAT3 0x0f8 0x3a4 0x000 0x0 0x0
-+#define MX50_PAD_SD1_D3__GPIO5_5 0x0f8 0x3a4 0x000 0x1 0x0
-+#define MX50_PAD_SD2_CLK__ESDHC2_CLK 0x0fc 0x3a8 0x000 0x0 0x0
-+#define MX50_PAD_SD2_CLK__GPIO5_6 0x0fc 0x3a8 0x000 0x1 0x0
-+#define MX50_PAD_SD2_CLK__MSHC_SCLK 0x0fc 0x3a8 0x000 0x2 0x0
-+#define MX50_PAD_SD2_CMD__ESDHC2_CMD 0x100 0x3ac 0x000 0x0 0x0
-+#define MX50_PAD_SD2_CMD__GPIO5_7 0x100 0x3ac 0x000 0x1 0x0
-+#define MX50_PAD_SD2_CMD__MSHC_BS 0x100 0x3ac 0x000 0x2 0x0
-+#define MX50_PAD_SD2_D0__ESDHC2_DAT0 0x104 0x3b0 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D0__GPIO5_8 0x104 0x3b0 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D0__MSHC_DATA_0 0x104 0x3b0 0x000 0x2 0x0
-+#define MX50_PAD_SD2_D0__KPP_COL_4 0x104 0x3b0 0x790 0x3 0x0
-+#define MX50_PAD_SD2_D1__ESDHC2_DAT1 0x108 0x3b4 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D1__GPIO5_9 0x108 0x3b4 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D1__MSHC_DATA_1 0x108 0x3b4 0x000 0x2 0x0
-+#define MX50_PAD_SD2_D1__KPP_ROW_4 0x108 0x3b4 0x7a0 0x3 0x0
-+#define MX50_PAD_SD2_D2__ESDHC2_DAT2 0x10c 0x3b8 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D2__GPIO5_10 0x10c 0x3b8 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D2__MSHC_DATA_2 0x10c 0x3b8 0x000 0x2 0x0
-+#define MX50_PAD_SD2_D2__KPP_COL_5 0x10c 0x3b8 0x794 0x3 0x0
-+#define MX50_PAD_SD2_D3__ESDHC2_DAT3 0x110 0x3bc 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D3__GPIO5_11 0x110 0x3bc 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D3__MSHC_DATA_3 0x110 0x3bc 0x000 0x2 0x0
-+#define MX50_PAD_SD2_D3__KPP_ROW_5 0x110 0x3bc 0x7a4 0x3 0x0
-+#define MX50_PAD_SD2_D4__ESDHC2_DAT4 0x114 0x3c0 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D4__GPIO5_12 0x114 0x3c0 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D4__AUDMUX_AUD4_RXFS 0x114 0x3c0 0x6d0 0x2 0x0
-+#define MX50_PAD_SD2_D4__KPP_COL_6 0x114 0x3c0 0x798 0x3 0x0
-+#define MX50_PAD_SD2_D4__EIM_WEIM_D_0 0x114 0x3c0 0x7ec 0x4 0x0
-+#define MX50_PAD_SD2_D4__CCM_CCM_OUT_0 0x114 0x3c0 0x000 0x7 0x0
-+#define MX50_PAD_SD2_D5__ESDHC2_DAT5 0x118 0x3c4 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D5__GPIO5_13 0x118 0x3c4 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D5__AUDMUX_AUD4_RXC 0x118 0x3c4 0x6cc 0x2 0x0
-+#define MX50_PAD_SD2_D5__KPP_ROW_6 0x118 0x3c4 0x7a8 0x3 0x0
-+#define MX50_PAD_SD2_D5__EIM_WEIM_D_1 0x118 0x3c4 0x7f0 0x4 0x0
-+#define MX50_PAD_SD2_D5__CCM_CCM_OUT_1 0x118 0x3c4 0x000 0x7 0x0
-+#define MX50_PAD_SD2_D6__ESDHC2_DAT6 0x11c 0x3c8 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D6__GPIO5_14 0x11c 0x3c8 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D6__AUDMUX_AUD4_RXD 0x11c 0x3c8 0x6c4 0x2 0x0
-+#define MX50_PAD_SD2_D6__KPP_COL_7 0x11c 0x3c8 0x79c 0x3 0x0
-+#define MX50_PAD_SD2_D6__EIM_WEIM_D_2 0x11c 0x3c8 0x7f4 0x4 0x0
-+#define MX50_PAD_SD2_D6__CCM_CCM_OUT_2 0x11c 0x3c8 0x000 0x7 0x0
-+#define MX50_PAD_SD2_D7__ESDHC2_DAT7 0x120 0x3cc 0x000 0x0 0x0
-+#define MX50_PAD_SD2_D7__GPIO5_15 0x120 0x3cc 0x000 0x1 0x0
-+#define MX50_PAD_SD2_D7__AUDMUX_AUD4_TXFS 0x120 0x3cc 0x6d8 0x2 0x0
-+#define MX50_PAD_SD2_D7__KPP_ROW_7 0x120 0x3cc 0x7ac 0x3 0x0
-+#define MX50_PAD_SD2_D7__EIM_WEIM_D_3 0x120 0x3cc 0x7f8 0x4 0x0
-+#define MX50_PAD_SD2_D7__CCM_STOP 0x120 0x3cc 0x000 0x7 0x0
-+#define MX50_PAD_SD2_WP__ESDHC2_WP 0x124 0x3d0 0x744 0x0 0x1
-+#define MX50_PAD_SD2_WP__GPIO5_16 0x124 0x3d0 0x000 0x1 0x0
-+#define MX50_PAD_SD2_WP__AUDMUX_AUD4_TXD 0x124 0x3d0 0x6c8 0x2 0x0
-+#define MX50_PAD_SD2_WP__EIM_WEIM_D_4 0x124 0x3d0 0x7fc 0x4 0x0
-+#define MX50_PAD_SD2_WP__CCM_WAIT 0x124 0x3d0 0x000 0x7 0x0
-+#define MX50_PAD_SD2_CD__ESDHC2_CD 0x128 0x3d4 0x740 0x0 0x1
-+#define MX50_PAD_SD2_CD__GPIO5_17 0x128 0x3d4 0x000 0x1 0x0
-+#define MX50_PAD_SD2_CD__AUDMUX_AUD4_TXC 0x128 0x3d4 0x6d4 0x2 0x0
-+#define MX50_PAD_SD2_CD__EIM_WEIM_D_5 0x128 0x3d4 0x800 0x4 0x0
-+#define MX50_PAD_SD2_CD__CCM_REF_EN_B 0x128 0x3d4 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D0__ELCDIF_DAT_0 0x12c 0x40c 0x6fc 0x0 0x0
-+#define MX50_PAD_DISP_D0__GPIO2_0 0x12c 0x40c 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D0__FEC_TX_CLK 0x12c 0x40c 0x78c 0x2 0x0
-+#define MX50_PAD_DISP_D0__EIM_WEIM_A_16 0x12c 0x40c 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D0__SDMA_DEBUG_PC_0 0x12c 0x40c 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D0__USBPHY1_VSTATUS_0 0x12c 0x40c 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D1__ELCDIF_DAT_1 0x130 0x410 0x700 0x0 0x0
-+#define MX50_PAD_DISP_D1__GPIO2_1 0x130 0x410 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D1__FEC_RX_ERR 0x130 0x410 0x788 0x2 0x0
-+#define MX50_PAD_DISP_D1__EIM_WEIM_A_17 0x130 0x410 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D1__SDMA_DEBUG_PC_1 0x130 0x410 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D1__USBPHY1_VSTATUS_1 0x130 0x410 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D2__ELCDIF_DAT_2 0x134 0x414 0x704 0x0 0x0
-+#define MX50_PAD_DISP_D2__GPIO2_2 0x134 0x414 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D2__FEC_RX_DV 0x134 0x414 0x784 0x2 0x0
-+#define MX50_PAD_DISP_D2__EIM_WEIM_A_18 0x134 0x414 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D2__SDMA_DEBUG_PC_2 0x134 0x414 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D2__USBPHY1_VSTATUS_2 0x134 0x414 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D3__ELCDIF_DAT_3 0x138 0x418 0x708 0x0 0x0
-+#define MX50_PAD_DISP_D3__GPIO2_3 0x138 0x418 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D3__FEC_RDATA_1 0x138 0x418 0x77c 0x2 0x0
-+#define MX50_PAD_DISP_D3__EIM_WEIM_A_19 0x138 0x418 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D3__FEC_COL 0x138 0x418 0x770 0x4 0x1
-+#define MX50_PAD_DISP_D3__SDMA_DEBUG_PC_3 0x138 0x418 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D3__USBPHY1_VSTATUS_3 0x138 0x418 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D4__ELCDIF_DAT_4 0x13c 0x41c 0x70c 0x0 0x0
-+#define MX50_PAD_DISP_D4__GPIO2_4 0x13c 0x41c 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D4__FEC_RDATA_0 0x13c 0x41c 0x778 0x2 0x0
-+#define MX50_PAD_DISP_D4__EIM_WEIM_A_20 0x13c 0x41c 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D4__SDMA_DEBUG_PC_4 0x13c 0x41c 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D4__USBPHY1_VSTATUS_4 0x13c 0x41c 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D5__ELCDIF_DAT_5 0x140 0x420 0x710 0x0 0x0
-+#define MX50_PAD_DISP_D5__GPIO2_5 0x140 0x420 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D5__FEC_TX_EN 0x140 0x420 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D5__EIM_WEIM_A_21 0x140 0x420 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D5__SDMA_DEBUG_PC_5 0x140 0x420 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D5__USBPHY1_VSTATUS_5 0x140 0x420 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D6__ELCDIF_DAT_6 0x144 0x424 0x714 0x0 0x0
-+#define MX50_PAD_DISP_D6__GPIO2_6 0x144 0x424 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D6__FEC_TDATA_1 0x144 0x424 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D6__EIM_WEIM_A_22 0x144 0x424 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D6__FEC_RX_CLK 0x144 0x424 0x780 0x4 0x1
-+#define MX50_PAD_DISP_D6__SDMA_DEBUG_PC_6 0x144 0x424 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D6__USBPHY1_VSTATUS_6 0x144 0x424 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D7__ELCDIF_DAT_7 0x148 0x428 0x718 0x0 0x0
-+#define MX50_PAD_DISP_D7__GPIO2_7 0x148 0x428 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D7__FEC_TDATA_0 0x148 0x428 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D7__EIM_WEIM_A_23 0x148 0x428 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D7__SDMA_DEBUG_PC_7 0x148 0x428 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D7__USBPHY1_VSTATUS_7 0x148 0x428 0x000 0x7 0x0
-+#define MX50_PAD_DISP_WR__ELCDIF_WR_RWN 0x14c 0x42c 0x000 0x0 0x0
-+#define MX50_PAD_DISP_WR__GPIO2_16 0x14c 0x42c 0x000 0x1 0x0
-+#define MX50_PAD_DISP_WR__ELCDIF_DOTCLK 0x14c 0x42c 0x000 0x2 0x0
-+#define MX50_PAD_DISP_WR__EIM_WEIM_A_24 0x14c 0x42c 0x000 0x3 0x0
-+#define MX50_PAD_DISP_WR__SDMA_DEBUG_PC_8 0x14c 0x42c 0x000 0x6 0x0
-+#define MX50_PAD_DISP_WR__USBPHY1_AVALID 0x14c 0x42c 0x000 0x7 0x0
-+#define MX50_PAD_DISP_RD__ELCDIF_RD_E 0x150 0x430 0x000 0x0 0x0
-+#define MX50_PAD_DISP_RD__GPIO2_19 0x150 0x430 0x000 0x1 0x0
-+#define MX50_PAD_DISP_RD__ELCDIF_ENABLE 0x150 0x430 0x000 0x2 0x0
-+#define MX50_PAD_DISP_RD__EIM_WEIM_A_25 0x150 0x430 0x000 0x3 0x0
-+#define MX50_PAD_DISP_RD__SDMA_DEBUG_PC_9 0x150 0x430 0x000 0x6 0x0
-+#define MX50_PAD_DISP_RD__USBPHY1_BVALID 0x150 0x430 0x000 0x7 0x0
-+#define MX50_PAD_DISP_RS__ELCDIF_RS 0x154 0x434 0x000 0x0 0x0
-+#define MX50_PAD_DISP_RS__GPIO2_17 0x154 0x434 0x000 0x1 0x0
-+#define MX50_PAD_DISP_RS__ELCDIF_VSYNC 0x154 0x434 0x73c 0x2 0x1
-+#define MX50_PAD_DISP_RS__EIM_WEIM_A_26 0x154 0x434 0x000 0x3 0x0
-+#define MX50_PAD_DISP_RS__SDMA_DEBUG_PC_10 0x154 0x434 0x000 0x6 0x0
-+#define MX50_PAD_DISP_RS__USBPHY1_ENDSESSION 0x154 0x434 0x000 0x7 0x0
-+#define MX50_PAD_DISP_CS__ELCDIF_CS 0x158 0x438 0x000 0x0 0x0
-+#define MX50_PAD_DISP_CS__GPIO2_21 0x158 0x438 0x000 0x1 0x0
-+#define MX50_PAD_DISP_CS__ELCDIF_HSYNC 0x158 0x438 0x6f8 0x2 0x1
-+#define MX50_PAD_DISP_CS__EIM_WEIM_A_27 0x158 0x438 0x000 0x3 0x0
-+#define MX50_PAD_DISP_CS__EIM_WEIM_CS_3 0x158 0x438 0x000 0x4 0x0
-+#define MX50_PAD_DISP_CS__SDMA_DEBUG_PC_11 0x158 0x438 0x000 0x6 0x0
-+#define MX50_PAD_DISP_CS__USBPHY1_IDDIG 0x158 0x438 0x000 0x7 0x0
-+#define MX50_PAD_DISP_BUSY__ELCDIF_BUSY 0x15c 0x43c 0x6f8 0x0 0x2
-+#define MX50_PAD_DISP_BUSY__GPIO2_18 0x15c 0x43c 0x000 0x1 0x0
-+#define MX50_PAD_DISP_BUSY__EIM_WEIM_CS_3 0x15c 0x43c 0x000 0x4 0x0
-+#define MX50_PAD_DISP_BUSY__SDMA_DEBUG_PC_12 0x15c 0x43c 0x000 0x6 0x0
-+#define MX50_PAD_DISP_BUSY__USBPHY2_HOSTDISCONNECT 0x15c 0x43c 0x000 0x7 0x0
-+#define MX50_PAD_DISP_RESET__ELCDIF_RESET 0x160 0x440 0x000 0x0 0x0
-+#define MX50_PAD_DISP_RESET__GPIO2_20 0x160 0x440 0x000 0x1 0x0
-+#define MX50_PAD_DISP_RESET__EIM_WEIM_CS_3 0x160 0x440 0x000 0x4 0x0
-+#define MX50_PAD_DISP_RESET__SDMA_DEBUG_PC_13 0x160 0x440 0x000 0x6 0x0
-+#define MX50_PAD_DISP_RESET__USBPHY2_BISTOK 0x160 0x440 0x000 0x7 0x0
-+#define MX50_PAD_SD3_CMD__ESDHC3_CMD 0x164 0x444 0x000 0x0 0x0
-+#define MX50_PAD_SD3_CMD__GPIO5_18 0x164 0x444 0x000 0x1 0x0
-+#define MX50_PAD_SD3_CMD__EIM_NANDF_WRN 0x164 0x444 0x000 0x2 0x0
-+#define MX50_PAD_SD3_CMD__SSP_CMD 0x164 0x444 0x000 0x3 0x0
-+#define MX50_PAD_SD3_CLK__ESDHC3_CLK 0x168 0x448 0x000 0x0 0x0
-+#define MX50_PAD_SD3_CLK__GPIO5_19 0x168 0x448 0x000 0x1 0x0
-+#define MX50_PAD_SD3_CLK__EIM_NANDF_RDN 0x168 0x448 0x000 0x2 0x0
-+#define MX50_PAD_SD3_CLK__SSP_CLK 0x168 0x448 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D0__ESDHC3_DAT0 0x16c 0x44c 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D0__GPIO5_20 0x16c 0x44c 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D0__EIM_NANDF_D_4 0x16c 0x44c 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D0__SSP_D0 0x16c 0x44c 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D0__CCM_PLL1_BYP 0x16c 0x44c 0x6dc 0x7 0x1
-+#define MX50_PAD_SD3_D1__ESDHC3_DAT1 0x170 0x450 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D1__GPIO5_21 0x170 0x450 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D1__EIM_NANDF_D_5 0x170 0x450 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D1__SSP_D1 0x170 0x450 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D1__CCM_PLL2_BYP 0x170 0x450 0x000 0x7 0x0
-+#define MX50_PAD_SD3_D2__ESDHC3_DAT2 0x174 0x454 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D2__GPIO5_22 0x174 0x454 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D2__EIM_NANDF_D_6 0x174 0x454 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D2__SSP_D2 0x174 0x454 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D2__CCM_PLL3_BYP 0x174 0x454 0x6e4 0x7 0x1
-+#define MX50_PAD_SD3_D3__ESDHC3_DAT3 0x178 0x458 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D3__GPIO5_23 0x178 0x458 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D3__EIM_NANDF_D_7 0x178 0x458 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D3__SSP_D3 0x178 0x458 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D4__ESDHC3_DAT4 0x17c 0x45c 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D4__GPIO5_24 0x17c 0x45c 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D4__EIM_NANDF_D_0 0x17c 0x45c 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D4__SSP_D4 0x17c 0x45c 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D5__ESDHC3_DAT5 0x180 0x460 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D5__GPIO5_25 0x180 0x460 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D5__EIM_NANDF_D_1 0x180 0x460 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D5__SSP_D5 0x180 0x460 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D6__ESDHC3_DAT6 0x184 0x464 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D6__GPIO5_26 0x184 0x464 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D6__EIM_NANDF_D_2 0x184 0x464 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D6__SSP_D6 0x184 0x464 0x000 0x3 0x0
-+#define MX50_PAD_SD3_D7__ESDHC3_DAT7 0x188 0x468 0x000 0x0 0x0
-+#define MX50_PAD_SD3_D7__GPIO5_27 0x188 0x468 0x000 0x1 0x0
-+#define MX50_PAD_SD3_D7__EIM_NANDF_D_3 0x188 0x468 0x000 0x2 0x0
-+#define MX50_PAD_SD3_D7__SSP_D7 0x188 0x468 0x000 0x3 0x0
-+#define MX50_PAD_SD3_WP__ESDHC3_WP 0x18c 0x46C 0x000 0x0 0x0
-+#define MX50_PAD_SD3_WP__GPIO5_28 0x18c 0x46C 0x000 0x1 0x0
-+#define MX50_PAD_SD3_WP__EIM_NANDF_RESETN 0x18c 0x46C 0x000 0x2 0x0
-+#define MX50_PAD_SD3_WP__SSP_CD 0x18c 0x46C 0x000 0x3 0x0
-+#define MX50_PAD_SD3_WP__ESDHC4_LCTL 0x18c 0x46C 0x000 0x4 0x0
-+#define MX50_PAD_SD3_WP__EIM_WEIM_CS_3 0x18c 0x46C 0x000 0x5 0x0
-+#define MX50_PAD_DISP_D8__ELCDIF_DAT_8 0x190 0x470 0x71c 0x0 0x0
-+#define MX50_PAD_DISP_D8__GPIO2_8 0x190 0x470 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D8__EIM_NANDF_CLE 0x190 0x470 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D8__ESDHC1_LCTL 0x190 0x470 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D8__ESDHC4_CMD 0x190 0x470 0x74c 0x4 0x2
-+#define MX50_PAD_DISP_D8__KPP_COL_4 0x190 0x470 0x790 0x5 0x1
-+#define MX50_PAD_DISP_D8__FEC_TX_CLK 0x190 0x470 0x78c 0x6 0x1
-+#define MX50_PAD_DISP_D8__USBPHY1_DATAOUT_0 0x190 0x470 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D9__ELCDIF_DAT_9 0x194 0x474 0x720 0x0 0x0
-+#define MX50_PAD_DISP_D9__GPIO2_9 0x194 0x474 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D9__EIM_NANDF_ALE 0x194 0x474 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D9__ESDHC2_LCTL 0x194 0x474 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D9__ESDHC4_CLK 0x194 0x474 0x748 0x4 0x2
-+#define MX50_PAD_DISP_D9__KPP_ROW_4 0x194 0x474 0x7a0 0x5 0x1
-+#define MX50_PAD_DISP_D9__FEC_RX_ER 0x194 0x474 0x788 0x6 0x1
-+#define MX50_PAD_DISP_D9__USBPHY1_DATAOUT_1 0x194 0x474 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D10__ELCDIF_DAT_10 0x198 0x478 0x724 0x0 0x0
-+#define MX50_PAD_DISP_D10__GPIO2_10 0x198 0x478 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D10__EIM_NANDF_CEN_0 0x198 0x478 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D10__ESDHC3_LCTL 0x198 0x478 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D10__ESDHC4_DAT0 0x198 0x478 0x000 0x4 0x0
-+#define MX50_PAD_DISP_D10__KPP_COL_5 0x198 0x478 0x794 0x5 0x1
-+#define MX50_PAD_DISP_D10__FEC_RX_DV 0x198 0x478 0x784 0x6 0x1
-+#define MX50_PAD_DISP_D10__USBPHY1_DATAOUT_2 0x198 0x478 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D11__ELCDIF_DAT_11 0x19c 0x47c 0x728 0x0 0x0
-+#define MX50_PAD_DISP_D11__GPIO2_11 0x19c 0x47c 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D11__EIM_NANDF_CEN_1 0x19c 0x47c 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D11__ESDHC4_DAT1 0x19c 0x47c 0x754 0x4 0x1
-+#define MX50_PAD_DISP_D11__KPP_ROW_5 0x19c 0x47c 0x7a4 0x5 0x1
-+#define MX50_PAD_DISP_D11__FEC_RDATA_1 0x19c 0x47c 0x77c 0x6 0x1
-+#define MX50_PAD_DISP_D11__USBPHY1_DATAOUT_3 0x19c 0x47c 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D12__ELCDIF_DAT_12 0x1a0 0x480 0x72c 0x0 0x0
-+#define MX50_PAD_DISP_D12__GPIO2_12 0x1a0 0x480 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D12__EIM_NANDF_CEN_2 0x1a0 0x480 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D12__ESDHC1_CD 0x1a0 0x480 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D12__ESDHC4_DAT2 0x1a0 0x480 0x758 0x4 0x1
-+#define MX50_PAD_DISP_D12__KPP_COL_6 0x1a0 0x480 0x798 0x5 0x1
-+#define MX50_PAD_DISP_D12__FEC_RDATA_0 0x1a0 0x480 0x778 0x6 0x1
-+#define MX50_PAD_DISP_D12__USBPHY1_DATAOUT_4 0x1a0 0x480 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D13__ELCDIF_DAT_13 0x1a4 0x484 0x730 0x0 0x0
-+#define MX50_PAD_DISP_D13__GPIO2_13 0x1a4 0x484 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D13__EIM_NANDF_CEN_3 0x1a4 0x484 0x000 0x2 0x0
-+#define MX50_PAD_DISP_D13__ESDHC3_CD 0x1a4 0x484 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D13__ESDHC4_DAT3 0x1a4 0x484 0x75c 0x4 0x1
-+#define MX50_PAD_DISP_D13__KPP_ROW_6 0x1a4 0x484 0x7a8 0x5 0x1
-+#define MX50_PAD_DISP_D13__FEC_TX_EN 0x1a4 0x484 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D13__USBPHY1_DATAOUT_5 0x1a4 0x484 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D14__ELCDIF_DAT_14 0x1a8 0x488 0x734 0x0 0x0
-+#define MX50_PAD_DISP_D14__GPIO2_14 0x1a8 0x488 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D14__EIM_NANDF_READY0 0x1a8 0x488 0x7b4 0x2 0x1
-+#define MX50_PAD_DISP_D14__ESDHC1_WP 0x1a8 0x488 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D14__ESDHC4_WP 0x1a8 0x488 0x000 0x4 0x0
-+#define MX50_PAD_DISP_D14__KPP_COL_7 0x1a8 0x488 0x79c 0x5 0x1
-+#define MX50_PAD_DISP_D14__FEC_TDATA_1 0x1a8 0x488 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D14__USBPHY1_DATAOUT_6 0x1a8 0x488 0x000 0x7 0x0
-+#define MX50_PAD_DISP_D15__ELCDIF_DAT_15 0x1ac 0x48c 0x738 0x0 0x0
-+#define MX50_PAD_DISP_D15__GPIO2_15 0x1ac 0x48c 0x000 0x1 0x0
-+#define MX50_PAD_DISP_D15__EIM_NANDF_DQS 0x1ac 0x48c 0x7b0 0x2 0x1
-+#define MX50_PAD_DISP_D15__ESDHC3_RST 0x1ac 0x48c 0x000 0x3 0x0
-+#define MX50_PAD_DISP_D15__ESDHC4_CD 0x1ac 0x48c 0x000 0x4 0x0
-+#define MX50_PAD_DISP_D15__KPP_ROW_7 0x1ac 0x48c 0x7ac 0x5 0x1
-+#define MX50_PAD_DISP_D15__FEC_TDATA_0 0x1ac 0x48c 0x000 0x6 0x0
-+#define MX50_PAD_DISP_D15__USBPHY1_DATAOUT_7 0x1ac 0x48c 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D0__EPDC_SDDO_0 0x1b0 0x54c 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D0__GPIO3_0 0x1b0 0x54c 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D0__EIM_WEIM_D_0 0x1b0 0x54c 0x7ec 0x2 0x1
-+#define MX50_PAD_EPDC_D0__ELCDIF_RS 0x1b0 0x54c 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D0__ELCDIF_DOTCLK 0x1b0 0x54c 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_D0__SDMA_DEBUG_EVT_CHN_LINES_0 0x1b0 0x54c 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D0__USBPHY2_DATAOUT_0 0x1b0 0x54c 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D1__EPDC_SDDO_1 0x1b4 0x550 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D1__GPIO3_1 0x1b4 0x550 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D1__EIM_WEIM_D_1 0x1b4 0x550 0x7f0 0x2 0x1
-+#define MX50_PAD_EPDC_D1__ELCDIF_CS 0x1b4 0x550 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D1__ELCDIF_ENABLE 0x1b4 0x550 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_D1__SDMA_DEBUG_EVT_CHN_LINES_1 0x1b4 0x550 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D1__USBPHY2_DATAOUT_1 0x1b4 0x550 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D2__EPDC_SDDO_2 0x1b8 0x554 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D2__GPIO3_2 0x1b8 0x554 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D2__EIM_WEIM_D_2 0x1b8 0x554 0x7f4 0x2 0x1
-+#define MX50_PAD_EPDC_D2__ELCDIF_WR_RWN 0x1b8 0x554 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D2__ELCDIF_VSYNC 0x1b8 0x554 0x73c 0x4 0x2
-+#define MX50_PAD_EPDC_D2__SDMA_DEBUG_EVT_CHN_LINES_2 0x1b8 0x554 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D2__USBPHY2_DATAOUT_2 0x1b8 0x554 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D3__EPDC_SDDO_3 0x1bc 0x558 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D3__GPIO3_3 0x1bc 0x558 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D3__EIM_WEIM_D_3 0x1bc 0x558 0x7f8 0x2 0x1
-+#define MX50_PAD_EPDC_D3__ELCDIF_RD_E 0x1bc 0x558 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D3__ELCDIF_HSYNC 0x1bc 0x558 0x6f8 0x4 0x3
-+#define MX50_PAD_EPDC_D3__SDMA_DEBUG_EVT_CHN_LINES_3 0x1bc 0x558 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D3__USBPHY2_DATAOUT_3 0x1bc 0x558 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D4__EPDC_SDDO_4 0x1c0 0x55c 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D4__GPIO3_4 0x1c0 0x55c 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D4__EIM_WEIM_D_4 0x1c0 0x55c 0x7fc 0x2 0x1
-+#define MX50_PAD_EPDC_D4__SDMA_DEBUG_EVT_CHN_LINES_4 0x1c0 0x55c 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D4__USBPHY2_DATAOUT_4 0x1c0 0x55c 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D5__EPDC_SDDO_5 0x1c4 0x560 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D5__GPIO3_5 0x1c4 0x560 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D5__EIM_WEIM_D_5 0x1c4 0x560 0x800 0x2 0x1
-+#define MX50_PAD_EPDC_D5__SDMA_DEBUG_EVT_CHN_LINES_5 0x1c4 0x560 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D5__USBPHY2_DATAOUT_5 0x1c4 0x560 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D6__EPDC_SDDO_6 0x1c8 0x564 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D6__GPIO3_6 0x1c8 0x564 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D6__EIM_WEIM_D_6 0x1c8 0x564 0x804 0x2 0x1
-+#define MX50_PAD_EPDC_D6__SDMA_DEBUG_EVT_CHN_LINES_6 0x1c8 0x564 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D6__USBPHY2_DATAOUT_6 0x1c8 0x564 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D7__EPDC_SDDO_7 0x1cc 0x568 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D7__GPIO3_7 0x1cc 0x568 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D7__EIM_WEIM_D_7 0x1cc 0x568 0x808 0x2 0x1
-+#define MX50_PAD_EPDC_D7__SDMA_DEBUG_EVT_CHN_LINES_7 0x1cc 0x568 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D7__USBPHY2_DATAOUT_7 0x1cc 0x568 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D8__EPDC_SDDO_8 0x1d0 0x56c 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D8__GPIO3_8 0x1d0 0x56c 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D8__EIM_WEIM_D_8 0x1d0 0x56c 0x80c 0x2 0x2
-+#define MX50_PAD_EPDC_D8__ELCDIF_DAT_24 0x1d0 0x56c 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D8__SDMA_DEBUG_MATCHED_DMBUS 0x1d0 0x56c 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D8__USBPHY2_VSTATUS_0 0x1d0 0x56c 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D9__EPDC_SDDO_9 0x1d4 0x570 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D9__GPIO3_9 0x1d4 0x570 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D9__EIM_WEIM_D_9 0x1d4 0x570 0x810 0x2 0x2
-+#define MX50_PAD_EPDC_D9__ELCDIF_DAT_25 0x1d4 0x570 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D9__SDMA_DEBUG_EVENT_CHANNEL_SEL 0x1d4 0x570 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D9__USBPHY2_VSTATUS_1 0x1d4 0x570 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D10__EPDC_SDDO_10 0x1d8 0x574 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D10__GPIO3_10 0x1d8 0x574 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D10__EIM_WEIM_D_10 0x1d8 0x574 0x814 0x2 0x2
-+#define MX50_PAD_EPDC_D10__ELCDIF_DAT_26 0x1d8 0x574 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D10__SDMA_DEBUG_EVENT_CHANNEL_0 0x1d8 0x574 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D10__USBPHY2_VSTATUS_2 0x1d8 0x574 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D11__EPDC_SDDO_11 0x1dc 0x578 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D11__GPIO3_11 0x1dc 0x578 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D11__EIM_WEIM_D_11 0x1dc 0x578 0x818 0x2 0x2
-+#define MX50_PAD_EPDC_D11__ELCDIF_DAT_27 0x1dc 0x578 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D11__SDMA_DEBUG_EVENT_CHANNEL_1 0x1dc 0x578 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D11__USBPHY2_VSTATUS_3 0x1dc 0x578 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D12__EPDC_SDDO_12 0x1e0 0x57c 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D12__GPIO3_12 0x1e0 0x57c 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D12__EIM_WEIM_D_12 0x1e0 0x57c 0x81c 0x2 0x1
-+#define MX50_PAD_EPDC_D12__ELCDIF_DAT_28 0x1e0 0x57c 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D12__SDMA_DEBUG_EVENT_CHANNEL_2 0x1e0 0x57c 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D12__USBPHY2_VSTATUS_4 0x1e0 0x57c 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D13__EPDC_SDDO_13 0x1e4 0x580 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D13__GPIO3_13 0x1e4 0x580 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D13__EIM_WEIM_D_13 0x1e4 0x580 0x820 0x2 0x1
-+#define MX50_PAD_EPDC_D13__ELCDIF_DAT_29 0x1e4 0x580 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D13__SDMA_DEBUG_EVENT_CHANNEL_3 0x1e4 0x580 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D13__USBPHY2_VSTATUS_5 0x1e4 0x580 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D14__EPDC_SDDO_14 0x1e8 0x584 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D14__GPIO3_14 0x1e8 0x584 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D14__EIM_WEIM_D_14 0x1e8 0x584 0x824 0x2 0x1
-+#define MX50_PAD_EPDC_D14__ELCDIF_DAT_30 0x1e8 0x584 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D14__AUDMUX_AUD6_TXD 0x1e8 0x584 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_D14__SDMA_DEBUG_EVENT_CHANNEL_4 0x1e8 0x584 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D14__USBPHY2_VSTATUS_6 0x1e8 0x584 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_D15__EPDC_SDDO_15 0x1ec 0x588 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_D15__GPIO3_15 0x1ec 0x588 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_D15__EIM_WEIM_D_15 0x1ec 0x588 0x828 0x2 0x1
-+#define MX50_PAD_EPDC_D15__ELCDIF_DAT_31 0x1ec 0x588 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_D15__AUDMUX_AUD6_TXC 0x1ec 0x588 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_D15__SDMA_DEBUG_EVENT_CHANNEL_5 0x1ec 0x588 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_D15__USBPHY2_VSTATUS_7 0x1ec 0x588 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_GDCLK__EPDC_GDCLK 0x1f0 0x58c 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_GDCLK__GPIO3_16 0x1f0 0x58c 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_GDCLK__EIM_WEIM_D_16 0x1f0 0x58c 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_GDCLK__ELCDIF_DAT_16 0x1f0 0x58c 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_GDCLK__AUDMUX_AUD6_TXFS 0x1f0 0x58c 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_GDCLK__SDMA_DEBUG_CORE_STATE_0 0x1f0 0x58c 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_GDCLK__USBPHY2_BISTOK 0x1f0 0x58c 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_GDSP__EPCD_GDSP 0x1f4 0x590 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_GDSP__GPIO3_17 0x1f4 0x590 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_GDSP__EIM_WEIM_D_17 0x1f4 0x590 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_GDSP__ELCDIF_DAT_17 0x1f4 0x590 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_GDSP__AUDMUX_AUD6_RXD 0x1f4 0x590 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_GDSP__SDMA_DEBUG_CORE_STATE_1 0x1f4 0x590 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_GDSP__USBPHY2_BVALID 0x1f4 0x590 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_GDOE__EPCD_GDOE 0x1f8 0x594 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_GDOE__GPIO3_18 0x1f8 0x594 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_GDOE__EIM_WEIM_D_18 0x1f8 0x594 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_GDOE__ELCDIF_DAT_18 0x1f8 0x594 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_GDOE__AUDMUX_AUD6_RXC 0x1f8 0x594 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_GDOE__SDMA_DEBUG_CORE_STATE_2 0x1f8 0x594 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_GDOE__USBPHY2_ENDSESSION 0x1f8 0x594 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_GDRL__EPCD_GDRL 0x1fc 0x598 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_GDRL__GPIO3_19 0x1fc 0x598 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_GDRL__EIM_WEIM_D_19 0x1f8 0x598 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_GDRL__ELCDIF_DAT_19 0x1fc 0x598 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_GDRL__AUDMUX_AUD6_RXFS 0x1fc 0x598 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_GDRL__SDMA_DEBUG_CORE_STATE_3 0x1fc 0x598 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_GDRL__USBPHY2_IDDIG 0x1fc 0x598 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_SDCLK__EPCD_SDCLK 0x200 0x59c 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCLK__GPIO3_20 0x200 0x59c 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCLK__EIM_WEIM_D_20 0x200 0x59c 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_SDCLK__ELCDIF_DAT_20 0x200 0x59c 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_SDCLK__AUDMUX_AUD5_TXD 0x200 0x59c 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_SDCLK__SDMA_DEBUG_BUS_DEVICE_0 0x200 0x59c 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_SDCLK__USBPHY2_HOSTDISCONNECT 0x200 0x59c 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_SDOEZ__EPCD_SDOEZ 0x204 0x5a0 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDOEZ__GPIO3_21 0x204 0x5a0 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDOEZ__EIM_WEIM_D_21 0x204 0x5a0 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_SDOEZ__ELCDIF_DAT_21 0x204 0x5a0 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_SDOEZ__AUDMUX_AUD5_TXC 0x204 0x5a0 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_SDOEZ__SDMA_DEBUG_BUS_DEVICE_1 0x204 0x5a0 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_SDOEZ__USBPHY2_TXREADY 0x204 0x5a0 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_SDOED__EPCD_SDOED 0x208 0x5a4 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDOED__GPIO3_22 0x208 0x5a4 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDOED__EIM_WEIM_D_22 0x208 0x5a4 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_SDOED__ELCDIF_DAT_22 0x208 0x5a4 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_SDOED__AUDMUX_AUD5_TXFS 0x208 0x5a4 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_SDOED__SDMA_DEBUG_BUS_DEVICE_2 0x208 0x5a4 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_SDOED__USBPHY2_RXVALID 0x208 0x5a4 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_SDOE__EPCD_SDOE 0x20c 0x5a8 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDOE__GPIO3_23 0x20c 0x5a8 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDOE__EIM_WEIM_D_23 0x20c 0x5a8 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_SDOE__ELCDIF_DAT_23 0x20c 0x5a8 0x000 0x3 0x0
-+#define MX50_PAD_EPDC_SDOE__AUDMUX_AUD5_RXD 0x20c 0x5a8 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_SDOE__SDMA_DEBUG_BUS_DEVICE_3 0x20c 0x5a8 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_SDOE__USBPHY2_RXACTIVE 0x20c 0x5a8 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_SDLE__EPCD_SDLE 0x210 0x5ac 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDLE__GPIO3_24 0x210 0x5ac 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDLE__EIM_WEIM_D_24 0x210 0x5ac 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_SDLE__ELCDIF_DAT_8 0x210 0x5ac 0x71c 0x3 0x1
-+#define MX50_PAD_EPDC_SDLE__AUDMUX_AUD5_RXC 0x210 0x5ac 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_SDLE__SDMA_DEBUG_BUS_DEVICE_4 0x210 0x5ac 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_SDLE__USBPHY2_RXERROR 0x210 0x5ac 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_SDCLKN__EPCD_SDCLKN 0x214 0x5b0 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCLKN__GPIO3_25 0x214 0x5b0 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCLKN__EIM_WEIM_D_25 0x214 0x5b0 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_SDCLKN__ELCDIF_DAT_9 0x214 0x5b0 0x720 0x3 0x1
-+#define MX50_PAD_EPDC_SDCLKN__AUDMUX_AUD5_RXFS 0x214 0x5b0 0x000 0x4 0x0
-+#define MX50_PAD_EPDC_SDCLKN__SDMA_DEBUG_BUS_ERROR 0x214 0x5b0 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_SDCLKN__USBPHY2_SIECLOCK 0x214 0x5b0 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_SDSHR__EPCD_SDSHR 0x218 0x5b4 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDSHR__GPIO3_26 0x218 0x5b4 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDSHR__EIM_WEIM_D_26 0x218 0x5b4 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_SDSHR__ELCDIF_DAT_10 0x218 0x5b4 0x724 0x3 0x1
-+#define MX50_PAD_EPDC_SDSHR__AUDMUX_AUD4_TXD 0x218 0x5b4 0x6c8 0x4 0x1
-+#define MX50_PAD_EPDC_SDSHR__SDMA_DEBUG_BUS_RWB 0x218 0x5b4 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_SDSHR__USBPHY2_LINESTATE_0 0x218 0x5b4 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_PWRCOM__EPCD_PWRCOM 0x21c 0x5b8 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_PWRCOM__GPIO3_27 0x21c 0x5b8 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_PWRCOM__EIM_WEIM_D_27 0x21c 0x5b8 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_PWRCOM__ELCDIF_DAT_11 0x21c 0x5b8 0x728 0x3 0x1
-+#define MX50_PAD_EPDC_PWRCOM__AUDMUX_AUD4_TXC 0x21c 0x5b8 0x6d4 0x4 0x1
-+#define MX50_PAD_EPDC_PWRCOM__SDMA_DEBUG_CORE_RUN 0x21c 0x5b8 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_PWRCOM__USBPHY2_LINESTATE_1 0x21c 0x5b8 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_PWRSTAT__EPCD_PWRSTAT 0x220 0x5bc 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_PWRSTAT__GPIO3_28 0x220 0x5bc 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_PWRSTAT__EIM_WEIM_D_28 0x220 0x5bc 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_PWRSTAT__ELCDIF_DAT_12 0x220 0x5bc 0x72c 0x3 0x1
-+#define MX50_PAD_EPDC_PWRSTAT__AUDMUX_AUD4_TXFS 0x220 0x5bc 0x6d8 0x4 0x1
-+#define MX50_PAD_EPDC_PWRSTAT__SDMA_DEBUG_MODE 0x220 0x5bc 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_PWRSTAT__USBPHY2_VBUSVALID 0x220 0x5bc 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_PWRCTRL0__EPCD_PWRCTRL0 0x224 0x5c0 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_PWRCTRL0__GPIO3_29 0x224 0x5c0 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_PWRCTRL0__EIM_WEIM_D_29 0x224 0x5c0 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_PWRCTRL0__ELCDIF_DAT_13 0x224 0x5c0 0x730 0x3 0x1
-+#define MX50_PAD_EPDC_PWRCTRL0__AUDMUX_AUD4_RXD 0x224 0x5c0 0x6c4 0x4 0x1
-+#define MX50_PAD_EPDC_PWRCTRL0__SDMA_DEBUG_RTBUFFER_WRITE 0x224 0x5c0 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_PWRCTRL0__USBPHY2_AVALID 0x224 0x5c0 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_PWRCTRL1__EPCD_PWRCTRL1 0x228 0x5c4 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_PWRCTRL1__GPIO3_30 0x228 0x5c4 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_PWRCTRL1__EIM_WEIM_D_30 0x228 0x5c4 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_PWRCTRL1__ELCDIF_DAT_14 0x228 0x5c4 0x734 0x3 0x1
-+#define MX50_PAD_EPDC_PWRCTRL1__AUDMUX_AUD4_RXC 0x228 0x5c4 0x6cc 0x4 0x1
-+#define MX50_PAD_EPDC_PWRCTRL1__SDMA_DEBUG_YIELD 0x228 0x5c4 0x000 0x6 0x0
-+#define MX50_PAD_EPDC_PWRCTRL1__USBPHY1_ONBIST 0x228 0x5c4 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_PWRCTRL2__EPCD_PWRCTRL2 0x22c 0x5c8 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_PWRCTRL2__GPIO3_31 0x22c 0x5c8 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_PWRCTRL2__EIM_WEIM_D_31 0x22c 0x5c8 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_PWRCTRL2__ELCDIF_DAT_15 0x22c 0x5c8 0x738 0x3 0x1
-+#define MX50_PAD_EPDC_PWRCTRL2__AUDMUX_AUD4_RXFS 0x22c 0x5c8 0x6d0 0x4 0x1
-+#define MX50_PAD_EPDC_PWRCTRL2__SDMA_EXT_EVENT_0 0x22c 0x5c8 0x7b8 0x6 0x1
-+#define MX50_PAD_EPDC_PWRCTRL2__USBPHY2_ONBIST 0x22c 0x5c8 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_PWRCTRL3__EPCD_PWRCTRL3 0x230 0x5cc 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_PWRCTRL3__GPIO4_20 0x230 0x5cc 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_PWRCTRL3__EIM_WEIM_EB_2 0x230 0x5cc 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_PWRCTRL3__SDMA_EXT_EVENT_1 0x230 0x5cc 0x7bc 0x6 0x1
-+#define MX50_PAD_EPDC_PWRCTRL3__USBPHY1_BISTOK 0x230 0x5cc 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_VCOM0__EPCD_VCOM_0 0x234 0x5d0 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_VCOM0__GPIO4_21 0x234 0x5d0 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_VCOM0__EIM_WEIM_EB_3 0x234 0x5d0 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_VCOM0__USBPHY2_BISTOK 0x234 0x5d0 0x000 0x7 0x0
-+#define MX50_PAD_EPDC_VCOM1__EPCD_VCOM_1 0x238 0x5d4 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_VCOM1__GPIO4_22 0x238 0x5d4 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_VCOM1__EIM_WEIM_CS_3 0x238 0x5d4 0x000 0x2 0x0
-+#define MX50_PAD_EPDC_BDR0__EPCD_BDR_0 0x23c 0x5d8 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_BDR0__GPIO4_23 0x23c 0x5d8 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_BDR0__ELCDIF_DAT_7 0x23c 0x5d8 0x718 0x3 0x1
-+#define MX50_PAD_EPDC_BDR1__EPCD_BDR_1 0x240 0x5dc 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_BDR1__GPIO4_24 0x240 0x5dc 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_BDR1__ELCDIF_DAT_6 0x240 0x5dc 0x714 0x3 0x1
-+#define MX50_PAD_EPDC_SDCE0__EPCD_SDCE_0 0x244 0x5e0 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCE0__GPIO4_25 0x244 0x5e0 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCE0__ELCDIF_DAT_5 0x244 0x5e0 0x710 0x3 0x1
-+#define MX50_PAD_EPDC_SDCE1__EPCD_SDCE_1 0x248 0x5e4 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCE1__GPIO4_26 0x248 0x5e4 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCE1__ELCDIF_DAT_4 0x248 0x5e4 0x70c 0x3 0x0
-+#define MX50_PAD_EPDC_SDCE2__EPCD_SDCE_2 0x24c 0x5e8 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCE2__GPIO4_27 0x24c 0x5e8 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCE2__ELCDIF_DAT_3 0x24c 0x5e8 0x708 0x3 0x1
-+#define MX50_PAD_EPDC_SDCE3__EPCD_SDCE_3 0x250 0x5ec 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCE3__GPIO4_28 0x250 0x5ec 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCE3__ELCDIF_DAT_2 0x250 0x5ec 0x704 0x3 0x1
-+#define MX50_PAD_EPDC_SDCE4__EPCD_SDCE_4 0x254 0x5f0 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCE4__GPIO4_29 0x254 0x5f0 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCE4__ELCDIF_DAT_1 0x254 0x5f0 0x700 0x3 0x1
-+#define MX50_PAD_EPDC_SDCE5__EPCD_SDCE_5 0x258 0x5f4 0x000 0x0 0x0
-+#define MX50_PAD_EPDC_SDCE5__GPIO4_30 0x258 0x5f4 0x000 0x1 0x0
-+#define MX50_PAD_EPDC_SDCE5__ELCDIF_DAT_0 0x258 0x5f4 0x6fc 0x3 0x1
-+#define MX50_PAD_EIM_DA0__EIM_WEIM_A_0 0x25c 0x5f8 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA0__GPIO1_0 0x25c 0x5f8 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA0__KPP_COL_4 0x25c 0x5f8 0x790 0x3 0x2
-+#define MX50_PAD_EIM_DA0__TPIU_TRACE_0 0x25c 0x5f8 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA0__SRC_BT_CFG1_0 0x25c 0x5f8 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA1__EIM_WEIM_A_1 0x260 0x5fc 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA1__GPIO1_1 0x260 0x5fc 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA1__KPP_ROW_4 0x260 0x5fc 0x7a0 0x3 0x2
-+#define MX50_PAD_EIM_DA1__TPIU_TRACE_1 0x260 0x5fc 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA1__SRC_BT_CFG1_1 0x260 0x5fc 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA2__EIM_WEIM_A_2 0x264 0x600 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA2__GPIO1_2 0x264 0x600 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA2__KPP_COL_5 0x264 0x600 0x794 0x3 0x2
-+#define MX50_PAD_EIM_DA2__TPIU_TRACE_2 0x264 0x600 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA2__SRC_BT_CFG1_2 0x264 0x600 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA3__EIM_WEIM_A_3 0x268 0x604 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA3__GPIO1_3 0x268 0x604 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA3__KPP_ROW_5 0x268 0x604 0x7a4 0x3 0x2
-+#define MX50_PAD_EIM_DA3__TPIU_TRACE_3 0x268 0x604 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA3__SRC_BT_CFG1_3 0x268 0x604 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA4__EIM_WEIM_A_4 0x26c 0x608 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA4__GPIO1_4 0x26c 0x608 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA4__KPP_COL_6 0x26c 0x608 0x798 0x3 0x2
-+#define MX50_PAD_EIM_DA4__TPIU_TRACE_4 0x26c 0x608 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA4__SRC_BT_CFG1_4 0x26c 0x608 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA5__EIM_WEIM_A_5 0x270 0x60c 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA5__GPIO1_5 0x270 0x60c 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA5__KPP_ROW_6 0x270 0x60c 0x7a8 0x3 0x2
-+#define MX50_PAD_EIM_DA5__TPIU_TRACE_5 0x270 0x60c 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA5__SRC_BT_CFG1_5 0x270 0x60c 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA6__EIM_WEIM_A_6 0x274 0x610 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA6__GPIO1_6 0x274 0x610 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA6__KPP_COL_7 0x274 0x610 0x79c 0x3 0x2
-+#define MX50_PAD_EIM_DA6__TPIU_TRACE_6 0x274 0x610 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA6__SRC_BT_CFG1_6 0x274 0x610 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA7__EIM_WEIM_A_7 0x278 0x614 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA7__GPIO1_7 0x278 0x614 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA7__KPP_ROW_7 0x278 0x614 0x7ac 0x3 0x2
-+#define MX50_PAD_EIM_DA7__TPIU_TRACE_7 0x278 0x614 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA7__SRC_BT_CFG1_7 0x278 0x614 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA8__EIM_WEIM_A_8 0x27c 0x618 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA8__GPIO1_8 0x27c 0x618 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA8__EIM_NANDF_CLE 0x27c 0x618 0x000 0x2 0x0
-+#define MX50_PAD_EIM_DA8__TPIU_TRACE_8 0x27c 0x618 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA8__SRC_BT_CFG2_0 0x27c 0x618 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA9__EIM_WEIM_A_9 0x280 0x61c 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA9__GPIO1_9 0x280 0x61c 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA9__EIM_NANDF_ALE 0x280 0x61c 0x000 0x2 0x0
-+#define MX50_PAD_EIM_DA9__TPIU_TRACE_9 0x280 0x61c 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA9__SRC_BT_CFG2_1 0x280 0x61c 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA10__EIM_WEIM_A_10 0x284 0x620 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA10__GPIO1_10 0x284 0x620 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA10__EIM_NANDF_CEN_0 0x284 0x620 0x000 0x2 0x0
-+#define MX50_PAD_EIM_DA10__TPIU_TRACE_10 0x284 0x620 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA10__SRC_BT_CFG2_2 0x284 0x620 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA11__EIM_WEIM_A_11 0x288 0x624 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA11__GPIO1_11 0x288 0x624 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA11__EIM_NANDF_CEN_1 0x288 0x624 0x000 0x2 0x0
-+#define MX50_PAD_EIM_DA11__TPIU_TRACE_11 0x288 0x624 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA11__SRC_BT_CFG2_3 0x288 0x624 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA12__EIM_WEIM_A_12 0x28c 0x628 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA12__GPIO1_12 0x28c 0x628 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA12__EIM_NANDF_CEN_2 0x28c 0x628 0x000 0x2 0x0
-+#define MX50_PAD_EIM_DA12__EPDC_SDCE_6 0x28c 0x628 0x000 0x3 0x0
-+#define MX50_PAD_EIM_DA12__TPIU_TRACE_12 0x28c 0x628 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA12__SRC_BT_CFG2_4 0x28c 0x628 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA13__EIM_WEIM_A_13 0x290 0x62c 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA13__GPIO1_13 0x290 0x62c 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA13__EIM_NANDF_CEN_3 0x290 0x62c 0x000 0x2 0x0
-+#define MX50_PAD_EIM_DA13__EPDC_SDCE_7 0x290 0x62c 0x000 0x3 0x0
-+#define MX50_PAD_EIM_DA13__TPIU_TRACE_13 0x290 0x62c 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA13__SRC_BT_CFG2_5 0x290 0x62c 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA14__EIM_WEIM_A_14 0x294 0x630 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA14__GPIO1_14 0x294 0x630 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA14__EIM_NANDF_READY0 0x294 0x630 0x7b4 0x2 0x2
-+#define MX50_PAD_EIM_DA14__EPDC_SDCE_8 0x294 0x630 0x000 0x3 0x0
-+#define MX50_PAD_EIM_DA14__TPIU_TRACE_14 0x294 0x630 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA14__SRC_BT_CFG2_6 0x294 0x630 0x000 0x7 0x0
-+#define MX50_PAD_EIM_DA15__EIM_WEIM_A_15 0x298 0x634 0x000 0x0 0x0
-+#define MX50_PAD_EIM_DA15__GPIO1_15 0x298 0x634 0x000 0x1 0x0
-+#define MX50_PAD_EIM_DA15__EIM_NANDF_DQS 0x298 0x634 0x7b0 0x2 0x2
-+#define MX50_PAD_EIM_DA15__EPDC_SDCE_9 0x298 0x634 0x000 0x3 0x0
-+#define MX50_PAD_EIM_DA15__TPIU_TRACE_15 0x298 0x634 0x000 0x6 0x0
-+#define MX50_PAD_EIM_DA15__SRC_BT_CFG2_7 0x298 0x634 0x000 0x7 0x0
-+#define MX50_PAD_EIM_CS2__EIM_WEIM_CS_2 0x29c 0x638 0x000 0x0 0x0
-+#define MX50_PAD_EIM_CS2__GPIO1_16 0x29c 0x638 0x000 0x1 0x0
-+#define MX50_PAD_EIM_CS2__EIM_WEIM_A_27 0x29c 0x638 0x000 0x2 0x0
-+#define MX50_PAD_EIM_CS2__TPIU_TRCLK 0x29c 0x638 0x000 0x6 0x0
-+#define MX50_PAD_EIM_CS2__SRC_BT_CFG3_0 0x29c 0x638 0x000 0x7 0x0
-+#define MX50_PAD_EIM_CS1__EIM_WEIM_CS_1 0x2a0 0x63c 0x000 0x0 0x0
-+#define MX50_PAD_EIM_CS1__GPIO1_17 0x2a0 0x63c 0x000 0x1 0x0
-+#define MX50_PAD_EIM_CS1__TPIU_TRCTL 0x2a0 0x63c 0x000 0x6 0x0
-+#define MX50_PAD_EIM_CS1__SRC_BT_CFG3_1 0x2a0 0x63c 0x000 0x7 0x0
-+#define MX50_PAD_EIM_CS0__EIM_WEIM_CS_0 0x2a4 0x640 0x000 0x0 0x0
-+#define MX50_PAD_EIM_CS0__GPIO1_18 0x2a4 0x640 0x000 0x1 0x0
-+#define MX50_PAD_EIM_CS0__SRC_BT_CFG3_2 0x2a4 0x640 0x000 0x7 0x0
-+#define MX50_PAD_EIM_EB0__EIM_WEIM_EB_0 0x2a8 0x644 0x000 0x0 0x0
-+#define MX50_PAD_EIM_EB0__GPIO1_19 0x2a8 0x644 0x000 0x1 0x0
-+#define MX50_PAD_EIM_EB0__SRC_BT_CFG3_3 0x2a8 0x644 0x000 0x7 0x0
-+#define MX50_PAD_EIM_EB1__EIM_WEIM_EB_1 0x2ac 0x648 0x000 0x0 0x0
-+#define MX50_PAD_EIM_EB1__GPIO1_20 0x2ac 0x648 0x000 0x1 0x0
-+#define MX50_PAD_EIM_EB1__SRC_BT_CFG3_4 0x2ac 0x648 0x000 0x7 0x0
-+#define MX50_PAD_EIM_WAIT__EIM_WEIM_WAIT 0x2b0 0x64c 0x000 0x0 0x0
-+#define MX50_PAD_EIM_WAIT__GPIO1_21 0x2b0 0x64c 0x000 0x1 0x0
-+#define MX50_PAD_EIM_WAIT__EIM_WEIM_DTACK_B 0x2b0 0x64c 0x000 0x2 0x0
-+#define MX50_PAD_EIM_WAIT__SRC_BT_CFG3_5 0x2b0 0x64c 0x000 0x7 0x0
-+#define MX50_PAD_EIM_BCLK__EIM_WEIM_BCLK 0x2b4 0x650 0x000 0x0 0x0
-+#define MX50_PAD_EIM_BCLK__GPIO1_22 0x2b4 0x650 0x000 0x1 0x0
-+#define MX50_PAD_EIM_BCLK__SRC_BT_CFG3_6 0x2b4 0x650 0x000 0x7 0x0
-+#define MX50_PAD_EIM_RDY__EIM_WEIM_RDY 0x2b8 0x654 0x000 0x0 0x0
-+#define MX50_PAD_EIM_RDY__GPIO1_23 0x2b8 0x654 0x000 0x1 0x0
-+#define MX50_PAD_EIM_RDY__SRC_BT_CFG3_7 0x2b8 0x654 0x000 0x7 0x0
-+#define MX50_PAD_EIM_OE__EIM_WEIM_OE 0x2bc 0x658 0x000 0x0 0x0
-+#define MX50_PAD_EIM_OE__GPIO1_24 0x2bc 0x658 0x000 0x1 0x0
-+#define MX50_PAD_EIM_OE__INT_BOOT 0x2bc 0x658 0x000 0x7 0x0
-+#define MX50_PAD_EIM_RW__EIM_WEIM_RW 0x2c0 0x65c 0x000 0x0 0x0
-+#define MX50_PAD_EIM_RW__GPIO1_25 0x2c0 0x65c 0x000 0x1 0x0
-+#define MX50_PAD_EIM_RW__SYSTEM_RST 0x2c0 0x65c 0x000 0x7 0x0
-+#define MX50_PAD_EIM_LBA__EIM_WEIM_LBA 0x2c4 0x660 0x000 0x0 0x0
-+#define MX50_PAD_EIM_LBA__GPIO1_26 0x2c4 0x660 0x000 0x1 0x0
-+#define MX50_PAD_EIM_LBA__TESTER_ACK 0x2c4 0x660 0x000 0x7 0x0
-+#define MX50_PAD_EIM_CRE__EIM_WEIM_CRE 0x2c8 0x664 0x000 0x0 0x0
-+#define MX50_PAD_EIM_CRE__GPIO1_27 0x2c8 0x664 0x000 0x1 0x0
-+
-+#endif /* __DTS_IMX50_PINFUNC_H */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx51-apf51dev.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-apf51dev.dts
---- linux-3.10.36/arch/arm/boot/dts/imx51-apf51dev.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-apf51dev.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -16,12 +16,44 @@
- model = "Armadeus Systems APF51Dev docking/development board";
- compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
-
-+ display@di1 {
-+ compatible = "fsl,imx-parallel-display";
-+ interface-pix-fmt = "bgr666";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ipu_disp1>;
-+
-+ display-timings {
-+ lw700 {
-+ native-mode;
-+ clock-frequency = <33000033>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <96>;
-+ hfront-porch = <96>;
-+ vback-porch = <20>;
-+ vfront-porch = <21>;
-+ hsync-len = <64>;
-+ vsync-len = <4>;
-+ hsync-active = <1>;
-+ vsync-active = <1>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+
-+ port {
-+ display_in: endpoint {
-+ remote-endpoint = <&ipu_di0_disp0>;
-+ };
-+ };
-+ };
-+
- gpio-keys {
- compatible = "gpio-keys";
-
- user-key {
- label = "user";
-- gpios = <&gpio1 3 0>;
-+ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
- linux,code = <256>; /* BTN_0 */
- };
- };
-@@ -31,7 +63,7 @@
-
- user {
- label = "Heartbeat";
-- gpios = <&gpio1 2 0>;
-+ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat";
- };
- };
-@@ -39,31 +71,33 @@
-
- &ecspi1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ecspi1_1>;
-+ pinctrl-0 = <&pinctrl_ecspi1>;
- fsl,spi-num-chipselects = <2>;
-- cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>;
-+ cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,
-+ <&gpio4 25 GPIO_ACTIVE_HIGH>;
- status = "okay";
- };
-
- &ecspi2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ecspi2_1>;
-+ pinctrl-0 = <&pinctrl_ecspi2>;
- fsl,spi-num-chipselects = <2>;
-- cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;
-+ cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
-+ <&gpio3 27 GPIO_ACTIVE_LOW>;
- status = "okay";
- };
-
- &esdhc1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc1_1>;
-- cd-gpios = <&gpio2 29 0>;
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;
- bus-width = <4>;
- status = "okay";
- };
-
- &esdhc2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc2_1>;
-+ pinctrl-0 = <&pinctrl_esdhc2>;
- bus-width = <4>;
- non-removable;
- status = "okay";
-@@ -71,7 +105,7 @@
-
- &i2c2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c2_2>;
-+ pinctrl-0 = <&pinctrl_i2c2>;
- status = "okay";
- };
-
-@@ -79,7 +113,7 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-
-- hog {
-+ imx51-apf51dev {
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
-@@ -93,5 +127,85 @@
- MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
- >;
- };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
-+ MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
-+ MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
-+ >;
-+ };
-+
-+ pinctrl_ecspi2: ecspi2grp {
-+ fsl,pins = <
-+ MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
-+ MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
-+ MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
-+ MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
-+ MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
-+ MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
-+ MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
-+ MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_esdhc2: esdhc2grp {
-+ fsl,pins = <
-+ MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
-+ MX51_PAD_SD2_CLK__SD2_CLK 0x20d5
-+ MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
-+ MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
-+ MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
-+ MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
-+ MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
-+ >;
-+ };
-+
-+ pinctrl_ipu_disp1: ipudisp1grp {
-+ fsl,pins = <
-+ MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
-+ MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5
-+ MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5
-+ MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5
-+ MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5
-+ MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5
-+ MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5
-+ MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5
-+ MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5
-+ MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5
-+ MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
-+ MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
-+ MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
-+ MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
-+ MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
-+ MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
-+ MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
-+ MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
-+ MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
-+ MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
-+ MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
-+ MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
-+ MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
-+ MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
-+ MX51_PAD_DI1_PIN2__DI1_PIN2 0x5
-+ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
-+ >;
-+ };
- };
- };
-+
-+&ipu_di0_disp0 {
-+ remote-endpoint = <&display_in>;
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx51-apf51.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-apf51.dts
---- linux-3.10.36/arch/arm/boot/dts/imx51-apf51.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-apf51.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -26,10 +26,6 @@
- };
-
- clocks {
-- ckih1 {
-- clock-frequency = <0>;
-- };
--
- osc {
- clock-frequency = <33554432>;
- };
-@@ -38,15 +34,56 @@
-
- &fec {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_fec_2>;
-+ pinctrl-0 = <&pinctrl_fec>;
- phy-mode = "mii";
-- phy-reset-gpios = <&gpio3 0 0>;
-+ phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
- phy-reset-duration = <1>;
- status = "okay";
- };
-
-+&iomuxc {
-+ imx51-apf51 {
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX51_PAD_DI_GP3__FEC_TX_ER 0x80000000
-+ MX51_PAD_DI2_PIN4__FEC_CRS 0x80000000
-+ MX51_PAD_DI2_PIN2__FEC_MDC 0x80000000
-+ MX51_PAD_DI2_PIN3__FEC_MDIO 0x80000000
-+ MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
-+ MX51_PAD_DI_GP4__FEC_RDATA2 0x80000000
-+ MX51_PAD_DISP2_DAT0__FEC_RDATA3 0x80000000
-+ MX51_PAD_DISP2_DAT1__FEC_RX_ER 0x80000000
-+ MX51_PAD_DISP2_DAT6__FEC_TDATA1 0x80000000
-+ MX51_PAD_DISP2_DAT7__FEC_TDATA2 0x80000000
-+ MX51_PAD_DISP2_DAT8__FEC_TDATA3 0x80000000
-+ MX51_PAD_DISP2_DAT9__FEC_TX_EN 0x80000000
-+ MX51_PAD_DISP2_DAT10__FEC_COL 0x80000000
-+ MX51_PAD_DISP2_DAT11__FEC_RX_CLK 0x80000000
-+ MX51_PAD_DISP2_DAT12__FEC_RX_DV 0x80000000
-+ MX51_PAD_DISP2_DAT13__FEC_TX_CLK 0x80000000
-+ MX51_PAD_DISP2_DAT14__FEC_RDATA0 0x80000000
-+ MX51_PAD_DISP2_DAT15__FEC_TDATA0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
-+ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
-+ >;
-+ };
-+ };
-+};
-+
-+&nfc {
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-+
- &uart3 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart3_2>;
-+ pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx51-babbage.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts
---- linux-3.10.36/arch/arm/boot/dts/imx51-babbage.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -21,20 +21,63 @@
- reg = <0x90000000 0x20000000>;
- };
-
-- display@di0 {
-+ display0: display@di0 {
- compatible = "fsl,imx-parallel-display";
-- crtcs = <&ipu 0>;
- interface-pix-fmt = "rgb24";
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ipu_disp1_1>;
-+ pinctrl-0 = <&pinctrl_ipu_disp1>;
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: dvi {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vfront-porch = <7>;
-+ hsync-len = <60>;
-+ vsync-len = <10>;
-+ };
-+ };
-+
-+ port {
-+ display0_in: endpoint {
-+ remote-endpoint = <&ipu_di0_disp0>;
-+ };
-+ };
- };
-
-- display@di1 {
-+ display1: display@di1 {
- compatible = "fsl,imx-parallel-display";
-- crtcs = <&ipu 1>;
- interface-pix-fmt = "rgb565";
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ipu_disp2_1>;
-+ pinctrl-0 = <&pinctrl_ipu_disp2>;
-+ status = "disabled";
-+ display-timings {
-+ native-mode = <&timing1>;
-+ timing1: claawvga {
-+ clock-frequency = <27000000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <40>;
-+ hfront-porch = <60>;
-+ vback-porch = <10>;
-+ vfront-porch = <10>;
-+ hsync-len = <20>;
-+ vsync-len = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+
-+ port {
-+ display1_in: endpoint {
-+ remote-endpoint = <&ipu_di1_disp1>;
-+ };
-+ };
- };
-
- gpio-keys {
-@@ -42,12 +85,23 @@
-
- power {
- label = "Power Button";
-- gpios = <&gpio2 21 0>;
-+ gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
- linux,code = <116>; /* KEY_POWER */
- gpio-key,wakeup;
- };
- };
-
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_leds>;
-+
-+ led-diagnostic {
-+ label = "diagnostic";
-+ gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
-+ };
-+ };
-+
- sound {
- compatible = "fsl,imx51-babbage-sgtl5000",
- "fsl,imx-audio-sgtl5000";
-@@ -61,11 +115,25 @@
- mux-int-port = <2>;
- mux-ext-port = <3>;
- };
-+
-+ clocks {
-+ ckih1 {
-+ clock-frequency = <22579200>;
-+ };
-+
-+ clk_26M: codec_clock {
-+ compatible = "fixed-clock";
-+ reg=<0>;
-+ #clock-cells = <0>;
-+ clock-frequency = <26000000>;
-+ gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
-+ };
-+ };
- };
-
- &esdhc1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc1_1>;
-+ pinctrl-0 = <&pinctrl_esdhc1>;
- fsl,cd-controller;
- fsl,wp-controller;
- status = "okay";
-@@ -73,24 +141,25 @@
-
- &esdhc2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc2_1>;
-- cd-gpios = <&gpio1 6 0>;
-- wp-gpios = <&gpio1 5 0>;
-+ pinctrl-0 = <&pinctrl_esdhc2>;
-+ cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
-+ wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
- status = "okay";
- };
-
- &uart3 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart3_1>;
-+ pinctrl-0 = <&pinctrl_uart3>;
- fsl,uart-has-rtscts;
- status = "okay";
- };
-
- &ecspi1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ecspi1_1>;
-+ pinctrl-0 = <&pinctrl_ecspi1>;
- fsl,spi-num-chipselects = <2>;
-- cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>;
-+ cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,
-+ <&gpio4 25 GPIO_ACTIVE_LOW>;
- status = "okay";
-
- pmic: mc13892@0 {
-@@ -98,9 +167,10 @@
- #size-cells = <0>;
- compatible = "fsl,mc13892";
- spi-max-frequency = <6000000>;
-+ spi-cs-high;
- reg = <0>;
- interrupt-parent = <&gpio1>;
-- interrupts = <8 0x4>;
-+ interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
-
- regulators {
- sw1_reg: sw1 {
-@@ -210,6 +280,14 @@
- };
- };
-
-+&ipu_di0_disp0 {
-+ remote-endpoint = <&display0_in>;
-+};
-+
-+&ipu_di1_disp1 {
-+ remote-endpoint = <&display1_in>;
-+};
-+
- &ssi2 {
- fsl,mode = "i2s-slave";
- status = "okay";
-@@ -219,7 +297,7 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-
-- hog {
-+ imx51-babbage {
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX51_PAD_GPIO1_0__SD1_CD 0x20d5
-@@ -229,6 +307,176 @@
- MX51_PAD_EIM_A27__GPIO2_21 0x5
- MX51_PAD_CSPI1_SS0__GPIO4_24 0x85
- MX51_PAD_CSPI1_SS1__GPIO4_25 0x85
-+ MX51_PAD_CSPI1_RDY__GPIO4_26 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX51_PAD_AUD3_BB_TXD__AUD3_TXD 0x80000000
-+ MX51_PAD_AUD3_BB_RXD__AUD3_RXD 0x80000000
-+ MX51_PAD_AUD3_BB_CK__AUD3_TXC 0x80000000
-+ MX51_PAD_AUD3_BB_FS__AUD3_TXFS 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
-+ MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
-+ MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
-+ MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
-+ MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
-+ MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
-+ MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
-+ MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_esdhc2: esdhc2grp {
-+ fsl,pins = <
-+ MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
-+ MX51_PAD_SD2_CLK__SD2_CLK 0x20d5
-+ MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
-+ MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
-+ MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
-+ MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_EB2__FEC_MDIO 0x80000000
-+ MX51_PAD_EIM_EB3__FEC_RDATA1 0x80000000
-+ MX51_PAD_EIM_CS2__FEC_RDATA2 0x80000000
-+ MX51_PAD_EIM_CS3__FEC_RDATA3 0x80000000
-+ MX51_PAD_EIM_CS4__FEC_RX_ER 0x80000000
-+ MX51_PAD_EIM_CS5__FEC_CRS 0x80000000
-+ MX51_PAD_NANDF_RB2__FEC_COL 0x80000000
-+ MX51_PAD_NANDF_RB3__FEC_RX_CLK 0x80000000
-+ MX51_PAD_NANDF_D9__FEC_RDATA0 0x80000000
-+ MX51_PAD_NANDF_D8__FEC_TDATA0 0x80000000
-+ MX51_PAD_NANDF_CS2__FEC_TX_ER 0x80000000
-+ MX51_PAD_NANDF_CS3__FEC_MDC 0x80000000
-+ MX51_PAD_NANDF_CS4__FEC_TDATA1 0x80000000
-+ MX51_PAD_NANDF_CS5__FEC_TDATA2 0x80000000
-+ MX51_PAD_NANDF_CS6__FEC_TDATA3 0x80000000
-+ MX51_PAD_NANDF_CS7__FEC_TX_EN 0x80000000
-+ MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK 0x80000000
-+ MX51_PAD_EIM_A20__GPIO2_14 0x85 /* Reset */
-+ >;
-+ };
-+
-+ pinctrl_gpio_leds: gpioledsgrp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_D22__GPIO2_6 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX51_PAD_KEY_COL4__I2C2_SCL 0x400001ed
-+ MX51_PAD_KEY_COL5__I2C2_SDA 0x400001ed
-+ >;
-+ };
-+
-+ pinctrl_ipu_disp1: ipudisp1grp {
-+ fsl,pins = <
-+ MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
-+ MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5
-+ MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5
-+ MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5
-+ MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5
-+ MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5
-+ MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5
-+ MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5
-+ MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5
-+ MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5
-+ MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
-+ MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
-+ MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
-+ MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
-+ MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
-+ MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
-+ MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
-+ MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
-+ MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
-+ MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
-+ MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
-+ MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
-+ MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
-+ MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
-+ MX51_PAD_DI1_PIN2__DI1_PIN2 0x5
-+ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
-+ >;
-+ };
-+
-+ pinctrl_ipu_disp2: ipudisp2grp {
-+ fsl,pins = <
-+ MX51_PAD_DISP2_DAT0__DISP2_DAT0 0x5
-+ MX51_PAD_DISP2_DAT1__DISP2_DAT1 0x5
-+ MX51_PAD_DISP2_DAT2__DISP2_DAT2 0x5
-+ MX51_PAD_DISP2_DAT3__DISP2_DAT3 0x5
-+ MX51_PAD_DISP2_DAT4__DISP2_DAT4 0x5
-+ MX51_PAD_DISP2_DAT5__DISP2_DAT5 0x5
-+ MX51_PAD_DISP2_DAT6__DISP2_DAT6 0x5
-+ MX51_PAD_DISP2_DAT7__DISP2_DAT7 0x5
-+ MX51_PAD_DISP2_DAT8__DISP2_DAT8 0x5
-+ MX51_PAD_DISP2_DAT9__DISP2_DAT9 0x5
-+ MX51_PAD_DISP2_DAT10__DISP2_DAT10 0x5
-+ MX51_PAD_DISP2_DAT11__DISP2_DAT11 0x5
-+ MX51_PAD_DISP2_DAT12__DISP2_DAT12 0x5
-+ MX51_PAD_DISP2_DAT13__DISP2_DAT13 0x5
-+ MX51_PAD_DISP2_DAT14__DISP2_DAT14 0x5
-+ MX51_PAD_DISP2_DAT15__DISP2_DAT15 0x5
-+ MX51_PAD_DI2_PIN2__DI2_PIN2 0x5
-+ MX51_PAD_DI2_PIN3__DI2_PIN3 0x5
-+ MX51_PAD_DI2_DISP_CLK__DI2_DISP_CLK 0x5
-+ MX51_PAD_DI_GP4__DI2_PIN15 0x5
-+ >;
-+ };
-+
-+ pinctrl_kpp: kppgrp {
-+ fsl,pins = <
-+ MX51_PAD_KEY_ROW0__KEY_ROW0 0xe0
-+ MX51_PAD_KEY_ROW1__KEY_ROW1 0xe0
-+ MX51_PAD_KEY_ROW2__KEY_ROW2 0xe0
-+ MX51_PAD_KEY_ROW3__KEY_ROW3 0xe0
-+ MX51_PAD_KEY_COL0__KEY_COL0 0xe8
-+ MX51_PAD_KEY_COL1__KEY_COL1 0xe8
-+ MX51_PAD_KEY_COL2__KEY_COL2 0xe8
-+ MX51_PAD_KEY_COL3__KEY_COL3 0xe8
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
-+ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
-+ MX51_PAD_UART1_RTS__UART1_RTS 0x1c5
-+ MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
-+ MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_D25__UART3_RXD 0x1c5
-+ MX51_PAD_EIM_D26__UART3_TXD 0x1c5
-+ MX51_PAD_EIM_D27__UART3_RTS 0x1c5
-+ MX51_PAD_EIM_D24__UART3_CTS 0x1c5
- >;
- };
- };
-@@ -236,26 +484,26 @@
-
- &uart1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1_1>;
-+ pinctrl-0 = <&pinctrl_uart1>;
- fsl,uart-has-rtscts;
- status = "okay";
- };
-
- &uart2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart2_1>;
-+ pinctrl-0 = <&pinctrl_uart2>;
- status = "okay";
- };
-
- &i2c2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c2_1>;
-+ pinctrl-0 = <&pinctrl_i2c2>;
- status = "okay";
-
- sgtl5000: codec@0a {
- compatible = "fsl,sgtl5000";
- reg = <0x0a>;
-- clock-frequency = <26000000>;
-+ clocks = <&clk_26M>;
- VDDA-supply = <&vdig_reg>;
- VDDIO-supply = <&vvideo_reg>;
- };
-@@ -263,35 +511,39 @@
-
- &audmux {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_audmux_1>;
-+ pinctrl-0 = <&pinctrl_audmux>;
- status = "okay";
- };
-
- &fec {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_fec_1>;
-+ pinctrl-0 = <&pinctrl_fec>;
- phy-mode = "mii";
-+ phy-reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
-+ phy-reset-duration = <1>;
- status = "okay";
- };
-
- &kpp {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_kpp_1>;
-- linux,keymap = <0x00000067 /* KEY_UP */
-- 0x0001006c /* KEY_DOWN */
-- 0x00020072 /* KEY_VOLUMEDOWN */
-- 0x00030066 /* KEY_HOME */
-- 0x0100006a /* KEY_RIGHT */
-- 0x01010069 /* KEY_LEFT */
-- 0x0102001c /* KEY_ENTER */
-- 0x01030073 /* KEY_VOLUMEUP */
-- 0x02000040 /* KEY_F6 */
-- 0x02010042 /* KEY_F8 */
-- 0x02020043 /* KEY_F9 */
-- 0x02030044 /* KEY_F10 */
-- 0x0300003b /* KEY_F1 */
-- 0x0301003c /* KEY_F2 */
-- 0x0302003d /* KEY_F3 */
-- 0x03030074>; /* KEY_POWER */
-+ pinctrl-0 = <&pinctrl_kpp>;
-+ linux,keymap = <
-+ MATRIX_KEY(0, 0, KEY_UP)
-+ MATRIX_KEY(0, 1, KEY_DOWN)
-+ MATRIX_KEY(0, 2, KEY_VOLUMEDOWN)
-+ MATRIX_KEY(0, 3, KEY_HOME)
-+ MATRIX_KEY(1, 0, KEY_RIGHT)
-+ MATRIX_KEY(1, 1, KEY_LEFT)
-+ MATRIX_KEY(1, 2, KEY_ENTER)
-+ MATRIX_KEY(1, 3, KEY_VOLUMEUP)
-+ MATRIX_KEY(2, 0, KEY_F6)
-+ MATRIX_KEY(2, 1, KEY_F8)
-+ MATRIX_KEY(2, 2, KEY_F9)
-+ MATRIX_KEY(2, 3, KEY_F10)
-+ MATRIX_KEY(3, 0, KEY_F1)
-+ MATRIX_KEY(3, 1, KEY_F2)
-+ MATRIX_KEY(3, 2, KEY_F3)
-+ MATRIX_KEY(3, 3, KEY_POWER)
-+ >;
- status = "okay";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx51.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx51.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -12,16 +12,30 @@
-
- #include "skeleton.dtsi"
- #include "imx51-pinfunc.h"
-+#include <dt-bindings/clock/imx5-clock.h>
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-
- / {
- aliases {
-- serial0 = &uart1;
-- serial1 = &uart2;
-- serial2 = &uart3;
-+ ethernet0 = &fec;
- gpio0 = &gpio1;
- gpio1 = &gpio2;
- gpio2 = &gpio3;
- gpio3 = &gpio4;
-+ i2c0 = &i2c1;
-+ i2c1 = &i2c2;
-+ mmc0 = &esdhc1;
-+ mmc1 = &esdhc2;
-+ mmc2 = &esdhc3;
-+ mmc3 = &esdhc4;
-+ serial0 = &uart1;
-+ serial1 = &uart2;
-+ serial2 = &uart3;
-+ spi0 = &ecspi1;
-+ spi1 = &ecspi2;
-+ spi2 = &cspi;
- };
-
- tzic: tz-interrupt-controller@e0000000 {
-@@ -42,7 +56,7 @@
-
- ckih1 {
- compatible = "fsl,imx-ckih1", "fixed-clock";
-- clock-frequency = <22579200>;
-+ clock-frequency = <0>;
- };
-
- ckih2 {
-@@ -59,21 +73,40 @@
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-- cpu@0 {
-+ cpu: cpu@0 {
- device_type = "cpu";
- compatible = "arm,cortex-a8";
- reg = <0>;
-- clock-latency = <61036>; /* two CLK32 periods */
-- clocks = <&clks 24>;
-+ clock-latency = <62500>;
-+ clocks = <&clks IMX5_CLK_CPU_PODF>;
- clock-names = "cpu";
- operating-points = <
-- /* kHz uV (No regulator support) */
-- 160000 0
-- 800000 0
-+ 166000 1000000
-+ 600000 1050000
-+ 800000 1100000
- >;
-+ voltage-tolerance = <5>;
- };
- };
-
-+ usbphy {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "simple-bus";
-+
-+ usbphy0: usbphy@0 {
-+ compatible = "usb-nop-xceiv";
-+ reg = <0>;
-+ clocks = <&clks IMX5_CLK_USB_PHY_GATE>;
-+ clock-names = "main_clk";
-+ };
-+ };
-+
-+ display-subsystem {
-+ compatible = "fsl,imx-display-subsystem";
-+ ports = <&ipu_di0>, <&ipu_di1>;
-+ };
-+
- soc {
- #address-cells = <1>;
- #size-cells = <1>;
-@@ -81,14 +114,36 @@
- interrupt-parent = <&tzic>;
- ranges;
-
-+ iram: iram@1ffe0000 {
-+ compatible = "mmio-sram";
-+ reg = <0x1ffe0000 0x20000>;
-+ };
-+
- ipu: ipu@40000000 {
-- #crtc-cells = <1>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- compatible = "fsl,imx51-ipu";
- reg = <0x40000000 0x20000000>;
- interrupts = <11 10>;
-- clocks = <&clks 59>, <&clks 110>, <&clks 61>;
-+ clocks = <&clks IMX5_CLK_IPU_GATE>,
-+ <&clks IMX5_CLK_IPU_DI0_GATE>,
-+ <&clks IMX5_CLK_IPU_DI1_GATE>;
- clock-names = "bus", "di0", "di1";
- resets = <&src 2>;
-+
-+ ipu_di0: port@2 {
-+ reg = <2>;
-+
-+ ipu_di0_disp0: endpoint {
-+ };
-+ };
-+
-+ ipu_di1: port@3 {
-+ reg = <3>;
-+
-+ ipu_di1_disp1: endpoint {
-+ };
-+ };
- };
-
- aips@70000000 { /* AIPS1 */
-@@ -109,7 +164,9 @@
- compatible = "fsl,imx51-esdhc";
- reg = <0x70004000 0x4000>;
- interrupts = <1>;
-- clocks = <&clks 44>, <&clks 0>, <&clks 71>;
-+ clocks = <&clks IMX5_CLK_ESDHC1_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC1_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- status = "disabled";
- };
-@@ -118,7 +175,9 @@
- compatible = "fsl,imx51-esdhc";
- reg = <0x70008000 0x4000>;
- interrupts = <2>;
-- clocks = <&clks 45>, <&clks 0>, <&clks 72>;
-+ clocks = <&clks IMX5_CLK_ESDHC2_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC2_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
- status = "disabled";
-@@ -128,7 +187,8 @@
- compatible = "fsl,imx51-uart", "fsl,imx21-uart";
- reg = <0x7000c000 0x4000>;
- interrupts = <33>;
-- clocks = <&clks 32>, <&clks 33>;
-+ clocks = <&clks IMX5_CLK_UART3_IPG_GATE>,
-+ <&clks IMX5_CLK_UART3_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -139,7 +199,8 @@
- compatible = "fsl,imx51-ecspi";
- reg = <0x70010000 0x4000>;
- interrupts = <36>;
-- clocks = <&clks 51>, <&clks 52>;
-+ clocks = <&clks IMX5_CLK_ECSPI1_IPG_GATE>,
-+ <&clks IMX5_CLK_ECSPI1_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -148,7 +209,10 @@
- compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
- reg = <0x70014000 0x4000>;
- interrupts = <30>;
-- clocks = <&clks 49>;
-+ clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
-+ dmas = <&sdma 24 1 0>,
-+ <&sdma 25 1 0>;
-+ dma-names = "rx", "tx";
- fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
- status = "disabled";
-@@ -158,7 +222,9 @@
- compatible = "fsl,imx51-esdhc";
- reg = <0x70020000 0x4000>;
- interrupts = <3>;
-- clocks = <&clks 46>, <&clks 0>, <&clks 73>;
-+ clocks = <&clks IMX5_CLK_ESDHC3_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC3_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
- status = "disabled";
-@@ -168,7 +234,9 @@
- compatible = "fsl,imx51-esdhc";
- reg = <0x70024000 0x4000>;
- interrupts = <4>;
-- clocks = <&clks 47>, <&clks 0>, <&clks 74>;
-+ clocks = <&clks IMX5_CLK_ESDHC4_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC4_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
- status = "disabled";
-@@ -179,6 +247,9 @@
- compatible = "fsl,imx51-usb", "fsl,imx27-usb";
- reg = <0x73f80000 0x0200>;
- interrupts = <18>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 0>;
-+ fsl,usbphy = <&usbphy0>;
- status = "disabled";
- };
-
-@@ -186,6 +257,8 @@
- compatible = "fsl,imx51-usb", "fsl,imx27-usb";
- reg = <0x73f80200 0x0200>;
- interrupts = <14>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 1>;
- status = "disabled";
- };
-
-@@ -193,6 +266,8 @@
- compatible = "fsl,imx51-usb", "fsl,imx27-usb";
- reg = <0x73f80400 0x0200>;
- interrupts = <16>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 2>;
- status = "disabled";
- };
-
-@@ -200,9 +275,18 @@
- compatible = "fsl,imx51-usb", "fsl,imx27-usb";
- reg = <0x73f80600 0x0200>;
- interrupts = <17>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 3>;
- status = "disabled";
- };
-
-+ usbmisc: usbmisc@73f80800 {
-+ #index-cells = <1>;
-+ compatible = "fsl,imx51-usbmisc";
-+ reg = <0x73f80800 0x200>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ };
-+
- gpio1: gpio@73f84000 {
- compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";
- reg = <0x73f84000 0x4000>;
-@@ -247,7 +331,7 @@
- compatible = "fsl,imx51-kpp", "fsl,imx21-kpp";
- reg = <0x73f94000 0x4000>;
- interrupts = <60>;
-- clocks = <&clks 0>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
- status = "disabled";
- };
-
-@@ -255,14 +339,14 @@
- compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
- reg = <0x73f98000 0x4000>;
- interrupts = <58>;
-- clocks = <&clks 0>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
- };
-
- wdog2: wdog@73f9c000 {
- compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
- reg = <0x73f9c000 0x4000>;
- interrupts = <59>;
-- clocks = <&clks 0>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
- status = "disabled";
- };
-
-@@ -270,289 +354,22 @@
- compatible = "fsl,imx51-gpt", "fsl,imx31-gpt";
- reg = <0x73fa0000 0x4000>;
- interrupts = <39>;
-- clocks = <&clks 36>, <&clks 41>;
-+ clocks = <&clks IMX5_CLK_GPT_IPG_GATE>,
-+ <&clks IMX5_CLK_GPT_HF_GATE>;
- clock-names = "ipg", "per";
- };
-
- iomuxc: iomuxc@73fa8000 {
- compatible = "fsl,imx51-iomuxc";
- reg = <0x73fa8000 0x4000>;
--
-- audmux {
-- pinctrl_audmux_1: audmuxgrp-1 {
-- fsl,pins = <
-- MX51_PAD_AUD3_BB_TXD__AUD3_TXD 0x80000000
-- MX51_PAD_AUD3_BB_RXD__AUD3_RXD 0x80000000
-- MX51_PAD_AUD3_BB_CK__AUD3_TXC 0x80000000
-- MX51_PAD_AUD3_BB_FS__AUD3_TXFS 0x80000000
-- >;
-- };
-- };
--
-- fec {
-- pinctrl_fec_1: fecgrp-1 {
-- fsl,pins = <
-- MX51_PAD_EIM_EB2__FEC_MDIO 0x80000000
-- MX51_PAD_EIM_EB3__FEC_RDATA1 0x80000000
-- MX51_PAD_EIM_CS2__FEC_RDATA2 0x80000000
-- MX51_PAD_EIM_CS3__FEC_RDATA3 0x80000000
-- MX51_PAD_EIM_CS4__FEC_RX_ER 0x80000000
-- MX51_PAD_EIM_CS5__FEC_CRS 0x80000000
-- MX51_PAD_NANDF_RB2__FEC_COL 0x80000000
-- MX51_PAD_NANDF_RB3__FEC_RX_CLK 0x80000000
-- MX51_PAD_NANDF_D9__FEC_RDATA0 0x80000000
-- MX51_PAD_NANDF_D8__FEC_TDATA0 0x80000000
-- MX51_PAD_NANDF_CS2__FEC_TX_ER 0x80000000
-- MX51_PAD_NANDF_CS3__FEC_MDC 0x80000000
-- MX51_PAD_NANDF_CS4__FEC_TDATA1 0x80000000
-- MX51_PAD_NANDF_CS5__FEC_TDATA2 0x80000000
-- MX51_PAD_NANDF_CS6__FEC_TDATA3 0x80000000
-- MX51_PAD_NANDF_CS7__FEC_TX_EN 0x80000000
-- MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK 0x80000000
-- >;
-- };
--
-- pinctrl_fec_2: fecgrp-2 {
-- fsl,pins = <
-- MX51_PAD_DI_GP3__FEC_TX_ER 0x80000000
-- MX51_PAD_DI2_PIN4__FEC_CRS 0x80000000
-- MX51_PAD_DI2_PIN2__FEC_MDC 0x80000000
-- MX51_PAD_DI2_PIN3__FEC_MDIO 0x80000000
-- MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
-- MX51_PAD_DI_GP4__FEC_RDATA2 0x80000000
-- MX51_PAD_DISP2_DAT0__FEC_RDATA3 0x80000000
-- MX51_PAD_DISP2_DAT1__FEC_RX_ER 0x80000000
-- MX51_PAD_DISP2_DAT6__FEC_TDATA1 0x80000000
-- MX51_PAD_DISP2_DAT7__FEC_TDATA2 0x80000000
-- MX51_PAD_DISP2_DAT8__FEC_TDATA3 0x80000000
-- MX51_PAD_DISP2_DAT9__FEC_TX_EN 0x80000000
-- MX51_PAD_DISP2_DAT10__FEC_COL 0x80000000
-- MX51_PAD_DISP2_DAT11__FEC_RX_CLK 0x80000000
-- MX51_PAD_DISP2_DAT12__FEC_RX_DV 0x80000000
-- MX51_PAD_DISP2_DAT13__FEC_TX_CLK 0x80000000
-- MX51_PAD_DISP2_DAT14__FEC_RDATA0 0x80000000
-- MX51_PAD_DISP2_DAT15__FEC_TDATA0 0x80000000
-- >;
-- };
-- };
--
-- ecspi1 {
-- pinctrl_ecspi1_1: ecspi1grp-1 {
-- fsl,pins = <
-- MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
-- MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
-- MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
-- >;
-- };
-- };
--
-- ecspi2 {
-- pinctrl_ecspi2_1: ecspi2grp-1 {
-- fsl,pins = <
-- MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
-- MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
-- MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
-- >;
-- };
-- };
--
-- esdhc1 {
-- pinctrl_esdhc1_1: esdhc1grp-1 {
-- fsl,pins = <
-- MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
-- MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
-- MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
-- MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
-- MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
-- MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
-- >;
-- };
-- };
--
-- esdhc2 {
-- pinctrl_esdhc2_1: esdhc2grp-1 {
-- fsl,pins = <
-- MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
-- MX51_PAD_SD2_CLK__SD2_CLK 0x20d5
-- MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
-- MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
-- MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
-- MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
-- >;
-- };
-- };
--
-- i2c2 {
-- pinctrl_i2c2_1: i2c2grp-1 {
-- fsl,pins = <
-- MX51_PAD_KEY_COL4__I2C2_SCL 0x400001ed
-- MX51_PAD_KEY_COL5__I2C2_SDA 0x400001ed
-- >;
-- };
--
-- pinctrl_i2c2_2: i2c2grp-2 {
-- fsl,pins = <
-- MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
-- MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
-- >;
-- };
-- };
--
-- ipu_disp1 {
-- pinctrl_ipu_disp1_1: ipudisp1grp-1 {
-- fsl,pins = <
-- MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
-- MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5
-- MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5
-- MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5
-- MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5
-- MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5
-- MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5
-- MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5
-- MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5
-- MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5
-- MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
-- MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
-- MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
-- MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
-- MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
-- MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
-- MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
-- MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
-- MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
-- MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
-- MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
-- MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
-- MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
-- MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
-- MX51_PAD_DI1_PIN2__DI1_PIN2 0x5 /* hsync */
-- MX51_PAD_DI1_PIN3__DI1_PIN3 0x5 /* vsync */
-- >;
-- };
-- };
--
-- ipu_disp2 {
-- pinctrl_ipu_disp2_1: ipudisp2grp-1 {
-- fsl,pins = <
-- MX51_PAD_DISP2_DAT0__DISP2_DAT0 0x5
-- MX51_PAD_DISP2_DAT1__DISP2_DAT1 0x5
-- MX51_PAD_DISP2_DAT2__DISP2_DAT2 0x5
-- MX51_PAD_DISP2_DAT3__DISP2_DAT3 0x5
-- MX51_PAD_DISP2_DAT4__DISP2_DAT4 0x5
-- MX51_PAD_DISP2_DAT5__DISP2_DAT5 0x5
-- MX51_PAD_DISP2_DAT6__DISP2_DAT6 0x5
-- MX51_PAD_DISP2_DAT7__DISP2_DAT7 0x5
-- MX51_PAD_DISP2_DAT8__DISP2_DAT8 0x5
-- MX51_PAD_DISP2_DAT9__DISP2_DAT9 0x5
-- MX51_PAD_DISP2_DAT10__DISP2_DAT10 0x5
-- MX51_PAD_DISP2_DAT11__DISP2_DAT11 0x5
-- MX51_PAD_DISP2_DAT12__DISP2_DAT12 0x5
-- MX51_PAD_DISP2_DAT13__DISP2_DAT13 0x5
-- MX51_PAD_DISP2_DAT14__DISP2_DAT14 0x5
-- MX51_PAD_DISP2_DAT15__DISP2_DAT15 0x5
-- MX51_PAD_DI2_PIN2__DI2_PIN2 0x5 /* hsync */
-- MX51_PAD_DI2_PIN3__DI2_PIN3 0x5 /* vsync */
-- MX51_PAD_DI2_DISP_CLK__DI2_DISP_CLK 0x5
-- MX51_PAD_DI_GP4__DI2_PIN15 0x5
-- >;
-- };
-- };
--
-- pata {
-- pinctrl_pata_1: patagrp-1 {
-- fsl,pins = <
-- MX51_PAD_NANDF_WE_B__PATA_DIOW 0x2004
-- MX51_PAD_NANDF_RE_B__PATA_DIOR 0x2004
-- MX51_PAD_NANDF_ALE__PATA_BUFFER_EN 0x2004
-- MX51_PAD_NANDF_CLE__PATA_RESET_B 0x2004
-- MX51_PAD_NANDF_WP_B__PATA_DMACK 0x2004
-- MX51_PAD_NANDF_RB0__PATA_DMARQ 0x2004
-- MX51_PAD_NANDF_RB1__PATA_IORDY 0x2004
-- MX51_PAD_GPIO_NAND__PATA_INTRQ 0x2004
-- MX51_PAD_NANDF_CS2__PATA_CS_0 0x2004
-- MX51_PAD_NANDF_CS3__PATA_CS_1 0x2004
-- MX51_PAD_NANDF_CS4__PATA_DA_0 0x2004
-- MX51_PAD_NANDF_CS5__PATA_DA_1 0x2004
-- MX51_PAD_NANDF_CS6__PATA_DA_2 0x2004
-- MX51_PAD_NANDF_D15__PATA_DATA15 0x2004
-- MX51_PAD_NANDF_D14__PATA_DATA14 0x2004
-- MX51_PAD_NANDF_D13__PATA_DATA13 0x2004
-- MX51_PAD_NANDF_D12__PATA_DATA12 0x2004
-- MX51_PAD_NANDF_D11__PATA_DATA11 0x2004
-- MX51_PAD_NANDF_D10__PATA_DATA10 0x2004
-- MX51_PAD_NANDF_D9__PATA_DATA9 0x2004
-- MX51_PAD_NANDF_D8__PATA_DATA8 0x2004
-- MX51_PAD_NANDF_D7__PATA_DATA7 0x2004
-- MX51_PAD_NANDF_D6__PATA_DATA6 0x2004
-- MX51_PAD_NANDF_D5__PATA_DATA5 0x2004
-- MX51_PAD_NANDF_D4__PATA_DATA4 0x2004
-- MX51_PAD_NANDF_D3__PATA_DATA3 0x2004
-- MX51_PAD_NANDF_D2__PATA_DATA2 0x2004
-- MX51_PAD_NANDF_D1__PATA_DATA1 0x2004
-- MX51_PAD_NANDF_D0__PATA_DATA0 0x2004
-- >;
-- };
-- };
--
-- uart1 {
-- pinctrl_uart1_1: uart1grp-1 {
-- fsl,pins = <
-- MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
-- MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
-- MX51_PAD_UART1_RTS__UART1_RTS 0x1c5
-- MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
-- >;
-- };
-- };
--
-- uart2 {
-- pinctrl_uart2_1: uart2grp-1 {
-- fsl,pins = <
-- MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
-- MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
-- >;
-- };
-- };
--
-- uart3 {
-- pinctrl_uart3_1: uart3grp-1 {
-- fsl,pins = <
-- MX51_PAD_EIM_D25__UART3_RXD 0x1c5
-- MX51_PAD_EIM_D26__UART3_TXD 0x1c5
-- MX51_PAD_EIM_D27__UART3_RTS 0x1c5
-- MX51_PAD_EIM_D24__UART3_CTS 0x1c5
-- >;
-- };
--
-- pinctrl_uart3_2: uart3grp-2 {
-- fsl,pins = <
-- MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
-- MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
-- >;
-- };
-- };
--
-- kpp {
-- pinctrl_kpp_1: kppgrp-1 {
-- fsl,pins = <
-- MX51_PAD_KEY_ROW0__KEY_ROW0 0xe0
-- MX51_PAD_KEY_ROW1__KEY_ROW1 0xe0
-- MX51_PAD_KEY_ROW2__KEY_ROW2 0xe0
-- MX51_PAD_KEY_ROW3__KEY_ROW3 0xe0
-- MX51_PAD_KEY_COL0__KEY_COL0 0xe8
-- MX51_PAD_KEY_COL1__KEY_COL1 0xe8
-- MX51_PAD_KEY_COL2__KEY_COL2 0xe8
-- MX51_PAD_KEY_COL3__KEY_COL3 0xe8
-- >;
-- };
-- };
- };
-
- pwm1: pwm@73fb4000 {
- #pwm-cells = <2>;
- compatible = "fsl,imx51-pwm", "fsl,imx27-pwm";
- reg = <0x73fb4000 0x4000>;
-- clocks = <&clks 37>, <&clks 38>;
-+ clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>,
-+ <&clks IMX5_CLK_PWM1_HF_GATE>;
- clock-names = "ipg", "per";
- interrupts = <61>;
- };
-@@ -561,7 +378,8 @@
- #pwm-cells = <2>;
- compatible = "fsl,imx51-pwm", "fsl,imx27-pwm";
- reg = <0x73fb8000 0x4000>;
-- clocks = <&clks 39>, <&clks 40>;
-+ clocks = <&clks IMX5_CLK_PWM2_IPG_GATE>,
-+ <&clks IMX5_CLK_PWM2_HF_GATE>;
- clock-names = "ipg", "per";
- interrupts = <94>;
- };
-@@ -570,7 +388,8 @@
- compatible = "fsl,imx51-uart", "fsl,imx21-uart";
- reg = <0x73fbc000 0x4000>;
- interrupts = <31>;
-- clocks = <&clks 28>, <&clks 29>;
-+ clocks = <&clks IMX5_CLK_UART1_IPG_GATE>,
-+ <&clks IMX5_CLK_UART1_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -579,7 +398,8 @@
- compatible = "fsl,imx51-uart", "fsl,imx21-uart";
- reg = <0x73fc0000 0x4000>;
- interrupts = <32>;
-- clocks = <&clks 30>, <&clks 31>;
-+ clocks = <&clks IMX5_CLK_UART2_IPG_GATE>,
-+ <&clks IMX5_CLK_UART2_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -605,13 +425,29 @@
- reg = <0x80000000 0x10000000>;
- ranges;
-
-+ iim: iim@83f98000 {
-+ compatible = "fsl,imx51-iim", "fsl,imx27-iim";
-+ reg = <0x83f98000 0x4000>;
-+ interrupts = <69>;
-+ clocks = <&clks IMX5_CLK_IIM_GATE>;
-+ };
-+
-+ owire: owire@83fa4000 {
-+ compatible = "fsl,imx51-owire", "fsl,imx21-owire";
-+ reg = <0x83fa4000 0x4000>;
-+ interrupts = <88>;
-+ clocks = <&clks IMX5_CLK_OWIRE_GATE>;
-+ status = "disabled";
-+ };
-+
- ecspi2: ecspi@83fac000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "fsl,imx51-ecspi";
- reg = <0x83fac000 0x4000>;
- interrupts = <37>;
-- clocks = <&clks 53>, <&clks 54>;
-+ clocks = <&clks IMX5_CLK_ECSPI2_IPG_GATE>,
-+ <&clks IMX5_CLK_ECSPI2_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -620,8 +456,10 @@
- compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
- reg = <0x83fb0000 0x4000>;
- interrupts = <6>;
-- clocks = <&clks 56>, <&clks 56>;
-+ clocks = <&clks IMX5_CLK_SDMA_GATE>,
-+ <&clks IMX5_CLK_SDMA_GATE>;
- clock-names = "ipg", "ahb";
-+ #dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";
- };
-
-@@ -631,7 +469,8 @@
- compatible = "fsl,imx51-cspi", "fsl,imx35-cspi";
- reg = <0x83fc0000 0x4000>;
- interrupts = <38>;
-- clocks = <&clks 55>, <&clks 55>;
-+ clocks = <&clks IMX5_CLK_CSPI_IPG_GATE>,
-+ <&clks IMX5_CLK_CSPI_IPG_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -642,7 +481,7 @@
- compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
- reg = <0x83fc4000 0x4000>;
- interrupts = <63>;
-- clocks = <&clks 35>;
-+ clocks = <&clks IMX5_CLK_I2C2_GATE>;
- status = "disabled";
- };
-
-@@ -652,7 +491,7 @@
- compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
- reg = <0x83fc8000 0x4000>;
- interrupts = <62>;
-- clocks = <&clks 34>;
-+ clocks = <&clks IMX5_CLK_I2C1_GATE>;
- status = "disabled";
- };
-
-@@ -660,7 +499,10 @@
- compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
- reg = <0x83fcc000 0x4000>;
- interrupts = <29>;
-- clocks = <&clks 48>;
-+ clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
-+ dmas = <&sdma 28 0 0>,
-+ <&sdma 29 0 0>;
-+ dma-names = "rx", "tx";
- fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
- status = "disabled";
-@@ -669,6 +511,25 @@
- audmux: audmux@83fd0000 {
- compatible = "fsl,imx51-audmux", "fsl,imx31-audmux";
- reg = <0x83fd0000 0x4000>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
-+ clock-names = "audmux";
-+ status = "disabled";
-+ };
-+
-+ weim: weim@83fda000 {
-+ #address-cells = <2>;
-+ #size-cells = <1>;
-+ compatible = "fsl,imx51-weim";
-+ reg = <0x83fda000 0x1000>;
-+ clocks = <&clks IMX5_CLK_EMI_SLOW_GATE>;
-+ ranges = <
-+ 0 0 0xb0000000 0x08000000
-+ 1 0 0xb8000000 0x08000000
-+ 2 0 0xc0000000 0x08000000
-+ 3 0 0xc8000000 0x04000000
-+ 4 0 0xcc000000 0x02000000
-+ 5 0 0xce000000 0x02000000
-+ >;
- status = "disabled";
- };
-
-@@ -676,7 +537,7 @@
- compatible = "fsl,imx51-nand";
- reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>;
- interrupts = <8>;
-- clocks = <&clks 60>;
-+ clocks = <&clks IMX5_CLK_NFC_GATE>;
- status = "disabled";
- };
-
-@@ -684,7 +545,7 @@
- compatible = "fsl,imx51-pata", "fsl,imx27-pata";
- reg = <0x83fe0000 0x4000>;
- interrupts = <70>;
-- clocks = <&clks 161>;
-+ clocks = <&clks IMX5_CLK_PATA_GATE>;
- status = "disabled";
- };
-
-@@ -692,7 +553,10 @@
- compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
- reg = <0x83fe8000 0x4000>;
- interrupts = <96>;
-- clocks = <&clks 50>;
-+ clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>;
-+ dmas = <&sdma 46 0 0>,
-+ <&sdma 47 0 0>;
-+ dma-names = "rx", "tx";
- fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <47 46 37 35>; /* TX0 RX0 TX1 RX1 */
- status = "disabled";
-@@ -702,7 +566,9 @@
- compatible = "fsl,imx51-fec", "fsl,imx27-fec";
- reg = <0x83fec000 0x4000>;
- interrupts = <87>;
-- clocks = <&clks 42>, <&clks 42>, <&clks 42>;
-+ clocks = <&clks IMX5_CLK_FEC_GATE>,
-+ <&clks IMX5_CLK_FEC_GATE>,
-+ <&clks IMX5_CLK_FEC_GATE>;
- clock-names = "ipg", "ahb", "ptp";
- status = "disabled";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,93 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301, USA.
-+ */
-+
-+#include "imx51.dtsi"
-+
-+/ {
-+ model = "Eukrea CPUIMX51";
-+ compatible = "eukrea,cpuimx51", "fsl,imx51";
-+
-+ memory {
-+ reg = <0x90000000 0x10000000>; /* 256M */
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ pcf8563@51 {
-+ compatible = "nxp,pcf8563";
-+ reg = <0x51>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx51-eukrea {
-+ pinctrl_tsc2007_1: tsc2007grp-1 {
-+ fsl,pins = <
-+ MX51_PAD_GPIO_NAND__GPIO_NAND 0x1f5
-+ MX51_PAD_NANDF_D8__GPIO4_0 0x1f5
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX51_PAD_DI_GP3__FEC_TX_ER 0x80000000
-+ MX51_PAD_DI2_PIN4__FEC_CRS 0x80000000
-+ MX51_PAD_DI2_PIN2__FEC_MDC 0x80000000
-+ MX51_PAD_DI2_PIN3__FEC_MDIO 0x80000000
-+ MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
-+ MX51_PAD_DI_GP4__FEC_RDATA2 0x80000000
-+ MX51_PAD_DISP2_DAT0__FEC_RDATA3 0x80000000
-+ MX51_PAD_DISP2_DAT1__FEC_RX_ER 0x80000000
-+ MX51_PAD_DISP2_DAT6__FEC_TDATA1 0x80000000
-+ MX51_PAD_DISP2_DAT7__FEC_TDATA2 0x80000000
-+ MX51_PAD_DISP2_DAT8__FEC_TDATA3 0x80000000
-+ MX51_PAD_DISP2_DAT9__FEC_TX_EN 0x80000000
-+ MX51_PAD_DISP2_DAT10__FEC_COL 0x80000000
-+ MX51_PAD_DISP2_DAT11__FEC_RX_CLK 0x80000000
-+ MX51_PAD_DISP2_DAT12__FEC_RX_DV 0x80000000
-+ MX51_PAD_DISP2_DAT13__FEC_TX_CLK 0x80000000
-+ MX51_PAD_DISP2_DAT14__FEC_RDATA0 0x80000000
-+ MX51_PAD_DISP2_DAT15__FEC_TDATA0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX51_PAD_SD2_CMD__I2C1_SCL 0x400001ed
-+ MX51_PAD_SD2_CLK__I2C1_SDA 0x400001ed
-+ >;
-+ };
-+ };
-+};
-+
-+&nfc {
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
---- linux-3.10.36/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,175 @@
-+/*
-+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301, USA.
-+ */
-+
-+/dts-v1/;
-+#include "imx51-eukrea-cpuimx51.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+ model = "Eukrea CPUIMX51";
-+ compatible = "eukrea,mbimxsd51","eukrea,cpuimx51", "fsl,imx51";
-+
-+ gpio_keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpiokeys_1>;
-+
-+ button-1 {
-+ label = "BP1";
-+ gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
-+ linux,code = <256>;
-+ gpio-key,wakeup;
-+ linux,input-type = <1>;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpioled>;
-+
-+ led1 {
-+ label = "led1";
-+ gpios = <&gpio3 30 GPIO_ACTIVE_LOW>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ sound {
-+ compatible = "eukrea,asoc-tlv320";
-+ eukrea,model = "imx51-eukrea-tlv320aic23";
-+ ssi-controller = <&ssi2>;
-+ fsl,mux-int-port = <2>;
-+ fsl,mux-ext-port = <3>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&esdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>;
-+ fsl,cd-controller;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ tlv320aic23: codec@1a {
-+ compatible = "ti,tlv320aic23";
-+ reg = <0x1a>;
-+ };
-+};
-+
-+&iomuxc {
-+ imx51-eukrea {
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX51_PAD_AUD3_BB_TXD__AUD3_TXD 0x80000000
-+ MX51_PAD_AUD3_BB_RXD__AUD3_RXD 0x80000000
-+ MX51_PAD_AUD3_BB_CK__AUD3_TXC 0x80000000
-+ MX51_PAD_AUD3_BB_FS__AUD3_TXFS 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
-+ MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
-+ MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
-+ MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
-+ MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
-+ MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
-+ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
-+ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_uart3_rtscts: uart3rtsctsgrp {
-+ fsl,pins = <
-+ MX51_PAD_KEY_COL4__UART3_RTS 0x1c5
-+ MX51_PAD_KEY_COL5__UART3_CTS 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_backlight_1: backlightgrp-1 {
-+ fsl,pins = <
-+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x1f5
-+ >;
-+ };
-+
-+ pinctrl_esdhc1_cd: esdhc1_cd {
-+ fsl,pins = <
-+ MX51_PAD_GPIO1_0__SD1_CD 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_gpiokeys_1: gpiokeysgrp-1 {
-+ fsl,pins = <
-+ MX51_PAD_NANDF_D9__GPIO3_31 0x1f5
-+ >;
-+ };
-+
-+ pinctrl_gpioled: gpioledgrp-1 {
-+ fsl,pins = <
-+ MX51_PAD_NANDF_D10__GPIO3_30 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_reg_lcd_3v3: reg_lcd_3v3 {
-+ fsl,pins = <
-+ MX51_PAD_CSI1_D9__GPIO3_13 0x1f5
-+ >;
-+ };
-+ };
-+};
-+
-+&ssi2 {
-+ codec-handle = <&tlv320aic23>;
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3 &pinctrl_uart3_rtscts>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-ard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-ard.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-ard.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-ard.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -49,9 +49,12 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_3p3v: 3p3v {
-+ reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
-@@ -99,7 +102,7 @@
-
- &esdhc1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc1_2>;
-+ pinctrl-0 = <&pinctrl_esdhc1>;
- cd-gpios = <&gpio1 1 0>;
- wp-gpios = <&gpio1 9 0>;
- status = "okay";
-@@ -109,7 +112,7 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-
-- hog {
-+ imx53-ard {
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX53_PAD_GPIO_1__GPIO1_1 0x80000000
-@@ -148,11 +151,33 @@
- MX53_PAD_EIM_CS1__EMI_WEIM_CS_1 0x80000000
- >;
- };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
-+ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
-+ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
-+ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
-+ MX53_PAD_PATA_DATA8__ESDHC1_DAT4 0x1d5
-+ MX53_PAD_PATA_DATA9__ESDHC1_DAT5 0x1d5
-+ MX53_PAD_PATA_DATA10__ESDHC1_DAT6 0x1d5
-+ MX53_PAD_PATA_DATA11__ESDHC1_DAT7 0x1d5
-+ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
-+ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DIOW__UART1_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMACK__UART1_RXD_MUX 0x1e4
-+ >;
-+ };
- };
- };
-
- &uart1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1_2>;
-+ pinctrl-0 = <&pinctrl_uart1>;
- status = "okay";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53.dtsi linux-solidrun/arch/arm/boot/dts/imx53.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx53.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -12,14 +12,13 @@
-
- #include "skeleton.dtsi"
- #include "imx53-pinfunc.h"
-+#include <dt-bindings/clock/imx5-clock.h>
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-
- / {
- aliases {
-- serial0 = &uart1;
-- serial1 = &uart2;
-- serial2 = &uart3;
-- serial3 = &uart4;
-- serial4 = &uart5;
-+ ethernet0 = &fec;
- gpio0 = &gpio1;
- gpio1 = &gpio2;
- gpio2 = &gpio3;
-@@ -27,6 +26,36 @@
- gpio4 = &gpio5;
- gpio5 = &gpio6;
- gpio6 = &gpio7;
-+ i2c0 = &i2c1;
-+ i2c1 = &i2c2;
-+ i2c2 = &i2c3;
-+ mmc0 = &esdhc1;
-+ mmc1 = &esdhc2;
-+ mmc2 = &esdhc3;
-+ mmc3 = &esdhc4;
-+ serial0 = &uart1;
-+ serial1 = &uart2;
-+ serial2 = &uart3;
-+ serial3 = &uart4;
-+ serial4 = &uart5;
-+ spi0 = &ecspi1;
-+ spi1 = &ecspi2;
-+ spi2 = &cspi;
-+ };
-+
-+ cpus {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ cpu@0 {
-+ device_type = "cpu";
-+ compatible = "arm,cortex-a8";
-+ reg = <0x0>;
-+ };
-+ };
-+
-+ display-subsystem {
-+ compatible = "fsl,imx-display-subsystem";
-+ ports = <&ipu_di0>, <&ipu_di1>;
- };
-
- tzic: tz-interrupt-controller@0fffc000 {
-@@ -68,14 +97,63 @@
- interrupt-parent = <&tzic>;
- ranges;
-
-+ sata: sata@10000000 {
-+ compatible = "fsl,imx53-ahci";
-+ reg = <0x10000000 0x1000>;
-+ interrupts = <28>;
-+ clocks = <&clks IMX5_CLK_SATA_GATE>,
-+ <&clks IMX5_CLK_SATA_REF>,
-+ <&clks IMX5_CLK_AHB>;
-+ clock-names = "sata_gate", "sata_ref", "ahb";
-+ status = "disabled";
-+ };
-+
- ipu: ipu@18000000 {
-- #crtc-cells = <1>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- compatible = "fsl,imx53-ipu";
- reg = <0x18000000 0x080000000>;
- interrupts = <11 10>;
-- clocks = <&clks 59>, <&clks 110>, <&clks 61>;
-+ clocks = <&clks IMX5_CLK_IPU_GATE>,
-+ <&clks IMX5_CLK_IPU_DI0_GATE>,
-+ <&clks IMX5_CLK_IPU_DI1_GATE>;
- clock-names = "bus", "di0", "di1";
- resets = <&src 2>;
-+
-+ ipu_di0: port@2 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <2>;
-+
-+ ipu_di0_disp0: endpoint@0 {
-+ reg = <0>;
-+ };
-+
-+ ipu_di0_lvds0: endpoint@1 {
-+ reg = <1>;
-+ remote-endpoint = <&lvds0_in>;
-+ };
-+ };
-+
-+ ipu_di1: port@3 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <3>;
-+
-+ ipu_di1_disp1: endpoint@0 {
-+ reg = <0>;
-+ };
-+
-+ ipu_di1_lvds1: endpoint@1 {
-+ reg = <1>;
-+ remote-endpoint = <&lvds1_in>;
-+ };
-+
-+ ipu_di1_tve: endpoint@2 {
-+ reg = <2>;
-+ remote-endpoint = <&tve_in>;
-+ };
-+ };
- };
-
- aips@50000000 { /* AIPS1 */
-@@ -96,7 +174,9 @@
- compatible = "fsl,imx53-esdhc";
- reg = <0x50004000 0x4000>;
- interrupts = <1>;
-- clocks = <&clks 44>, <&clks 0>, <&clks 71>;
-+ clocks = <&clks IMX5_CLK_ESDHC1_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC1_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
- status = "disabled";
-@@ -106,7 +186,9 @@
- compatible = "fsl,imx53-esdhc";
- reg = <0x50008000 0x4000>;
- interrupts = <2>;
-- clocks = <&clks 45>, <&clks 0>, <&clks 72>;
-+ clocks = <&clks IMX5_CLK_ESDHC2_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC2_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
- status = "disabled";
-@@ -116,7 +198,8 @@
- compatible = "fsl,imx53-uart", "fsl,imx21-uart";
- reg = <0x5000c000 0x4000>;
- interrupts = <33>;
-- clocks = <&clks 32>, <&clks 33>;
-+ clocks = <&clks IMX5_CLK_UART3_IPG_GATE>,
-+ <&clks IMX5_CLK_UART3_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -127,16 +210,22 @@
- compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi";
- reg = <0x50010000 0x4000>;
- interrupts = <36>;
-- clocks = <&clks 51>, <&clks 52>;
-+ clocks = <&clks IMX5_CLK_ECSPI1_IPG_GATE>,
-+ <&clks IMX5_CLK_ECSPI1_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-
- ssi2: ssi@50014000 {
-- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
-+ compatible = "fsl,imx53-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
- reg = <0x50014000 0x4000>;
- interrupts = <30>;
-- clocks = <&clks 49>;
-+ clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
-+ dmas = <&sdma 24 1 0>,
-+ <&sdma 25 1 0>;
-+ dma-names = "rx", "tx";
- fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
- status = "disabled";
-@@ -146,7 +235,9 @@
- compatible = "fsl,imx53-esdhc";
- reg = <0x50020000 0x4000>;
- interrupts = <3>;
-- clocks = <&clks 46>, <&clks 0>, <&clks 73>;
-+ clocks = <&clks IMX5_CLK_ESDHC3_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC3_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
- status = "disabled";
-@@ -156,17 +247,36 @@
- compatible = "fsl,imx53-esdhc";
- reg = <0x50024000 0x4000>;
- interrupts = <4>;
-- clocks = <&clks 47>, <&clks 0>, <&clks 74>;
-+ clocks = <&clks IMX5_CLK_ESDHC4_IPG_GATE>,
-+ <&clks IMX5_CLK_DUMMY>,
-+ <&clks IMX5_CLK_ESDHC4_PER_GATE>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
- status = "disabled";
- };
- };
-
-+ usbphy0: usbphy@0 {
-+ compatible = "usb-nop-xceiv";
-+ clocks = <&clks IMX5_CLK_USB_PHY1_GATE>;
-+ clock-names = "main_clk";
-+ status = "okay";
-+ };
-+
-+ usbphy1: usbphy@1 {
-+ compatible = "usb-nop-xceiv";
-+ clocks = <&clks IMX5_CLK_USB_PHY2_GATE>;
-+ clock-names = "main_clk";
-+ status = "okay";
-+ };
-+
- usbotg: usb@53f80000 {
- compatible = "fsl,imx53-usb", "fsl,imx27-usb";
- reg = <0x53f80000 0x0200>;
- interrupts = <18>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 0>;
-+ fsl,usbphy = <&usbphy0>;
- status = "disabled";
- };
-
-@@ -174,6 +284,9 @@
- compatible = "fsl,imx53-usb", "fsl,imx27-usb";
- reg = <0x53f80200 0x0200>;
- interrupts = <14>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 1>;
-+ fsl,usbphy = <&usbphy1>;
- status = "disabled";
- };
-
-@@ -181,6 +294,8 @@
- compatible = "fsl,imx53-usb", "fsl,imx27-usb";
- reg = <0x53f80400 0x0200>;
- interrupts = <16>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 2>;
- status = "disabled";
- };
-
-@@ -188,9 +303,18 @@
- compatible = "fsl,imx53-usb", "fsl,imx27-usb";
- reg = <0x53f80600 0x0200>;
- interrupts = <17>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ fsl,usbmisc = <&usbmisc 3>;
- status = "disabled";
- };
-
-+ usbmisc: usbmisc@53f80800 {
-+ #index-cells = <1>;
-+ compatible = "fsl,imx53-usbmisc";
-+ reg = <0x53f80800 0x200>;
-+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
-+ };
-+
- gpio1: gpio@53f84000 {
- compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
- reg = <0x53f84000 0x4000>;
-@@ -231,18 +355,26 @@
- #interrupt-cells = <2>;
- };
-
-+ kpp: kpp@53f94000 {
-+ compatible = "fsl,imx53-kpp", "fsl,imx21-kpp";
-+ reg = <0x53f94000 0x4000>;
-+ interrupts = <60>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
-+ status = "disabled";
-+ };
-+
- wdog1: wdog@53f98000 {
- compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
- reg = <0x53f98000 0x4000>;
- interrupts = <58>;
-- clocks = <&clks 0>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
- };
-
- wdog2: wdog@53f9c000 {
- compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
- reg = <0x53f9c000 0x4000>;
- interrupts = <59>;
-- clocks = <&clks 0>;
-+ clocks = <&clks IMX5_CLK_DUMMY>;
- status = "disabled";
- };
-
-@@ -250,270 +382,14 @@
- compatible = "fsl,imx53-gpt", "fsl,imx31-gpt";
- reg = <0x53fa0000 0x4000>;
- interrupts = <39>;
-- clocks = <&clks 36>, <&clks 41>;
-+ clocks = <&clks IMX5_CLK_GPT_IPG_GATE>,
-+ <&clks IMX5_CLK_GPT_HF_GATE>;
- clock-names = "ipg", "per";
- };
-
- iomuxc: iomuxc@53fa8000 {
- compatible = "fsl,imx53-iomuxc";
- reg = <0x53fa8000 0x4000>;
--
-- audmux {
-- pinctrl_audmux_1: audmuxgrp-1 {
-- fsl,pins = <
-- MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC 0x80000000
-- MX53_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x80000000
-- MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS 0x80000000
-- MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x80000000
-- >;
-- };
-- };
--
-- fec {
-- pinctrl_fec_1: fecgrp-1 {
-- fsl,pins = <
-- MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
-- MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-- MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
-- MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
-- MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
-- MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
-- MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
-- MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-- MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
-- MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
-- >;
-- };
-- };
--
-- csi {
-- pinctrl_csi_1: csigrp-1 {
-- fsl,pins = <
-- MX53_PAD_CSI0_DATA_EN__IPU_CSI0_DATA_EN 0x1d5
-- MX53_PAD_CSI0_VSYNC__IPU_CSI0_VSYNC 0x1d5
-- MX53_PAD_CSI0_MCLK__IPU_CSI0_HSYNC 0x1d5
-- MX53_PAD_CSI0_PIXCLK__IPU_CSI0_PIXCLK 0x1d5
-- MX53_PAD_CSI0_DAT19__IPU_CSI0_D_19 0x1d5
-- MX53_PAD_CSI0_DAT18__IPU_CSI0_D_18 0x1d5
-- MX53_PAD_CSI0_DAT17__IPU_CSI0_D_17 0x1d5
-- MX53_PAD_CSI0_DAT16__IPU_CSI0_D_16 0x1d5
-- MX53_PAD_CSI0_DAT15__IPU_CSI0_D_15 0x1d5
-- MX53_PAD_CSI0_DAT14__IPU_CSI0_D_14 0x1d5
-- MX53_PAD_CSI0_DAT13__IPU_CSI0_D_13 0x1d5
-- MX53_PAD_CSI0_DAT12__IPU_CSI0_D_12 0x1d5
-- MX53_PAD_CSI0_DAT11__IPU_CSI0_D_11 0x1d5
-- MX53_PAD_CSI0_DAT10__IPU_CSI0_D_10 0x1d5
-- MX53_PAD_CSI0_DAT9__IPU_CSI0_D_9 0x1d5
-- MX53_PAD_CSI0_DAT8__IPU_CSI0_D_8 0x1d5
-- MX53_PAD_CSI0_DAT7__IPU_CSI0_D_7 0x1d5
-- MX53_PAD_CSI0_DAT6__IPU_CSI0_D_6 0x1d5
-- MX53_PAD_CSI0_DAT5__IPU_CSI0_D_5 0x1d5
-- MX53_PAD_CSI0_DAT4__IPU_CSI0_D_4 0x1d5
-- MX53_PAD_CSI0_PIXCLK__IPU_CSI0_PIXCLK 0x1d5
-- >;
-- };
-- };
--
-- cspi {
-- pinctrl_cspi_1: cspigrp-1 {
-- fsl,pins = <
-- MX53_PAD_SD1_DATA0__CSPI_MISO 0x1d5
-- MX53_PAD_SD1_CMD__CSPI_MOSI 0x1d5
-- MX53_PAD_SD1_CLK__CSPI_SCLK 0x1d5
-- >;
-- };
-- };
--
-- ecspi1 {
-- pinctrl_ecspi1_1: ecspi1grp-1 {
-- fsl,pins = <
-- MX53_PAD_EIM_D16__ECSPI1_SCLK 0x80000000
-- MX53_PAD_EIM_D17__ECSPI1_MISO 0x80000000
-- MX53_PAD_EIM_D18__ECSPI1_MOSI 0x80000000
-- >;
-- };
-- };
--
-- esdhc1 {
-- pinctrl_esdhc1_1: esdhc1grp-1 {
-- fsl,pins = <
-- MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
-- MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
-- MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
-- MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
-- MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
-- MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
-- >;
-- };
--
-- pinctrl_esdhc1_2: esdhc1grp-2 {
-- fsl,pins = <
-- MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
-- MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
-- MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
-- MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
-- MX53_PAD_PATA_DATA8__ESDHC1_DAT4 0x1d5
-- MX53_PAD_PATA_DATA9__ESDHC1_DAT5 0x1d5
-- MX53_PAD_PATA_DATA10__ESDHC1_DAT6 0x1d5
-- MX53_PAD_PATA_DATA11__ESDHC1_DAT7 0x1d5
-- MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
-- MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
-- >;
-- };
-- };
--
-- esdhc2 {
-- pinctrl_esdhc2_1: esdhc2grp-1 {
-- fsl,pins = <
-- MX53_PAD_SD2_CMD__ESDHC2_CMD 0x1d5
-- MX53_PAD_SD2_CLK__ESDHC2_CLK 0x1d5
-- MX53_PAD_SD2_DATA0__ESDHC2_DAT0 0x1d5
-- MX53_PAD_SD2_DATA1__ESDHC2_DAT1 0x1d5
-- MX53_PAD_SD2_DATA2__ESDHC2_DAT2 0x1d5
-- MX53_PAD_SD2_DATA3__ESDHC2_DAT3 0x1d5
-- >;
-- };
-- };
--
-- esdhc3 {
-- pinctrl_esdhc3_1: esdhc3grp-1 {
-- fsl,pins = <
-- MX53_PAD_PATA_DATA8__ESDHC3_DAT0 0x1d5
-- MX53_PAD_PATA_DATA9__ESDHC3_DAT1 0x1d5
-- MX53_PAD_PATA_DATA10__ESDHC3_DAT2 0x1d5
-- MX53_PAD_PATA_DATA11__ESDHC3_DAT3 0x1d5
-- MX53_PAD_PATA_DATA0__ESDHC3_DAT4 0x1d5
-- MX53_PAD_PATA_DATA1__ESDHC3_DAT5 0x1d5
-- MX53_PAD_PATA_DATA2__ESDHC3_DAT6 0x1d5
-- MX53_PAD_PATA_DATA3__ESDHC3_DAT7 0x1d5
-- MX53_PAD_PATA_RESET_B__ESDHC3_CMD 0x1d5
-- MX53_PAD_PATA_IORDY__ESDHC3_CLK 0x1d5
-- >;
-- };
-- };
--
-- can1 {
-- pinctrl_can1_1: can1grp-1 {
-- fsl,pins = <
-- MX53_PAD_PATA_INTRQ__CAN1_TXCAN 0x80000000
-- MX53_PAD_PATA_DIOR__CAN1_RXCAN 0x80000000
-- >;
-- };
--
-- pinctrl_can1_2: can1grp-2 {
-- fsl,pins = <
-- MX53_PAD_KEY_COL2__CAN1_TXCAN 0x80000000
-- MX53_PAD_KEY_ROW2__CAN1_RXCAN 0x80000000
-- >;
-- };
-- };
--
-- can2 {
-- pinctrl_can2_1: can2grp-1 {
-- fsl,pins = <
-- MX53_PAD_KEY_COL4__CAN2_TXCAN 0x80000000
-- MX53_PAD_KEY_ROW4__CAN2_RXCAN 0x80000000
-- >;
-- };
-- };
--
-- i2c1 {
-- pinctrl_i2c1_1: i2c1grp-1 {
-- fsl,pins = <
-- MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000
-- MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000
-- >;
-- };
-- };
--
-- i2c2 {
-- pinctrl_i2c2_1: i2c2grp-1 {
-- fsl,pins = <
-- MX53_PAD_KEY_ROW3__I2C2_SDA 0xc0000000
-- MX53_PAD_KEY_COL3__I2C2_SCL 0xc0000000
-- >;
-- };
-- };
--
-- i2c3 {
-- pinctrl_i2c3_1: i2c3grp-1 {
-- fsl,pins = <
-- MX53_PAD_GPIO_6__I2C3_SDA 0xc0000000
-- MX53_PAD_GPIO_5__I2C3_SCL 0xc0000000
-- >;
-- };
-- };
--
-- owire {
-- pinctrl_owire_1: owiregrp-1 {
-- fsl,pins = <
-- MX53_PAD_GPIO_18__OWIRE_LINE 0x80000000
-- >;
-- };
-- };
--
-- uart1 {
-- pinctrl_uart1_1: uart1grp-1 {
-- fsl,pins = <
-- MX53_PAD_CSI0_DAT10__UART1_TXD_MUX 0x1c5
-- MX53_PAD_CSI0_DAT11__UART1_RXD_MUX 0x1c5
-- >;
-- };
--
-- pinctrl_uart1_2: uart1grp-2 {
-- fsl,pins = <
-- MX53_PAD_PATA_DIOW__UART1_TXD_MUX 0x1c5
-- MX53_PAD_PATA_DMACK__UART1_RXD_MUX 0x1c5
-- >;
-- };
-- };
--
-- uart2 {
-- pinctrl_uart2_1: uart2grp-1 {
-- fsl,pins = <
-- MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX 0x1c5
-- MX53_PAD_PATA_DMARQ__UART2_TXD_MUX 0x1c5
-- >;
-- };
-- };
--
-- uart3 {
-- pinctrl_uart3_1: uart3grp-1 {
-- fsl,pins = <
-- MX53_PAD_PATA_CS_0__UART3_TXD_MUX 0x1c5
-- MX53_PAD_PATA_CS_1__UART3_RXD_MUX 0x1c5
-- MX53_PAD_PATA_DA_1__UART3_CTS 0x1c5
-- MX53_PAD_PATA_DA_2__UART3_RTS 0x1c5
-- >;
-- };
--
-- pinctrl_uart3_2: uart3grp-2 {
-- fsl,pins = <
-- MX53_PAD_PATA_CS_0__UART3_TXD_MUX 0x1c5
-- MX53_PAD_PATA_CS_1__UART3_RXD_MUX 0x1c5
-- >;
-- };
--
-- };
--
-- uart4 {
-- pinctrl_uart4_1: uart4grp-1 {
-- fsl,pins = <
-- MX53_PAD_KEY_COL0__UART4_TXD_MUX 0x1c5
-- MX53_PAD_KEY_ROW0__UART4_RXD_MUX 0x1c5
-- >;
-- };
-- };
--
-- uart5 {
-- pinctrl_uart5_1: uart5grp-1 {
-- fsl,pins = <
-- MX53_PAD_KEY_COL1__UART5_TXD_MUX 0x1c5
-- MX53_PAD_KEY_ROW1__UART5_RXD_MUX 0x1c5
-- >;
-- };
-- };
--
- };
-
- gpr: iomuxc-gpr@53fa8000 {
-@@ -527,9 +403,12 @@
- compatible = "fsl,imx53-ldb";
- reg = <0x53fa8008 0x4>;
- gpr = <&gpr>;
-- clocks = <&clks 122>, <&clks 120>,
-- <&clks 115>, <&clks 116>,
-- <&clks 123>, <&clks 85>;
-+ clocks = <&clks IMX5_CLK_LDB_DI0_SEL>,
-+ <&clks IMX5_CLK_LDB_DI1_SEL>,
-+ <&clks IMX5_CLK_IPU_DI0_SEL>,
-+ <&clks IMX5_CLK_IPU_DI1_SEL>,
-+ <&clks IMX5_CLK_LDB_DI0_GATE>,
-+ <&clks IMX5_CLK_LDB_DI1_GATE>;
- clock-names = "di0_pll", "di1_pll",
- "di0_sel", "di1_sel",
- "di0", "di1";
-@@ -537,14 +416,24 @@
-
- lvds-channel@0 {
- reg = <0>;
-- crtcs = <&ipu 0>;
- status = "disabled";
-+
-+ port {
-+ lvds0_in: endpoint {
-+ remote-endpoint = <&ipu_di0_lvds0>;
-+ };
-+ };
- };
-
- lvds-channel@1 {
- reg = <1>;
-- crtcs = <&ipu 1>;
- status = "disabled";
-+
-+ port {
-+ lvds1_in: endpoint {
-+ remote-endpoint = <&ipu_di0_lvds0>;
-+ };
-+ };
- };
- };
-
-@@ -552,7 +441,8 @@
- #pwm-cells = <2>;
- compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
- reg = <0x53fb4000 0x4000>;
-- clocks = <&clks 37>, <&clks 38>;
-+ clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>,
-+ <&clks IMX5_CLK_PWM1_HF_GATE>;
- clock-names = "ipg", "per";
- interrupts = <61>;
- };
-@@ -561,7 +451,8 @@
- #pwm-cells = <2>;
- compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
- reg = <0x53fb8000 0x4000>;
-- clocks = <&clks 39>, <&clks 40>;
-+ clocks = <&clks IMX5_CLK_PWM2_IPG_GATE>,
-+ <&clks IMX5_CLK_PWM2_HF_GATE>;
- clock-names = "ipg", "per";
- interrupts = <94>;
- };
-@@ -570,7 +461,8 @@
- compatible = "fsl,imx53-uart", "fsl,imx21-uart";
- reg = <0x53fbc000 0x4000>;
- interrupts = <31>;
-- clocks = <&clks 28>, <&clks 29>;
-+ clocks = <&clks IMX5_CLK_UART1_IPG_GATE>,
-+ <&clks IMX5_CLK_UART1_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -579,7 +471,8 @@
- compatible = "fsl,imx53-uart", "fsl,imx21-uart";
- reg = <0x53fc0000 0x4000>;
- interrupts = <32>;
-- clocks = <&clks 30>, <&clks 31>;
-+ clocks = <&clks IMX5_CLK_UART2_IPG_GATE>,
-+ <&clks IMX5_CLK_UART2_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -588,7 +481,8 @@
- compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
- reg = <0x53fc8000 0x4000>;
- interrupts = <82>;
-- clocks = <&clks 158>, <&clks 157>;
-+ clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>,
-+ <&clks IMX5_CLK_CAN1_SERIAL_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -597,7 +491,8 @@
- compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
- reg = <0x53fcc000 0x4000>;
- interrupts = <83>;
-- clocks = <&clks 87>, <&clks 86>;
-+ clocks = <&clks IMX5_CLK_CAN2_IPG_GATE>,
-+ <&clks IMX5_CLK_CAN2_SERIAL_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -651,7 +546,7 @@
- compatible = "fsl,imx53-i2c", "fsl,imx21-i2c";
- reg = <0x53fec000 0x4000>;
- interrupts = <64>;
-- clocks = <&clks 88>;
-+ clocks = <&clks IMX5_CLK_I2C3_GATE>;
- status = "disabled";
- };
-
-@@ -659,7 +554,8 @@
- compatible = "fsl,imx53-uart", "fsl,imx21-uart";
- reg = <0x53ff0000 0x4000>;
- interrupts = <13>;
-- clocks = <&clks 65>, <&clks 66>;
-+ clocks = <&clks IMX5_CLK_UART4_IPG_GATE>,
-+ <&clks IMX5_CLK_UART4_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -672,11 +568,19 @@
- reg = <0x60000000 0x10000000>;
- ranges;
-
-+ iim: iim@63f98000 {
-+ compatible = "fsl,imx53-iim", "fsl,imx27-iim";
-+ reg = <0x63f98000 0x4000>;
-+ interrupts = <69>;
-+ clocks = <&clks IMX5_CLK_IIM_GATE>;
-+ };
-+
- uart5: serial@63f90000 {
- compatible = "fsl,imx53-uart", "fsl,imx21-uart";
- reg = <0x63f90000 0x4000>;
- interrupts = <86>;
-- clocks = <&clks 67>, <&clks 68>;
-+ clocks = <&clks IMX5_CLK_UART5_IPG_GATE>,
-+ <&clks IMX5_CLK_UART5_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -684,7 +588,7 @@
- owire: owire@63fa4000 {
- compatible = "fsl,imx53-owire", "fsl,imx21-owire";
- reg = <0x63fa4000 0x4000>;
-- clocks = <&clks 159>;
-+ clocks = <&clks IMX5_CLK_OWIRE_GATE>;
- status = "disabled";
- };
-
-@@ -694,7 +598,8 @@
- compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi";
- reg = <0x63fac000 0x4000>;
- interrupts = <37>;
-- clocks = <&clks 53>, <&clks 54>;
-+ clocks = <&clks IMX5_CLK_ECSPI2_IPG_GATE>,
-+ <&clks IMX5_CLK_ECSPI2_PER_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -703,8 +608,10 @@
- compatible = "fsl,imx53-sdma", "fsl,imx35-sdma";
- reg = <0x63fb0000 0x4000>;
- interrupts = <6>;
-- clocks = <&clks 56>, <&clks 56>;
-+ clocks = <&clks IMX5_CLK_SDMA_GATE>,
-+ <&clks IMX5_CLK_SDMA_GATE>;
- clock-names = "ipg", "ahb";
-+ #dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
- };
-
-@@ -714,7 +621,8 @@
- compatible = "fsl,imx53-cspi", "fsl,imx35-cspi";
- reg = <0x63fc0000 0x4000>;
- interrupts = <38>;
-- clocks = <&clks 55>, <&clks 55>;
-+ clocks = <&clks IMX5_CLK_CSPI_IPG_GATE>,
-+ <&clks IMX5_CLK_CSPI_IPG_GATE>;
- clock-names = "ipg", "per";
- status = "disabled";
- };
-@@ -725,7 +633,7 @@
- compatible = "fsl,imx53-i2c", "fsl,imx21-i2c";
- reg = <0x63fc4000 0x4000>;
- interrupts = <63>;
-- clocks = <&clks 35>;
-+ clocks = <&clks IMX5_CLK_I2C2_GATE>;
- status = "disabled";
- };
-
-@@ -735,15 +643,19 @@
- compatible = "fsl,imx53-i2c", "fsl,imx21-i2c";
- reg = <0x63fc8000 0x4000>;
- interrupts = <62>;
-- clocks = <&clks 34>;
-+ clocks = <&clks IMX5_CLK_I2C1_GATE>;
- status = "disabled";
- };
-
- ssi1: ssi@63fcc000 {
-- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
-+ compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
- reg = <0x63fcc000 0x4000>;
- interrupts = <29>;
-- clocks = <&clks 48>;
-+ clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
-+ dmas = <&sdma 28 0 0>,
-+ <&sdma 29 0 0>;
-+ dma-names = "rx", "tx";
- fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
- status = "disabled";
-@@ -759,15 +671,19 @@
- compatible = "fsl,imx53-nand";
- reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>;
- interrupts = <8>;
-- clocks = <&clks 60>;
-+ clocks = <&clks IMX5_CLK_NFC_GATE>;
- status = "disabled";
- };
-
- ssi3: ssi@63fe8000 {
-- compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
-+ compatible = "fsl,imx53-ssi", "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
- reg = <0x63fe8000 0x4000>;
- interrupts = <96>;
-- clocks = <&clks 50>;
-+ clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>;
-+ dmas = <&sdma 46 0 0>,
-+ <&sdma 47 0 0>;
-+ dma-names = "rx", "tx";
- fsl,fifo-depth = <15>;
- fsl,ssi-dma-events = <47 46 45 44>; /* TX0 RX0 TX1 RX1 */
- status = "disabled";
-@@ -777,10 +693,45 @@
- compatible = "fsl,imx53-fec", "fsl,imx25-fec";
- reg = <0x63fec000 0x4000>;
- interrupts = <87>;
-- clocks = <&clks 42>, <&clks 42>, <&clks 42>;
-+ clocks = <&clks IMX5_CLK_FEC_GATE>,
-+ <&clks IMX5_CLK_FEC_GATE>,
-+ <&clks IMX5_CLK_FEC_GATE>;
- clock-names = "ipg", "ahb", "ptp";
++++ linux-solidrun/arch/arm/boot/dts/imx53.dtsi 2014-04-24 07:58:12.860168771 +0200
+@@ -782,5 +782,10 @@
status = "disabled";
};
-+
-+ tve: tve@63ff0000 {
-+ compatible = "fsl,imx53-tve";
-+ reg = <0x63ff0000 0x1000>;
-+ interrupts = <92>;
-+ clocks = <&clks IMX5_CLK_TVE_GATE>,
-+ <&clks IMX5_CLK_IPU_DI1_SEL>;
-+ clock-names = "tve", "di_sel";
-+ status = "disabled";
-+
-+ port {
-+ tve_in: endpoint {
-+ remote-endpoint = <&ipu_di1_tve>;
-+ };
-+ };
-+ };
-+
-+ vpu: vpu@63ff4000 {
-+ compatible = "fsl,imx53-vpu";
-+ reg = <0x63ff4000 0x1000>;
-+ interrupts = <9>;
-+ clocks = <&clks IMX5_CLK_VPU_GATE>,
-+ <&clks IMX5_CLK_VPU_GATE>;
-+ clock-names = "per", "ahb";
-+ resets = <&src 1>;
-+ iram = <&ocram>;
-+ };
-+ };
+ };
+
+ ocram: sram@f8000000 {
+ compatible = "mmio-sram";
+ reg = <0xf8000000 0x20000>;
-+ clocks = <&clks IMX5_CLK_OCRAM>;
- };
- };
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-m53evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-m53evk.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-m53evk.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-m53evk.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,462 @@
-+/*
-+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx53.dtsi"
-+
-+/ {
-+ model = "DENX M53EVK";
-+ compatible = "denx,imx53-m53evk", "fsl,imx53";
-+
-+ memory {
-+ reg = <0x70000000 0x20000000>;
-+ };
-+
-+ soc {
-+ display1: display@di1 {
-+ compatible = "fsl,imx-parallel-display";
-+ interface-pix-fmt = "bgr666";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ipu_disp1>;
-+
-+ display-timings {
-+ 800x480p60 {
-+ native-mode;
-+ clock-frequency = <31500000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hfront-porch = <40>;
-+ hback-porch = <88>;
-+ hsync-len = <128>;
-+ vback-porch = <33>;
-+ vfront-porch = <9>;
-+ vsync-len = <3>;
-+ vsync-active = <1>;
-+ };
-+ };
-+ };
-+
-+ port {
-+ display1_in: endpoint {
-+ remote-endpoint = <&ipu_di1_disp1>;
-+ };
-+ };
-+ };
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm1 0 3000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <6>;
-+ power-supply = <&reg_backlight>;
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&led_pin_gpio>;
-+
-+ user1 {
-+ label = "user1";
-+ gpios = <&gpio2 8 0>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ user2 {
-+ label = "user2";
-+ gpios = <&gpio2 9 0>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p2v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P2V";
-+ regulator-min-microvolt = <3200000>;
-+ regulator-max-microvolt = <3200000>;
-+ regulator-always-on;
-+ };
-+
-+
-+ reg_backlight: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "lcd-supply";
-+ regulator-min-microvolt = <3200000>;
-+ regulator-max-microvolt = <3200000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usbh1_vbus: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio1 2 0>;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx53-m53evk-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx53-m53evk-sgtl5000";
-+ ssi-controller = <&ssi2>;
-+ audio-codec = <&sgtl5000>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "LINE_IN", "Line In Jack",
-+ "Headphone Jack", "HP_OUT",
-+ "Ext Spk", "LINE_OUT";
-+ mux-int-port = <2>;
-+ mux-ext-port = <4>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_can1>;
-+ status = "okay";
-+};
-+
-+&can2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_can2>;
-+ status = "okay";
-+};
-+
-+&esdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ cd-gpios = <&gpio1 1 0>;
-+ wp-gpios = <&gpio1 9 0>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ phy-mode = "rmii";
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ sgtl5000: codec@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ VDDA-supply = <&reg_3p2v>;
-+ VDDIO-supply = <&reg_3p2v>;
-+ clocks = <&clks IMX5_CLK_SSI_EXT1_GATE>;
-+ };
-+};
-+
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ clock-frequency = <400000>;
-+ status = "okay";
-+
-+ stmpe610@41 {
-+ compatible = "st,stmpe610";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <0x41>;
-+ id = <0>;
-+ blocks = <0x5>;
-+ interrupts = <6 0x0>;
-+ interrupt-parent = <&gpio7>;
-+ irq-trigger = <0x1>;
-+
-+ stmpe_touchscreen {
-+ compatible = "stmpe,ts";
-+ reg = <0>;
-+ ts,sample-time = <4>;
-+ ts,mod-12b = <1>;
-+ ts,ref-sel = <0>;
-+ ts,adc-freq = <1>;
-+ ts,ave-ctrl = <3>;
-+ ts,touch-det-delay = <3>;
-+ ts,settling = <4>;
-+ ts,fraction-z = <7>;
-+ ts,i-drive = <1>;
-+ };
-+ };
-+
-+ eeprom: eeprom@50 {
-+ compatible = "atmel,24c128";
-+ reg = <0x50>;
-+ pagesize = <32>;
-+ };
-+
-+ rtc: rtc@68 {
-+ compatible = "stm,m41t62";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&i2c3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx53-m53evk {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
-+ MX53_PAD_EIM_EB3__GPIO2_31 0x80000000
-+ MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000
-+ MX53_PAD_GPIO_2__GPIO1_2 0x80000000
-+ MX53_PAD_GPIO_3__USBOH3_USBH1_OC 0x80000000
-+ >;
-+ };
-+
-+ led_pin_gpio: led_gpio@0 {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DATA8__GPIO2_8 0x80000000
-+ MX53_PAD_PATA_DATA9__GPIO2_9 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX53_PAD_SD2_DATA3__AUDMUX_AUD4_TXC 0x80000000
-+ MX53_PAD_SD2_DATA2__AUDMUX_AUD4_TXD 0x80000000
-+ MX53_PAD_SD2_DATA1__AUDMUX_AUD4_TXFS 0x80000000
-+ MX53_PAD_SD2_DATA0__AUDMUX_AUD4_RXD 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_can1: can1grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_7__CAN1_TXCAN 0x80000000
-+ MX53_PAD_GPIO_8__CAN1_RXCAN 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_can2: can2grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL4__CAN2_TXCAN 0x80000000
-+ MX53_PAD_KEY_ROW4__CAN2_RXCAN 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
-+ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
-+ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
-+ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
-+ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
-+ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-+ MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
-+ MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
-+ MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
-+ MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
-+ MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
-+ MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
-+ MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000
-+ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D16__I2C2_SDA 0xc0000000
-+ MX53_PAD_EIM_EB2__I2C2_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_6__I2C3_SDA 0xc0000000
-+ MX53_PAD_GPIO_5__I2C3_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_ipu_disp1: ipudisp1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_DA9__IPU_DISP1_DAT_0 0x5
-+ MX53_PAD_EIM_DA8__IPU_DISP1_DAT_1 0x5
-+ MX53_PAD_EIM_DA7__IPU_DISP1_DAT_2 0x5
-+ MX53_PAD_EIM_DA6__IPU_DISP1_DAT_3 0x5
-+ MX53_PAD_EIM_DA5__IPU_DISP1_DAT_4 0x5
-+ MX53_PAD_EIM_DA4__IPU_DISP1_DAT_5 0x5
-+ MX53_PAD_EIM_DA3__IPU_DISP1_DAT_6 0x5
-+ MX53_PAD_EIM_DA2__IPU_DISP1_DAT_7 0x5
-+ MX53_PAD_EIM_DA1__IPU_DISP1_DAT_8 0x5
-+ MX53_PAD_EIM_DA0__IPU_DISP1_DAT_9 0x5
-+ MX53_PAD_EIM_EB1__IPU_DISP1_DAT_10 0x5
-+ MX53_PAD_EIM_EB0__IPU_DISP1_DAT_11 0x5
-+ MX53_PAD_EIM_A17__IPU_DISP1_DAT_12 0x5
-+ MX53_PAD_EIM_A18__IPU_DISP1_DAT_13 0x5
-+ MX53_PAD_EIM_A19__IPU_DISP1_DAT_14 0x5
-+ MX53_PAD_EIM_A20__IPU_DISP1_DAT_15 0x5
-+ MX53_PAD_EIM_A21__IPU_DISP1_DAT_16 0x5
-+ MX53_PAD_EIM_A22__IPU_DISP1_DAT_17 0x5
-+ MX53_PAD_EIM_A23__IPU_DISP1_DAT_18 0x5
-+ MX53_PAD_EIM_A24__IPU_DISP1_DAT_19 0x5
-+ MX53_PAD_EIM_D31__IPU_DISP1_DAT_20 0x5
-+ MX53_PAD_EIM_D30__IPU_DISP1_DAT_21 0x5
-+ MX53_PAD_EIM_D26__IPU_DISP1_DAT_22 0x5
-+ MX53_PAD_EIM_D27__IPU_DISP1_DAT_23 0x5
-+ MX53_PAD_EIM_A16__IPU_DI1_DISP_CLK 0x5
-+ MX53_PAD_EIM_DA13__IPU_DI1_D0_CS 0x5
-+ MX53_PAD_EIM_DA14__IPU_DI1_D1_CS 0x5
-+ MX53_PAD_EIM_DA15__IPU_DI1_PIN1 0x5
-+ MX53_PAD_EIM_DA11__IPU_DI1_PIN2 0x5
-+ MX53_PAD_EIM_DA12__IPU_DI1_PIN3 0x5
-+ MX53_PAD_EIM_A25__IPU_DI1_PIN12 0x5
-+ MX53_PAD_EIM_DA10__IPU_DI1_PIN15 0x5
-+ >;
-+ };
-+
-+ pinctrl_nand: nandgrp {
-+ fsl,pins = <
-+ MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B 0x4
-+ MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B 0x4
-+ MX53_PAD_NANDF_CLE__EMI_NANDF_CLE 0x4
-+ MX53_PAD_NANDF_ALE__EMI_NANDF_ALE 0x4
-+ MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B 0xe0
-+ MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0 0xe0
-+ MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0 0x4
-+ MX53_PAD_PATA_DATA0__EMI_NANDF_D_0 0xa4
-+ MX53_PAD_PATA_DATA1__EMI_NANDF_D_1 0xa4
-+ MX53_PAD_PATA_DATA2__EMI_NANDF_D_2 0xa4
-+ MX53_PAD_PATA_DATA3__EMI_NANDF_D_3 0xa4
-+ MX53_PAD_PATA_DATA4__EMI_NANDF_D_4 0xa4
-+ MX53_PAD_PATA_DATA5__EMI_NANDF_D_5 0xa4
-+ MX53_PAD_PATA_DATA6__EMI_NANDF_D_6 0xa4
-+ MX53_PAD_PATA_DATA7__EMI_NANDF_D_7 0xa4
-+ >;
-+ };
-+
-+ pinctrl_pwm1: pwm1grp {
-+ fsl,pins = <
-+ MX53_PAD_DISP0_DAT8__PWM1_PWMO 0x5
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DIOW__UART1_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMACK__UART1_RXD_MUX 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMARQ__UART2_TXD_MUX 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_CS_0__UART3_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_CS_1__UART3_RXD_MUX 0x1e4
-+ MX53_PAD_PATA_DA_1__UART3_CTS 0x1e4
-+ MX53_PAD_PATA_DA_2__UART3_RTS 0x1e4
-+ >;
-+ };
-+ };
-+};
-+
-+&ipu_di1_disp1 {
-+ remote-endpoint = <&display1_in>;
-+};
-+
-+&nfc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_nand>;
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ status = "okay";
-+};
-+
-+&pwm1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm1>;
-+ status = "okay";
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-+
-+&ssi2 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <&reg_usbh1_vbus>;
-+ phy_type = "utmi";
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ dr_mode = "peripheral";
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-mba53.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-mba53.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-mba53.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-mba53.dts 2014-04-21 13:50:39.058713648 +0200
-@@ -16,27 +16,93 @@
- / {
- model = "TQ MBa53 starter kit";
- compatible = "tq,mba53", "tq,tqma53", "fsl,imx53";
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm2 0 50000>;
-+ brightness-levels = <0 24 28 32 36 40 44 48 52 56 60 64 68 72 76 80 84 88 92 96 100>;
-+ default-brightness-level = <10>;
-+ enable-gpios = <&gpio7 7 0>;
-+ power-supply = <&reg_backlight>;
-+ };
-+
-+ disp1: display@disp1 {
-+ compatible = "fsl,imx-parallel-display";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_disp1_1>;
-+ interface-pix-fmt = "rgb24";
-+ status = "disabled";
-+
-+ port {
-+ display1_in: endpoint {
-+ remote-endpoint = <&ipu_di1_disp1>;
-+ };
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_backlight: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "lcd-supply";
-+ gpio = <&gpio2 5 0>;
-+ startup-delay-us = <5000>;
-+ };
-+
-+ reg_3p2v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "3P2V";
-+ regulator-min-microvolt = <3200000>;
-+ regulator-max-microvolt = <3200000>;
-+ regulator-always-on;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "tq,imx53-mba53-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx53-mba53-sgtl5000";
-+ ssi-controller = <&ssi2>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <2>;
-+ mux-ext-port = <5>;
-+ };
-+};
-+
-+&ldb {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_lvds1_1>;
-+ status = "disabled";
- };
-
- &iomuxc {
- lvds1 {
- pinctrl_lvds1_1: lvds1-grp1 {
- fsl,pins = <
-- MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x10000
-- MX53_PAD_LVDS0_CLK_P__LDB_LVDS0_CLK 0x10000
-- MX53_PAD_LVDS0_TX2_P__LDB_LVDS0_TX2 0x10000
-- MX53_PAD_LVDS0_TX1_P__LDB_LVDS0_TX1 0x10000
-- MX53_PAD_LVDS0_TX0_P__LDB_LVDS0_TX0 0x10000
-+ MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x80000000
-+ MX53_PAD_LVDS0_CLK_P__LDB_LVDS0_CLK 0x80000000
-+ MX53_PAD_LVDS0_TX2_P__LDB_LVDS0_TX2 0x80000000
-+ MX53_PAD_LVDS0_TX1_P__LDB_LVDS0_TX1 0x80000000
-+ MX53_PAD_LVDS0_TX0_P__LDB_LVDS0_TX0 0x80000000
- >;
- };
-
- pinctrl_lvds1_2: lvds1-grp2 {
- fsl,pins = <
-- MX53_PAD_LVDS1_TX3_P__LDB_LVDS1_TX3 0x10000
-- MX53_PAD_LVDS1_TX2_P__LDB_LVDS1_TX2 0x10000
-- MX53_PAD_LVDS1_CLK_P__LDB_LVDS1_CLK 0x10000
-- MX53_PAD_LVDS1_TX1_P__LDB_LVDS1_TX1 0x10000
-- MX53_PAD_LVDS1_TX0_P__LDB_LVDS1_TX0 0x10000
-+ MX53_PAD_LVDS1_TX3_P__LDB_LVDS1_TX3 0x80000000
-+ MX53_PAD_LVDS1_TX2_P__LDB_LVDS1_TX2 0x80000000
-+ MX53_PAD_LVDS1_CLK_P__LDB_LVDS1_CLK 0x80000000
-+ MX53_PAD_LVDS1_TX1_P__LDB_LVDS1_TX1 0x80000000
-+ MX53_PAD_LVDS1_TX0_P__LDB_LVDS1_TX0 0x80000000
- >;
- };
- };
-@@ -44,52 +110,78 @@
- disp1 {
- pinctrl_disp1_1: disp1-grp1 {
- fsl,pins = <
-- MX53_PAD_EIM_DA10__IPU_DI1_PIN15 0x10000 /* DISP1_DRDY */
-- MX53_PAD_EIM_D23__IPU_DI1_PIN2 0x10000 /* DISP1_HSYNC */
-- MX53_PAD_EIM_EB3__IPU_DI1_PIN3 0x10000 /* DISP1_VSYNC */
-- MX53_PAD_EIM_D26__IPU_DISP1_DAT_22 0x10000
-- MX53_PAD_EIM_D27__IPU_DISP1_DAT_23 0x10000
-- MX53_PAD_EIM_D30__IPU_DISP1_DAT_21 0x10000
-- MX53_PAD_EIM_D31__IPU_DISP1_DAT_20 0x10000
-- MX53_PAD_EIM_A24__IPU_DISP1_DAT_19 0x10000
-- MX53_PAD_EIM_A23__IPU_DISP1_DAT_18 0x10000
-- MX53_PAD_EIM_A22__IPU_DISP1_DAT_17 0x10000
-- MX53_PAD_EIM_A21__IPU_DISP1_DAT_16 0x10000
-- MX53_PAD_EIM_A20__IPU_DISP1_DAT_15 0x10000
-- MX53_PAD_EIM_A19__IPU_DISP1_DAT_14 0x10000
-- MX53_PAD_EIM_A18__IPU_DISP1_DAT_13 0x10000
-- MX53_PAD_EIM_A17__IPU_DISP1_DAT_12 0x10000
-- MX53_PAD_EIM_EB0__IPU_DISP1_DAT_11 0x10000
-- MX53_PAD_EIM_EB1__IPU_DISP1_DAT_10 0x10000
-- MX53_PAD_EIM_DA0__IPU_DISP1_DAT_9 0x10000
-- MX53_PAD_EIM_DA1__IPU_DISP1_DAT_8 0x10000
-- MX53_PAD_EIM_DA2__IPU_DISP1_DAT_7 0x10000
-- MX53_PAD_EIM_DA3__IPU_DISP1_DAT_6 0x10000
-- MX53_PAD_EIM_DA4__IPU_DISP1_DAT_5 0x10000
-- MX53_PAD_EIM_DA5__IPU_DISP1_DAT_4 0x10000
-- MX53_PAD_EIM_DA6__IPU_DISP1_DAT_3 0x10000
-- MX53_PAD_EIM_DA7__IPU_DISP1_DAT_2 0x10000
-- MX53_PAD_EIM_DA8__IPU_DISP1_DAT_1 0x10000
-- MX53_PAD_EIM_DA9__IPU_DISP1_DAT_0 0x10000
-+ MX53_PAD_EIM_A16__IPU_DI1_DISP_CLK 0x80000000 /* DISP1_CLK */
-+ MX53_PAD_EIM_DA10__IPU_DI1_PIN15 0x80000000 /* DISP1_DRDY */
-+ MX53_PAD_EIM_D23__IPU_DI1_PIN2 0x80000000 /* DISP1_HSYNC */
-+ MX53_PAD_EIM_EB3__IPU_DI1_PIN3 0x80000000 /* DISP1_VSYNC */
-+ MX53_PAD_EIM_D26__IPU_DISP1_DAT_22 0x80000000
-+ MX53_PAD_EIM_D27__IPU_DISP1_DAT_23 0x80000000
-+ MX53_PAD_EIM_D30__IPU_DISP1_DAT_21 0x80000000
-+ MX53_PAD_EIM_D31__IPU_DISP1_DAT_20 0x80000000
-+ MX53_PAD_EIM_A24__IPU_DISP1_DAT_19 0x80000000
-+ MX53_PAD_EIM_A23__IPU_DISP1_DAT_18 0x80000000
-+ MX53_PAD_EIM_A22__IPU_DISP1_DAT_17 0x80000000
-+ MX53_PAD_EIM_A21__IPU_DISP1_DAT_16 0x80000000
-+ MX53_PAD_EIM_A20__IPU_DISP1_DAT_15 0x80000000
-+ MX53_PAD_EIM_A19__IPU_DISP1_DAT_14 0x80000000
-+ MX53_PAD_EIM_A18__IPU_DISP1_DAT_13 0x80000000
-+ MX53_PAD_EIM_A17__IPU_DISP1_DAT_12 0x80000000
-+ MX53_PAD_EIM_EB0__IPU_DISP1_DAT_11 0x80000000
-+ MX53_PAD_EIM_EB1__IPU_DISP1_DAT_10 0x80000000
-+ MX53_PAD_EIM_DA0__IPU_DISP1_DAT_9 0x80000000
-+ MX53_PAD_EIM_DA1__IPU_DISP1_DAT_8 0x80000000
-+ MX53_PAD_EIM_DA2__IPU_DISP1_DAT_7 0x80000000
-+ MX53_PAD_EIM_DA3__IPU_DISP1_DAT_6 0x80000000
-+ MX53_PAD_EIM_DA4__IPU_DISP1_DAT_5 0x80000000
-+ MX53_PAD_EIM_DA5__IPU_DISP1_DAT_4 0x80000000
-+ MX53_PAD_EIM_DA6__IPU_DISP1_DAT_3 0x80000000
-+ MX53_PAD_EIM_DA7__IPU_DISP1_DAT_2 0x80000000
-+ MX53_PAD_EIM_DA8__IPU_DISP1_DAT_1 0x80000000
-+ MX53_PAD_EIM_DA9__IPU_DISP1_DAT_0 0x80000000
-+ >;
-+ };
-+ };
-+
-+ tve {
-+ pinctrl_vga_sync_1: vgasync-grp1 {
-+ fsl,pins = <
-+ /* VGA_VSYNC, HSYNC with max drive strength */
-+ MX53_PAD_EIM_CS1__IPU_DI1_PIN6 0xe6
-+ MX53_PAD_EIM_DA15__IPU_DI1_PIN4 0xe6
- >;
- };
- };
- };
-
-+&ipu_di1_disp1 {
-+ remote-endpoint = <&display1_in>;
-+};
-+
- &cspi {
- status = "okay";
- };
-
-+&audmux {
-+ status = "okay";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+};
-+
- &i2c2 {
- codec: sgtl5000@a {
- compatible = "fsl,sgtl5000";
- reg = <0x0a>;
-+ clocks = <&clks IMX5_CLK_SSI_EXT1_GATE>;
-+ VDDA-supply = <&reg_3p2v>;
-+ VDDIO-supply = <&reg_3p2v>;
- };
-
- expander: pca9554@20 {
- compatible = "pca9554";
- reg = <0x20>;
- interrupts = <109>;
-+ #gpio-cells = <2>;
-+ gpio-controller;
- };
-
- sensor2: lm75@49 {
-@@ -99,6 +191,7 @@
- };
-
- &fec {
-+ phy-reset-gpios = <&gpio7 6 0>;
- status = "okay";
- };
-
-@@ -114,10 +207,24 @@
- status = "okay";
- };
-
-+&usbotg {
-+ dr_mode = "host";
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
-+};
-+
- &uart1 {
- status = "okay";
- };
-
-+&ssi2 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
- &uart2 {
- status = "okay";
- };
-@@ -133,3 +240,13 @@
- &i2c3 {
- status = "okay";
- };
-+
-+&tve {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_vga_sync_1>;
-+ i2c-ddc-bus = <&i2c3>;
-+ fsl,tve-mode = "vga";
-+ fsl,hsync-pin = <4>;
-+ fsl,vsync-pin = <6>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-qsb-common.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-qsb-common.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx53-qsb-common.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-qsb-common.dtsi 2014-04-21 13:50:39.058713648 +0200
-@@ -0,0 +1,345 @@
-+/*
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "imx53.dtsi"
-+
-+/ {
-+ memory {
-+ reg = <0x70000000 0x40000000>;
-+ };
-+
-+ display0: display@di0 {
-+ compatible = "fsl,imx-parallel-display";
-+ interface-pix-fmt = "rgb565";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ipu_disp0>;
-+ status = "disabled";
-+ display-timings {
-+ claawvga {
-+ native-mode;
-+ clock-frequency = <27000000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <40>;
-+ hfront-porch = <60>;
-+ vback-porch = <10>;
-+ vfront-porch = <10>;
-+ hsync-len = <20>;
-+ vsync-len = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+
-+ port {
-+ display0_in: endpoint {
-+ remote-endpoint = <&ipu_di0_disp0>;
-+ };
-+ };
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+
-+ power {
-+ label = "Power Button";
-+ gpios = <&gpio1 8 0>;
-+ linux,code = <116>; /* KEY_POWER */
-+ };
-+
-+ volume-up {
-+ label = "Volume Up";
-+ gpios = <&gpio2 14 0>;
-+ linux,code = <115>; /* KEY_VOLUMEUP */
-+ gpio-key,wakeup;
-+ };
-+
-+ volume-down {
-+ label = "Volume Down";
-+ gpios = <&gpio2 15 0>;
-+ linux,code = <114>; /* KEY_VOLUMEDOWN */
-+ gpio-key,wakeup;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&led_pin_gpio7_7>;
-+
-+ user {
-+ label = "Heartbeat";
-+ gpios = <&gpio7 7 0>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p2v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P2V";
-+ regulator-min-microvolt = <3200000>;
-+ regulator-max-microvolt = <3200000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_vbus: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "usb_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio7 8 0>;
-+ enable-active-high;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx53-qsb-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx53-qsb-sgtl5000";
-+ ssi-controller = <&ssi2>;
-+ audio-codec = <&sgtl5000>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <2>;
-+ mux-ext-port = <5>;
-+ };
-+};
-+
-+&esdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ status = "okay";
-+};
-+
-+&ipu_di0_disp0 {
-+ remote-endpoint = <&display0_in>;
-+};
-+
-+&ssi2 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&esdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc3>;
-+ cd-gpios = <&gpio3 11 0>;
-+ wp-gpios = <&gpio3 12 0>;
-+ bus-width = <8>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx53-qsb {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
-+ MX53_PAD_GPIO_8__GPIO1_8 0x80000000
-+ MX53_PAD_PATA_DATA14__GPIO2_14 0x80000000
-+ MX53_PAD_PATA_DATA15__GPIO2_15 0x80000000
-+ MX53_PAD_EIM_DA11__GPIO3_11 0x80000000
-+ MX53_PAD_EIM_DA12__GPIO3_12 0x80000000
-+ MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000
-+ MX53_PAD_PATA_DA_2__GPIO7_8 0x80000000
-+ MX53_PAD_GPIO_16__GPIO7_11 0x80000000
-+ >;
-+ };
-+
-+ led_pin_gpio7_7: led_gpio7_7@0 {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC 0x80000000
-+ MX53_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x80000000
-+ MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS 0x80000000
-+ MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
-+ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
-+ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
-+ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
-+ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
-+ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_esdhc3: esdhc3grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DATA8__ESDHC3_DAT0 0x1d5
-+ MX53_PAD_PATA_DATA9__ESDHC3_DAT1 0x1d5
-+ MX53_PAD_PATA_DATA10__ESDHC3_DAT2 0x1d5
-+ MX53_PAD_PATA_DATA11__ESDHC3_DAT3 0x1d5
-+ MX53_PAD_PATA_DATA0__ESDHC3_DAT4 0x1d5
-+ MX53_PAD_PATA_DATA1__ESDHC3_DAT5 0x1d5
-+ MX53_PAD_PATA_DATA2__ESDHC3_DAT6 0x1d5
-+ MX53_PAD_PATA_DATA3__ESDHC3_DAT7 0x1d5
-+ MX53_PAD_PATA_RESET_B__ESDHC3_CMD 0x1d5
-+ MX53_PAD_PATA_IORDY__ESDHC3_CLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-+ MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
-+ MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
-+ MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
-+ MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
-+ MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
-+ MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
-+ MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000
-+ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_ROW3__I2C2_SDA 0xc0000000
-+ MX53_PAD_KEY_COL3__I2C2_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_ipu_disp0: ipudisp0grp {
-+ fsl,pins = <
-+ MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK 0x5
-+ MX53_PAD_DI0_PIN15__IPU_DI0_PIN15 0x5
-+ MX53_PAD_DI0_PIN2__IPU_DI0_PIN2 0x5
-+ MX53_PAD_DI0_PIN3__IPU_DI0_PIN3 0x5
-+ MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0 0x5
-+ MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1 0x5
-+ MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2 0x5
-+ MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3 0x5
-+ MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4 0x5
-+ MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5 0x5
-+ MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6 0x5
-+ MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7 0x5
-+ MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8 0x5
-+ MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9 0x5
-+ MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10 0x5
-+ MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11 0x5
-+ MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12 0x5
-+ MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13 0x5
-+ MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14 0x5
-+ MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15 0x5
-+ MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16 0x5
-+ MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17 0x5
-+ MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18 0x5
-+ MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19 0x5
-+ MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20 0x5
-+ MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21 0x5
-+ MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22 0x5
-+ MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23 0x5
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX53_PAD_CSI0_DAT10__UART1_TXD_MUX 0x1e4
-+ MX53_PAD_CSI0_DAT11__UART1_RXD_MUX 0x1e4
-+ >;
-+ };
-+ };
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ sgtl5000: codec@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ VDDA-supply = <&reg_3p2v>;
-+ VDDIO-supply = <&reg_3p2v>;
-+ clocks = <&clks IMX5_CLK_SSI_EXT1_GATE>;
-+ };
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ accelerometer: mma8450@1c {
-+ compatible = "fsl,mma8450";
-+ reg = <0x1c>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ phy-mode = "rmii";
-+ phy-reset-gpios = <&gpio7 6 0>;
-+ status = "okay";
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-+
-+&vpu {
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <&reg_usb_vbus>;
-+ phy_type = "utmi";
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ dr_mode = "peripheral";
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-qsb.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-qsb.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-qsb.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-qsb.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -11,155 +11,14 @@
- */
-
- /dts-v1/;
--#include "imx53.dtsi"
-+#include "imx53-qsb-common.dtsi"
-
- / {
- model = "Freescale i.MX53 Quick Start Board";
- compatible = "fsl,imx53-qsb", "fsl,imx53";
--
-- memory {
-- reg = <0x70000000 0x40000000>;
-- };
--
-- gpio-keys {
-- compatible = "gpio-keys";
--
-- power {
-- label = "Power Button";
-- gpios = <&gpio1 8 0>;
-- linux,code = <116>; /* KEY_POWER */
-- gpio-key,wakeup;
-- };
--
-- volume-up {
-- label = "Volume Up";
-- gpios = <&gpio2 14 0>;
-- linux,code = <115>; /* KEY_VOLUMEUP */
-- };
--
-- volume-down {
-- label = "Volume Down";
-- gpios = <&gpio2 15 0>;
-- linux,code = <114>; /* KEY_VOLUMEDOWN */
-- };
-- };
--
-- leds {
-- compatible = "gpio-leds";
-- pinctrl-names = "default";
-- pinctrl-0 = <&led_pin_gpio7_7>;
--
-- user {
-- label = "Heartbeat";
-- gpios = <&gpio7 7 0>;
-- linux,default-trigger = "heartbeat";
-- };
-- };
--
-- regulators {
-- compatible = "simple-bus";
--
-- reg_3p2v: 3p2v {
-- compatible = "regulator-fixed";
-- regulator-name = "3P2V";
-- regulator-min-microvolt = <3200000>;
-- regulator-max-microvolt = <3200000>;
-- regulator-always-on;
-- };
-- };
--
-- sound {
-- compatible = "fsl,imx53-qsb-sgtl5000",
-- "fsl,imx-audio-sgtl5000";
-- model = "imx53-qsb-sgtl5000";
-- ssi-controller = <&ssi2>;
-- audio-codec = <&sgtl5000>;
-- audio-routing =
-- "MIC_IN", "Mic Jack",
-- "Mic Jack", "Mic Bias",
-- "Headphone Jack", "HP_OUT";
-- mux-int-port = <2>;
-- mux-ext-port = <5>;
-- };
--};
--
--&esdhc1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc1_1>;
-- cd-gpios = <&gpio3 13 0>;
-- status = "okay";
--};
--
--&ssi2 {
-- fsl,mode = "i2s-slave";
-- status = "okay";
--};
--
--&esdhc3 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc3_1>;
-- cd-gpios = <&gpio3 11 0>;
-- wp-gpios = <&gpio3 12 0>;
-- status = "okay";
--};
--
--&iomuxc {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_hog>;
--
-- hog {
-- pinctrl_hog: hoggrp {
-- fsl,pins = <
-- MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
-- MX53_PAD_GPIO_8__GPIO1_8 0x80000000
-- MX53_PAD_PATA_DATA14__GPIO2_14 0x80000000
-- MX53_PAD_PATA_DATA15__GPIO2_15 0x80000000
-- MX53_PAD_EIM_DA11__GPIO3_11 0x80000000
-- MX53_PAD_EIM_DA12__GPIO3_12 0x80000000
-- MX53_PAD_EIM_DA13__GPIO3_13 0x80000000
-- MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000
-- MX53_PAD_GPIO_16__GPIO7_11 0x80000000
-- >;
-- };
--
-- led_pin_gpio7_7: led_gpio7_7@0 {
-- fsl,pins = <
-- MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
-- >;
-- };
-- };
--
--};
--
--&uart1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1_1>;
-- status = "okay";
--};
--
--&i2c2 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c2_1>;
-- status = "okay";
--
-- sgtl5000: codec@0a {
-- compatible = "fsl,sgtl5000";
-- reg = <0x0a>;
-- VDDA-supply = <&reg_3p2v>;
-- VDDIO-supply = <&reg_3p2v>;
-- };
- };
-
- &i2c1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c1_1>;
-- status = "okay";
--
-- accelerometer: mma8450@1c {
-- compatible = "fsl,mma8450";
-- reg = <0x1c>;
-- };
--
- pmic: dialog@48 {
- compatible = "dlg,da9053-aa", "dlg,da9052";
- reg = <0x48>;
-@@ -254,17 +113,3 @@
- };
- };
- };
--
--&audmux {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_audmux_1>;
-- status = "okay";
--};
--
--&fec {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_fec_1>;
-- phy-mode = "rmii";
-- phy-reset-gpios = <&gpio7 6 0>;
-- status = "okay";
--};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-qsrb.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-qsrb.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-qsrb.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-qsrb.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,158 @@
-+/*
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx53-qsb-common.dtsi"
-+
-+/ {
-+ model = "Freescale i.MX53 Quick Start-R Board";
-+ compatible = "fsl,imx53-qsrb", "fsl,imx53";
-+};
-+
-+&iomuxc {
-+ i2c1 {
-+ /* open drain */
-+ pinctrl_i2c1_qsrb: i2c1grp-1 {
-+ fsl,pins = <
-+ MX53_PAD_CSI0_DAT8__I2C1_SDA 0x400001ec
-+ MX53_PAD_CSI0_DAT9__I2C1_SCL 0x400001ec
-+ >;
+ };
-+ };
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1_qsrb>;
-+ status = "okay";
-+
-+ pmic: mc34708@8 {
-+ compatible = "fsl,mc34708";
-+ reg = <0x08>;
-+ interrupt-parent = <&gpio5>;
-+ interrupts = <23 0x8>;
-+ regulators {
-+ sw1_reg: sw1a {
-+ regulator-name = "SW1";
-+ regulator-min-microvolt = <650000>;
-+ regulator-max-microvolt = <1437500>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw1b_reg: sw1b {
-+ regulator-name = "SW1B";
-+ regulator-min-microvolt = <650000>;
-+ regulator-max-microvolt = <1437500>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw2_reg: sw2 {
-+ regulator-name = "SW2";
-+ regulator-min-microvolt = <650000>;
-+ regulator-max-microvolt = <1437500>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3_reg: sw3 {
-+ regulator-name = "SW3";
-+ regulator-min-microvolt = <650000>;
-+ regulator-max-microvolt = <1425000>;
-+ regulator-boot-on;
-+ };
-+
-+ sw4a_reg: sw4a {
-+ regulator-name = "SW4A";
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw4b_reg: sw4b {
-+ regulator-name = "SW4B";
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw5_reg: sw5 {
-+ regulator-name = "SW5";
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ swbst_reg: swbst {
-+ regulator-name = "SWBST";
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vpll_reg: vpll {
-+ regulator-name = "VPLL";
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-boot-on;
-+ };
-+
-+ vrefddr_reg: vrefddr {
-+ regulator-name = "VREFDDR";
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vusb_reg: vusb {
-+ regulator-name = "VUSB";
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vusb2_reg: vusb2 {
-+ regulator-name = "VUSB2";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <3000000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vdac_reg: vdac {
-+ regulator-name = "VDAC";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2775000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vgen1_reg: vgen1 {
-+ regulator-name = "VGEN1";
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <1550000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vgen2_reg: vgen2 {
-+ regulator-name = "VGEN2";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+ };
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-smd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-smd.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-smd.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-smd.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -40,7 +40,7 @@
-
- &esdhc1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc1_1>;
-+ pinctrl-0 = <&pinctrl_esdhc1>;
- cd-gpios = <&gpio3 13 0>;
- wp-gpios = <&gpio4 11 0>;
- status = "okay";
-@@ -48,21 +48,21 @@
-
- &esdhc2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc2_1>;
-+ pinctrl-0 = <&pinctrl_esdhc2>;
- non-removable;
- status = "okay";
- };
-
- &uart3 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart3_1>;
-+ pinctrl-0 = <&pinctrl_uart3>;
- fsl,uart-has-rtscts;
- status = "okay";
- };
-
- &ecspi1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ecspi1_1>;
-+ pinctrl-0 = <&pinctrl_ecspi1>;
- fsl,spi-num-chipselects = <2>;
- cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>;
- status = "okay";
-@@ -95,7 +95,7 @@
-
- &esdhc3 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc3_1>;
-+ pinctrl-0 = <&pinctrl_esdhc3>;
- non-removable;
- status = "okay";
- };
-@@ -104,7 +104,7 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-
-- hog {
-+ imx53-smd {
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX53_PAD_PATA_DATA14__GPIO2_14 0x80000000
-@@ -116,24 +116,121 @@
- MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000
- >;
- };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D16__ECSPI1_SCLK 0x80000000
-+ MX53_PAD_EIM_D17__ECSPI1_MISO 0x80000000
-+ MX53_PAD_EIM_D18__ECSPI1_MOSI 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
-+ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
-+ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
-+ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
-+ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
-+ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_esdhc2: esdhc2grp {
-+ fsl,pins = <
-+ MX53_PAD_SD2_CMD__ESDHC2_CMD 0x1d5
-+ MX53_PAD_SD2_CLK__ESDHC2_CLK 0x1d5
-+ MX53_PAD_SD2_DATA0__ESDHC2_DAT0 0x1d5
-+ MX53_PAD_SD2_DATA1__ESDHC2_DAT1 0x1d5
-+ MX53_PAD_SD2_DATA2__ESDHC2_DAT2 0x1d5
-+ MX53_PAD_SD2_DATA3__ESDHC2_DAT3 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_esdhc3: esdhc3grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DATA8__ESDHC3_DAT0 0x1d5
-+ MX53_PAD_PATA_DATA9__ESDHC3_DAT1 0x1d5
-+ MX53_PAD_PATA_DATA10__ESDHC3_DAT2 0x1d5
-+ MX53_PAD_PATA_DATA11__ESDHC3_DAT3 0x1d5
-+ MX53_PAD_PATA_DATA0__ESDHC3_DAT4 0x1d5
-+ MX53_PAD_PATA_DATA1__ESDHC3_DAT5 0x1d5
-+ MX53_PAD_PATA_DATA2__ESDHC3_DAT6 0x1d5
-+ MX53_PAD_PATA_DATA3__ESDHC3_DAT7 0x1d5
-+ MX53_PAD_PATA_RESET_B__ESDHC3_CMD 0x1d5
-+ MX53_PAD_PATA_IORDY__ESDHC3_CLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-+ MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
-+ MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
-+ MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
-+ MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
-+ MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
-+ MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
-+ MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000
-+ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_ROW3__I2C2_SDA 0xc0000000
-+ MX53_PAD_KEY_COL3__I2C2_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX53_PAD_CSI0_DAT10__UART1_TXD_MUX 0x1e4
-+ MX53_PAD_CSI0_DAT11__UART1_RXD_MUX 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMARQ__UART2_TXD_MUX 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_CS_0__UART3_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_CS_1__UART3_RXD_MUX 0x1e4
-+ MX53_PAD_PATA_DA_1__UART3_CTS 0x1e4
-+ MX53_PAD_PATA_DA_2__UART3_RTS 0x1e4
-+ >;
-+ };
- };
- };
-
- &uart1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1_1>;
-+ pinctrl-0 = <&pinctrl_uart1>;
- status = "okay";
- };
-
- &uart2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart2_1>;
-+ pinctrl-0 = <&pinctrl_uart2>;
- status = "okay";
- };
-
- &i2c2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c2_1>;
-+ pinctrl-0 = <&pinctrl_i2c2>;
- status = "okay";
-
- codec: sgtl5000@0a {
-@@ -154,7 +251,7 @@
-
- &i2c1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c1_1>;
-+ pinctrl-0 = <&pinctrl_i2c1>;
- status = "okay";
-
- accelerometer: mma8450@1c {
-@@ -175,7 +272,7 @@
-
- &fec {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_fec_1>;
-+ pinctrl-0 = <&pinctrl_fec>;
- phy-mode = "rmii";
- phy-reset-gpios = <&gpio7 6 0>;
- status = "okay";
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-tqma53.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tqma53.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx53-tqma53.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tqma53.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -22,9 +22,12 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_3p3v: 3p3v {
-+ reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
-@@ -35,7 +38,9 @@
-
- &esdhc2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc2_1>;
-+ pinctrl-0 = <&pinctrl_esdhc2>,
-+ <&pinctrl_esdhc2_cdwp>;
-+ vmmc-supply = <&reg_3p3v>;
- wp-gpios = <&gpio1 2 0>;
- cd-gpios = <&gpio1 4 0>;
- status = "disabled";
-@@ -43,13 +48,13 @@
-
- &uart3 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart3_2>;
-+ pinctrl-0 = <&pinctrl_uart3>;
- status = "disabled";
- };
-
- &ecspi1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ecspi1_1>;
-+ pinctrl-0 = <&pinctrl_ecspi1>;
- fsl,spi-num-chipselects = <4>;
- cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>,
- <&gpio3 24 0>, <&gpio3 25 0>;
-@@ -58,7 +63,7 @@
-
- &esdhc3 { /* EMMC */
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_esdhc3_1>;
-+ pinctrl-0 = <&pinctrl_esdhc3>;
- vmmc-supply = <&reg_3p3v>;
- non-removable;
- bus-width = <8>;
-@@ -69,31 +74,142 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-
-- i2s {
-- pinctrl_i2s_1: i2s-grp1 {
-+ imx53-tqma53 {
-+ pinctrl_hog: hoggrp {
- fsl,pins = <
-- MX53_PAD_GPIO_19__GPIO4_5 0x10000 /* I2S_MCLK */
-- MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC 0x10000 /* I2S_SCLK */
-- MX53_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x10000 /* I2S_DOUT */
-- MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS 0x10000 /* I2S_LRCLK */
-- MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x10000 /* I2S_DIN */
-+ MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000 /* SSI_MCLK */
-+ MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000 /* LCD_BLT_EN */
-+ MX53_PAD_PATA_DA_2__GPIO7_8 0x80000000 /* LCD_RESET */
-+ MX53_PAD_PATA_DATA5__GPIO2_5 0x80000000 /* LCD_POWER */
-+ MX53_PAD_PATA_DATA6__GPIO2_6 0x80000000 /* PMIC_INT */
-+ MX53_PAD_PATA_DATA14__GPIO2_14 0x80000000 /* CSI_RST */
-+ MX53_PAD_PATA_DATA15__GPIO2_15 0x80000000 /* CSI_PWDN */
-+ MX53_PAD_GPIO_19__GPIO4_5 0x80000000 /* #SYSTEM_DOWN */
-+ MX53_PAD_GPIO_3__GPIO1_3 0x80000000
-+ MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000 /* #PHY_RESET */
-+ MX53_PAD_GPIO_1__PWM2_PWMO 0x80000000 /* LCD_CONTRAST */
- >;
- };
-- };
-
-- hog {
-- pinctrl_hog: hoggrp {
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC 0x80000000
-+ MX53_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x80000000
-+ MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS 0x80000000
-+ MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_can1: can1grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL2__CAN1_TXCAN 0x80000000
-+ MX53_PAD_KEY_ROW2__CAN1_RXCAN 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_can2: can2grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL4__CAN2_TXCAN 0x80000000
-+ MX53_PAD_KEY_ROW4__CAN2_RXCAN 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_cspi: cspigrp {
-+ fsl,pins = <
-+ MX53_PAD_SD1_DATA0__CSPI_MISO 0x1d5
-+ MX53_PAD_SD1_CMD__CSPI_MOSI 0x1d5
-+ MX53_PAD_SD1_CLK__CSPI_SCLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D16__ECSPI1_SCLK 0x80000000
-+ MX53_PAD_EIM_D17__ECSPI1_MISO 0x80000000
-+ MX53_PAD_EIM_D18__ECSPI1_MOSI 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc2: esdhc2grp {
-+ fsl,pins = <
-+ MX53_PAD_SD2_CMD__ESDHC2_CMD 0x1d5
-+ MX53_PAD_SD2_CLK__ESDHC2_CLK 0x1d5
-+ MX53_PAD_SD2_DATA0__ESDHC2_DAT0 0x1d5
-+ MX53_PAD_SD2_DATA1__ESDHC2_DAT1 0x1d5
-+ MX53_PAD_SD2_DATA2__ESDHC2_DAT2 0x1d5
-+ MX53_PAD_SD2_DATA3__ESDHC2_DAT3 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_esdhc2_cdwp: esdhc2cdwp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_4__GPIO1_4 0x80000000 /* SD2_CD */
-+ MX53_PAD_GPIO_2__GPIO1_2 0x80000000 /* SD2_WP */
-+ >;
-+ };
-+
-+ pinctrl_esdhc3: esdhc3grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DATA8__ESDHC3_DAT0 0x1d5
-+ MX53_PAD_PATA_DATA9__ESDHC3_DAT1 0x1d5
-+ MX53_PAD_PATA_DATA10__ESDHC3_DAT2 0x1d5
-+ MX53_PAD_PATA_DATA11__ESDHC3_DAT3 0x1d5
-+ MX53_PAD_PATA_DATA0__ESDHC3_DAT4 0x1d5
-+ MX53_PAD_PATA_DATA1__ESDHC3_DAT5 0x1d5
-+ MX53_PAD_PATA_DATA2__ESDHC3_DAT6 0x1d5
-+ MX53_PAD_PATA_DATA3__ESDHC3_DAT7 0x1d5
-+ MX53_PAD_PATA_RESET_B__ESDHC3_CMD 0x1d5
-+ MX53_PAD_PATA_IORDY__ESDHC3_CLK 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-+ MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
-+ MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
-+ MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
-+ MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
-+ MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
-+ MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
-+ MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_ROW3__I2C2_SDA 0xc0000000
-+ MX53_PAD_KEY_COL3__I2C2_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_6__I2C3_SDA 0xc0000000
-+ MX53_PAD_GPIO_5__I2C3_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DIOW__UART1_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMACK__UART1_RXD_MUX 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMARQ__UART2_TXD_MUX 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
- fsl,pins = <
-- MX53_PAD_EIM_CS1__IPU_DI1_PIN6 0x10000 /* VSYNC */
-- MX53_PAD_EIM_DA15__IPU_DI1_PIN4 0x10000 /* HSYNC */
-- MX53_PAD_PATA_DA_1__GPIO7_7 0x10000 /* LCD_BLT_EN */
-- MX53_PAD_PATA_DA_2__GPIO7_8 0x10000 /* LCD_RESET */
-- MX53_PAD_PATA_DATA5__GPIO2_5 0x10000 /* LCD_POWER */
-- MX53_PAD_PATA_DATA6__GPIO2_6 0x10000 /* PMIC_INT */
-- MX53_PAD_PATA_DATA14__GPIO2_14 0x10000 /* CSI_RST */
-- MX53_PAD_PATA_DATA15__GPIO2_15 0x10000 /* CSI_PWDN */
-- MX53_PAD_GPIO_0__GPIO1_0 0x10000 /* SYSTEM_DOWN */
-- MX53_PAD_GPIO_3__GPIO1_3 0x10000
-+ MX53_PAD_PATA_CS_0__UART3_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_CS_1__UART3_RXD_MUX 0x1e4
- >;
- };
};
-@@ -101,38 +217,38 @@
-
- &uart1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1_2>;
-+ pinctrl-0 = <&pinctrl_uart1>;
- fsl,uart-has-rtscts;
- status = "disabled";
- };
-
- &uart2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart2_1>;
-+ pinctrl-0 = <&pinctrl_uart2>;
- status = "disabled";
- };
-
- &can1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_can1_2>;
-+ pinctrl-0 = <&pinctrl_can1>;
- status = "disabled";
- };
-
- &can2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_can2_1>;
-+ pinctrl-0 = <&pinctrl_can2>;
- status = "disabled";
- };
-
- &i2c3 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c3_1>;
-+ pinctrl-0 = <&pinctrl_i2c3>;
- status = "disabled";
- };
-
- &cspi {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_cspi_1>;
-+ pinctrl-0 = <&pinctrl_cspi>;
- fsl,spi-num-chipselects = <3>;
- cs-gpios = <&gpio1 18 0>, <&gpio1 19 0>,
- <&gpio1 21 0>;
-@@ -141,7 +257,7 @@
-
- &i2c2 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c2_1>;
-+ pinctrl-0 = <&pinctrl_i2c2>;
- status = "okay";
-
- pmic: mc34708@8 {
-@@ -149,7 +265,7 @@
- reg = <0x8>;
- fsl,mc13xxx-uses-rtc;
- interrupt-parent = <&gpio2>;
-- interrupts = <6 8>; /* PDATA_DATA6, low active */
-+ interrupts = <6 4>; /* PATA_DATA6, active high */
- };
-
- sensor1: lm75@48 {
-@@ -166,7 +282,7 @@
-
- &fec {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_fec_1>;
-+ pinctrl-0 = <&pinctrl_fec>;
- phy-mode = "rmii";
- status = "disabled";
};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-tx53.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tx53.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx53-tx53.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tx53.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,550 @@
-+/*
-+ * Copyright 2012 <LW@KARO-electronics.de>
-+ * based on imx53-qsb.dts
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "imx53.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+ model = "Ka-Ro electronics TX53 module";
-+ compatible = "karo,tx53", "fsl,imx53";
-+
-+ aliases {
-+ can0 = &can2; /* Make the can interface indices consistent with TX28/TX48 modules */
-+ can1 = &can1;
-+ ipu = &ipu;
-+ reg_can_xcvr = &reg_can_xcvr;
-+ usbh1 = &usbh1;
-+ usbotg = &usbotg;
-+ };
-+
-+ clocks {
-+ ckih1 {
-+ clock-frequency = <0>;
-+ };
-+
-+ mclk: clock@0 {
-+ compatible = "fixed-clock";
-+ reg = <0>;
-+ #clock-cells = <0>;
-+ clock-frequency = <27000000>;
-+ };
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_key>;
-+
-+ power {
-+ label = "Power Button";
-+ gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
-+ linux,code = <116>; /* KEY_POWER */
-+ gpio-key,wakeup;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_stk5led>;
-+
-+ user {
-+ label = "Heartbeat";
-+ gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_2v5: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "2V5";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ };
-+
-+ reg_3v3: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ reg_can_xcvr: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "CAN XCVR";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_can_xcvr>;
-+ gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
-+ };
-+
-+ reg_usbh1_vbus: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "usbh1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh1_vbus>;
-+ gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+
-+ reg_usbotg_vbus: regulator@4 {
-+ compatible = "regulator-fixed";
-+ reg = <4>;
-+ regulator-name = "usbotg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg_vbus>;
-+ gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "karo,tx53-audio-sgtl5000", "fsl,imx-audio-sgtl5000";
-+ model = "tx53-audio-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&sgtl5000>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ /* '1' based port numbers according to datasheet names */
-+ mux-int-port = <1>;
-+ mux-ext-port = <5>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ssi1>;
-+ status = "okay";
-+};
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_can1>;
-+ xceiver-supply = <&reg_can_xcvr>;
-+ status = "okay";
-+};
-+
-+&can2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_can2>;
-+ xceiver-supply = <&reg_can_xcvr>;
-+ status = "okay";
-+};
-+
-+&ecspi1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
-+ fsl,spi-num-chipselects = <2>;
-+ status = "okay";
-+
-+ cs-gpios = <
-+ &gpio2 30 GPIO_ACTIVE_HIGH
-+ &gpio3 19 GPIO_ACTIVE_HIGH
-+ >;
-+
-+ spidev0: spi@0 {
-+ compatible = "spidev";
-+ reg = <0>;
-+ spi-max-frequency = <54000000>;
-+ };
-+
-+ spidev1: spi@1 {
-+ compatible = "spidev";
-+ reg = <1>;
-+ spi-max-frequency = <54000000>;
-+ };
-+};
-+
-+&esdhc1 {
-+ cd-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
-+ fsl,wp-controller;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ status = "okay";
-+};
-+
-+&esdhc2 {
-+ cd-gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>;
-+ fsl,wp-controller;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc2>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ phy-mode = "rmii";
-+ phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_HIGH>;
-+ phy-handle = <&phy0>;
-+ mac-address = [000000000000]; /* placeholder; will be overwritten by bootloader */
-+ status = "okay";
-+
-+ phy0: ethernet-phy@0 {
-+ interrupt-parent = <&gpio2>;
-+ interrupts = <4>;
-+ device_type = "ethernet-phy";
-+ };
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ clock-frequency = <400000>;
-+ status = "okay";
-+
-+ rtc1: ds1339@68 {
-+ compatible = "dallas,ds1339";
-+ reg = <0x68>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ds1339>;
-+ interrupt-parent = <&gpio4>;
-+ interrupts = <20 0>;
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx53-tx53 {
-+ pinctrl_hog: hoggrp {
-+ /* pins not in use by any device on the Starterkit board series */
-+ fsl,pins = <
-+ /* CMOS Sensor Interface */
-+ MX53_PAD_CSI0_DAT12__GPIO5_30 0x1f4
-+ MX53_PAD_CSI0_DAT13__GPIO5_31 0x1f4
-+ MX53_PAD_CSI0_DAT14__GPIO6_0 0x1f4
-+ MX53_PAD_CSI0_DAT15__GPIO6_1 0x1f4
-+ MX53_PAD_CSI0_DAT16__GPIO6_2 0x1f4
-+ MX53_PAD_CSI0_DAT17__GPIO6_3 0x1f4
-+ MX53_PAD_CSI0_DAT18__GPIO6_4 0x1f4
-+ MX53_PAD_CSI0_DAT19__GPIO6_5 0x1f4
-+ MX53_PAD_CSI0_MCLK__GPIO5_19 0x1f4
-+ MX53_PAD_CSI0_VSYNC__GPIO5_21 0x1f4
-+ MX53_PAD_CSI0_PIXCLK__GPIO5_18 0x1f4
-+ MX53_PAD_GPIO_0__GPIO1_0 0x1f4
-+ /* Module Specific Signal */
-+ /* MX53_PAD_NANDF_CS2__GPIO6_15 0x1f4 maybe used by EDT-FT5x06 */
-+ /* MX53_PAD_EIM_A16__GPIO2_22 0x1f4 maybe used by EDT-FT5x06 */
-+ MX53_PAD_EIM_D29__GPIO3_29 0x1f4
-+ MX53_PAD_EIM_EB3__GPIO2_31 0x1f4
-+ /* MX53_PAD_EIM_A17__GPIO2_21 0x1f4 maybe used by EDT-FT5x06 */
-+ /* MX53_PAD_EIM_A18__GPIO2_20 0x1f4 used by LED */
-+ MX53_PAD_EIM_A19__GPIO2_19 0x1f4
-+ MX53_PAD_EIM_A20__GPIO2_18 0x1f4
-+ MX53_PAD_EIM_A21__GPIO2_17 0x1f4
-+ MX53_PAD_EIM_A22__GPIO2_16 0x1f4
-+ MX53_PAD_EIM_A23__GPIO6_6 0x1f4
-+ MX53_PAD_EIM_A24__GPIO5_4 0x1f4
-+ MX53_PAD_CSI0_DAT8__GPIO5_26 0x1f4
-+ MX53_PAD_CSI0_DAT9__GPIO5_27 0x1f4
-+ MX53_PAD_CSI0_DAT10__GPIO5_28 0x1f4
-+ MX53_PAD_CSI0_DAT11__GPIO5_29 0x1f4
-+ /* MX53_PAD_EIM_D22__GPIO3_22 0x1f4 maybe used by EETI touchpanel driver */
-+ /* MX53_PAD_EIM_D23__GPIO3_23 0x1f4 maybe used by EETI touchpanel driver */
-+ MX53_PAD_GPIO_13__GPIO4_3 0x1f4
-+ MX53_PAD_EIM_CS0__GPIO2_23 0x1f4
-+ MX53_PAD_EIM_CS1__GPIO2_24 0x1f4
-+ MX53_PAD_CSI0_DATA_EN__GPIO5_20 0x1f4
-+ MX53_PAD_EIM_WAIT__GPIO5_0 0x1f4
-+ MX53_PAD_EIM_EB0__GPIO2_28 0x1f4
-+ MX53_PAD_EIM_EB1__GPIO2_29 0x1f4
-+ MX53_PAD_EIM_OE__GPIO2_25 0x1f4
-+ MX53_PAD_EIM_LBA__GPIO2_27 0x1f4
-+ MX53_PAD_EIM_RW__GPIO2_26 0x1f4
-+ MX53_PAD_EIM_DA8__GPIO3_8 0x1f4
-+ MX53_PAD_EIM_DA9__GPIO3_9 0x1f4
-+ MX53_PAD_EIM_DA10__GPIO3_10 0x1f4
-+ MX53_PAD_EIM_DA11__GPIO3_11 0x1f4
-+ MX53_PAD_EIM_DA12__GPIO3_12 0x1f4
-+ MX53_PAD_EIM_DA13__GPIO3_13 0x1f4
-+ MX53_PAD_EIM_DA14__GPIO3_14 0x1f4
-+ MX53_PAD_EIM_DA15__GPIO3_15 0x1f4
-+ >;
-+ };
-+
-+ pinctrl_can1: can1grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_7__CAN1_TXCAN 0x80000000
-+ MX53_PAD_GPIO_8__CAN1_RXCAN 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_can2: can2grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL4__CAN2_TXCAN 0x80000000
-+ MX53_PAD_KEY_ROW4__CAN2_RXCAN 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_can_xcvr: can-xcvrgrp {
-+ fsl,pins = <MX53_PAD_DISP0_DAT0__GPIO4_21 0xe0>; /* Flexcan XCVR enable */
-+ };
-+
-+ pinctrl_ds1339: ds1339grp {
-+ fsl,pins = <MX53_PAD_DI0_PIN4__GPIO4_20 0xe0>;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_19__ECSPI1_RDY 0x80000000
-+ MX53_PAD_EIM_EB2__ECSPI1_SS0 0x80000000
-+ MX53_PAD_EIM_D16__ECSPI1_SCLK 0x80000000
-+ MX53_PAD_EIM_D17__ECSPI1_MISO 0x80000000
-+ MX53_PAD_EIM_D18__ECSPI1_MOSI 0x80000000
-+ MX53_PAD_EIM_D19__ECSPI1_SS1 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
-+ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5
-+ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
-+ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
-+ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
-+ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
-+ MX53_PAD_EIM_D24__GPIO3_24 0x1f0
-+ >;
-+ };
-+
-+ pinctrl_esdhc2: esdhc2grp {
-+ fsl,pins = <
-+ MX53_PAD_SD2_CMD__ESDHC2_CMD 0x1d5
-+ MX53_PAD_SD2_CLK__ESDHC2_CLK 0x1d5
-+ MX53_PAD_SD2_DATA0__ESDHC2_DAT0 0x1d5
-+ MX53_PAD_SD2_DATA1__ESDHC2_DAT1 0x1d5
-+ MX53_PAD_SD2_DATA2__ESDHC2_DAT2 0x1d5
-+ MX53_PAD_SD2_DATA3__ESDHC2_DAT3 0x1d5
-+ MX53_PAD_EIM_D25__GPIO3_25 0x1f0
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-+ MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
-+ MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
-+ MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
-+ MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
-+ MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
-+ MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
-+ MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_gpio_key: gpio-keygrp {
-+ fsl,pins = <MX53_PAD_EIM_A25__GPIO5_2 0x1f4>;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000
-+ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_3__I2C3_SCL 0xc0000000
-+ MX53_PAD_GPIO_6__I2C3_SDA 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_nand: nandgrp {
-+ fsl,pins = <
-+ MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B 0x4
-+ MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B 0x4
-+ MX53_PAD_NANDF_CLE__EMI_NANDF_CLE 0x4
-+ MX53_PAD_NANDF_ALE__EMI_NANDF_ALE 0x4
-+ MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B 0xe0
-+ MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0 0xe0
-+ MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0 0x4
-+ MX53_PAD_EIM_DA0__EMI_NAND_WEIM_DA_0 0xa4
-+ MX53_PAD_EIM_DA1__EMI_NAND_WEIM_DA_1 0xa4
-+ MX53_PAD_EIM_DA2__EMI_NAND_WEIM_DA_2 0xa4
-+ MX53_PAD_EIM_DA3__EMI_NAND_WEIM_DA_3 0xa4
-+ MX53_PAD_EIM_DA4__EMI_NAND_WEIM_DA_4 0xa4
-+ MX53_PAD_EIM_DA5__EMI_NAND_WEIM_DA_5 0xa4
-+ MX53_PAD_EIM_DA6__EMI_NAND_WEIM_DA_6 0xa4
-+ MX53_PAD_EIM_DA7__EMI_NAND_WEIM_DA_7 0xa4
-+ >;
-+ };
-+
-+ pinctrl_pwm2: pwm2grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_1__PWM2_PWMO 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_ssi1: ssi1grp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC 0x80000000
-+ MX53_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x80000000
-+ MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS 0x80000000
-+ MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_ssi2: ssi2grp {
-+ fsl,pins = <
-+ MX53_PAD_CSI0_DAT4__AUDMUX_AUD3_TXC 0x80000000
-+ MX53_PAD_CSI0_DAT5__AUDMUX_AUD3_TXD 0x80000000
-+ MX53_PAD_CSI0_DAT6__AUDMUX_AUD3_TXFS 0x80000000
-+ MX53_PAD_CSI0_DAT7__AUDMUX_AUD3_RXD 0x80000000
-+ MX53_PAD_EIM_D27__GPIO3_27 0x1f0
-+ >;
-+ };
-+
-+ pinctrl_stk5led: stk5ledgrp {
-+ fsl,pins = <MX53_PAD_EIM_A18__GPIO2_20 0xc0>;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DIOW__UART1_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMACK__UART1_RXD_MUX 0x1e4
-+ MX53_PAD_PATA_RESET_B__UART1_CTS 0x1c5
-+ MX53_PAD_PATA_IORDY__UART1_RTS 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX 0x1c5
-+ MX53_PAD_PATA_DMARQ__UART2_TXD_MUX 0x1c5
-+ MX53_PAD_PATA_DIOR__UART2_RTS 0x1c5
-+ MX53_PAD_PATA_INTRQ__UART2_CTS 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_CS_0__UART3_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_CS_1__UART3_RXD_MUX 0x1e4
-+ MX53_PAD_PATA_DA_1__UART3_CTS 0x1e4
-+ MX53_PAD_PATA_DA_2__UART3_RTS 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_usbh1: usbh1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D30__GPIO3_30 0x100 /* OC */
-+ >;
-+ };
-+
-+ pinctrl_usbh1_vbus: usbh1-vbusgrp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D31__GPIO3_31 0xe0 /* VBUS ENABLE */
-+ >;
-+ };
-+
-+ pinctrl_usbotg_vbus: usbotg-vbusgrp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_7__GPIO1_7 0xe0 /* VBUS ENABLE */
-+ MX53_PAD_GPIO_8__GPIO1_8 0x100 /* OC */
-+ >;
-+ };
-+ };
-+};
-+
-+&ipu {
-+ status = "okay";
-+};
-+
-+&nfc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_nand>;
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-+
-+&pwm2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm2>;
-+ #pwm-cells = <3>;
-+};
-+
-+&sdma {
-+ fsl,sdma-ram-script-name = "sdma-imx53.bin";
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ codec-handle = <&sgtl5000>;
-+ status = "okay";
-+};
-+
-+&ssi2 {
-+ status = "disabled";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh1>;
-+ phy_type = "utmi";
-+ disable-over-current;
-+ vbus-supply = <&reg_usbh1_vbus>;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ phy_type = "utmi";
-+ dr_mode = "peripheral";
-+ disable-over-current;
-+ vbus-supply = <&reg_usbotg_vbus>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-tx53-x03x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tx53-x03x.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-tx53-x03x.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tx53-x03x.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,315 @@
-+/*
-+ * Copyright 2013 Lothar Waßmann <LW@KARO-electronics.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx53-tx53.dtsi"
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/pwm/pwm.h>
-+
-+/ {
-+ model = "Ka-Ro electronics TX53 module (LCD)";
-+ compatible = "karo,tx53", "fsl,imx53";
-+
-+ aliases {
-+ display = &display;
-+ };
-+
-+ soc {
-+ display: display@di0 {
-+ compatible = "fsl,imx-parallel-display";
-+ crtcs = <&ipu 0>;
-+ interface-pix-fmt = "rgb24";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_rgb24_vga1>;
-+ status = "okay";
-+
-+ display-timings {
-+ VGA {
-+ clock-frequency = <25200000>;
-+ hactive = <640>;
-+ vactive = <480>;
-+ hback-porch = <48>;
-+ hsync-len = <96>;
-+ hfront-porch = <16>;
-+ vback-porch = <31>;
-+ vsync-len = <2>;
-+ vfront-porch = <12>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+
-+ ETV570 {
-+ clock-frequency = <25200000>;
-+ hactive = <640>;
-+ vactive = <480>;
-+ hback-porch = <114>;
-+ hsync-len = <30>;
-+ hfront-porch = <16>;
-+ vback-porch = <32>;
-+ vsync-len = <3>;
-+ vfront-porch = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+
-+ ET0350 {
-+ clock-frequency = <6413760>;
-+ hactive = <320>;
-+ vactive = <240>;
-+ hback-porch = <34>;
-+ hsync-len = <34>;
-+ hfront-porch = <20>;
-+ vback-porch = <15>;
-+ vsync-len = <3>;
-+ vfront-porch = <4>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+
-+ ET0430 {
-+ clock-frequency = <9009000>;
-+ hactive = <480>;
-+ vactive = <272>;
-+ hback-porch = <2>;
-+ hsync-len = <41>;
-+ hfront-porch = <2>;
-+ vback-porch = <2>;
-+ vsync-len = <10>;
-+ vfront-porch = <2>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
-+ };
-+
-+ ET0500 {
-+ clock-frequency = <33264000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <88>;
-+ hsync-len = <128>;
-+ hfront-porch = <40>;
-+ vback-porch = <33>;
-+ vsync-len = <2>;
-+ vfront-porch = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+
-+ ET0700 { /* same as ET0500 */
-+ clock-frequency = <33264000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <88>;
-+ hsync-len = <128>;
-+ hfront-porch = <40>;
-+ vback-porch = <33>;
-+ vsync-len = <2>;
-+ vfront-porch = <10>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+
-+ ETQ570 {
-+ clock-frequency = <6596040>;
-+ hactive = <320>;
-+ vactive = <240>;
-+ hback-porch = <38>;
-+ hsync-len = <30>;
-+ hfront-porch = <30>;
-+ vback-porch = <16>;
-+ vsync-len = <3>;
-+ vfront-porch = <4>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+ };
-+ };
-+
-+ backlight: backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-+ power-supply = <&reg_3v3>;
-+ brightness-levels = <
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32 33 34 35 36 37 38 39
-+ 40 41 42 43 44 45 46 47 48 49
-+ 50 51 52 53 54 55 56 57 58 59
-+ 60 61 62 63 64 65 66 67 68 69
-+ 70 71 72 73 74 75 76 77 78 79
-+ 80 81 82 83 84 85 86 87 88 89
-+ 90 91 92 93 94 95 96 97 98 99
-+ 100
-+ >;
-+ default-brightness-level = <50>;
-+ };
-+
-+ regulators {
-+ reg_lcd_pwr: regulator@5 {
-+ compatible = "regulator-fixed";
-+ reg = <5>;
-+ regulator-name = "LCD POWER";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ regulator-boot-on;
-+ };
-+
-+ reg_lcd_reset: regulator@6 {
-+ compatible = "regulator-fixed";
-+ reg = <6>;
-+ regulator-name = "LCD RESET";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ regulator-boot-on;
-+ };
-+ };
-+};
-+
-+&i2c3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+
-+ sgtl5000: codec@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ VDDA-supply = <&reg_2v5>;
-+ VDDIO-supply = <&reg_3v3>;
-+ clocks = <&mclk>;
-+ };
-+
-+ polytouch: edt-ft5x06@38 {
-+ compatible = "edt,edt-ft5x06";
-+ reg = <0x38>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_edt_ft5x06_1>;
-+ interrupt-parent = <&gpio6>;
-+ interrupts = <15 0>;
-+ reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
-+ wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
-+ };
-+
-+ touchscreen: tsc2007@48 {
-+ compatible = "ti,tsc2007";
-+ reg = <0x48>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_tsc2007>;
-+ interrupt-parent = <&gpio3>;
-+ interrupts = <26 0>;
-+ gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
-+ ti,x-plate-ohms = <660>;
-+ linux,wakeup;
-+ };
-+};
-+
-+&iomuxc {
-+ imx53-tx53-x03x {
-+ pinctrl_edt_ft5x06_1: edt-ft5x06grp-1 {
-+ fsl,pins = <
-+ MX53_PAD_NANDF_CS2__GPIO6_15 0x1f0 /* Interrupt */
-+ MX53_PAD_EIM_A16__GPIO2_22 0x04 /* Reset */
-+ MX53_PAD_EIM_A17__GPIO2_21 0x04 /* Wake */
-+ >;
-+ };
-+
-+ pinctrl_kpp: kppgrp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_9__KPP_COL_6 0x1f4
-+ MX53_PAD_GPIO_4__KPP_COL_7 0x1f4
-+ MX53_PAD_KEY_COL2__KPP_COL_2 0x1f4
-+ MX53_PAD_KEY_COL3__KPP_COL_3 0x1f4
-+ MX53_PAD_GPIO_2__KPP_ROW_6 0x1f4
-+ MX53_PAD_GPIO_5__KPP_ROW_7 0x1f4
-+ MX53_PAD_KEY_ROW2__KPP_ROW_2 0x1f4
-+ MX53_PAD_KEY_ROW3__KPP_ROW_3 0x1f4
-+ >;
-+ };
-+
-+ pinctrl_rgb24_vga1: rgb24-vgagrp1 {
-+ fsl,pins = <
-+ MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK 0x5
-+ MX53_PAD_DI0_PIN15__IPU_DI0_PIN15 0x5
-+ MX53_PAD_DI0_PIN2__IPU_DI0_PIN2 0x5
-+ MX53_PAD_DI0_PIN3__IPU_DI0_PIN3 0x5
-+ MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0 0x5
-+ MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1 0x5
-+ MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2 0x5
-+ MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3 0x5
-+ MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4 0x5
-+ MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5 0x5
-+ MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6 0x5
-+ MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7 0x5
-+ MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8 0x5
-+ MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9 0x5
-+ MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10 0x5
-+ MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11 0x5
-+ MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12 0x5
-+ MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13 0x5
-+ MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14 0x5
-+ MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15 0x5
-+ MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16 0x5
-+ MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17 0x5
-+ MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18 0x5
-+ MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19 0x5
-+ MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20 0x5
-+ MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21 0x5
-+ MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22 0x5
-+ MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23 0x5
-+ >;
-+ };
-+
-+ pinctrl_tsc2007: tsc2007grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D26__GPIO3_26 0x1f0 /* Interrupt */
-+ >;
-+ };
-+ };
-+};
-+
-+&kpp {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_kpp>;
-+ /* sample keymap */
-+ /* row/col 0,1 are mapped to KPP row/col 6,7 */
-+ linux,keymap = <
-+ MATRIX_KEY(6, 6, KEY_POWER)
-+ MATRIX_KEY(6, 7, KEY_KP0)
-+ MATRIX_KEY(6, 2, KEY_KP1)
-+ MATRIX_KEY(6, 3, KEY_KP2)
-+ MATRIX_KEY(7, 6, KEY_KP3)
-+ MATRIX_KEY(7, 7, KEY_KP4)
-+ MATRIX_KEY(7, 2, KEY_KP5)
-+ MATRIX_KEY(7, 3, KEY_KP6)
-+ MATRIX_KEY(2, 6, KEY_KP7)
-+ MATRIX_KEY(2, 7, KEY_KP8)
-+ MATRIX_KEY(2, 2, KEY_KP9)
-+ >;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-tx53-x13x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tx53-x13x.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-tx53-x13x.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-tx53-x13x.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,243 @@
-+/*
-+ * Copyright 2013 Lothar Waßmann <LW@KARO-electronics.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx53-tx53.dtsi"
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+ model = "Ka-Ro electronics TX53 module (LVDS)";
-+ compatible = "karo,tx53", "fsl,imx53";
-+
-+ aliases {
-+ display = &lvds0;
-+ lvds0 = &lvds0;
-+ lvds1 = &lvds1;
-+ };
-+
-+ backlight0: backlight0 {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm2 0 500000 0>;
-+ power-supply = <&reg_3v3>;
-+ brightness-levels = <
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32 33 34 35 36 37 38 39
-+ 40 41 42 43 44 45 46 47 48 49
-+ 50 51 52 53 54 55 56 57 58 59
-+ 60 61 62 63 64 65 66 67 68 69
-+ 70 71 72 73 74 75 76 77 78 79
-+ 80 81 82 83 84 85 86 87 88 89
-+ 90 91 92 93 94 95 96 97 98 99
-+ 100
-+ >;
-+ default-brightness-level = <50>;
-+ };
-+
-+ backlight1: backlight1 {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm1 0 500000 0>;
-+ power-supply = <&reg_3v3>;
-+ brightness-levels = <
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32 33 34 35 36 37 38 39
-+ 40 41 42 43 44 45 46 47 48 49
-+ 50 51 52 53 54 55 56 57 58 59
-+ 60 61 62 63 64 65 66 67 68 69
-+ 70 71 72 73 74 75 76 77 78 79
-+ 80 81 82 83 84 85 86 87 88 89
-+ 90 91 92 93 94 95 96 97 98 99
-+ 100
-+ >;
-+ default-brightness-level = <50>;
-+ };
-+
-+ regulators {
-+ reg_lcd_pwr0: regulator@5 {
-+ compatible = "regulator-fixed";
-+ reg = <5>;
-+ regulator-name = "LVDS0 POWER";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ regulator-boot-on;
-+ };
-+
-+ reg_lcd_pwr1: regulator@6 {
-+ compatible = "regulator-fixed";
-+ reg = <6>;
-+ regulator-name = "LVDS1 POWER";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ regulator-boot-on;
-+ };
-+ };
-+};
-+
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ touchscreen2: eeti@04 {
-+ compatible = "eeti,egalax_ts";
-+ reg = <0x04>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_eeti2>;
-+ interrupt-parent = <&gpio3>;
-+ interrupts = <23 0>;
-+ wakeup-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
-+ linux,wakeup;
-+ };
-+};
-+
-+&i2c3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+
-+ sgtl5000: codec@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ VDDA-supply = <&reg_2v5>;
-+ VDDIO-supply = <&reg_3v3>;
-+ clocks = <&mclk>;
-+ };
-+
-+ touchscreen1: eeti@04 {
-+ compatible = "eeti,egalax_ts";
-+ reg = <0x04>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_eeti1>;
-+ interrupt-parent = <&gpio3>;
-+ interrupts = <22 0>;
-+ wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-+ linux,wakeup;
-+ };
-+};
-+
-+&iomuxc {
-+ imx53-tx53-x13x {
-+ pinctrl_i2c2: i2c2-grp1 {
-+ fsl,pins = <
-+ MX53_PAD_KEY_ROW3__I2C2_SDA 0xc0000000
-+ MX53_PAD_KEY_COL3__I2C2_SCL 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_lvds0: lvds0grp {
-+ fsl,pins = <
-+ MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x80000000
-+ MX53_PAD_LVDS0_CLK_P__LDB_LVDS0_CLK 0x80000000
-+ MX53_PAD_LVDS0_TX2_P__LDB_LVDS0_TX2 0x80000000
-+ MX53_PAD_LVDS0_TX1_P__LDB_LVDS0_TX1 0x80000000
-+ MX53_PAD_LVDS0_TX0_P__LDB_LVDS0_TX0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_lvds1: lvds1grp {
-+ fsl,pins = <
-+ MX53_PAD_LVDS1_TX3_P__LDB_LVDS1_TX3 0x80000000
-+ MX53_PAD_LVDS1_TX2_P__LDB_LVDS1_TX2 0x80000000
-+ MX53_PAD_LVDS1_CLK_P__LDB_LVDS1_CLK 0x80000000
-+ MX53_PAD_LVDS1_TX1_P__LDB_LVDS1_TX1 0x80000000
-+ MX53_PAD_LVDS1_TX0_P__LDB_LVDS1_TX0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_pwm1: pwm1grp {
-+ fsl,pins = <MX53_PAD_GPIO_9__PWM1_PWMO 0x04>;
-+ };
-+
-+ pinctrl_eeti1: eeti1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D22__GPIO3_22 0x1f0 /* Interrupt */
-+ >;
-+ };
-+
-+ pinctrl_eeti2: eeti2grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D23__GPIO3_23 0x1f0 /* Interrupt */
-+ >;
-+ };
-+ };
-+};
-+
-+&ldb {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_lvds0 &pinctrl_lvds1>;
-+ status = "okay";
-+
-+ lvds0: lvds-channel@0 {
-+ fsl,data-mapping = "jeida";
-+ fsl,data-width = <24>;
-+ status = "okay";
-+
-+ display-timings {
-+ native-mode = <&lvds_timing0>;
-+ lvds_timing0: hsd100pxn1 {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hsync-len = <60>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vsync-len = <10>;
-+ vfront-porch = <7>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+ };
-+
-+ lvds1: lvds-channel@1 {
-+ fsl,data-mapping = "jeida";
-+ fsl,data-width = <24>;
-+ status = "okay";
-+
-+ display-timings {
-+ native-mode = <&lvds_timing1>;
-+ lvds_timing1: hsd100pxn1 {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hsync-len = <60>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vsync-len = <10>;
-+ vfront-porch = <7>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+ };
-+};
-+
-+&pwm1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm1>;
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-voipac-bsb.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-voipac-bsb.dts
---- linux-3.10.36/arch/arm/boot/dts/imx53-voipac-bsb.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-voipac-bsb.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,159 @@
-+/*
-+ * Copyright 2013 Rostislav Lisovy <lisovy@gmail.com>, PiKRON s.r.o.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx53-voipac-dmm-668.dtsi"
-+
-+/ {
-+ sound {
-+ compatible = "fsl,imx53-voipac-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx53-voipac-sgtl5000";
-+ ssi-controller = <&ssi2>;
-+ audio-codec = <&sgtl5000>;
-+ audio-routing =
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <2>;
-+ mux-ext-port = <5>;
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&led_pin_gpio>;
-+
-+ led1 {
-+ label = "led-red";
-+ gpios = <&gpio3 29 0>;
-+ default-state = "off";
-+ };
-+
-+ led2 {
-+ label = "led-orange";
-+ gpios = <&gpio2 31 0>;
-+ default-state = "off";
-+ };
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx53-voipac {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ /* SD2_CD */
-+ MX53_PAD_EIM_D25__GPIO3_25 0x80000000
-+ /* SD2_WP */
-+ MX53_PAD_EIM_A19__GPIO2_19 0x80000000
-+ >;
-+ };
-+
-+ led_pin_gpio: led_gpio {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D29__GPIO3_29 0x80000000
-+ MX53_PAD_EIM_EB3__GPIO2_31 0x80000000
-+ >;
-+ };
-+
-+ /* Keyboard controller */
-+ pinctrl_kpp_1: kppgrp-1 {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_9__KPP_COL_6 0xe8
-+ MX53_PAD_GPIO_4__KPP_COL_7 0xe8
-+ MX53_PAD_KEY_COL2__KPP_COL_2 0xe8
-+ MX53_PAD_KEY_COL3__KPP_COL_3 0xe8
-+ MX53_PAD_KEY_COL4__KPP_COL_4 0xe8
-+ MX53_PAD_GPIO_2__KPP_ROW_6 0xe0
-+ MX53_PAD_GPIO_5__KPP_ROW_7 0xe0
-+ MX53_PAD_KEY_ROW2__KPP_ROW_2 0xe0
-+ MX53_PAD_KEY_ROW3__KPP_ROW_3 0xe0
-+ MX53_PAD_KEY_ROW4__KPP_ROW_4 0xe0
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC 0x80000000
-+ MX53_PAD_KEY_ROW0__AUDMUX_AUD5_TXD 0x80000000
-+ MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS 0x80000000
-+ MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_esdhc2: esdhc2grp {
-+ fsl,pins = <
-+ MX53_PAD_SD2_CMD__ESDHC2_CMD 0x1d5
-+ MX53_PAD_SD2_CLK__ESDHC2_CLK 0x1d5
-+ MX53_PAD_SD2_DATA0__ESDHC2_DAT0 0x1d5
-+ MX53_PAD_SD2_DATA1__ESDHC2_DAT1 0x1d5
-+ MX53_PAD_SD2_DATA2__ESDHC2_DAT2 0x1d5
-+ MX53_PAD_SD2_DATA3__ESDHC2_DAT3 0x1d5
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX53_PAD_GPIO_3__I2C3_SCL 0xc0000000
-+ MX53_PAD_GPIO_6__I2C3_SDA 0xc0000000
-+ >;
-+ };
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>; /* SSI1 */
-+ status = "okay";
-+};
-+
-+&esdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc2>;
-+ cd-gpios = <&gpio3 25 0>;
-+ wp-gpios = <&gpio2 19 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-+
-+&i2c3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+
-+ sgtl5000: codec@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ VDDA-supply = <&reg_3p3v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ clocks = <&clks 150>;
-+ };
-+};
-+
-+&kpp {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_kpp_1>;
-+ linux,keymap = <
-+ 0x0203003b /* KEY_F1 */
-+ 0x0603003c /* KEY_F2 */
-+ 0x0207003d /* KEY_F3 */
-+ 0x0607003e /* KEY_F4 */
-+ >;
-+ keypad,num-rows = <8>;
-+ keypad,num-columns = <1>;
-+ status = "okay";
-+};
-+
-+&ssi2 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,277 @@
-+/*
-+ * Copyright 2013 Rostislav Lisovy <lisovy@gmail.com>, PiKRON s.r.o.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "imx53.dtsi"
-+
-+/ {
-+ model = "Voipac i.MX53 X53-DMM-668";
-+ compatible = "voipac,imx53-dmm-668", "fsl,imx53";
-+
-+ memory@70000000 {
-+ device_type = "memory";
-+ reg = <0x70000000 0x20000000>;
-+ };
-+
-+ memory@b0000000 {
-+ device_type = "memory";
-+ reg = <0xb0000000 0x20000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p3v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_vbus: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "usb_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 31 0>; /* PEN */
-+ enable-active-high;
-+ };
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx53-voipac {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ /* Make DA9053 regulator functional */
-+ MX53_PAD_GPIO_16__GPIO7_11 0x80000000
-+ /* FEC Power enable */
-+ MX53_PAD_GPIO_11__GPIO4_1 0x80000000
-+ /* FEC RST */
-+ MX53_PAD_GPIO_12__GPIO4_2 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D16__ECSPI1_SCLK 0x80000000
-+ MX53_PAD_EIM_D17__ECSPI1_MISO 0x80000000
-+ MX53_PAD_EIM_D18__ECSPI1_MOSI 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
-+ MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
-+ MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
-+ MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
-+ MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
-+ MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
-+ MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
-+ MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
-+ MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
-+ MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000
-+ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX53_PAD_PATA_DIOW__UART1_TXD_MUX 0x1e4
-+ MX53_PAD_PATA_DMACK__UART1_RXD_MUX 0x1e4
-+ >;
-+ };
-+
-+ pinctrl_nand: nandgrp {
-+ fsl,pins = <
-+ MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B 0x4
-+ MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B 0x4
-+ MX53_PAD_NANDF_CLE__EMI_NANDF_CLE 0x4
-+ MX53_PAD_NANDF_ALE__EMI_NANDF_ALE 0x4
-+ MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B 0xe0
-+ MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0 0xe0
-+ MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0 0x4
-+ MX53_PAD_PATA_DATA0__EMI_NANDF_D_0 0xa4
-+ MX53_PAD_PATA_DATA1__EMI_NANDF_D_1 0xa4
-+ MX53_PAD_PATA_DATA2__EMI_NANDF_D_2 0xa4
-+ MX53_PAD_PATA_DATA3__EMI_NANDF_D_3 0xa4
-+ MX53_PAD_PATA_DATA4__EMI_NANDF_D_4 0xa4
-+ MX53_PAD_PATA_DATA5__EMI_NANDF_D_5 0xa4
-+ MX53_PAD_PATA_DATA6__EMI_NANDF_D_6 0xa4
-+ MX53_PAD_PATA_DATA7__EMI_NANDF_D_7 0xa4
-+ >;
-+ };
-+ };
-+};
-+
-+&ecspi1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
-+ fsl,spi-num-chipselects = <4>;
-+ cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>, <&gpio2 16 0>, <&gpio2 17 0>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ phy-mode = "rmii";
-+ phy-reset-gpios = <&gpio4 2 0>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ pmic: dialog@48 {
-+ compatible = "dlg,da9053-aa", "dlg,da9052";
-+ reg = <0x48>;
-+ interrupt-parent = <&gpio7>;
-+ interrupts = <11 0x8>; /* low-level active IRQ at GPIO7_11 */
-+
-+ regulators {
-+ buck1_reg: buck1 {
-+ regulator-name = "BUCKCORE";
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <1400000>;
-+ regulator-always-on;
-+ };
-+
-+ buck2_reg: buck2 {
-+ regulator-name = "BUCKPRO";
-+ regulator-min-microvolt = <900000>;
-+ regulator-max-microvolt = <1350000>;
-+ regulator-always-on;
-+ };
-+
-+ buck3_reg: buck3 {
-+ regulator-name = "BUCKMEM";
-+ regulator-min-microvolt = <1420000>;
-+ regulator-max-microvolt = <1580000>;
-+ regulator-always-on;
-+ };
-+
-+ buck4_reg: buck4 {
-+ regulator-name = "BUCKPERI";
-+ regulator-min-microvolt = <2370000>;
-+ regulator-max-microvolt = <2630000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo1_reg: ldo1 {
-+ regulator-name = "ldo1_1v3";
-+ regulator-min-microvolt = <1250000>;
-+ regulator-max-microvolt = <1350000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ ldo2_reg: ldo2 {
-+ regulator-name = "ldo2_1v3";
-+ regulator-min-microvolt = <1250000>;
-+ regulator-max-microvolt = <1350000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo3_reg: ldo3 {
-+ regulator-name = "ldo3_3v3";
-+ regulator-min-microvolt = <3250000>;
-+ regulator-max-microvolt = <3350000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo4_reg: ldo4 {
-+ regulator-name = "ldo4_2v775";
-+ regulator-min-microvolt = <2770000>;
-+ regulator-max-microvolt = <2780000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo5_reg: ldo5 {
-+ regulator-name = "ldo5_3v3";
-+ regulator-min-microvolt = <3250000>;
-+ regulator-max-microvolt = <3350000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo6_reg: ldo6 {
-+ regulator-name = "ldo6_1v3";
-+ regulator-min-microvolt = <1250000>;
-+ regulator-max-microvolt = <1350000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo7_reg: ldo7 {
-+ regulator-name = "ldo7_2v75";
-+ regulator-min-microvolt = <2700000>;
-+ regulator-max-microvolt = <2800000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo8_reg: ldo8 {
-+ regulator-name = "ldo8_1v8";
-+ regulator-min-microvolt = <1750000>;
-+ regulator-max-microvolt = <1850000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo9_reg: ldo9 {
-+ regulator-name = "ldo9_1v5";
-+ regulator-min-microvolt = <1450000>;
-+ regulator-max-microvolt = <1550000>;
-+ regulator-always-on;
-+ };
-+
-+ ldo10_reg: ldo10 {
-+ regulator-name = "ldo10_1v3";
-+ regulator-min-microvolt = <1250000>;
-+ regulator-max-microvolt = <1350000>;
-+ regulator-always-on;
-+ };
-+ };
-+ };
-+};
-+
-+&nfc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_nand>;
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <&reg_usb_vbus>;
-+ phy_type = "utmi";
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-cubox-i.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-cubox-i.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-cubox-i.dts linux-solidrun/arch/arm/boot/dts/imx6dl-cubox-i.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-cubox-i.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-cubox-i.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-cubox-i.dts 2014-04-24 07:58:12.860168771 +0200
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2014 Russell King
@@ -18193,48 +200,25 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-cubox-i.dts linux-linaro-stable
+ model = "SolidRun Cubox-i Solo/DualLite";
+ compatible = "solidrun,cubox-i/dl", "fsl,imx6dl";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#ifndef __DTS_V1__
-+#define __DTS_V1__
-+/dts-v1/;
-+#endif
-+
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-dfi-fs700-m60.dtsi"
-+
-+/ {
-+ model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";
-+ compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl.dtsi linux-solidrun/arch/arm/boot/dts/imx6dl.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx6dl.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -8,8 +8,9 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6dl.dtsi 2014-04-24 07:58:12.872168814 +0200
+@@ -8,19 +8,39 @@
*
*/
-#include "imx6qdl.dtsi"
-+#include <dt-bindings/interrupt-controller/irq.h>
#include "imx6dl-pinfunc.h"
+#include "imx6qdl.dtsi"
/ {
cpus {
-@@ -21,6 +22,26 @@
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+- cpu@0 {
++ cpu0: cpu@0 {
+ compatible = "arm,cortex-a9";
device_type = "cpu";
reg = <0>;
next-level-cache = <&L2>;
@@ -18245,10 +229,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/ar
+ 396000 1075000
+ >;
+ fsl,soc-operating-points = <
-+ /* ARM kHz SOC-PU uV */
-+ 996000 1175000
-+ 792000 1175000
-+ 396000 1175000
++ /* ARM kHz SOC-PU uV */
++ 996000 1175000
++ 792000 1175000
++ 396000 1175000
+ >;
+ clock-latency = <61036>; /* two CLK32 periods */
+ clocks = <&clks 104>, <&clks 6>, <&clks 16>,
@@ -18261,21 +245,39 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/ar
};
cpu@1 {
-@@ -32,141 +53,30 @@
+@@ -28,140 +48,125 @@
+ device_type = "cpu";
+ reg = <1>;
+ next-level-cache = <&L2>;
++ operating-points = <
++ /* kHz uV */
++ 996000 1250000
++ 792000 1175000
++ 396000 1075000
++ >;
++ fsl,soc-operating-points = <
++ /* ARM kHz SOC-PU uV */
++ 996000 1175000
++ 792000 1175000
++ 396000 1175000
++ >;
++ clock-latency = <61036>; /* two CLK32 periods */
++ clocks = <&clks 104>, <&clks 6>, <&clks 16>,
++ <&clks 17>, <&clks 170>;
++ clock-names = "arm", "pll2_pfd2_396m", "step",
++ "pll1_sw", "pll1_sys";
++ arm-supply = <&reg_arm>;
++ pu-supply = <&reg_pu>;
++ soc-supply = <&reg_soc>;
+ };
};
soc {
-+ ocram: sram@00900000 {
-+ compatible = "mmio-sram";
-+ reg = <0x00900000 0x20000>;
-+ clocks = <&clks 142>;
-+ };
-+
- aips1: aips-bus@02000000 {
- iomuxc: iomuxc@020e0000 {
- compatible = "fsl,imx6dl-iomuxc";
+- aips1: aips-bus@02000000 {
+- iomuxc: iomuxc@020e0000 {
+- compatible = "fsl,imx6dl-iomuxc";
- reg = <0x020e0000 0x4000>;
--
+
- enet {
- pinctrl_enet_1: enetgrp-1 {
- fsl,pins = <
@@ -18389,49 +391,124 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/ar
- >;
- };
- };
--
--
++ 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>, <&clks 22> , <&clks 8>;
++ clock-names = "pll2_bus", "pll2_pfd2_396m", "pll2_198m", "arm", "pll3_usb_otg", "periph",
++ "periph_pre", "periph_clk2", "periph_clk2_sel", "osc", "axi_sel", "pll3_pfd1_540m";
++ interrupts = <0 107 0x04>, <0 112 0x4>;
++ interrupt-names = "irq_busfreq_0", "irq_busfreq_1";
++ fsl,max_ddr_freq = <400000000>;
++ };
++
++ gpu: gpu@00130000 {
++ compatible = "fsl,imx6dl-gpu", "fsl,imx6q-gpu";
++ reg = <0x00130000 0x4000>, <0x00134000 0x4000>,
++ <0x0 0x0>;
++ reg-names = "iobase_3d", "iobase_2d",
++ "phys_baseaddr";
++ interrupts = <0 9 0x04>, <0 10 0x04>;
++ interrupt-names = "irq_3d", "irq_2d";
++ clocks = <&clks 143>, <&clks 27>,
++ <&clks 121>, <&clks 122>,
++ <&clks 0>;
++ clock-names = "gpu2d_axi_clk", "gpu3d_axi_clk",
++ "gpu2d_clk", "gpu3d_clk",
++ "gpu3d_shader_clk";
++ resets = <&src 0>, <&src 3>;
++ reset-names = "gpu3d", "gpu2d";
++ pu-supply = <&reg_pu>;
++ };
++
++ ocram: sram@00900000 {
++ compatible = "mmio-sram";
++ reg = <0x00900000 0x20000>;
++ clocks = <&clks 142>;
++ };
+
++ hdmi_core: hdmi_core@00120000 {
++ compatible = "fsl,imx6dl-hdmi-core";
++ reg = <0x00120000 0x9000>;
++ clocks = <&clks 124>, <&clks 123>;
++ clock-names = "hdmi_isfr", "hdmi_iahb";
++ status = "disabled";
++ };
++
++ hdmi_video: hdmi_video@020e0000 {
++ compatible = "fsl,imx6dl-hdmi-video";
++ reg = <0x020e0000 0x1000>;
++ reg-names = "hdmi_gpr";
++ interrupts = <0 115 0x04>;
++ clocks = <&clks 124>, <&clks 123>;
++ clock-names = "hdmi_isfr", "hdmi_iahb";
++ status = "disabled";
++ };
++
++ hdmi_audio: hdmi_audio@00120000 {
++ compatible = "fsl,imx6dl-hdmi-audio";
++ clocks = <&clks 124>, <&clks 123>;
++ clock-names = "hdmi_isfr", "hdmi_iahb";
++ dmas = <&sdma 2 22 0>;
++ dma-names = "tx";
++ status = "disabled";
++ };
++
++ hdmi_cec: hdmi_cec@00120000 {
++ compatible = "fsl,imx6dl-hdmi-cec";
++ interrupts = <0 115 0x04>;
++ status = "disabled";
++ };
++
++ aips1: aips-bus@02000000 {
++ vpu@02040000 {
++ iramsize = <0>;
++ status = "okay";
++ };
+
++ iomuxc: iomuxc@020e0000 {
++ compatible = "fsl,imx6dl-iomuxc";
};
pxp: pxp@020f0000 {
++ compatible = "fsl,imx6dl-pxp-dma";
reg = <0x020f0000 0x4000>;
-- interrupts = <0 98 0x04>;
-+ interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 98 0x04>;
++ clocks = <&clks 133>;
++ clock-names = "pxp-axi";
++ status = "disabled";
};
epdc: epdc@020f4000 {
++ compatible = "fsl,imx6dl-epdc";
reg = <0x020f4000 0x4000>;
-- interrupts = <0 97 0x04>;
-+ interrupts = <0 97 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 97 0x04>;
++ clocks = <&clks 133>, <&clks 137>;
++ clock-names = "epdc_axi", "epdc_pix";
};
lcdif: lcdif@020f8000 {
- reg = <0x020f8000 0x4000>;
-- interrupts = <0 39 0x04>;
-+ interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
- };
+@@ -171,6 +176,16 @@
};
-@@ -176,9 +86,27 @@
+ aips2: aips-bus@02100000 {
++ mipi_dsi: mipi@021e0000 {
++ compatible = "fsl,imx6dl-mipi-dsi";
++ reg = <0x021e0000 0x4000>;
++ interrupts = <0 102 0x04>;
++ gpr = <&gpr>;
++ clocks = <&clks 138>, <&clks 204>;
++ clock-names = "mipi_pllref_clk", "mipi_cfg_clk";
++ status = "disabled";
++ };
++
+ i2c4: i2c@021f8000 {
+ #address-cells = <1>;
#size-cells = <0>;
- compatible = "fsl,imx1-i2c";
- reg = <0x021f8000 0x4000>;
-- interrupts = <0 35 0x04>;
-+ interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
+@@ -182,3 +197,54 @@
};
};
-+
-+ display-subsystem {
-+ compatible = "fsl,imx-display-subsystem";
-+ ports = <&ipu1_di0>, <&ipu1_di1>;
-+ };
-+};
-+
-+&hdmi {
-+ compatible = "fsl,imx6dl-hdmi";
-+};
+ };
+
+&ldb {
+ clocks = <&clks 33>, <&clks 34>,
@@ -18440,105 +517,58 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/ar
+ clock-names = "di0_pll", "di1_pll",
+ "di0_sel", "di1_sel",
+ "di0", "di1";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw51xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-gw51xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-gw51xx.dtsi"
++ lvds-channel@0 {
++ crtcs = <&ipu1 0>, <&ipu1 1>;
++ };
+
-+/ {
-+ model = "Gateworks Ventana i.MX6 DualLite GW51XX";
-+ compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
++ lvds-channel@1 {
++ crtcs = <&ipu1 0>, <&ipu1 1>;
++ };
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw52xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-gw52xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-gw52xx.dtsi"
+
-+/ {
-+ model = "Gateworks Ventana i.MX6 DualLite GW52XX";
-+ compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
++&iomuxc {
++ epdc {
++ pinctrl_epdc_0: epdcgrp-0 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_A16__EPDC_DATA00 0x80000000
++ MX6QDL_PAD_EIM_DA10__EPDC_DATA01 0x80000000
++ MX6QDL_PAD_EIM_DA12__EPDC_DATA02 0x80000000
++ MX6QDL_PAD_EIM_DA11__EPDC_DATA03 0x80000000
++ MX6QDL_PAD_EIM_LBA__EPDC_DATA04 0x80000000
++ MX6QDL_PAD_EIM_EB2__EPDC_DATA05 0x80000000
++ MX6QDL_PAD_EIM_CS0__EPDC_DATA06 0x80000000
++ MX6QDL_PAD_EIM_RW__EPDC_DATA07 0x80000000
++ MX6QDL_PAD_EIM_A21__EPDC_GDCLK 0x80000000
++ MX6QDL_PAD_EIM_A22__EPDC_GDSP 0x80000000
++ MX6QDL_PAD_EIM_A23__EPDC_GDOE 0x80000000
++ MX6QDL_PAD_EIM_A24__EPDC_GDRL 0x80000000
++ MX6QDL_PAD_EIM_D31__EPDC_SDCLK_P 0x80000000
++ MX6QDL_PAD_EIM_D27__EPDC_SDOE 0x80000000
++ MX6QDL_PAD_EIM_DA1__EPDC_SDLE 0x80000000
++ MX6QDL_PAD_EIM_EB1__EPDC_SDSHR 0x80000000
++ MX6QDL_PAD_EIM_DA2__EPDC_BDR0 0x80000000
++ MX6QDL_PAD_EIM_DA4__EPDC_SDCE0 0x80000000
++ MX6QDL_PAD_EIM_DA5__EPDC_SDCE1 0x80000000
++ MX6QDL_PAD_EIM_DA6__EPDC_SDCE2 0x80000000
++ >;
++ };
++ };
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw53xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-gw53xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-gw53xx.dtsi"
-+
-+/ {
-+ model = "Gateworks Ventana i.MX6 DualLite GW53XX";
-+ compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
++&hdmi {
++ compatible = "fsl,imx6dl-hdmi";
++ crtcs = <&ipu1 0>, <&ipu1 1>;
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw54xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-gw54xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,19 @@
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-solidrun/arch/arm/boot/dts/imx6dl-hummingboard.dts
+--- linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-04-24 07:58:12.864168787 +0200
+@@ -0,0 +1,258 @@
+/*
-+ * Copyright 2013 Gateworks Corporation
++ * Copyright (C) 2013 Russell King
+ *
+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-gw54xx.dtsi"
-+
-+/ {
-+ model = "Gateworks Ventana i.MX6 DualLite GW54XX";
-+ compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,163 @@
-+/*
-+ * Copyright (C) 2013,2014 Russell King
++ * License version 2.
+ */
+/dts-v1/;
+
@@ -18550,6 +580,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+ model = "SolidRun HummingBoard DL/Solo";
+ compatible = "solidrun,hummingboard", "fsl,imx6dl";
+
++ aliases {
++ mxcfb0 = &mxcfb1;
++ };
++
+ ir_recv: ir-receiver {
+ compatible = "gpio-ir-receiver";
+ gpios = <&gpio1 2 1>;
@@ -18591,6 +625,18 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+ };
+ };
+
++ codec: spdif-transmitter {
++ compatible = "linux,spdif-dit";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hummingboard_spdif>;
++ };
++
++ imx-drm {
++ compatible = "fsl,imx-drm";
++ crtcs = <&ipu1 0>, <&ipu1 1>;
++ connectors = <&hdmi>;
++ };
++
+ sound-spdif {
+ compatible = "fsl,imx-audio-spdif";
+ model = "imx-spdif";
@@ -18598,17 +644,89 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+ spdif-controller = <&spdif>;
+ spdif-out;
+ };
++
++ sound-hdmi {
++ compatible = "fsl,imx6q-audio-hdmi",
++ "fsl,imx-audio-hdmi";
++ model = "imx-audio-hdmi";
++ hdmi-controller = <&hdmi_audio>;
++ };
++
++ mxcfb1: mxc_sdc_fb@0 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "hdmi";
++ interface_pix_fmt = "RGB24";
++ mode_str ="1280x720@60";
++ default_bpp = <32>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "okay";
++ };
++
++ v4l2_cap_0 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <0>;
++ mclk_source = <0>;
++ status = "okay";
++ };
++
++ v4l2_cap_1 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <1>;
++ mclk_source = <0>;
++ status = "okay";
++ };
++
++ v4l2_out {
++ compatible = "fsl,mxc_v4l2_output";
++ status = "okay";
++ };
+};
+
-+&can1 {
++&flexcan1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hummingboard_flexcan1>;
+ status = "okay";
+};
+
++&hdmi {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hummingboard_hdmi>;
++ ddc = <&i2c2>;
++ status = "okay";
++ crtcs = <&ipu1 0>;
++};
++
++&hdmi_audio {
++ status = "okay";
++};
++
++&hdmi_cec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hummingboard_hdmi>;
++ status = "okay";
++};
++
++&hdmi_core {
++ ipu_id = <1>;
++ disp_id = <0>;
++ status = "okay";
++};
++
++&hdmi_video {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;
++ fsl,phy_reg_vlev = <0x0294>;
++ fsl,phy_reg_cksymtx = <0x800d>;
++ fsl,hdcp;
++ status = "okay";
++};
++
+&i2c1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hummingboard_i2c1>;
++ pinctrl-0 = <&pinctrl_i2c1_1>;
+
+ /*
+ * Not fitted on Carrier-1 board... yet
@@ -18621,6 +739,13 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+ */
+};
+
++&i2c2 {
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2_2>;
++ status = "okay";
++};
++
+&iomuxc {
+ hummingboard {
+ pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {
@@ -18636,15 +761,14 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+ >;
+ };
+
-+ pinctrl_hummingboard_i2c1: hummingboard-i2c1 {
++ pinctrl_hummingboard_hdmi: hummingboard-hdmi {
+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
++ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+ >;
+ };
+
+ pinctrl_hummingboard_spdif: hummingboard-spdif {
-+ fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
++ fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;
+ };
+
+ pinctrl_hummingboard_usbh1_vbus: hummingboard-usbh1-vbus {
@@ -18675,8 +799,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+};
+
+&spdif {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hummingboard_spdif>;
+ status = "okay";
+};
+
@@ -18700,35 +822,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+ cd-gpios = <&gpio1 4 0>;
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,21 @@
-+/*
-+ * Copyright 2013 Boundary Devices, Inc.
-+ * Copyright 2012 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-nitrogen6x.dtsi"
-+
-+/ {
-+ model = "Freescale i.MX6 DualLite Nitrogen6x Board";
-+ compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-pinfunc.h linux-solidrun/arch/arm/boot/dts/imx6dl-pinfunc.h
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-04-21 13:50:39.062713665 +0200
-@@ -14,1072 +14,1078 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-04-24 07:58:12.864168787 +0200
+@@ -14,1072 +14,1076 @@
* The pin function ID is a tuple of
* <mux_reg conf_reg input_reg mux_mode input_val>
*/
@@ -20540,7 +2637,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-m
+#define MX6QDL_PAD_GPIO_5__I2C3_SCL 0x230 0x600 0x878 0x6 0x2
+#define MX6QDL_PAD_GPIO_5__ARM_EVENTI 0x230 0x600 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_6__ESAI_TX_CLK 0x234 0x604 0x840 0x0 0x1
-+#define MX6QDL_PAD_GPIO_6__ENET_IRQ 0x234 0x604 0x03c 0x11 0xff000609
+#define MX6QDL_PAD_GPIO_6__I2C3_SDA 0x234 0x604 0x87c 0x2 0x2
+#define MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x234 0x604 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_6__SD2_LCTL 0x234 0x604 0x000 0x6 0x0
@@ -20736,7 +2832,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-m
+#define MX6QDL_PAD_RGMII_TXC__GPIO6_IO19 0x2d8 0x6c0 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TXC__XTALOSC_REF_CLK_24M 0x2d8 0x6c0 0x000 0x7 0x0
+#define MX6QDL_PAD_SD1_CLK__SD1_CLK 0x2dc 0x6c4 0x928 0x0 0x1
-+#define MX6QDL_PAD_SD1_CLK__OSC32K_32K_OUT 0x2dc 0x6c4 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN 0x2dc 0x6c4 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x2dc 0x6c4 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_CMD__SD1_CMD 0x2e0 0x6c8 0x000 0x0 0x0
@@ -20874,18 +2969,25 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-m
+#define MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x35c 0x744 0x000 0x5 0x0
#endif /* __DTS_IMX6DL_PINFUNC_H */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -15,17 +15,3 @@
- model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-04-24 07:58:12.872168814 +0200
+@@ -16,16 +16,15 @@
compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
};
--
+
-&iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
--
++&ldb {
++ ipu_id = <0>;
++ sec_ipu_id = <0>;
++};
++
++&mxcfb1 {
++ status = "okay";
++};
+
- hog {
- pinctrl_hog: hoggrp {
- fsl,pins = <
@@ -20894,10 +2996,12 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro-stab
- >;
- };
- };
--};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts
++&mxcfb2 {
++ status = "okay";
+ };
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts 2014-04-24 07:58:12.864168787 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -20937,9 +3041,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts linux-linar
+ dr_mode = "peripheral";
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts 2014-04-24 07:58:12.864168787 +0200
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -20959,9 +3063,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts linux-li
+ /* pin conflict with flexcan1 */
+ status = "disabled";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts 2014-04-24 07:58:12.864168787 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -21010,58 +3114,147 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts linux-l
+&weim {
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabrelite.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabrelite.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabrelite.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,20 @@
-+/*
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-sabrelite.dtsi"
-+
-+/ {
-+ model = "Freescale i.MX6 DualLite SABRE Lite Board";
-+ compatible = "fsl,imx6dl-sabrelite", "fsl,imx6dl";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd.dts linux-solidrun/arch/arm/boot/dts/imx6dl-sabresd.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -15,21 +15,3 @@
- model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-04-24 07:58:12.872168814 +0200
+@@ -16,20 +16,126 @@
compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
};
--
--&iomuxc {
-- pinctrl-names = "default";
+
++&i2c3 {
++ max17135@48 {
++ compatible = "maxim,max17135";
++ reg = <0x48>;
++ vneg_pwrup = <1>;
++ gvee_pwrup = <1>;
++ vpos_pwrup = <2>;
++ gvdd_pwrup = <1>;
++ gvdd_pwrdn = <1>;
++ vpos_pwrdn = <2>;
++ gvee_pwrdn = <1>;
++ vneg_pwrdn = <1>;
++ SENSOR-supply = <&reg_sensor>;
++ gpio_pmic_pwrgood = <&gpio2 21 0>;
++ gpio_pmic_vcom_ctrl = <&gpio3 17 0>;
++ gpio_pmic_wakeup = <&gpio3 20 0>;
++ gpio_pmic_v3p3 = <&gpio2 20 0>;
++ gpio_pmic_intr = <&gpio2 25 0>;
++
++ regulators {
++ DISPLAY_reg: DISPLAY {
++ regulator-name = "DISPLAY";
++ };
++
++ GVDD_reg: GVDD {
++ /* 20v */
++ regulator-name = "GVDD";
++ };
++
++ GVEE_reg: GVEE {
++ /* -22v */
++ regulator-name = "GVEE";
++ };
++
++ HVINN_reg: HVINN {
++ /* -22v */
++ regulator-name = "HVINN";
++ };
++
++ HVINP_reg: HVINP {
++ /* 20v */
++ regulator-name = "HVINP";
++ };
++
++ VCOM_reg: VCOM {
++ regulator-name = "VCOM";
++ /* 2's-compliment, -4325000 */
++ regulator-min-microvolt = <0xffbe0178>;
++ /* 2's-compliment, -500000 */
++ regulator-max-microvolt = <0xfff85ee0>;
++ };
++
++ VNEG_reg: VNEG {
++ /* -15v */
++ regulator-name = "VNEG";
++ };
++
++ VPOS_reg: VPOS {
++ /* 15v */
++ regulator-name = "VPOS";
++ };
++
++ V3P3_reg: V3P3 {
++ regulator-name = "V3P3";
++ };
++ };
++ };
++};
++
+ &iomuxc {
+ pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
--
-- hog {
++ pinctrl-0 = <&pinctrl_hog_1>, <&pinctrl_hog_2>;
+
+ hog {
- pinctrl_hog: hoggrp {
-- fsl,pins = <
++ pinctrl_hog_2: hoggrp-2 {
+ fsl,pins = <
- MX6DL_PAD_GPIO_4__GPIO1_IO04 0x80000000
- MX6DL_PAD_GPIO_5__GPIO1_IO05 0x80000000
- MX6DL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
- MX6DL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
- MX6DL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
- MX6DL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
-- >;
-- };
-- };
--};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
++ /* MAX17135 */
++ MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000
++ MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x80000000
++ MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x80000000
++ MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000
++ MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000
++ /* elan touch */
++ MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000
++ MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000
++ MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x170b0
+ >;
+ };
+ };
+ };
++
++&epdc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_epdc_0>;
++ V3P3-supply = <&V3P3_reg>;
++ VCOM-supply = <&VCOM_reg>;
++ DISPLAY-supply = <&DISPLAY_reg>;
++ status = "okay";
++};
++
++&ldb {
++ ipu_id = <0>;
++ sec_ipu_id = <0>;
++};
++
++&pxp {
++ status = "okay";
++};
++
++&mxcfb1 {
++ status = "okay";
++};
++
++&mxcfb2 {
++ status = "okay";
++};
++
++&battery {
++ offset-charger = <1485>;
++ offset-discharger = <1464>;
++ offset-usb-charger = <1285>;
++};
++
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-solidrun/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-04-24 07:58:12.872168814 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -21082,9 +3275,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-linaro-s
+&i2c2 {
+ status = "disable";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts linux-solidrun/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts 2014-04-24 07:58:12.872168814 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -21115,9 +3308,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts linux-linaro-st
+&vpu {
+ pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-wandboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-wandboard.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-wandboard.dts linux-solidrun/arch/arm/boot/dts/imx6dl-wandboard.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6dl-wandboard.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-wandboard.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6dl-wandboard.dts 2014-04-24 07:58:12.872168814 +0200
@@ -10,6 +10,7 @@
*/
/dts-v1/;
@@ -21153,29 +3346,16 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6dl-wandboard.dts linux-linaro-stab
- pinctrl-0 = <&pinctrl_usdhc3_2>;
- status = "okay";
-};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-arm2.dts linux-solidrun/arch/arm/boot/dts/imx6q-arm2.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-arm2.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -23,14 +23,27 @@
-
- regulators {
- compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-- reg_3p3v: 3p3v {
-+ reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
++++ linux-solidrun/arch/arm/boot/dts/imx6q-arm2.dts 2014-04-24 07:58:12.872168814 +0200
+@@ -31,6 +31,15 @@
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
+
-+ reg_usb_otg_vbus: regulator@1 {
++ reg_usb_otg_vbus: usb_otg_vbus {
+ compatible = "regulator-fixed";
-+ reg = <1>;
+ regulator-name = "usb_otg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
@@ -21185,303 +3365,91 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stable-mx6
};
leds {
-@@ -46,7 +59,7 @@
-
- &gpmi {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_gpmi_nand_1>;
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
- status = "disabled"; /* gpmi nand conflicts with SD */
+@@ -42,6 +51,15 @@
+ linux,default-trigger = "heartbeat";
+ };
+ };
++
++ sound-spdif {
++ compatible = "fsl,imx-audio-spdif",
++ "fsl,imx-sabreauto-spdif";
++ model = "imx-spdif";
++ spdif-controller = <&spdif>;
++ spdif-out;
++ spdif-in;
++ };
};
-@@ -54,19 +67,112 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-
-- hog {
-+ imx6q-arm2 {
+ &gpmi {
+@@ -57,7 +75,7 @@
+ hog {
pinctrl_hog: hoggrp {
fsl,pins = <
- MX6Q_PAD_EIM_D25__GPIO3_IO25 0x80000000
+ MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_KEY_COL2__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
-+ >;
-+ };
-+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D26__UART2_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D27__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B 0x1b0b1
-+ MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart4: uart4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
>;
};
-- };
-
-- arm2 {
-- pinctrl_usdhc3_arm2: usdhc3grp-arm2 {
-+ pinctrl_usbotg: usbotggrp {
+ };
+@@ -65,8 +83,8 @@
+ arm2 {
+ pinctrl_usdhc3_arm2: usdhc3grp-arm2 {
fsl,pins = <
- MX6Q_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
- MX6Q_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
-+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
-+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
-+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3_cdwp: usdhc3cdwp {
-+ fsl,pins = <
+ MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
+ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_usdhc4: usdhc4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
-+ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
-+ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
-+ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
-+ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
-+ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
-+ MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
-+ MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
-+ MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
-+ MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
>;
};
};
-@@ -74,8 +180,18 @@
+@@ -79,6 +97,14 @@
+ status = "okay";
+ };
- &fec {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_enet_2>;
-+ pinctrl-0 = <&pinctrl_enet>;
- phy-mode = "rgmii";
-+ interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
-+ <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
-+ status = "okay";
-+};
-+
+&usbotg {
+ vbus-supply = <&reg_usb_otg_vbus>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
++ pinctrl-0 = <&pinctrl_usbotg_1>;
+ disable-over-current;
- status = "okay";
- };
-
-@@ -84,8 +200,8 @@
++ status = "okay";
++};
++
+ &usdhc3 {
+ cd-gpios = <&gpio6 11 0>;
wp-gpios = <&gpio6 14 0>;
- vmmc-supply = <&reg_3p3v>;
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc3_1
-- &pinctrl_usdhc3_arm2>;
-+ pinctrl-0 = <&pinctrl_usdhc3
-+ &pinctrl_usdhc3_cdwp>;
+@@ -97,6 +123,30 @@
status = "okay";
};
-@@ -93,12 +209,20 @@
- non-removable;
- vmmc-supply = <&reg_3p3v>;
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc4_1>;
-+ pinctrl-0 = <&pinctrl_usdhc4>;
-+ status = "okay";
-+};
-+
+&uart2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
++ pinctrl-0 = <&pinctrl_uart2_2>;
+ fsl,dte-mode;
+ fsl,uart-has-rtscts;
- status = "okay";
- };
-
- &uart4 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart4_1>;
-+ pinctrl-0 = <&pinctrl_uart4>;
- status = "okay";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cm-fx6.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-cm-fx6.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cm-fx6.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,107 @@
-+/*
-+ * Copyright 2013 CompuLab Ltd.
-+ *
-+ * Author: Valentin Raevsky <valentin@compulab.co.il>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+
-+/ {
-+ model = "CompuLab CM-FX6";
-+ compatible = "compulab,cm-fx6", "fsl,imx6q";
-+
-+ memory {
-+ reg = <0x10000000 0x80000000>;
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ heartbeat-led {
-+ label = "Heartbeat";
-+ gpios = <&gpio2 31 0>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
+ status = "okay";
+};
+
-+&gpmi {
++&spdif {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
++ pinctrl-0 = <&pinctrl_spdif_2>;
+ status = "okay";
+};
+
-+&iomuxc {
-+ imx6q-cm-fx6 {
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
-+ >;
-+ };
-+
-+ pinctrl_uart4: uart4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
-+ };
-+};
-+
-+&uart4 {
++&uart2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4>;
++ pinctrl-0 = <&pinctrl_uart2_2>;
++ fsl,dte-mode;
++ fsl,uart-has-rtscts;
++ dma-names = "rx", "tx";
++ dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts
++
+ &uart4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart4_1>;
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-cubox-i.dts linux-solidrun/arch/arm/boot/dts/imx6q-cubox-i.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-cubox-i.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-04-24 07:58:12.872168814 +0200
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2014 Russell King
@@ -21499,37 +3467,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-stable-
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#ifndef __DTS_V1__
-+#define __DTS_V1__
-+/dts-v1/;
-+#endif
-+
-+#include "imx6q.dtsi"
-+#include "imx6qdl-dfi-fs700-m60.dtsi"
-+
-+/ {
-+ model = "DFI FS700-M60-6QD i.MX6qd Q7 Board";
-+ compatible = "dfi,fs700-m60-6qd", "dfi,fs700e-m60", "fsl,imx6q";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-solidrun/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,139 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-04-24 07:58:12.876168828 +0200
+@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2014 Russell King
+ */
@@ -21537,6 +3478,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
+#include "imx6qdl-microsom-ar8035.dtsi"
+
+/ {
++ aliases {
++ mxcfb0 = &mxcfb1;
++ };
++
+ ir_recv: ir-receiver {
+ compatible = "gpio-ir-receiver";
+ gpios = <&gpio3 9 1>;
@@ -21544,6 +3489,20 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
+ pinctrl-0 = <&pinctrl_cubox_i_ir>;
+ };
+
++ pwmleds {
++ compatible = "pwm-leds";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
++
++ front {
++ active-low;
++ default-brightness = <128>;
++ label = "imx6:red:front";
++ max-brightness = <248>;
++ pwms = <&pwm1 0 50000>;
++ };
++ };
++
+ regulators {
+ compatible = "simple-bus";
+
@@ -21578,18 +3537,108 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
+ };
+ };
+
++ codec: spdif-transmitter {
++ compatible = "linux,spdif-dit";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_cubox_i_spdif>;
++ };
++
++ imx-drm {
++ compatible = "fsl,imx-drm";
++ crtcs = <&ipu1 0>, <&ipu1 1>;
++ connectors = <&hdmi>;
++ };
++
+ sound-spdif {
+ compatible = "fsl,imx-audio-spdif";
+ model = "imx-spdif";
-+ /* IMX6 doesn't implement this yet */
+ spdif-controller = <&spdif>;
+ spdif-out;
+ };
++
++ sound-hdmi {
++ compatible = "fsl,imx6q-audio-hdmi",
++ "fsl,imx-audio-hdmi";
++ model = "imx-audio-hdmi";
++ hdmi-controller = <&hdmi_audio>;
++ };
++
++ mxcfb1: mxc_sdc_fb@0 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "hdmi";
++ interface_pix_fmt = "RGB24";
++ mode_str ="1280x720@60";
++ default_bpp = <32>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "okay";
++ };
++
++ v4l2_cap_0 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <0>;
++ mclk_source = <0>;
++ status = "okay";
++ };
++
++ v4l2_cap_1 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <1>;
++ mclk_source = <0>;
++ status = "okay";
++ };
++
++ v4l2_out {
++ compatible = "fsl,mxc_v4l2_output";
++ status = "okay";
++ };
++};
++
++&hdmi {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_cubox_i_hdmi>;
++ ddc = <&i2c2>;
++ status = "okay";
++ crtcs = <&ipu1 0>;
++};
++
++&hdmi_audio {
++ status = "okay";
++};
++
++&hdmi_cec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_cubox_i_hdmi>;
++ status = "okay";
++};
++
++&hdmi_core {
++ ipu_id = <1>;
++ disp_id = <0>;
++ status = "okay";
++};
++
++&hdmi_video {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;
++ fsl,phy_reg_vlev = <0x0294>;
++ fsl,phy_reg_cksymtx = <0x800d>;
++ fsl,hdcp;
++ status = "okay";
++};
++
++&i2c2 {
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2_2>;
++ status = "disable";
+};
+
+&i2c3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cubox_i_i2c3>;
++ pinctrl-0 = <&pinctrl_i2c3_1>;
+
+ status = "okay";
+
@@ -21601,21 +3650,24 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
+
+&iomuxc {
+ cubox_i {
-+ pinctrl_cubox_i_i2c3: cubox-i-i2c3 {
++ pinctrl_cubox_i_ir: cubox-i-ir {
+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
++ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
+ >;
+ };
+
-+ pinctrl_cubox_i_ir: cubox-i-ir {
++ pinctrl_cubox_i_hdmi: cubox-i-hdmi {
+ fsl,pins = <
-+ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
++ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+ >;
+ };
+
++ pinctrl_cubox_i_pwm1: cubox-i-pwm1-front-led {
++ fsl,pins = <MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0>;
++ };
++
+ pinctrl_cubox_i_spdif: cubox-i-spdif {
-+ fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
++ fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;
+ };
+
+ pinctrl_cubox_i_usbh1_vbus: cubox-i-usbh1-vbus {
@@ -21643,245 +3695,79 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
+ >;
+ };
-+ };
-+};
-+
-+&spdif {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cubox_i_spdif>;
-+ status = "okay";
-+};
+
-+&usbh1 {
-+ vbus-supply = <&reg_usbh1_vbus>;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ vbus-supply = <&reg_usbotg_vbus>;
-+ status = "okay";
-+};
-+
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>;
-+ vmmc-supply = <&reg_3p3v>;
-+ cd-gpios = <&gpio1 4 0>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,199 @@
-+/ {
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ dummy_reg: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "dummy-supply";
-+ };
-+
-+ reg_usb_otg_vbus: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
-+ enable-active-high;
-+ };
-+ };
-+
-+ chosen {
-+ linux,stdout-path = &uart1;
-+ };
-+};
-+
-+&ecspi3 {
-+ fsl,spi-num-chipselects = <1>;
-+ cs-gpios = <&gpio4 24 0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi3>;
-+ status = "okay";
-+
-+ flash: m25p80@0 {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ compatible = "sst,sst25vf040b", "m25p80";
-+ spi-max-frequency = <20000000>;
-+ reg = <0>;
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ status = "okay";
-+ phy-mode = "rgmii";
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6qdl-dfi-fs700-m60 {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x80000000
-+ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 /* PMIC irq */
-+ MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x80000000 /* MAX11801 irq */
-+ MX6QDL_PAD_NANDF_D5__GPIO2_IO05 0x000030b0 /* Backlight enable */
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
-+ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
-+ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
-+ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
-+ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
-+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
-+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000 /* card detect */
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc4: usdhc4grp {
++ pinctrl_cubox_i_usdhc2_100mhz: cubox-i-usdhc2-100mhz {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
-+ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
-+ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
-+ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
-+ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
-+ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
-+ MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
-+ MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
-+ MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
-+ MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
++ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170b9
++ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100b9
++ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170b9
++ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170b9
++ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170b9
++ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130b9
+ >;
+ };
+
-+ pinctrl_ecspi3: ecspi3grp {
++ pinctrl_cubox_i_usdhc2_200mhz: cubox-i-usdhc2-200mhz {
+ fsl,pins = <
-+ MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1
-+ MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1
-+ MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
-+ MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24 0x80000000 /* SPI NOR chipselect */
++ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170f9
++ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100f9
++ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170f9
++ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170f9
++ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170f9
++ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130f9
+ >;
+ };
+ };
+};
+
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
++&spdif {
+ status = "okay";
+};
+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
++&usbh1 {
++ vbus-supply = <&reg_usbh1_vbus>;
+ status = "okay";
+};
+
-+&usbh1 {
++&usbotg {
++ vbus-supply = <&reg_usbotg_vbus>;
+ status = "okay";
+};
+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ dr_mode = "host";
++&uart4 {
+ status = "okay";
+};
+
-+&usdhc2 { /* module slot */
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ cd-gpios = <&gpio2 2 0>;
++&usdhc1 {
++ status = "disabled";
++};
++
++&uart4 {
+ status = "okay";
+};
+
-+&usdhc3 { /* baseboard slot */
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
++&usdhc1 {
++ status = "okay";
+};
+
-+&usdhc4 { /* eMMC */
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc4>;
-+ bus-width = <8>;
-+ non-removable;
++&usdhc2 {
++ pinctrl-names = "default", "state_100mhz", "state_200mhz";
++ pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>;
++ pinctrl-1 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2_100mhz>;
++ pinctrl-2 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2_200mhz>;
++ vmmc-supply = <&reg_3p3v>;
++ cd-gpios = <&gpio1 4 0>;
++ no-1-8-v;
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-solidrun/arch/arm/boot/dts/imx6qdl.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -10,15 +10,15 @@
- * http://www.gnu.org/copyleft/gpl.html
++++ linux-solidrun/arch/arm/boot/dts/imx6qdl.dtsi 2014-04-24 07:58:12.876168828 +0200
+@@ -11,14 +11,12 @@
*/
-+#include <dt-bindings/interrupt-controller/arm-gic.h>
-+
#include "skeleton.dtsi"
++#include <dt-bindings/gpio/gpio.h>
/ {
aliases {
@@ -21890,23 +3776,19 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
- serial2 = &uart3;
- serial3 = &uart4;
- serial4 = &uart5;
-+ ethernet0 = &fec;
-+ can0 = &can1;
-+ can1 = &can2;
++ flexcan0 = &flexcan1;
++ flexcan1 = &flexcan2;
gpio0 = &gpio1;
gpio1 = &gpio2;
gpio2 = &gpio3;
-@@ -26,6 +26,24 @@
+@@ -26,6 +24,21 @@
gpio4 = &gpio5;
gpio5 = &gpio6;
gpio6 = &gpio7;
+ i2c0 = &i2c1;
+ i2c1 = &i2c2;
+ i2c2 = &i2c3;
-+ mmc0 = &usdhc1;
-+ mmc1 = &usdhc2;
-+ mmc2 = &usdhc3;
-+ mmc3 = &usdhc4;
++ ipu0 = &ipu1;
+ serial0 = &uart1;
+ serial1 = &uart2;
+ serial2 = &uart3;
@@ -21921,25 +3803,48 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
};
intc: interrupt-controller@00a01000 {
-@@ -68,7 +86,10 @@
+@@ -58,6 +71,10 @@
+ };
+ };
+
++ pu_dummy: pudummy_reg {
++ compatible = "fsl,imx6-dummy-pureg"; /* only used in ldo-bypass */
++ };
++
+ soc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+@@ -65,6 +82,11 @@
+ interrupt-parent = <&intc>;
+ ranges;
+
++ caam_sm: caam-sm@00100000 {
++ compatible = "fsl,imx6q-caam-sm";
++ reg = <0x00100000 0x3fff>;
++ };
++
dma_apbh: dma-apbh@00110000 {
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
reg = <0x00110000 0x2000>;
-- interrupts = <0 13 0x04>, <0 13 0x04>, <0 13 0x04>, <0 13 0x04>;
-+ interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 13 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 13 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 13 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3";
- #dma-cells = <1>;
- dma-channels = <4>;
-@@ -81,15 +102,14 @@
+@@ -75,24 +97,35 @@
+ clocks = <&clks 106>;
+ };
+
++ irq_sec_vio: caam_secvio {
++ compatible = "fsl,imx6q-caam-secvio";
++ interrupts = <0 20 0x04>;
++ secvio_src = <0x8000001d>;
++ };
++
+ gpmi: gpmi-nand@00112000 {
+ compatible = "fsl,imx6q-gpmi-nand";
+ #address-cells = <1>;
#size-cells = <1>;
reg = <0x00112000 0x2000>, <0x00114000 0x2000>;
reg-names = "gpmi-nand", "bch";
- interrupts = <0 13 0x04>, <0 15 0x04>;
- interrupt-names = "gpmi-dma", "bch";
-+ interrupts = <0 15 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 15 0x04>;
+ interrupt-names = "bch";
clocks = <&clks 152>, <&clks 153>, <&clks 151>,
<&clks 150>, <&clks 149>;
@@ -21951,12 +3856,17 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
status = "disabled";
};
-@@ -103,14 +123,38 @@
- L2: l2-cache@00a02000 {
- compatible = "arm,pl310-cache";
- reg = <0x00a02000 0x1000>;
-- interrupts = <0 92 0x04>;
-+ interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
++ ocram: sram@00900000 {
++ compatible = "mmio-sram";
++ reg = <0x00900000 0x3f000>;
++ clocks = <&clks 142>;
++ };
++
+ timer@00a00600 {
+ compatible = "arm,cortex-a9-twd-timer";
+ reg = <0x00a00600 0x20>;
+@@ -106,6 +139,24 @@
+ interrupts = <0 92 0x04>;
cache-unified;
cache-level = <2>;
+ arm,tag-latency = <4 2 3>;
@@ -21973,33 +3883,21 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
+ 0x81000000 0 0 0x01f80000 0 0x00010000 /* downstream I/O */
+ 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
+ num-lanes = <1>;
-+ interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>;
-+ #interrupt-cells = <1>;
-+ interrupt-map-mask = <0 0 0 0x7>;
-+ interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>;
-+ clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi";
++ interrupts = <0 123 0x04>;
++ clocks = <&clks 189>, <&clks 187>, <&clks 144>, <&clks 212>;
++ clock-names = "pcie_ref_125m", "sata_ref_100m", "pcie_axi", "lvds_gate";
+ status = "disabled";
};
pmu {
- compatible = "arm,cortex-a9-pmu";
-- interrupts = <0 94 0x04>;
-+ interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- aips-bus@02000000 { /* AIPS1 */
-@@ -128,8 +172,23 @@
+@@ -128,8 +179,24 @@
ranges;
spdif: spdif@02004000 {
-+ compatible = "fsl,imx35-spdif";
++ compatible = "fsl,imx6q-spdif",
++ "fsl,imx35-spdif";
reg = <0x02004000 0x4000>;
-- interrupts = <0 52 0x04>;
-+ interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 52 0x04>;
+ dmas = <&sdma 14 18 0>,
+ <&sdma 15 18 0>;
+ dma-names = "rx", "tx";
@@ -22007,73 +3905,18 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
+ <&clks 197>, <&clks 107>,
+ <&clks 0>, <&clks 118>,
+ <&clks 0>, <&clks 139>,
-+ <&clks 0>;
++ <&clks 0>, <&clks 156>;
+ clock-names = "core", "rxtx0",
+ "rxtx1", "rxtx2",
+ "rxtx3", "rxtx4",
+ "rxtx5", "rxtx6",
-+ "rxtx7";
++ "rxtx7", "dma";
+ status = "disabled";
};
ecspi1: ecspi@02008000 {
-@@ -137,9 +196,11 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
- reg = <0x02008000 0x4000>;
-- interrupts = <0 31 0x04>;
-+ interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 112>, <&clks 112>;
- clock-names = "ipg", "per";
-+ dmas = <&sdma 3 7 1>, <&sdma 4 7 2>;
-+ dma-names = "rx", "tx";
- status = "disabled";
- };
-
-@@ -148,9 +209,11 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
- reg = <0x0200c000 0x4000>;
-- interrupts = <0 32 0x04>;
-+ interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 113>, <&clks 113>;
- clock-names = "ipg", "per";
-+ dmas = <&sdma 5 7 1>, <&sdma 6 7 2>;
-+ dma-names = "rx", "tx";
- status = "disabled";
- };
-
-@@ -159,9 +222,11 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
- reg = <0x02010000 0x4000>;
-- interrupts = <0 33 0x04>;
-+ interrupts = <0 33 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 114>, <&clks 114>;
- clock-names = "ipg", "per";
-+ dmas = <&sdma 7 7 1>, <&sdma 8 7 2>;
-+ dma-names = "rx", "tx";
- status = "disabled";
- };
-
-@@ -170,51 +235,70 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
- reg = <0x02014000 0x4000>;
-- interrupts = <0 34 0x04>;
-+ interrupts = <0 34 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 115>, <&clks 115>;
- clock-names = "ipg", "per";
-+ dmas = <&sdma 9 7 1>, <&sdma 10 7 2>;
-+ dma-names = "rx", "tx";
- status = "disabled";
- };
-
- uart1: serial@02020000 {
- compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
- reg = <0x02020000 0x4000>;
-- interrupts = <0 26 0x04>;
-+ interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
+@@ -182,19 +249,31 @@
+ interrupts = <0 26 0x04>;
clocks = <&clks 160>, <&clks 161>;
clock-names = "ipg", "per";
+ dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
@@ -22082,133 +3925,123 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
};
esai: esai@02024000 {
++ compatible = "fsl,imx6q-esai";
reg = <0x02024000 0x4000>;
-- interrupts = <0 51 0x04>;
-+ interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 51 0x04>;
++ clocks = <&clks 118>, <&clks 156>;
++ clock-names = "core", "dma";
++ fsl,esai-dma-events = <24 23>;
++ fsl,flags = <1>;
++ status = "disabled";
};
ssi1: ssi@02028000 {
-- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
-+ compatible = "fsl,imx6q-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
+ compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
reg = <0x02028000 0x4000>;
-- interrupts = <0 46 0x04>;
-+ interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 178>;
+ interrupts = <0 46 0x04>;
+- clocks = <&clks 178>;
++ clocks = <&clks 178>, <&clks 157>;
++ clock-names = "ipg", "baud";
+ dmas = <&sdma 37 1 0>,
+ <&sdma 38 1 0>;
+ dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
fsl,ssi-dma-events = <38 37>;
status = "disabled";
- };
-
- ssi2: ssi@0202c000 {
-- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
-+ compatible = "fsl,imx6q-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
+@@ -204,7 +283,11 @@
+ compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
reg = <0x0202c000 0x4000>;
-- interrupts = <0 47 0x04>;
-+ interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 179>;
+ interrupts = <0 47 0x04>;
+- clocks = <&clks 179>;
++ clocks = <&clks 179>, <&clks 158>;
++ clock-names = "ipg", "baud";
+ dmas = <&sdma 41 1 0>,
+ <&sdma 42 1 0>;
+ dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
fsl,ssi-dma-events = <42 41>;
status = "disabled";
- };
-
- ssi3: ssi@02030000 {
-- compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
-+ compatible = "fsl,imx6q-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
+@@ -214,15 +297,36 @@
+ compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
reg = <0x02030000 0x4000>;
-- interrupts = <0 48 0x04>;
-+ interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 180>;
+ interrupts = <0 48 0x04>;
+- clocks = <&clks 180>;
++ clocks = <&clks 180>, <&clks 159>;
++ clock-names = "ipg", "baud";
+ dmas = <&sdma 45 1 0>,
+ <&sdma 46 1 0>;
+ dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
fsl,ssi-dma-events = <46 45>;
status = "disabled";
-@@ -222,7 +306,7 @@
+ };
asrc: asrc@02034000 {
++ compatible = "fsl,imx53-asrc";
reg = <0x02034000 0x4000>;
-- interrupts = <0 50 0x04>;
-+ interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 50 0x04>;
++ clocks = <&clks 107>, <&clks 156>;
++ clock-names = "core", "dma";
++ dmas = <&sdma 17 20 1>, <&sdma 18 20 1>, <&sdma 19 20 1>,
++ <&sdma 20 20 1>, <&sdma 21 20 1>, <&sdma 22 20 1>;
++ dma-names = "rxa", "rxb", "rxc",
++ "txa", "txb", "txc";
++ status = "okay";
++ };
++
++ asrc_p2p: asrc_p2p {
++ compatible = "fsl,imx6q-asrc-p2p";
++ fsl,output-rate = <48000>;
++ fsl,output-width = <16>;
++ fsl,asrc-dma-rx-events = <17 18 19>;
++ fsl,asrc-dma-tx-events = <20 21 22>;
++ status = "okay";
};
spba@0203c000 {
-@@ -232,7 +316,8 @@
+@@ -231,8 +335,18 @@
+ };
vpu: vpu@02040000 {
++ compatible = "fsl,imx6-vpu";
reg = <0x02040000 0x3c000>;
- interrupts = <0 3 0x04 0 12 0x04>;
-+ interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 12 IRQ_TYPE_LEVEL_HIGH>;
++ reg-names = "vpu_regs";
++ interrupts = <0 3 0x01>, <0 12 0x04>;
++ interrupt-names = "vpu_jpu_irq", "vpu_ipi_irq";
++ clocks = <&clks 168>, <&clks 140>, <&clks 142>;
++ clock-names = "vpu_clk", "mmdc_ch0_axi", "ocram";
++ iramsize = <0x21000>;
++ iram = <&ocram>;
++ resets = <&src 1>;
++ pu-supply = <&reg_pu>;
++ status = "disabled";
};
aipstz@0207c000 { /* AIPSTZ1 */
-@@ -243,7 +328,7 @@
- #pwm-cells = <2>;
- compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
- reg = <0x02080000 0x4000>;
-- interrupts = <0 83 0x04>;
-+ interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 62>, <&clks 145>;
- clock-names = "ipg", "per";
- };
-@@ -252,7 +337,7 @@
- #pwm-cells = <2>;
- compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
- reg = <0x02084000 0x4000>;
-- interrupts = <0 84 0x04>;
-+ interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 62>, <&clks 146>;
- clock-names = "ipg", "per";
- };
-@@ -261,7 +346,7 @@
- #pwm-cells = <2>;
- compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
- reg = <0x02088000 0x4000>;
-- interrupts = <0 85 0x04>;
-+ interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 62>, <&clks 147>;
- clock-names = "ipg", "per";
- };
-@@ -270,25 +355,33 @@
- #pwm-cells = <2>;
- compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
- reg = <0x0208c000 0x4000>;
-- interrupts = <0 86 0x04>;
-+ interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 62>, <&clks 148>;
+@@ -275,18 +389,28 @@
clock-names = "ipg", "per";
};
- can1: flexcan@02090000 {
+- can1: flexcan@02090000 {
++ flexcan1: flexcan@02090000 {
+ compatible = "fsl,imx6q-flexcan";
reg = <0x02090000 0x4000>;
-- interrupts = <0 110 0x04>;
-+ interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 110 0x04>;
+ clocks = <&clks 108>, <&clks 109>;
+ clock-names = "ipg", "per";
++ gpr = <&gpr>;
+ status = "disabled";
};
- can2: flexcan@02094000 {
+- can2: flexcan@02094000 {
++ flexcan2: flexcan@02094000 {
+ compatible = "fsl,imx6q-flexcan";
reg = <0x02094000 0x4000>;
-- interrupts = <0 111 0x04>;
-+ interrupts = <0 111 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 111 0x04>;
+ clocks = <&clks 110>, <&clks 111>;
+ clock-names = "ipg", "per";
++ gpr = <&gpr>;
+ status = "disabled";
};
@@ -22216,141 +4049,23 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
- compatible = "fsl,imx6q-gpt";
+ compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
reg = <0x02098000 0x4000>;
-- interrupts = <0 55 0x04>;
-+ interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 55 0x04>;
clocks = <&clks 119>, <&clks 120>;
- clock-names = "ipg", "per";
- };
-@@ -296,7 +389,8 @@
- gpio1: gpio@0209c000 {
- compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
- reg = <0x0209c000 0x4000>;
-- interrupts = <0 66 0x04 0 67 0x04>;
-+ interrupts = <0 66 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 67 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
-@@ -306,7 +400,8 @@
- gpio2: gpio@020a0000 {
- compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
- reg = <0x020a0000 0x4000>;
-- interrupts = <0 68 0x04 0 69 0x04>;
-+ interrupts = <0 68 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 69 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
-@@ -316,7 +411,8 @@
- gpio3: gpio@020a4000 {
- compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
- reg = <0x020a4000 0x4000>;
-- interrupts = <0 70 0x04 0 71 0x04>;
-+ interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 71 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
-@@ -326,7 +422,8 @@
- gpio4: gpio@020a8000 {
- compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
- reg = <0x020a8000 0x4000>;
-- interrupts = <0 72 0x04 0 73 0x04>;
-+ interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 73 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
-@@ -336,7 +433,8 @@
- gpio5: gpio@020ac000 {
- compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
- reg = <0x020ac000 0x4000>;
-- interrupts = <0 74 0x04 0 75 0x04>;
-+ interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 75 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
-@@ -346,7 +444,8 @@
- gpio6: gpio@020b0000 {
- compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
- reg = <0x020b0000 0x4000>;
-- interrupts = <0 76 0x04 0 77 0x04>;
-+ interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 77 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
-@@ -356,7 +455,8 @@
- gpio7: gpio@020b4000 {
- compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
- reg = <0x020b4000 0x4000>;
-- interrupts = <0 78 0x04 0 79 0x04>;
-+ interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 79 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
-@@ -365,20 +465,20 @@
-
- kpp: kpp@020b8000 {
- reg = <0x020b8000 0x4000>;
-- interrupts = <0 82 0x04>;
-+ interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- wdog1: wdog@020bc000 {
- compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
- reg = <0x020bc000 0x4000>;
-- interrupts = <0 80 0x04>;
-+ interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 0>;
- };
-
- wdog2: wdog@020c0000 {
- compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
- reg = <0x020c0000 0x4000>;
-- interrupts = <0 81 0x04>;
-+ interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 0>;
- status = "disabled";
- };
-@@ -386,14 +486,17 @@
- clks: ccm@020c4000 {
- compatible = "fsl,imx6q-ccm";
- reg = <0x020c4000 0x4000>;
-- interrupts = <0 87 0x04 0 88 0x04>;
-+ interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 88 IRQ_TYPE_LEVEL_HIGH>;
- #clock-cells = <1>;
- };
-
- anatop: anatop@020c8000 {
- compatible = "fsl,imx6q-anatop", "syscon", "simple-bus";
- reg = <0x020c8000 0x1000>;
-- interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;
-+ interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 54 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 127 IRQ_TYPE_LEVEL_HIGH>;
-
- regulator-1p1@110 {
- compatible = "fsl,anatop-regulator";
-@@ -439,7 +542,7 @@
-
- reg_arm: regulator-vddcore@140 {
- compatible = "fsl,anatop-regulator";
-- regulator-name = "cpu";
-+ regulator-name = "vddarm";
+@@ -459,7 +583,6 @@
+ regulator-name = "vddpu";
regulator-min-microvolt = <725000>;
regulator-max-microvolt = <1450000>;
- regulator-always-on;
-@@ -489,18 +592,28 @@
+- regulator-always-on;
+ anatop-reg-offset = <0x140>;
+ anatop-vol-bit-shift = <9>;
+ anatop-vol-bit-width = <5>;
+@@ -489,11 +612,20 @@
};
};
+ tempmon: tempmon {
+ compatible = "fsl,imx6q-tempmon";
-+ interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 49 0x04>;
+ fsl,tempmon = <&anatop>;
+ fsl,tempmon-data = <&ocotp>;
+ clocks = <&clks 172>;
@@ -22359,221 +4074,878 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
usbphy1: usbphy@020c9000 {
compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
reg = <0x020c9000 0x1000>;
-- interrupts = <0 44 0x04>;
-+ interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 44 0x04>;
clocks = <&clks 182>;
+ fsl,anatop = <&anatop>;
};
usbphy2: usbphy@020ca000 {
- compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
+@@ -501,6 +633,12 @@
reg = <0x020ca000 0x1000>;
-- interrupts = <0 45 0x04>;
-+ interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 45 0x04>;
clocks = <&clks 183>;
+ fsl,anatop = <&anatop>;
++ };
++
++ caam_snvs: caam-snvs@020cc000 {
++ compatible = "fsl,imx6q-caam-snvs";
++ reg = <0x020cc000 0x4000>;
};
snvs@020cc000 {
-@@ -512,31 +625,34 @@
- snvs-rtc-lp@34 {
- compatible = "fsl,sec-v4.0-mon-rtc-lp";
- reg = <0x34 0x58>;
-- interrupts = <0 19 0x04 0 20 0x04>;
-+ interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 20 IRQ_TYPE_LEVEL_HIGH>;
- };
- };
-
- epit1: epit@020d0000 { /* EPIT1 */
- reg = <0x020d0000 0x4000>;
-- interrupts = <0 56 0x04>;
-+ interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- epit2: epit@020d4000 { /* EPIT2 */
- reg = <0x020d4000 0x4000>;
-- interrupts = <0 57 0x04>;
-+ interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- src: src@020d8000 {
- compatible = "fsl,imx6q-src", "fsl,imx51-src";
- reg = <0x020d8000 0x4000>;
-- interrupts = <0 91 0x04 0 96 0x04>;
-+ interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 96 IRQ_TYPE_LEVEL_HIGH>;
- #reset-cells = <1>;
- };
-
- gpc: gpc@020dc000 {
+@@ -537,6 +675,11 @@
compatible = "fsl,imx6q-gpc";
reg = <0x020dc000 0x4000>;
-- interrupts = <0 89 0x04 0 90 0x04>;
-+ interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 90 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 89 0x04 0 90 0x04>;
++ clocks = <&clks 122>, <&clks 74>, <&clks 121>,
++ <&clks 26>, <&clks 143>, <&clks 168>, <&clks 62>;
++ clock-names = "gpu3d_core", "gpu3d_shader", "gpu2d_core",
++ "gpu2d_axi", "openvg_axi", "vpu_axi", "ipg";
++ pu-supply = <&reg_pu>;
};
gpr: iomuxc-gpr@020e0000 {
-@@ -544,6 +660,11 @@
+@@ -544,24 +687,775 @@
reg = <0x020e0000 0x38>;
};
+ iomuxc: iomuxc@020e0000 {
+ compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc";
+ reg = <0x020e0000 0x4000>;
-+ };
+
- ldb: ldb@020e0008 {
- #address-cells = <1>;
- #size-cells = <0>;
-@@ -552,34 +673,96 @@
- status = "disabled";
-
- lvds-channel@0 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- reg = <0>;
-- crtcs = <&ipu1 0>;
- status = "disabled";
++ audmux {
++ pinctrl_audmux_1: audmux-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD2_DAT0__AUD4_RXD 0x130b0
++ MX6QDL_PAD_SD2_DAT3__AUD4_TXC 0x130b0
++ MX6QDL_PAD_SD2_DAT2__AUD4_TXD 0x130b0
++ MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x130b0
++ >;
++ };
+
-+ port@0 {
-+ reg = <0>;
++ pinctrl_audmux_2: audmux-2 {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0
++ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0
++ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x130b0
++ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0
++ >;
++ };
+
-+ lvds0_mux_0: endpoint {
-+ remote-endpoint = <&ipu1_di0_lvds0>;
-+ };
++ pinctrl_audmux_3: audmux-3 {
++ fsl,pins = <
++ MX6QDL_PAD_DISP0_DAT16__AUD5_TXC 0x130b0
++ MX6QDL_PAD_DISP0_DAT18__AUD5_TXFS 0x130b0
++ MX6QDL_PAD_DISP0_DAT19__AUD5_RXD 0x130b0
++ >;
+ };
++ };
+
-+ port@1 {
-+ reg = <1>;
++ ecspi1 {
++ pinctrl_ecspi1_1: ecspi1grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
++ MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
++ MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
++ >;
++ };
+
-+ lvds0_mux_1: endpoint {
-+ remote-endpoint = <&ipu1_di1_lvds0>;
-+ };
++ pinctrl_ecspi1_2: ecspi1grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
++ MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1
++ MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1
++ >;
+ };
- };
-
- lvds-channel@1 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- reg = <1>;
-- crtcs = <&ipu1 1>;
- status = "disabled";
++ };
++
++ ecspi3 {
++ pinctrl_ecspi3_1: ecspi3grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1
++ MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1
++ MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
++ >;
++ };
++ };
++
++ enet {
++ pinctrl_enet_1: enetgrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
++ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
++ >;
++ };
++
++ pinctrl_enet_2: enetgrp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL1__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_KEY_COL2__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
++ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
++ >;
++ };
++
++ pinctrl_enet_3: enetgrp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
++ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
++ >;
++ };
++ };
+
-+ port@0 {
-+ reg = <0>;
++ esai {
++ pinctrl_esai_1: esaigrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK 0x1b030
++ MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030
++ MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS 0x1b030
++ MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030
++ MX6QDL_PAD_ENET_TXD1__ESAI_TX2_RX3 0x1b030
++ MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1 0x1b030
++ MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0 0x1b030
++ MX6QDL_PAD_NANDF_CS2__ESAI_TX0 0x1b030
++ MX6QDL_PAD_NANDF_CS3__ESAI_TX1 0x1b030
++ >;
++ };
+
-+ lvds1_mux_0: endpoint {
-+ remote-endpoint = <&ipu1_di0_lvds1>;
-+ };
++ pinctrl_esai_2: esaigrp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030
++ MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS 0x1b030
++ MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030
++ MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3 0x1b030
++ MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1 0x1b030
++ MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0 0x1b030
++ MX6QDL_PAD_GPIO_17__ESAI_TX0 0x1b030
++ MX6QDL_PAD_NANDF_CS3__ESAI_TX1 0x1b030
++ MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK 0x1b030
++ MX6QDL_PAD_GPIO_9__ESAI_RX_FS 0x1b030
++ >;
+ };
++ };
+
-+ port@1 {
-+ reg = <1>;
++ flexcan1 {
++ pinctrl_flexcan1_1: flexcan1grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
++ MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
++ >;
++ };
+
-+ lvds1_mux_1: endpoint {
-+ remote-endpoint = <&ipu1_di1_lvds1>;
-+ };
++ pinctrl_flexcan1_2: flexcan1grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x80000000
++ MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
++ >;
++ };
++ };
++
++ flexcan2 {
++ pinctrl_flexcan2_1: flexcan2grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
++ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
++ >;
++ };
++ };
++
++ gpmi-nand {
++ pinctrl_gpmi_nand_1: gpmi-nand-1 {
++ fsl,pins = <
++ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
++ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
++ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
++ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
++ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
++ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
++ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
++ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
++ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
++ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
++ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
++ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
++ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
++ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
++ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
++ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
++ MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
++ >;
++ };
++ };
++
++ hdmi_hdcp {
++ pinctrl_hdmi_hdcp_1: hdmihdcpgrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1
++ MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_hdmi_hdcp_2: hdmihdcpgrp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1
++ MX6QDL_PAD_EIM_D16__HDMI_TX_DDC_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_hdmi_hdcp_3: hdmihdcpgrp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1
++ MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1
++ >;
++ };
++ };
++
++ hdmi_cec {
++ pinctrl_hdmi_cec_1: hdmicecgrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE 0x1f8b0
++ >;
++ };
++
++ pinctrl_hdmi_cec_2: hdmicecgrp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
++ >;
++ };
++ };
++
++ i2c1 {
++ pinctrl_i2c1_1: i2c1grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
++ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c1_2: i2c1grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
++ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
++ >;
++ };
++ };
++
++ i2c2 {
++ pinctrl_i2c2_1: i2c2grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
++ MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c2_2: i2c2grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
++ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c2_3: i2c2grp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
++ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
++ >;
++ };
++ };
++
++ i2c3 {
++ pinctrl_i2c3_1: i2c3grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
++ MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c3_2: i2c3grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
++ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c3_3: i2c3grp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
++ MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c3_4: i2c3grp-4 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
++ MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
++ >;
++ };
++ };
++
++ ipu1 {
++ pinctrl_ipu1_1: ipu1grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10
++ MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x10
++ MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10
++ MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10
++ MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04 0x80000000
++ MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x10
++ MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10
++ MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10
++ MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10
++ MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10
++ MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10
++ MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10
++ MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10
++ MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10
++ MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10
++ MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10
++ MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10
++ MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10
++ MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10
++ MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10
++ MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10
++ MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10
++ MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x10
++ MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18 0x10
++ MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19 0x10
++ MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20 0x10
++ MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 0x10
++ MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 0x10
++ MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 0x10
++ >;
++ };
++
++ pinctrl_ipu1_2: ipu1grp-2 { /* parallel camera */
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0x80000000
++ MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0x80000000
++ MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0x80000000
++ MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0x80000000
++ MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0x80000000
++ MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0x80000000
++ MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0x80000000
++ MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0x80000000
++ MX6QDL_PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN 0x80000000
++ MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x80000000
++ MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0x80000000
++ MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0x80000000
++ >;
++ };
++
++ pinctrl_ipu1_3: ipu1grp-3 { /* parallel port 16-bit */
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT4__IPU1_CSI0_DATA04 0x80000000
++ MX6QDL_PAD_CSI0_DAT5__IPU1_CSI0_DATA05 0x80000000
++ MX6QDL_PAD_CSI0_DAT6__IPU1_CSI0_DATA06 0x80000000
++ MX6QDL_PAD_CSI0_DAT7__IPU1_CSI0_DATA07 0x80000000
++ MX6QDL_PAD_CSI0_DAT8__IPU1_CSI0_DATA08 0x80000000
++ MX6QDL_PAD_CSI0_DAT9__IPU1_CSI0_DATA09 0x80000000
++ MX6QDL_PAD_CSI0_DAT10__IPU1_CSI0_DATA10 0x80000000
++ MX6QDL_PAD_CSI0_DAT11__IPU1_CSI0_DATA11 0x80000000
++ MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0x80000000
++ MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0x80000000
++ MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0x80000000
++ MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0x80000000
++ MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0x80000000
++ MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0x80000000
++ MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0x80000000
++ MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0x80000000
++ MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x80000000
++ MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0x80000000
++ MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0x80000000
++ >;
++ };
++ };
++
++ mlb {
++ pinctrl_mlb_1: mlbgrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_3__MLB_CLK 0x71
++ MX6QDL_PAD_GPIO_6__MLB_SIG 0x71
++ MX6QDL_PAD_GPIO_2__MLB_DATA 0x71
++ >;
++ };
++
++ pinctrl_mlb_2: mlbgrp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_TXD1__MLB_CLK 0x80000000
++ MX6QDL_PAD_GPIO_6__MLB_SIG 0x80000000
++ MX6QDL_PAD_GPIO_2__MLB_DATA 0x80000000
++ >;
++ };
++ };
++
++ pwm1 {
++ pinctrl_pwm1_1: pwm1grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1
++ >;
++ };
++ };
++
++ pwm3 {
++ pinctrl_pwm3_1: pwm3grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
++ >;
++ };
++ };
++
++ spdif {
++ pinctrl_spdif_1: spdifgrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL3__SPDIF_IN 0x1b0b0
++ >;
++ };
++
++ pinctrl_spdif_2: spdifgrp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b0b0
++ MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
++ >;
++ };
++
++ pinctrl_spdif_3: spdifgrp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_RXD0__SPDIF_OUT 0x1b0b0
++ >;
++ };
++ };
++
++ uart1 {
++ pinctrl_uart1_1: uart1grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
++ >;
++ };
++ };
++
++ uart2 {
++ pinctrl_uart2_1: uart2grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart2_2: uart2grp-2 { /* DTE mode */
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D26__UART2_RX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D27__UART2_TX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B 0x1b0b1
++ >;
++ };
++ };
++
++ uart3 {
++ pinctrl_uart3_1: uart3grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D30__UART3_CTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart3_2: uart3grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1
++ >;
++ };
++ };
++
++ uart4 {
++ pinctrl_uart4_1: uart4grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
++ >;
++ };
++ };
++
++ usbotg {
++ pinctrl_usbotg_1: usbotggrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++ >;
++ };
++
++ pinctrl_usbotg_2: usbotggrp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
++ >;
++ };
++ };
++
++ usbh2 {
++ pinctrl_usbh2_1: usbh2grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_RGMII_TXC__USB_H2_DATA 0x40013030
++ MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40013030
++ >;
++ };
++
++ pinctrl_usbh2_2: usbh2grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40017030
++ >;
++ };
++ };
++
++ usbh3 {
++ pinctrl_usbh3_1: usbh3grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_RGMII_RX_CTL__USB_H3_DATA 0x40013030
++ MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE 0x40013030
++ >;
++ };
++
++ pinctrl_usbh3_2: usbh3grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE 0x40017030
++ >;
++ };
++ };
++
++ usdhc1 {
++ pinctrl_usdhc1_1: usdhc1grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059
++ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059
++ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
++ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
++ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
++ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
++ MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17059
++ MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17059
++ MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17059
++ MX6QDL_PAD_NANDF_D3__SD1_DATA7 0x17059
++ >;
++ };
++
++ pinctrl_usdhc1_2: usdhc1grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059
++ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059
++ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
++ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
++ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
++ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
++ >;
++ };
++ };
++
++ usdhc2 {
++ pinctrl_usdhc2_1: usdhc2grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
++ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
++ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
++ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
++ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
++ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
++ MX6QDL_PAD_NANDF_D4__SD2_DATA4 0x17059
++ MX6QDL_PAD_NANDF_D5__SD2_DATA5 0x17059
++ MX6QDL_PAD_NANDF_D6__SD2_DATA6 0x17059
++ MX6QDL_PAD_NANDF_D7__SD2_DATA7 0x17059
++ >;
++ };
++
++ pinctrl_usdhc2_2: usdhc2grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
++ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
++ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
++ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
++ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
++ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
++ >;
++ };
++ };
++
++ usdhc3 {
++ pinctrl_usdhc3_1: usdhc3grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
++ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
++ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
++ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
++ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
++ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
++ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
++ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
++ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
++ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
++ >;
++ };
++
++ pinctrl_usdhc3_1_100mhz: usdhc3grp-1-100mhz { /* 100Mhz */
++ fsl,pins = <
++ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170b9
++ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100b9
++ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170b9
++ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170b9
++ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170b9
++ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170b9
++ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170b9
++ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170b9
++ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170b9
++ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170b9
++ >;
++ };
++
++ pinctrl_usdhc3_1_200mhz: usdhc3grp-1-200mhz { /* 200Mhz */
++ fsl,pins = <
++ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170f9
++ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100f9
++ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170f9
++ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170f9
++ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170f9
++ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170f9
++ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170f9
++ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170f9
++ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170f9
++ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170f9
++ >;
++ };
++
++ pinctrl_usdhc3_2: usdhc3grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
++ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
++ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
++ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
++ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
++ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
++ >;
++ };
++ };
++
++ usdhc4 {
++ pinctrl_usdhc4_1: usdhc4grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
++ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
++ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
++ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
++ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
++ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
++ MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
++ MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
++ MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
++ MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
++ >;
++ };
++
++ pinctrl_usdhc4_2: usdhc4grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
++ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
++ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
++ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
++ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
++ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
++ >;
++ };
++ };
++
++ weim {
++ pinctrl_weim_cs0_1: weim_cs0grp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0b1
++ >;
++ };
++
++ pinctrl_weim_nor_1: weim_norgrp-1 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0b1
++ MX6QDL_PAD_EIM_RW__EIM_RW 0xb0b1
++ MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb060
++ /* data */
++ MX6QDL_PAD_EIM_D16__EIM_DATA16 0x1b0b0
++ MX6QDL_PAD_EIM_D17__EIM_DATA17 0x1b0b0
++ MX6QDL_PAD_EIM_D18__EIM_DATA18 0x1b0b0
++ MX6QDL_PAD_EIM_D19__EIM_DATA19 0x1b0b0
++ MX6QDL_PAD_EIM_D20__EIM_DATA20 0x1b0b0
++ MX6QDL_PAD_EIM_D21__EIM_DATA21 0x1b0b0
++ MX6QDL_PAD_EIM_D22__EIM_DATA22 0x1b0b0
++ MX6QDL_PAD_EIM_D23__EIM_DATA23 0x1b0b0
++ MX6QDL_PAD_EIM_D24__EIM_DATA24 0x1b0b0
++ MX6QDL_PAD_EIM_D25__EIM_DATA25 0x1b0b0
++ MX6QDL_PAD_EIM_D26__EIM_DATA26 0x1b0b0
++ MX6QDL_PAD_EIM_D27__EIM_DATA27 0x1b0b0
++ MX6QDL_PAD_EIM_D28__EIM_DATA28 0x1b0b0
++ MX6QDL_PAD_EIM_D29__EIM_DATA29 0x1b0b0
++ MX6QDL_PAD_EIM_D30__EIM_DATA30 0x1b0b0
++ MX6QDL_PAD_EIM_D31__EIM_DATA31 0x1b0b0
++ /* address */
++ MX6QDL_PAD_EIM_A23__EIM_ADDR23 0xb0b1
++ MX6QDL_PAD_EIM_A22__EIM_ADDR22 0xb0b1
++ MX6QDL_PAD_EIM_A21__EIM_ADDR21 0xb0b1
++ MX6QDL_PAD_EIM_A20__EIM_ADDR20 0xb0b1
++ MX6QDL_PAD_EIM_A19__EIM_ADDR19 0xb0b1
++ MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0b1
++ MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0b1
++ MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0b1
++ MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0b1
++ MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0b1
++ MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0b1
++ MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0b1
++ MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0b1
++ MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0b1
++ MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0b1
++ MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0b1
++ MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0b1
++ MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0b1
++ MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0b1
++ MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0b1
++ MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0b1
++ MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0b1
++ MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0b1
++ MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0b1
++ >;
+ };
+ };
+ };
+
+ ldb: ldb@020e0008 {
+- #address-cells = <1>;
+- #size-cells = <0>;
+ compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb";
+- gpr = <&gpr>;
++ reg = <0x020e0000 0x4000>;
++ clocks = <&clks 135>, <&clks 136>,
++ <&clks 39>, <&clks 40>,
++ <&clks 41>, <&clks 42>,
++ <&clks 184>, <&clks 185>,
++ <&clks 205>, <&clks 206>,
++ <&clks 207>, <&clks 208>;
++ clock-names = "ldb_di0", "ldb_di1",
++ "ipu1_di0_sel", "ipu1_di1_sel",
++ "ipu2_di0_sel", "ipu2_di1_sel",
++ "di0_div_3_5", "di1_div_3_5",
++ "di0_div_7", "di1_div_7",
++ "di0_div_sel", "di1_div_sel";
+ status = "disabled";
++ };
+
+- lvds-channel@0 {
+- reg = <0>;
+- crtcs = <&ipu1 0>;
+- status = "disabled";
+- };
+-
+- lvds-channel@1 {
+- reg = <1>;
+- crtcs = <&ipu1 1>;
+- status = "disabled";
+- };
+ hdmi: hdmi@0120000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
+ reg = <0x00120000 0x9000>;
+ interrupts = <0 115 0x04>;
+ gpr = <&gpr>;
+ clocks = <&clks 123>, <&clks 124>;
+ clock-names = "iahb", "isfr";
+ status = "disabled";
-+
-+ port@0 {
-+ reg = <0>;
-+
-+ hdmi_mux_0: endpoint {
-+ remote-endpoint = <&ipu1_di0_hdmi>;
-+ };
-+ };
-+
-+ port@1 {
-+ reg = <1>;
-+
-+ hdmi_mux_1: endpoint {
-+ remote-endpoint = <&ipu1_di1_hdmi>;
-+ };
- };
};
dcic1: dcic@020e4000 {
- reg = <0x020e4000 0x4000>;
-- interrupts = <0 124 0x04>;
-+ interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- dcic2: dcic@020e8000 {
- reg = <0x020e8000 0x4000>;
-- interrupts = <0 125 0x04>;
-+ interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- sdma: sdma@020ec000 {
- compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
- reg = <0x020ec000 0x4000>;
-- interrupts = <0 2 0x04>;
-+ interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
+@@ -580,6 +1474,8 @@
+ interrupts = <0 2 0x04>;
clocks = <&clks 155>, <&clks 155>;
clock-names = "ipg", "ahb";
+ #dma-cells = <3>;
++ iram = <&ocram>;
fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
};
};
-@@ -593,7 +776,8 @@
+@@ -591,9 +1487,29 @@
+ reg = <0x02100000 0x100000>;
+ ranges;
- caam@02100000 {
- reg = <0x02100000 0x40000>;
+- caam@02100000 {
+- reg = <0x02100000 0x40000>;
- interrupts = <0 105 0x04 0 106 0x04>;
-+ interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 106 IRQ_TYPE_LEVEL_HIGH>;
++ crypto: caam@2100000 {
++ compatible = "fsl,sec-v4.0";
++ #address-cells = <1>;
++ #size-cells = <1>;
++ reg = <0x2100000 0x40000>;
++ ranges = <0 0x2100000 0x40000>;
++ interrupt-parent = <&intc>; /* interrupts = <0 92 0x4>; */
++ clocks = <&clks 213>, <&clks 214>, <&clks 215>;
++ clock-names = "caam_mem", "caam_aclk", "caam_ipg";
++
++ sec_jr0: jr0@1000 {
++ compatible = "fsl,sec-v4.0-job-ring";
++ reg = <0x1000 0x1000>;
++ interrupt-parent = <&intc>;
++ interrupts = <0 105 0x4>;
++ };
++
++ sec_jr1: jr1@2000 {
++ compatible = "fsl,sec-v4.0-job-ring";
++ reg = <0x2000 0x1000>;
++ interrupt-parent = <&intc>;
++ interrupts = <0 106 0x4>;
++ };
};
aipstz@0217c000 { /* AIPSTZ2 */
-@@ -603,7 +787,7 @@
- usbotg: usb@02184000 {
- compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
- reg = <0x02184000 0x200>;
-- interrupts = <0 43 0x04>;
-+ interrupts = <0 43 IRQ_TYPE_LEVEL_HIGH>;
+@@ -607,6 +1523,7 @@
clocks = <&clks 162>;
fsl,usbphy = <&usbphy1>;
fsl,usbmisc = <&usbmisc 0>;
-@@ -613,7 +797,7 @@
- usbh1: usb@02184200 {
- compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
- reg = <0x02184200 0x200>;
-- interrupts = <0 40 0x04>;
-+ interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 162>;
- fsl,usbphy = <&usbphy2>;
- fsl,usbmisc = <&usbmisc 1>;
-@@ -623,7 +807,7 @@
- usbh2: usb@02184400 {
- compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
- reg = <0x02184400 0x200>;
-- interrupts = <0 41 0x04>;
-+ interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 162>;
- fsl,usbmisc = <&usbmisc 2>;
++ fsl,anatop = <&anatop>;
status = "disabled";
-@@ -632,13 +816,13 @@
- usbh3: usb@02184600 {
- compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
- reg = <0x02184600 0x200>;
-- interrupts = <0 42 0x04>;
-+ interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 162>;
- fsl,usbmisc = <&usbmisc 3>;
+ };
+
+@@ -638,7 +1555,7 @@
status = "disabled";
};
@@ -22582,90 +4954,35 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
#index-cells = <1>;
compatible = "fsl,imx6q-usbmisc";
reg = <0x02184800 0x200>;
-@@ -648,7 +832,9 @@
- fec: ethernet@02188000 {
- compatible = "fsl,imx6q-fec";
- reg = <0x02188000 0x4000>;
-- interrupts = <0 118 0x04 0 119 0x04>;
-+ interrupts-extended =
-+ <&intc 0 118 IRQ_TYPE_LEVEL_HIGH>,
-+ <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 117>, <&clks 117>, <&clks 190>;
- clock-names = "ipg", "ahb", "ptp";
+@@ -654,9 +1571,14 @@
status = "disabled";
-@@ -656,13 +842,15 @@
+ };
- mlb@0218c000 {
+- mlb@0218c000 {
++ mlb: mlb@0218c000 {
++ compatible = "fsl,imx6q-mlb150";
reg = <0x0218c000 0x4000>;
-- interrupts = <0 53 0x04 0 117 0x04 0 126 0x04>;
-+ interrupts = <0 53 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 117 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 126 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 53 0x04 0 117 0x04 0 126 0x04>;
++ clocks = <&clks 139>, <&clks 175>;
++ clock-names = "mlb", "pll8_mlb";
++ iram = <&ocram>;
++ status = "disabled";
};
usdhc1: usdhc@02190000 {
- compatible = "fsl,imx6q-usdhc";
- reg = <0x02190000 0x4000>;
-- interrupts = <0 22 0x04>;
-+ interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 163>, <&clks 163>, <&clks 163>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
-@@ -672,7 +860,7 @@
- usdhc2: usdhc@02194000 {
- compatible = "fsl,imx6q-usdhc";
- reg = <0x02194000 0x4000>;
-- interrupts = <0 23 0x04>;
-+ interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 164>, <&clks 164>, <&clks 164>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
-@@ -682,7 +870,7 @@
- usdhc3: usdhc@02198000 {
- compatible = "fsl,imx6q-usdhc";
- reg = <0x02198000 0x4000>;
-- interrupts = <0 24 0x04>;
-+ interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 165>, <&clks 165>, <&clks 165>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
-@@ -692,7 +880,7 @@
- usdhc4: usdhc@0219c000 {
- compatible = "fsl,imx6q-usdhc";
- reg = <0x0219c000 0x4000>;
-- interrupts = <0 25 0x04>;
-+ interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 166>, <&clks 166>, <&clks 166>;
- clock-names = "ipg", "ahb", "per";
- bus-width = <4>;
-@@ -704,7 +892,7 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
- reg = <0x021a0000 0x4000>;
-- interrupts = <0 36 0x04>;
-+ interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 125>;
- status = "disabled";
- };
-@@ -714,7 +902,7 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
- reg = <0x021a4000 0x4000>;
-- interrupts = <0 37 0x04>;
-+ interrupts = <0 37 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 126>;
- status = "disabled";
- };
-@@ -724,7 +912,7 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
- reg = <0x021a8000 0x4000>;
-- interrupts = <0 38 0x04>;
-+ interrupts = <0 38 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 127>;
- status = "disabled";
+@@ -733,6 +1655,11 @@
+ reg = <0x021ac000 0x4000>;
};
-@@ -742,29 +930,26 @@
+
++ mmdc0-1@021b0000 { /* MMDC0-1 */
++ compatible = "fsl,imx6q-mmdc-combine";
++ reg = <0x021b0000 0x8000>;
++ };
++
+ mmdc0: mmdc@021b0000 { /* MMDC0 */
+ compatible = "fsl,imx6q-mmdc";
+ reg = <0x021b0000 0x4000>;
+@@ -742,20 +1669,23 @@
reg = <0x021b4000 0x4000>;
};
@@ -22673,15 +4990,14 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
+ weim: weim@021b8000 {
+ compatible = "fsl,imx6q-weim";
reg = <0x021b8000 0x4000>;
-- interrupts = <0 14 0x04>;
-+ interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 14 0x04>;
+ clocks = <&clks 196>;
};
- ocotp@021bc000 {
- compatible = "fsl,imx6q-ocotp";
-+ ocotp: ocotp@021bc000 {
-+ compatible = "fsl,imx6q-ocotp", "syscon";
++ ocotp: ocotp-ctrl@021bc000 {
++ compatible = "syscon";
reg = <0x021bc000 0x4000>;
};
@@ -22689,64 +5005,48 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
- reg = <0x021c0000 0x4000>;
- interrupts = <0 21 0x04>;
- };
--
++ ocotp-fuse@021bc000 {
++ compatible = "fsl,imx6q-ocotp";
++ reg = <0x021bc000 0x4000>;
++ clocks = <&clks 128>;
++ };
+
tzasc@021d0000 { /* TZASC1 */
reg = <0x021d0000 0x4000>;
-- interrupts = <0 108 0x04>;
-+ interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- tzasc@021d4000 { /* TZASC2 */
- reg = <0x021d4000 0x4000>;
-- interrupts = <0 109 0x04>;
-+ interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- audmux: audmux@021d8000 {
-@@ -773,64 +958,143 @@
+@@ -773,17 +1703,26 @@
status = "disabled";
};
- mipi@021dc000 { /* MIPI-CSI */
-+ mipi_csi: mipi@021dc000 {
++ mipi_csi: mipi_csi@021dc000 {
++ compatible = "fsl,imx6q-mipi-csi2";
reg = <0x021dc000 0x4000>;
- };
-
+- };
+-
- mipi@021e0000 { /* MIPI-DSI */
-+ mipi_dsi: mipi@021e0000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
- reg = <0x021e0000 0x4000>;
+- reg = <0x021e0000 0x4000>;
++ interrupts = <0 100 0x04>, <0 101 0x04>;
++ clocks = <&clks 138>, <&clks 53>;
++ /* Note: clks 138 is hsi_tx, however, the dphy_c
++ * hsi_tx and pll_refclk use the same clk gate.
++ * In current clk driver, open/close clk gate do
++ * use hsi_tx for a temporary debug purpose.
++ */
++ clock-names = "dphy_clk", "pixel_clk";
+ status = "disabled";
-+
-+ port@0 {
-+ reg = <0>;
-+
-+ mipi_mux_0: endpoint {
-+ remote-endpoint = <&ipu1_di0_mipi>;
-+ };
-+ };
-+
-+ port@1 {
-+ reg = <1>;
-+
-+ mipi_mux_1: endpoint {
-+ remote-endpoint = <&ipu1_di1_mipi>;
-+ };
-+ };
};
vdoa@021e4000 {
++ compatible = "fsl,imx6q-vdoa";
reg = <0x021e4000 0x4000>;
-- interrupts = <0 18 0x04>;
-+ interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <0 18 0x04>;
++ clocks = <&clks 202>;
++ iram = <&ocram>;
};
uart2: serial@021e8000 {
- compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
- reg = <0x021e8000 0x4000>;
-- interrupts = <0 27 0x04>;
-+ interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH>;
+@@ -792,6 +1731,8 @@
+ interrupts = <0 27 0x04>;
clocks = <&clks 160>, <&clks 161>;
clock-names = "ipg", "per";
+ dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
@@ -22754,11 +5054,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
status = "disabled";
};
- uart3: serial@021ec000 {
- compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
- reg = <0x021ec000 0x4000>;
-- interrupts = <0 28 0x04>;
-+ interrupts = <0 28 IRQ_TYPE_LEVEL_HIGH>;
+@@ -801,6 +1742,8 @@
+ interrupts = <0 28 0x04>;
clocks = <&clks 160>, <&clks 161>;
clock-names = "ipg", "per";
+ dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
@@ -22766,11 +5063,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
status = "disabled";
};
- uart4: serial@021f0000 {
- compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
- reg = <0x021f0000 0x4000>;
-- interrupts = <0 29 0x04>;
-+ interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
+@@ -810,6 +1753,8 @@
+ interrupts = <0 29 0x04>;
clocks = <&clks 160>, <&clks 161>;
clock-names = "ipg", "per";
+ dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
@@ -22778,11 +5072,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
status = "disabled";
};
- uart5: serial@021f4000 {
- compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
- reg = <0x021f4000 0x4000>;
-- interrupts = <0 30 0x04>;
-+ interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
+@@ -819,18 +1764,24 @@
+ interrupts = <0 30 0x04>;
clocks = <&clks 160>, <&clks 161>;
clock-names = "ipg", "per";
+ dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
@@ -22793,2322 +5084,459 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
ipu1: ipu@02400000 {
- #crtc-cells = <1>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
compatible = "fsl,imx6q-ipu";
reg = <0x02400000 0x400000>;
-- interrupts = <0 6 0x4 0 5 0x4>;
-+ interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 5 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 130>, <&clks 131>, <&clks 132>;
- clock-names = "bus", "di0", "di1";
+ interrupts = <0 6 0x4 0 5 0x4>;
+- clocks = <&clks 130>, <&clks 131>, <&clks 132>;
+- clock-names = "bus", "di0", "di1";
++ 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>;
-+
-+ ipu1_di0: port@2 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <2>;
-+
-+ ipu1_di0_disp0: endpoint@0 {
-+ };
-+
-+ ipu1_di0_hdmi: endpoint@1 {
-+ remote-endpoint = <&hdmi_mux_0>;
-+ };
-+
-+ ipu1_di0_mipi: endpoint@2 {
-+ remote-endpoint = <&mipi_mux_0>;
-+ };
-+
-+ ipu1_di0_lvds0: endpoint@3 {
-+ remote-endpoint = <&lvds0_mux_0>;
-+ };
-+
-+ ipu1_di0_lvds1: endpoint@4 {
-+ remote-endpoint = <&lvds1_mux_0>;
-+ };
-+ };
-+
-+ ipu1_di1: port@3 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <3>;
-+
-+ ipu1_di0_disp1: endpoint@0 {
-+ };
-+
-+ ipu1_di1_hdmi: endpoint@1 {
-+ remote-endpoint = <&hdmi_mux_1>;
-+ };
-+
-+ ipu1_di1_mipi: endpoint@2 {
-+ remote-endpoint = <&mipi_mux_1>;
-+ };
-+
-+ ipu1_di1_lvds0: endpoint@3 {
-+ remote-endpoint = <&lvds0_mux_1>;
-+ };
-+
-+ ipu1_di1_lvds1: endpoint@4 {
-+ remote-endpoint = <&lvds1_mux_1>;
-+ };
-+ };
++ bypass_reset = <0>;
};
};
};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,374 @@
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-solidrun/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+--- linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-04-24 07:58:12.876168828 +0200
+@@ -0,0 +1,58 @@
+/*
-+ * Copyright 2013 Gateworks Corporation
++ * Copyright 2013 Russell King
+ *
+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
++ * License version 2.
+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
++ * This describes the hookup for an AR8035 to the IMX6 on the Cubox-i
++ * MicroSOM.
++ *
++ * FIXME: we need to configure PLL_ENET to produce 25MHz, but there
++ * doesn't seem to be a way to do that yet from DT. (Writing 0x2000
++ * to 0x020c80e0 phys will do this.)
+ */
-+
-+/ {
-+ /* these are used by bootloader for disabling nodes */
-+ aliases {
-+ can0 = &can1;
-+ ethernet0 = &fec;
-+ led0 = &led0;
-+ led1 = &led1;
-+ nand = &gpmi;
-+ usb0 = &usbh1;
-+ usb1 = &usbotg;
-+ };
-+
-+ chosen {
-+ bootargs = "console=ttymxc1,115200";
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ led0: user1 {
-+ label = "user1";
-+ gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-+ default-state = "on";
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ led1: user2 {
-+ label = "user2";
-+ gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-+ default-state = "off";
-+ };
-+ };
-+
-+ memory {
-+ reg = <0x10000000 0x20000000>;
-+ };
-+
-+ pps {
-+ compatible = "pps-gpio";
-+ gpios = <&gpio1 26 0>;
-+ status = "okay";
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p3v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_5p0v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "5P0V";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_otg_vbus: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
-+ enable-active-high;
-+ };
-+ };
-+};
-+
+&fec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
++ pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio1 30 0>;
-+ status = "okay";
-+};
-+
-+&gpmi {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ eeprom1: eeprom@50 {
-+ compatible = "atmel,24c02";
-+ reg = <0x50>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom2: eeprom@51 {
-+ compatible = "atmel,24c02";
-+ reg = <0x51>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom3: eeprom@52 {
-+ compatible = "atmel,24c02";
-+ reg = <0x52>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom4: eeprom@53 {
-+ compatible = "atmel,24c02";
-+ reg = <0x53>;
-+ pagesize = <16>;
-+ };
-+
-+ gpio: pca9555@23 {
-+ compatible = "nxp,pca9555";
-+ reg = <0x23>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ };
-+
-+ hwmon: gsc@29 {
-+ compatible = "gw,gsp";
-+ reg = <0x29>;
-+ };
-+
-+ rtc: ds1672@68 {
-+ compatible = "dallas,ds1672";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ pmic: ltc3676@3c {
-+ compatible = "ltc,ltc3676";
-+ reg = <0x3c>;
-+
-+ regulators {
-+ sw1_reg: ltc3676__sw1 {
-+ regulator-min-microvolt = <1175000>;
-+ regulator-max-microvolt = <1175000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw2_reg: ltc3676__sw2 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3_reg: ltc3676__sw3 {
-+ regulator-min-microvolt = <1175000>;
-+ regulator-max-microvolt = <1175000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw4_reg: ltc3676__sw4 {
-+ regulator-min-microvolt = <1500000>;
-+ regulator-max-microvolt = <1500000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ ldo2_reg: ltc3676__ldo2 {
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ ldo4_reg: ltc3676__ldo4 {
-+ regulator-min-microvolt = <3000000>;
-+ regulator-max-microvolt = <3000000>;
-+ };
-+ };
-+ };
-+};
-+
-+&i2c3 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
++ phy-reset-duration = <2>;
++ phy-reset-gpios = <&gpio4 15 0>;
+ status = "okay";
-+
-+ videoin: adv7180@20 {
-+ compatible = "adi,adv7180";
-+ reg = <0x20>;
-+ };
+};
+
+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6qdl-gw51xx {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x80000000 /* MEZZ_DIO0 */
-+ MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000 /* MEZZ_DIO1 */
-+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 /* OTG_PWR_EN */
-+ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* GPS_PPS */
-+ MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* PHY Reset */
-+ MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x80000000 /* PCIE_RST# */
-+ MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x80000000 /* user1 led */
-+ MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x80000000 /* user2 led */
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
++ enet {
++ pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ /* AR8035 reset */
++ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0
++ /* AR8035 interrupt */
++ MX6QDL_PAD_DI0_PIN2__GPIO4_IO18 0x80000000
++ /* GPIO16 -> AR8035 25MHz */
++ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0xc0000000
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x80000000
+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart5: uart5grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++ /* AR8035 CLK_25M --> ENET_REF_CLK (V22) */
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x0a0b1
++ /* AR8035 pin strapping: IO voltage: pull up */
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
++ /* AR8035 pin strapping: PHYADDR#0: pull down */
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x130b0
++ /* AR8035 pin strapping: PHYADDR#1: pull down */
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x130b0
++ /* AR8035 pin strapping: MODE#1: pull up */
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
++ /* AR8035 pin strapping: MODE#3: pull up */
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
++ /* AR8035 pin strapping: MODE#0: pull down */
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x130b0
+ >;
+ };
+ };
+};
-+
-+&pcie {
-+ reset-gpio = <&gpio1 0 0>;
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ status = "okay";
-+};
-+
-+&uart5 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart5>;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,490 @@
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-solidrun/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-04-24 07:58:12.876168828 +0200
+@@ -0,0 +1,120 @@
+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
++ * Copyright (C) 2013,2014 Russell King
+ */
-+
++#include <dt-bindings/gpio/gpio.h>
+/ {
-+ /* these are used by bootloader for disabling nodes */
-+ aliases {
-+ ethernet0 = &fec;
-+ led0 = &led0;
-+ led1 = &led1;
-+ led2 = &led2;
-+ nand = &gpmi;
-+ ssi0 = &ssi1;
-+ usb0 = &usbh1;
-+ usb1 = &usbotg;
-+ usdhc2 = &usdhc3;
-+ };
-+
-+ chosen {
-+ bootargs = "console=ttymxc1,115200";
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ led0: user1 {
-+ label = "user1";
-+ gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-+ default-state = "on";
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ led1: user2 {
-+ label = "user2";
-+ gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-+ default-state = "off";
-+ };
-+
-+ led2: user3 {
-+ label = "user3";
-+ gpios = <&gpio4 15 1>; /* 111 - MX6_LOCLED# */
-+ default-state = "off";
-+ };
-+ };
-+
-+ memory {
-+ reg = <0x10000000 0x20000000>;
-+ };
-+
-+ pps {
-+ compatible = "pps-gpio";
-+ gpios = <&gpio1 26 0>;
-+ status = "okay";
-+ };
-+
+ regulators {
+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_1p0v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "1P0V";
-+ regulator-min-microvolt = <1000000>;
-+ regulator-max-microvolt = <1000000>;
-+ regulator-always-on;
-+ };
-+
-+ /* remove this fixed regulator once ltc3676__sw2 driver available */
-+ reg_1p8v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "1P8V";
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
-+ };
+
-+ reg_3p3v: regulator@2 {
++ reg_brcm_osc: brcm-osc-reg {
+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "3P3V";
++ enable-active-high;
++ gpio = <&gpio5 5 0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_microsom_brcm_osc_reg>;
++ regulator-name = "brcm_osc_reg";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
++ regulator-boot-on;
+ };
+
-+ reg_5p0v: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "5P0V";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_otg_vbus: regulator@4 {
++ reg_brcm: brcm-reg {
+ compatible = "regulator-fixed";
-+ reg = <4>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
+ enable-active-high;
++ gpio = <&gpio3 19 0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
++ regulator-name = "brcm_reg";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ startup-delay-us = <200000>;
+ };
+ };
-+
-+ sound {
-+ compatible = "fsl,imx6q-sabrelite-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx6q-sabrelite-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <4>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio1 30 0>;
-+ status = "okay";
-+};
-+
-+&gpmi {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ eeprom1: eeprom@50 {
-+ compatible = "atmel,24c02";
-+ reg = <0x50>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom2: eeprom@51 {
-+ compatible = "atmel,24c02";
-+ reg = <0x51>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom3: eeprom@52 {
-+ compatible = "atmel,24c02";
-+ reg = <0x52>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom4: eeprom@53 {
-+ compatible = "atmel,24c02";
-+ reg = <0x53>;
-+ pagesize = <16>;
-+ };
-+
-+ gpio: pca9555@23 {
-+ compatible = "nxp,pca9555";
-+ reg = <0x23>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ };
-+
-+ hwmon: gsc@29 {
-+ compatible = "gw,gsp";
-+ reg = <0x29>;
-+ };
-+
-+ rtc: ds1672@68 {
-+ compatible = "dallas,ds1672";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ pciswitch: pex8609@3f {
-+ compatible = "plx,pex8609";
-+ reg = <0x3f>;
-+ };
-+
-+ pmic: ltc3676@3c {
-+ compatible = "ltc,ltc3676";
-+ reg = <0x3c>;
-+
-+ regulators {
-+ sw1_reg: ltc3676__sw1 {
-+ regulator-min-microvolt = <1175000>;
-+ regulator-max-microvolt = <1175000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw2_reg: ltc3676__sw2 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3_reg: ltc3676__sw3 {
-+ regulator-min-microvolt = <1175000>;
-+ regulator-max-microvolt = <1175000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw4_reg: ltc3676__sw4 {
-+ regulator-min-microvolt = <1500000>;
-+ regulator-max-microvolt = <1500000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ ldo2_reg: ltc3676__ldo2 {
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ ldo3_reg: ltc3676__ldo3 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ ldo4_reg: ltc3676__ldo4 {
-+ regulator-min-microvolt = <3000000>;
-+ regulator-max-microvolt = <3000000>;
-+ };
-+ };
-+ };
-+};
-+
-+&i2c3 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+
-+ accelerometer: fxos8700@1e {
-+ compatible = "fsl,fxos8700";
-+ reg = <0x13>;
-+ };
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 169>;
-+ VDDA-supply = <&reg_1p8v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
-+
-+ touchscreen: egalax_ts@04 {
-+ compatible = "eeti,egalax_ts";
-+ reg = <0x04>;
-+ interrupt-parent = <&gpio7>;
-+ interrupts = <12 2>; /* gpio7_12 active low */
-+ wakeup-gpios = <&gpio7 12 0>;
-+ };
-+
-+ videoin: adv7180@20 {
-+ compatible = "adi,adv7180";
-+ reg = <0x20>;
-+ };
+};
+
+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6qdl-gw52xx {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x80000000 /* MEZZ_DIO0 */
-+ MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000 /* MEZZ_DIO1 */
-+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 /* OTG_PWR_EN */
-+ MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x80000000 /* VIDDEC_PDN# */
-+ MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* PHY Reset */
-+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* PCIE_RST# */
-+ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x80000000 /* GPS_PWDN */
-+ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* GPS_PPS */
-+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000130b0 /* AUD4_MCK */
-+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 /* USB_SEL_PCI */
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* TOUCH_IRQ# */
-+ MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x80000000 /* user1 led */
-+ MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x80000000 /* user2 led */
-+ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 /* user3 led */
-+ MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x80000000 /* LVDS_TCH# */
-+ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 /* SD3_CD# */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* UART2_EN# */
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_DAT0__AUD4_RXD 0x130b0
-+ MX6QDL_PAD_SD2_DAT3__AUD4_TXC 0x130b0
-+ MX6QDL_PAD_SD2_DAT2__AUD4_TXD 0x110b0
-+ MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
++ microsom {
++ pinctrl_microsom_brcm_osc_reg: microsom-brcm-osc-reg {
+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
++ MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05 0x40013070
+ >;
+ };
+
-+ pinctrl_i2c3: i2c3grp {
++ pinctrl_microsom_brcm_reg: microsom-brcm-reg {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x40013070
+ >;
+ };
+
-+ pinctrl_uart1: uart1grp {
++ pinctrl_microsom_brcm_wifi: microsom-brcm-wifi {
+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
++ MX6QDL_PAD_GPIO_8__XTALOSC_REF_CLK_32K 0x1b0b0
++ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x40013070
++ MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26 0x40013070
++ MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27 0x40013070
+ >;
+ };
+
-+ pinctrl_uart2: uart2grp {
++ pinctrl_microsom_brcm_bt: microsom-brcm-bt {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00 0x40013070
++ MX6QDL_PAD_CSI0_DAT15__GPIO6_IO01 0x40013070
++ MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04 0x40013070
+ >;
+ };
+
-+ pinctrl_uart5: uart5grp {
++ pinctrl_microsom_uart1: microsom-uart1 {
+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+ >;
+ };
+
-+ pinctrl_usbotg: usbotggrp {
++ pinctrl_microsom_uart4_1: microsom-uart4 {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++ MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B 0x1b0b1
+ >;
+ };
+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
++ pinctrl_microsom_usbotg: microsom-usbotg {
++ /*
++ * Similar to pinctrl_usbotg_2, but we want it
++ * pulled down for a fixed host connection.
++ */
++ fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+ };
+ };
+};
+
-+&ldb {
-+ status = "okay";
-+ lvds-channel@0 {
-+ crtcs = <&ipu1 0>, <&ipu1 1>;
-+ };
-+};
-+
-+&pcie {
-+ reset-gpio = <&gpio1 29 0>;
-+ status = "okay";
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
+&uart1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
++ pinctrl-0 = <&pinctrl_microsom_uart1>;
+ status = "okay";
+};
+
-+&uart5 {
++/* UART4 - Connected to optional BRCM Wifi/BT/FM */
++&uart4 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart5>;
-+ status = "okay";
++ pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4_1>;
++ fsl,uart-has-rtscts;
+};
+
+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
++ pinctrl-0 = <&pinctrl_microsom_usbotg>;
+};
+
-+&usdhc3 {
++/* USDHC1 - Connected to optional BRCM Wifi/BT/FM */
++&usdhc1 {
++ card-external-vcc-supply = <&reg_brcm>;
++ card-reset-gpios = <&gpio5 26 GPIO_ACTIVE_LOW>, <&gpio6 0 GPIO_ACTIVE_LOW>;
++ keep-power-in-suspend;
++ non-removable;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ cd-gpios = <&gpio7 0 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
++ pinctrl-0 = <&pinctrl_microsom_brcm_wifi &pinctrl_usdhc1_2>;
++ vmmc-supply = <&reg_brcm>;
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,553 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/ {
-+ /* these are used by bootloader for disabling nodes */
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-solidrun/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+--- linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-04-03 21:01:22.000000000 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-04-24 07:58:12.876168828 +0200
+@@ -11,9 +11,282 @@
+ */
+
+ / {
+ aliases {
-+ can0 = &can1;
-+ ethernet0 = &fec;
-+ ethernet1 = &eth1;
-+ led0 = &led0;
-+ led1 = &led1;
-+ led2 = &led2;
-+ nand = &gpmi;
-+ sky2 = &eth1;
-+ ssi0 = &ssi1;
-+ usb0 = &usbh1;
-+ usb1 = &usbotg;
-+ usdhc2 = &usdhc3;
-+ };
-+
-+ chosen {
-+ bootargs = "console=ttymxc1,115200";
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ led0: user1 {
-+ label = "user1";
-+ gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-+ default-state = "on";
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ led1: user2 {
-+ label = "user2";
-+ gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-+ default-state = "off";
-+ };
-+
-+ led2: user3 {
-+ label = "user3";
-+ gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
-+ default-state = "off";
-+ };
-+ };
-+
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+
-+ pps {
-+ compatible = "pps-gpio";
-+ gpios = <&gpio1 26 0>;
-+ status = "okay";
++ mxcfb0 = &mxcfb1;
++ mxcfb1 = &mxcfb2;
++ mxcfb2 = &mxcfb3;
++ mxcfb3 = &mxcfb4;
+ };
+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_1p0v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "1P0V";
-+ regulator-min-microvolt = <1000000>;
-+ regulator-max-microvolt = <1000000>;
-+ regulator-always-on;
-+ };
+ memory {
+ reg = <0x10000000 0x80000000>;
+ };
+
-+ /* remove when pmic 1p8 regulator available */
-+ reg_1p8v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "1P8V";
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
++ gpio-keys {
++ compatible = "gpio-keys";
++ home {
++ label = "Home";
++ gpios = <&gpio1 11 0>;
++ linux,code = <102>; /* KEY_HOME */
++ gpio-key,wakeup;
+ };
+
-+ reg_3p3v: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
++ back {
++ label = "Back";
++ gpios = <&gpio1 12 0>;
++ linux,code = <158>; /* KEY_BACK */
++ gpio-key,wakeup;
+ };
+
-+ reg_usb_h1_vbus: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "usb_h1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ regulator-always-on;
++ program {
++ label = "Program";
++ gpios = <&gpio2 12 0>;
++ linux,code = <362>; /* KEY_PROGRAM */
++ gpio-key,wakeup;
+ };
+
-+ reg_usb_otg_vbus: regulator@4 {
-+ compatible = "regulator-fixed";
-+ reg = <4>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
-+ enable-active-high;
++ volume-up {
++ label = "Volume Up";
++ gpios = <&gpio2 15 0>;
++ linux,code = <115>; /* KEY_VOLUMEUP */
++ gpio-key,wakeup;
+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx6q-sabrelite-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx6q-sabrelite-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <4>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan1>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio1 30 0>;
-+ status = "okay";
-+};
-+
-+&gpmi {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ eeprom1: eeprom@50 {
-+ compatible = "atmel,24c02";
-+ reg = <0x50>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom2: eeprom@51 {
-+ compatible = "atmel,24c02";
-+ reg = <0x51>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom3: eeprom@52 {
-+ compatible = "atmel,24c02";
-+ reg = <0x52>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom4: eeprom@53 {
-+ compatible = "atmel,24c02";
-+ reg = <0x53>;
-+ pagesize = <16>;
-+ };
-+
-+ gpio: pca9555@23 {
-+ compatible = "nxp,pca9555";
-+ reg = <0x23>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ };
-+
-+ hwmon: gsc@29 {
-+ compatible = "gw,gsp";
-+ reg = <0x29>;
-+ };
-+
-+ rtc: ds1672@68 {
-+ compatible = "dallas,ds1672";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ pciclkgen: si53156@6b {
-+ compatible = "sil,si53156";
-+ reg = <0x6b>;
-+ };
-+
-+ pciswitch: pex8606@3f {
-+ compatible = "plx,pex8606";
-+ reg = <0x3f>;
-+ };
-+
-+ pmic: ltc3676@3c {
-+ compatible = "ltc,ltc3676";
-+ reg = <0x3c>;
-+
-+ regulators {
-+ /* VDD_SOC */
-+ sw1_reg: ltc3676__sw1 {
-+ regulator-min-microvolt = <1175000>;
-+ regulator-max-microvolt = <1175000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ /* VDD_1P8 */
-+ sw2_reg: ltc3676__sw2 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ /* VDD_ARM */
-+ sw3_reg: ltc3676__sw3 {
-+ regulator-min-microvolt = <1175000>;
-+ regulator-max-microvolt = <1175000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ /* VDD_DDR */
-+ sw4_reg: ltc3676__sw4 {
-+ regulator-min-microvolt = <1500000>;
-+ regulator-max-microvolt = <1500000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ /* VDD_2P5 */
-+ ldo2_reg: ltc3676__ldo2 {
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ /* VDD_1P8 */
-+ ldo3_reg: ltc3676__ldo3 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
+
-+ /* VDD_HIGH */
-+ ldo4_reg: ltc3676__ldo4 {
-+ regulator-min-microvolt = <3000000>;
-+ regulator-max-microvolt = <3000000>;
-+ };
++ volume-down {
++ label = "Volume Down";
++ gpios = <&gpio5 14 0>;
++ linux,code = <114>; /* KEY_VOLUMEDOWN */
++ gpio-key,wakeup;
+ };
+ };
-+};
-+
-+&i2c3 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+
-+ accelerometer: fxos8700@1e {
-+ compatible = "fsl,fxos8700";
-+ reg = <0x1e>;
-+ };
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 201>;
-+ VDDA-supply = <&reg_1p8v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
-+
-+ hdmiin: adv7611@4c {
-+ compatible = "adi,adv7611";
-+ reg = <0x4c>;
-+ };
-+
-+ touchscreen: egalax_ts@04 {
-+ compatible = "eeti,egalax_ts";
-+ reg = <0x04>;
-+ interrupt-parent = <&gpio1>;
-+ interrupts = <11 2>; /* gpio1_11 active low */
-+ wakeup-gpios = <&gpio1 11 0>;
-+ };
-+
-+ videoout: adv7393@2a {
-+ compatible = "adi,adv7393";
-+ reg = <0x2a>;
-+ };
+
-+ videoin: adv7180@20 {
-+ compatible = "adi,adv7180";
-+ reg = <0x20>;
++ max7310_reset: max7310-reset {
++ compatible = "gpio-reset";
++ reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
++ reset-delay-us = <1>;
++ #reset-cells = <0>;
+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6qdl-gw53xx {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x80000000 /* PCIE6EXP_DIO0 */
-+ MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000 /* PCIE6EXP_DIO1 */
-+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 /* OTG_PWR_EN */
-+ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x80000000 /* GPS_SHDN */
-+ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* GPS_PPS */
-+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000 /* PCIE IRQ */
-+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* PCIE RST */
-+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000130b0 /* AUD4_MCK */
-+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 /* CAN_STBY */
-+ MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x80000000 /* PMIC_IRQ# */
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000 /* HUB_RST# */
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* PCIE_WDIS# */
-+ MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x80000000 /* ACCEL_IRQ# */
-+ MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x80000000 /* user1 led */
-+ MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x80000000 /* USBOTG_OC# */
-+ MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x80000000 /* user2 led */
-+ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 /* user3 led */
-+ MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x80000000 /* TOUCH_IRQ# */
-+ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 /* SD3_DET# */
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_DAT0__AUD4_RXD 0x130b0
-+ MX6QDL_PAD_SD2_DAT3__AUD4_TXC 0x130b0
-+ MX6QDL_PAD_SD2_DAT2__AUD4_TXD 0x110b0
-+ MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
+
-+ pinctrl_flexcan1: flexcan1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
-+ MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart5: uart5grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
++ mxcfb1: fb@0 {
++ 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 = "disabled";
+ };
-+};
-+
-+&ldb {
-+ status = "okay";
-+
-+ lvds-channel@1 {
-+ fsl,data-mapping = "spwg";
-+ fsl,data-width = <18>;
-+ status = "okay";
+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: hsd100pxn1 {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vfront-porch = <7>;
-+ hsync-len = <60>;
-+ vsync-len = <10>;
-+ };
-+ };
++ mxcfb2: fb@1 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "hdmi";
++ interface_pix_fmt = "RGB24";
++ mode_str ="1920x1080M@60";
++ default_bpp = <24>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "disabled";
+ };
-+};
-+
-+&pcie {
-+ reset-gpio = <&gpio1 29 0>;
-+ status = "okay";
+
-+ eth1: sky2@8 { /* MAC/PHY on bus 8 */
-+ compatible = "marvell,sky2";
++ mxcfb3: fb@2 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "lcd";
++ interface_pix_fmt = "RGB565";
++ mode_str ="CLAA-WVGA";
++ default_bpp = <16>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "disabled";
+ };
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
+
-+&uart5 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart5>;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <&reg_usb_h1_vbus>;
-+ status = "okay";
-+};
-+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ cd-gpios = <&gpio7 0 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,580 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/ {
-+ /* these are used by bootloader for disabling nodes */
-+ aliases {
-+ can0 = &can1;
-+ ethernet0 = &fec;
-+ ethernet1 = &eth1;
-+ led0 = &led0;
-+ led1 = &led1;
-+ led2 = &led2;
-+ nand = &gpmi;
-+ sky2 = &eth1;
-+ ssi0 = &ssi1;
-+ usb0 = &usbh1;
-+ usb1 = &usbotg;
-+ usdhc2 = &usdhc3;
++ mxcfb4: fb@3 {
++ 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 = "disabled";
+ };
+
-+ chosen {
-+ bootargs = "console=ttymxc1,115200";
++ backlight {
++ compatible = "pwm-backlight";
++ pwms = <&pwm3 0 5000000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <7>;
+ };
+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ led0: user1 {
-+ label = "user1";
-+ gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-+ default-state = "on";
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ led1: user2 {
-+ label = "user2";
-+ gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-+ default-state = "off";
++ regulators {
++ compatible = "simple-bus";
++ reg_audio: cs42888_supply {
++ compatible = "regulator-fixed";
++ regulator-name = "cs42888_supply";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ regulator-always-on;
+ };
+
-+ led2: user3 {
-+ label = "user3";
-+ gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
-+ default-state = "off";
++ si4763_vio1: vio1_tnr {
++ compatible = "regulator-fixed";
++ regulator-name = "vio1";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ regulator-always-on;
+ };
-+ };
-+
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+
-+ pps {
-+ compatible = "pps-gpio";
-+ gpios = <&gpio1 26 0>;
-+ status = "okay";
-+ };
+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_1p0v: regulator@0 {
++ si4763_vio2: vio2_tnr {
+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "1P0V";
-+ regulator-min-microvolt = <1000000>;
-+ regulator-max-microvolt = <1000000>;
++ regulator-name = "vio2";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
-+ reg_3p3v: regulator@1 {
++ si4763_vd: f3v3_tnr {
+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "3P3V";
++ regulator-name = "vd";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
-+ reg_usb_h1_vbus: regulator@2 {
++ si4763_va: f5v_tnr {
+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "usb_h1_vbus";
++ regulator-name = "va";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-always-on;
+ };
+
-+ reg_usb_otg_vbus: regulator@3 {
++ reg_usb_h1_vbus: usb_h1_vbus {
+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "usb_otg_vbus";
++ regulator-name = "usb_h1_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
++ gpio = <&max7310_b 7 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx6q-sabrelite-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx6q-sabrelite-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <4>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>; /* AUD4<->sgtl5000 */
-+ status = "okay";
-+};
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan1>;
-+ status = "okay";
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio1 30 0>;
-+ status = "okay";
-+};
-+
-+&gpmi {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ eeprom1: eeprom@50 {
-+ compatible = "atmel,24c02";
-+ reg = <0x50>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom2: eeprom@51 {
-+ compatible = "atmel,24c02";
-+ reg = <0x51>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom3: eeprom@52 {
-+ compatible = "atmel,24c02";
-+ reg = <0x52>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom4: eeprom@53 {
-+ compatible = "atmel,24c02";
-+ reg = <0x53>;
-+ pagesize = <16>;
-+ };
-+
-+ gpio: pca9555@23 {
-+ compatible = "nxp,pca9555";
-+ reg = <0x23>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ };
-+
-+ hwmon: gsc@29 {
-+ compatible = "gw,gsp";
-+ reg = <0x29>;
-+ };
-+
-+ rtc: ds1672@68 {
-+ compatible = "dallas,ds1672";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ pmic: pfuze100@08 {
-+ compatible = "fsl,pfuze100";
-+ reg = <0x08>;
-+
-+ regulators {
-+ sw1a_reg: sw1ab {
-+ regulator-min-microvolt = <300000>;
-+ regulator-max-microvolt = <1875000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ regulator-ramp-delay = <6250>;
-+ };
-+
-+ sw1c_reg: sw1c {
-+ regulator-min-microvolt = <300000>;
-+ regulator-max-microvolt = <1875000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ regulator-ramp-delay = <6250>;
-+ };
-+
-+ sw2_reg: sw2 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <3950000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3a_reg: sw3a {
-+ regulator-min-microvolt = <400000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3b_reg: sw3b {
-+ regulator-min-microvolt = <400000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw4_reg: sw4 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ swbst_reg: swbst {
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5150000>;
-+ };
-+
-+ snvs_reg: vsnvs {
-+ regulator-min-microvolt = <1000000>;
-+ regulator-max-microvolt = <3000000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vref_reg: vrefddr {
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vgen1_reg: vgen1 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <1550000>;
-+ };
-+
-+ vgen2_reg: vgen2 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <1550000>;
-+ };
-+
-+ vgen3_reg: vgen3 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ vgen4_reg: vgen4 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vgen5_reg: vgen5 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vgen6_reg: vgen6 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+ };
-+
-+ pciswitch: pex8609@3f {
-+ compatible = "plx,pex8609";
-+ reg = <0x3f>;
-+ };
-+
-+ pciclkgen: si52147@6b {
-+ compatible = "sil,si52147";
-+ reg = <0x6b>;
-+ };
-+};
-+
-+&i2c3 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+
-+ accelerometer: fxos8700@1e {
-+ compatible = "fsl,fxos8700";
-+ reg = <0x1e>;
-+ };
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 201>;
-+ VDDA-supply = <&sw4_reg>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
-+
-+ hdmiin: adv7611@4c {
-+ compatible = "adi,adv7611";
-+ reg = <0x4c>;
-+ };
-+
-+ touchscreen: egalax_ts@04 {
-+ compatible = "eeti,egalax_ts";
-+ reg = <0x04>;
-+ interrupt-parent = <&gpio7>;
-+ interrupts = <12 2>; /* gpio7_12 active low */
-+ wakeup-gpios = <&gpio7 12 0>;
-+ };
-+
-+ videoout: adv7393@2a {
-+ compatible = "adi,adv7393";
-+ reg = <0x2a>;
-+ };
-+
-+ videoin: adv7180@20 {
-+ compatible = "adi,adv7180";
-+ reg = <0x20>;
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6qdl-gw54xx {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 /* OTG_PWR_EN */
-+ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 /* SPINOR_CS0# */
-+ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* GPS_PPS */
-+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000 /* PCIE IRQ */
-+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* PCIE RST */
-+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000130b0 /* AUD4_MCK */
-+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 /* CAN_STBY */
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* TOUCH_IRQ# */
-+ MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x80000000 /* user1 led */
-+ MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x80000000 /* user2 led */
-+ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 /* user3 led */
-+ MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x80000000 /* USBHUB_RST# */
-+ MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 0x80000000 /* MIPI_DIO */
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_DAT0__AUD4_RXD 0x130b0
-+ MX6QDL_PAD_SD2_DAT3__AUD4_TXC 0x130b0
-+ MX6QDL_PAD_SD2_DAT2__AUD4_TXD 0x110b0
-+ MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_flexcan1: flexcan1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
-+ MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart5: uart5grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+ };
-+};
-+
-+&ldb {
-+ status = "okay";
-+
-+ lvds-channel@1 {
-+ fsl,data-mapping = "spwg";
-+ fsl,data-width = <18>;
-+ status = "okay";
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: hsd100pxn1 {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vfront-porch = <7>;
-+ hsync-len = <60>;
-+ vsync-len = <10>;
-+ };
-+ };
-+ };
-+};
-+
-+&pcie {
-+ reset-gpio = <&gpio1 29 0>;
-+ status = "okay";
-+
-+ eth1: sky2@8 { /* MAC/PHY on bus 8 */
-+ compatible = "marvell,sky2";
-+ };
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&ssi2 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&uart5 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart5>;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <&reg_usb_h1_vbus>;
-+ status = "okay";
-+};
-+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ cd-gpios = <&gpio7 0 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,62 @@
-+/*
-+ * Copyright (C) 2013,2014 Russell King
-+ *
-+ * This describes the hookup for an AR8035 to the iMX6 on the SolidRun
-+ * MicroSOM.
-+ */
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
-+ phy-mode = "rgmii";
-+ phy-reset-duration = <2>;
-+ phy-reset-gpios = <&gpio4 15 0>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ enet {
-+ pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ /* AR8035 reset */
-+ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0
-+ /* AR8035 interrupt */
-+ MX6QDL_PAD_DI0_PIN2__GPIO4_IO18 0x80000000
-+ /* GPIO16 -> AR8035 25MHz */
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0xc0000000
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x80000000
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ /* AR8035 CLK_25M --> ENET_REF_CLK (V22) */
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x0a0b1
-+ /* AR8035 pin strapping: IO voltage: pull up */
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ /* AR8035 pin strapping: PHYADDR#0: pull down */
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x130b0
-+ /* AR8035 pin strapping: PHYADDR#1: pull down */
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x130b0
-+ /* AR8035 pin strapping: MODE#1: pull up */
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ /* AR8035 pin strapping: MODE#3: pull up */
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ /* AR8035 pin strapping: MODE#0: pull down */
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x130b0
-+
-+ /*
-+ * As the RMII pins are also connected to RGMII
-+ * so that an AR8030 can be placed, set these
-+ * to high-z with the same pulls as above.
-+ * Use the GPIO settings to avoid changing the
-+ * input select registers.
-+ */
-+ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x03000
-+ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x03000
-+ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x03000
-+ >;
-+ };
-+ };
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-microsom.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (C) 2013,2014 Russell King
-+ */
-+
-+&iomuxc {
-+ microsom {
-+ pinctrl_microsom_uart1: microsom-uart1 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_microsom_usbotg: microsom-usbotg {
-+ /*
-+ * Similar to pinctrl_usbotg_2, but we want it
-+ * pulled down for a fixed host connection.
-+ */
-+ fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
-+ };
-+ };
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_microsom_uart1>;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_microsom_usbotg>;
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,422 @@
-+/*
-+ * Copyright 2013 Boundary Devices, Inc.
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_2p5v: regulator@0 {
++ reg_usb_otg_vbus: usb_otg_vbus {
+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
++ regulator-name = "usb_otg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&max7310_c 1 GPIO_ACTIVE_HIGH>;
++ enable-active-high;
+ };
+
-+ reg_3p3v: regulator@1 {
++ reg_3p3v: 3p3v {
+ compatible = "regulator-fixed";
-+ reg = <1>;
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
-+
-+ reg_usb_otg_vbus: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
-+ enable-active-high;
-+ };
+ };
+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_keys>;
-+
-+ power {
-+ label = "Power Button";
-+ gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_POWER>;
-+ gpio-key,wakeup;
-+ };
++ sound-cs42888 {
++ compatible = "fsl,imx6-sabreauto-cs42888",
++ "fsl,imx-audio-cs42888";
++ model = "imx-cs42888";
++ esai-controller = <&esai>;
++ asrc-controller = <&asrc_p2p>;
++ audio-codec = <&codec>;
++ };
+
-+ menu {
-+ label = "Menu";
-+ gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_MENU>;
++ clocks {
++ codec_osc: codec_osc {
++ compatible = "fixed-clock";
++ #clock-cells = <0>;
++ clock-frequency = <24576000>;
+ };
++ };
+
-+ home {
-+ label = "Home";
-+ gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_HOME>;
-+ };
++ sound-fm {
++ compatible = "fsl,imx-audio-si476x",
++ "fsl,imx-tuner-si476x";
++ model = "imx-radio-si4763";
+
-+ back {
-+ label = "Back";
-+ gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_BACK>;
-+ };
++ ssi-controller = <&ssi2>;
++ fm-controller = <&si4763>;
++ mux-int-port = <2>;
++ mux-ext-port = <5>;
++ };
+
-+ volume-up {
-+ label = "Volume Up";
-+ gpios = <&gpio7 13 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_VOLUMEUP>;
-+ };
++ sound-hdmi {
++ compatible = "fsl,imx6q-audio-hdmi",
++ "fsl,imx-audio-hdmi";
++ model = "imx-audio-hdmi";
++ hdmi-controller = <&hdmi_audio>;
++ };
+
-+ volume-down {
-+ label = "Volume Down";
-+ gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_VOLUMEDOWN>;
-+ };
++ sound-spdif {
++ compatible = "fsl,imx-audio-spdif",
++ "fsl,imx-sabreauto-spdif";
++ model = "imx-spdif";
++ spdif-controller = <&spdif>;
++ spdif-in;
+ };
+
-+ sound {
-+ compatible = "fsl,imx6q-nitrogen6x-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx6q-nitrogen6x-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <3>;
++ v4l2_cap_0 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <0>;
++ mclk_source = <0>;
++ status = "okay";
+ };
+
-+ backlight_lcd {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm1 0 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <7>;
-+ power-supply = <&reg_3p3v>;
++ v4l2_cap_1 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <1>;
++ mclk_source = <0>;
+ status = "okay";
+ };
+
-+ backlight_lvds {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm4 0 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <7>;
-+ power-supply = <&reg_3p3v>;
++ v4l2_out {
++ compatible = "fsl,mxc_v4l2_output";
+ status = "okay";
+ };
+};
+
+&audmux {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
++ pinctrl-0 = <&pinctrl_audmux_3>;
+ status = "okay";
+};
+
@@ -25116,336 +5544,23 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-linaro-s
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio3 19 0>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
-+ status = "okay";
++ pinctrl-0 = <&pinctrl_ecspi1_1 &pinctrl_ecspi1_sabreauto>;
++ status = "disabled"; /* pin conflict with WEIM NOR */
+
+ flash: m25p80@0 {
-+ compatible = "sst,sst25vf016b";
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "st,m25p32";
+ spi-max-frequency = <20000000>;
+ reg = <0>;
+ };
+};
+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio1 27 0>;
-+ txen-skew-ps = <0>;
-+ txc-skew-ps = <3000>;
-+ rxdv-skew-ps = <0>;
-+ rxc-skew-ps = <3000>;
-+ rxd0-skew-ps = <0>;
-+ rxd1-skew-ps = <0>;
-+ rxd2-skew-ps = <0>;
-+ rxd3-skew-ps = <0>;
-+ txd0-skew-ps = <0>;
-+ txd1-skew-ps = <0>;
-+ txd2-skew-ps = <0>;
-+ txd3-skew-ps = <0>;
-+ interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
-+ <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 201>;
-+ VDDA-supply = <&reg_2p5v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6q-nitrogen6x {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ /* SGTL5000 sys_mclk */
-+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x030b0
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0
-+ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0
-+ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0
-+ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
-+ MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
-+ MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
-+ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x000b1 /* CS */
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ /* Phy reset */
-+ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x000b0
-+ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
-+ >;
-+ };
-+
-+ pinctrl_gpio_keys: gpio_keysgrp {
-+ fsl,pins = <
-+ /* Power Button */
-+ MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0
-+ /* Menu Button */
-+ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0
-+ /* Home Button */
-+ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x1b0b0
-+ /* Back Button */
-+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
-+ /* Volume Up Button */
-+ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x1b0b0
-+ /* Volume Down Button */
-+ MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_pwm1: pwm1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_pwm3: pwm3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_DAT1__PWM3_OUT 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_pwm4: pwm4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0
-+ /* power enable, high active */
-+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x000b0
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 /* CD */
-+ >;
-+ };
-+
-+ pinctrl_usdhc4: usdhc4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
-+ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
-+ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
-+ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
-+ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
-+ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
-+ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* CD */
-+ >;
-+ };
-+ };
-+};
-+
-+&ldb {
-+ status = "okay";
-+
-+ lvds-channel@0 {
-+ fsl,data-mapping = "spwg";
-+ fsl,data-width = <18>;
-+ status = "okay";
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: hsd100pxn1 {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vfront-porch = <7>;
-+ hsync-len = <60>;
-+ vsync-len = <10>;
-+ };
-+ };
-+ };
-+};
-+
-+&pcie {
-+ status = "okay";
-+};
-+
-+&pwm1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm1>;
-+ status = "okay";
-+};
-+
-+&pwm3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3>;
-+ status = "okay";
-+};
-+
-+&pwm4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm4>;
-+ status = "okay";
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ cd-gpios = <&gpio7 0 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-+
-+&usdhc4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc4>;
-+ cd-gpios = <&gpio2 6 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -10,29 +10,449 @@
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-+#include <dt-bindings/gpio/gpio.h>
-+
- / {
- memory {
- reg = <0x10000000 0x80000000>;
- };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_leds>;
-+
-+ user {
-+ label = "debug";
-+ gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>;
-+ };
-+ };
-+
-+ sound-spdif {
-+ compatible = "fsl,imx-audio-spdif",
-+ "fsl,imx-sabreauto-spdif";
-+ model = "imx-spdif";
-+ spdif-controller = <&spdif>;
-+ spdif-in;
-+ };
-+
-+ backlight {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm3 0 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <7>;
-+ status = "okay";
-+ };
-+};
-+
+&ecspi1 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio3 19 0>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
-+ status = "disabled"; /* pin conflict with WEIM NOR */
++ pinctrl-0 = <&pinctrl_ecspi1_1>;
+
+ flash: m25p80@0 {
+ #address-cells = <1>;
@@ -25457,27 +5572,30 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-st
};
&fec {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_enet_2>;
-+ pinctrl-0 = <&pinctrl_enet>;
- phy-mode = "rgmii";
-+ interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
-+ <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
-+ status = "okay";
-+};
-+
+@@ -23,16 +296,409 @@
+ status = "okay";
+ };
+
+&gpmi {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
++ pinctrl-0 = <&pinctrl_gpmi_nand_1>;
+ status = "okay";
+};
+
+&i2c2 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
++ pinctrl-0 = <&pinctrl_i2c2_3>;
+ status = "okay";
+
++ egalax_ts@04 {
++ compatible = "eeti,egalax_ts";
++ reg = <0x04>;
++ interrupt-parent = <&gpio2>;
++ interrupts = <28 2>;
++ wakeup-gpios = <&gpio2 28 0>;
++ };
++
+ pmic: pfuze100@08 {
+ compatible = "fsl,pfuze100";
+ reg = <0x08>;
@@ -25576,262 +5694,186 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-st
+ };
+ };
+ };
-+};
+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6qdl-sabreauto {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
-+ MX6QDL_PAD_SD2_DAT2__GPIO1_IO13 0x80000000
-+ MX6QDL_PAD_GPIO_18__SD3_VSELECT 0x17059
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
-+ MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
-+ MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
-+ >;
-+ };
++ codec: cs42888@048 {
++ compatible = "cirrus,cs42888";
++ reg = <0x048>;
++ clocks = <&codec_osc 0>;
++ clock-names = "codec_osc";
++ VA-supply = <&reg_audio>;
++ VD-supply = <&reg_audio>;
++ VLS-supply = <&reg_audio>;
++ VLC-supply = <&reg_audio>;
++ };
+
-+ pinctrl_ecspi1_cs: ecspi1cs {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000
-+ >;
-+ };
++ hdmi: edid@50 {
++ compatible = "fsl,imx6-hdmi-i2c";
++ reg = <0x50>;
++ };
+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_KEY_COL2__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
-+ >;
-+ };
++ si4763: si4763@63 {
++ compatible = "si4761";
++ reg = <0x63>;
++ va-supply = <&si4763_va>;
++ vd-supply = <&si4763_vd>;
++ vio1-supply = <&si4763_vio1>;
++ vio2-supply = <&si4763_vio2>;
++ };
++};
+
-+ pinctrl_gpio_leds: gpioledsgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000
-+ >;
-+ };
++&i2c3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c3_4>;
++ pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>;
++ status = "okay";
+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
-+ >;
-+ };
++ max7310_a: gpio@30 {
++ compatible = "maxim,max7310";
++ reg = <0x30>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ resets = <&max7310_reset>;
++ };
+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
++ max7310_b: gpio@32 {
++ compatible = "maxim,max7310";
++ reg = <0x32>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ };
+
-+ pinctrl_pwm3: pwm1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
-+ >;
-+ };
++ max7310_c: gpio@34 {
++ compatible = "maxim,max7310";
++ reg = <0x34>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ };
+
-+ pinctrl_spdif: spdifgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__SPDIF_IN 0x1b0b0
-+ >;
-+ };
++ mma8451@1c {
++ compatible = "fsl,mma8451";
++ reg = <0x1c>;
++ position = <3>;
++ };
+
-+ pinctrl_uart4: uart4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
++ mag3110@0e {
++ compatible = "fsl,mag3110";
++ reg = <0x0e>;
++ position = <2>;
++ interrupt-parent = <&gpio2>;
++ interrupts = <29 2>;
++ };
+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
-+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
-+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
-+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
-+ >;
-+ };
++ isl29023@44 {
++ compatible = "fsl,isl29023";
++ reg = <0x44>;
++ rext = <499>;
++ interrupt-parent = <&gpio5>;
++ interrupts = <17 2>;
++ };
+
-+ pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170b9
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100b9
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170b9
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170b9
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170b9
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170b9
-+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170b9
-+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170b9
-+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170b9
-+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170b9
-+ >;
-+ };
++ adv7180: adv7180@21 {
++ compatible = "adv,adv7180";
++ reg = <0x21>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ipu1_3>;
++ clocks = <&clks 201>;
++ clock-names = "csi_mclk";
++ DOVDD-supply = <&reg_3p3v>; /* 3.3v, enabled via 2.8 VGEN6 */
++ AVDD-supply = <&reg_3p3v>; /* 1.8v */
++ DVDD-supply = <&reg_3p3v>; /* 1.8v */
++ PVDD-supply = <&reg_3p3v>; /* 1.8v */
++ pwn-gpios = <&max7310_b 2 0>;
++ csi_id = <0>;
++ mclk = <24000000>;
++ mclk_source = <0>;
++ cvbs = <1>;
++ };
++};
+
-+ pinctrl_usdhc3_200mhz: usdhc3grp200mhz {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170f9
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100f9
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170f9
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170f9
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170f9
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170f9
-+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170f9
-+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170f9
-+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170f9
-+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170f9
-+ >;
-+ };
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
+
-+ pinctrl_weim_cs0: weimcs0grp {
++ hog {
++ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0b1
++ MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
++ MX6QDL_PAD_SD2_DAT2__GPIO1_IO13 0x80000000
++ MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x80000000
++ MX6QDL_PAD_SD2_DAT0__GPIO1_IO15 0x80000000
++ MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x80000000
++ MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x80000000
++ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
++ MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x80000000
++ MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x80000000
++ MX6QDL_PAD_SD4_DAT4__GPIO2_IO12 0x80000000
++ MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x80000000
++ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x80000000
++ MX6QDL_PAD_GPIO_18__SD3_VSELECT 0x17059
+ >;
+ };
++ };
+
-+ pinctrl_weim_nor: weimnorgrp {
++ ecspi1 {
++ pinctrl_ecspi1_sabreauto: ecspi1-sabreauto {
+ fsl,pins = <
-+ MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0b1
-+ MX6QDL_PAD_EIM_RW__EIM_RW 0xb0b1
-+ MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb060
-+ MX6QDL_PAD_EIM_D16__EIM_DATA16 0x1b0b0
-+ MX6QDL_PAD_EIM_D17__EIM_DATA17 0x1b0b0
-+ MX6QDL_PAD_EIM_D18__EIM_DATA18 0x1b0b0
-+ MX6QDL_PAD_EIM_D19__EIM_DATA19 0x1b0b0
-+ MX6QDL_PAD_EIM_D20__EIM_DATA20 0x1b0b0
-+ MX6QDL_PAD_EIM_D21__EIM_DATA21 0x1b0b0
-+ MX6QDL_PAD_EIM_D22__EIM_DATA22 0x1b0b0
-+ MX6QDL_PAD_EIM_D23__EIM_DATA23 0x1b0b0
-+ MX6QDL_PAD_EIM_D24__EIM_DATA24 0x1b0b0
-+ MX6QDL_PAD_EIM_D25__EIM_DATA25 0x1b0b0
-+ MX6QDL_PAD_EIM_D26__EIM_DATA26 0x1b0b0
-+ MX6QDL_PAD_EIM_D27__EIM_DATA27 0x1b0b0
-+ MX6QDL_PAD_EIM_D28__EIM_DATA28 0x1b0b0
-+ MX6QDL_PAD_EIM_D29__EIM_DATA29 0x1b0b0
-+ MX6QDL_PAD_EIM_D30__EIM_DATA30 0x1b0b0
-+ MX6QDL_PAD_EIM_D31__EIM_DATA31 0x1b0b0
-+ MX6QDL_PAD_EIM_A23__EIM_ADDR23 0xb0b1
-+ MX6QDL_PAD_EIM_A22__EIM_ADDR22 0xb0b1
-+ MX6QDL_PAD_EIM_A21__EIM_ADDR21 0xb0b1
-+ MX6QDL_PAD_EIM_A20__EIM_ADDR20 0xb0b1
-+ MX6QDL_PAD_EIM_A19__EIM_ADDR19 0xb0b1
-+ MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0b1
-+ MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0b1
-+ MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0b1
-+ MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0b1
-+ MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0b1
-+ MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0b1
-+ MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0b1
-+ MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0b1
-+ MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0b1
-+ MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0b1
-+ MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0b1
-+ MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0b1
-+ MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0b1
-+ MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0b1
-+ MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0b1
-+ MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0b1
-+ MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0b1
-+ MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0b1
-+ MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0b1
++ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000
+ >;
+ };
+ };
+};
+
-+&ldb {
++&spdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_spdif_1>;
+ status = "okay";
++};
+
-+ lvds-channel@0 {
-+ fsl,data-mapping = "spwg";
-+ fsl,data-width = <18>;
-+ status = "okay";
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: hsd100pxn1 {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vfront-porch = <7>;
-+ hsync-len = <60>;
-+ vsync-len = <10>;
-+ };
-+ };
-+ };
++&ssi2 {
++ fsl,mode = "i2s-master";
++ status = "okay";
+};
+
-+&pwm3 {
++&uart3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3>;
++ pinctrl-0 = <&pinctrl_uart3_1>;
++ pinctrl-assert-gpios = <&max7310_b 4 GPIO_ACTIVE_HIGH>, /* CTS */
++ <&max7310_c 3 GPIO_ACTIVE_HIGH>; /* RXD and TXD */
++ fsl,uart-has-rtscts;
+ status = "okay";
+};
+
-+&spdif {
++&gpmi {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_spdif>;
- status = "okay";
- };
-
++ pinctrl-0 = <&pinctrl_gpmi_nand_1>;
++ status = "disabled"; /* pin conflict with uart3 */
++};
++
&uart4 {
pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart4_1>;
-+ pinctrl-0 = <&pinctrl_uart4>;
+ pinctrl-0 = <&pinctrl_uart4_1>;
status = "okay";
};
- &usdhc3 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc3_1>;
+-&usdhc3 {
++&usbh1 {
++ vbus-supply = <&reg_usb_h1_vbus>;
++ status = "okay";
++};
++
++&usbotg {
++ vbus-supply = <&reg_usb_otg_vbus>;
+ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg_2>;
++ imx6-usb-charger-detection;
++ status = "okay";
++};
++
++&usdhc3 {
+ pinctrl-names = "default", "state_100mhz", "state_200mhz";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
-+ pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+ pinctrl-0 = <&pinctrl_usdhc3_1>;
++ pinctrl-1 = <&pinctrl_usdhc3_1_100mhz>;
++ pinctrl-2 = <&pinctrl_usdhc3_1_200mhz>;
cd-gpios = <&gpio6 15 0>;
wp-gpios = <&gpio1 13 0>;
status = "okay";
@@ -25839,11 +5881,11 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-st
+
+&weim {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_weim_nor &pinctrl_weim_cs0>;
++ pinctrl-0 = <&pinctrl_weim_nor_1 &pinctrl_weim_cs0_1>;
+ #address-cells = <2>;
+ #size-cells = <1>;
+ ranges = <0 0 0x08000000 0x08000000>;
-+ status = "disabled"; /* pin conflict with SPI NOR */
++ status = "disabled"; /* pin conflict with ecspi1, i2c3 and uart3 */
+
+ nor@0,0 {
+ compatible = "cfi-flash";
@@ -25855,467 +5897,133 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-st
+ 0x0000c000 0x1404a38e 0x00000000>;
+ };
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_2p5v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_3p3v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_otg_vbus: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
-+ enable-active-high;
-+ };
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_keys>;
-+
-+ power {
-+ label = "Power Button";
-+ gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_POWER>;
-+ gpio-key,wakeup;
-+ };
-+
-+ menu {
-+ label = "Menu";
-+ gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_MENU>;
-+ };
-+
-+ home {
-+ label = "Home";
-+ gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_HOME>;
-+ };
-+
-+ back {
-+ label = "Back";
-+ gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_BACK>;
-+ };
-+
-+ volume-up {
-+ label = "Volume Up";
-+ gpios = <&gpio7 13 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_VOLUMEUP>;
-+ };
-+
-+ volume-down {
-+ label = "Volume Down";
-+ gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;
-+ linux,code = <KEY_VOLUMEDOWN>;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx6q-sabrelite-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx6q-sabrelite-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <4>;
-+ };
-+
-+ backlight_lcd {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm1 0 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <7>;
-+ power-supply = <&reg_3p3v>;
-+ status = "okay";
-+ };
-+
-+ backlight_lvds {
-+ compatible = "pwm-backlight";
-+ pwms = <&pwm4 0 5000000>;
-+ brightness-levels = <0 4 8 16 32 64 128 255>;
-+ default-brightness-level = <7>;
-+ power-supply = <&reg_3p3v>;
-+ status = "okay";
-+ };
-+};
+
-+&audmux {
++&flexcan1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
++ pinctrl-0 = <&pinctrl_flexcan1_1>;
++ pinctrl-assert-gpios = <&max7310_b 3 GPIO_ACTIVE_HIGH>; /* TX */
++ trx-en-gpio = <&max7310_b 6 GPIO_ACTIVE_HIGH>;
++ trx-stby-gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>;
++ status = "disabled"; /* pin conflict with fec */
+};
+
-+&ecspi1 {
-+ fsl,spi-num-chipselects = <1>;
-+ cs-gpios = <&gpio3 19 0>;
++&flexcan2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
++ pinctrl-0 = <&pinctrl_flexcan2_1>;
++ trx-en-gpio = <&max7310_c 6 GPIO_ACTIVE_HIGH>;
++ trx-stby-gpio = <&max7310_c 5 GPIO_ACTIVE_HIGH>;
+ status = "okay";
-+
-+ flash: m25p80@0 {
-+ compatible = "sst,sst25vf016b";
-+ spi-max-frequency = <20000000>;
-+ reg = <0>;
-+ };
+};
+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
-+ txen-skew-ps = <0>;
-+ txc-skew-ps = <3000>;
-+ rxdv-skew-ps = <0>;
-+ rxc-skew-ps = <3000>;
-+ rxd0-skew-ps = <0>;
-+ rxd1-skew-ps = <0>;
-+ rxd2-skew-ps = <0>;
-+ rxd3-skew-ps = <0>;
-+ txd0-skew-ps = <0>;
-+ txd1-skew-ps = <0>;
-+ txd2-skew-ps = <0>;
-+ txd3-skew-ps = <0>;
-+ interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
-+ <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
++&ldb {
++ ipu_id = <1>;
++ disp_id = <0>;
++ ext_ref = <1>;
++ mode = "sep0";
++ sec_ipu_id = <1>;
++ sec_disp_id = <1>;
+ status = "okay";
+};
+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
++&mipi_csi {
+ status = "okay";
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 201>;
-+ VDDA-supply = <&reg_2p5v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
++ ipu_id = <0>;
++ csi_id = <1>;
++ v_channel = <0>;
++ lanes = <1>;
+};
+
-+&iomuxc {
++&mlb {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6q-sabrelite {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ /* SGTL5000 sys_mclk */
-+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x030b0
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_DAT0__AUD4_RXD 0x130b0
-+ MX6QDL_PAD_SD2_DAT3__AUD4_TXC 0x130b0
-+ MX6QDL_PAD_SD2_DAT2__AUD4_TXD 0x110b0
-+ MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
-+ MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
-+ MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
-+ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x000b1 /* CS */
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ /* Phy reset */
-+ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x000b0
-+ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
-+ >;
-+ };
-+
-+ pinctrl_gpio_keys: gpio_keysgrp {
-+ fsl,pins = <
-+ /* Power Button */
-+ MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0
-+ /* Menu Button */
-+ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0
-+ /* Home Button */
-+ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x1b0b0
-+ /* Back Button */
-+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
-+ /* Volume Up Button */
-+ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x1b0b0
-+ /* Volume Down Button */
-+ MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_pwm1: pwm1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_pwm3: pwm3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_DAT1__PWM3_OUT 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_pwm4: pwm4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0
-+ /* power enable, high active */
-+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x000b0
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 /* CD */
-+ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* WP */
-+ >;
-+ };
-+
-+ pinctrl_usdhc4: usdhc4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
-+ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
-+ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
-+ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
-+ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
-+ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
-+ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* CD */
-+ >;
-+ };
-+ };
-+};
-+
-+&ldb {
++ pinctrl-0 = <&pinctrl_mlb_2>;
+ status = "okay";
-+
-+ lvds-channel@0 {
-+ fsl,data-mapping = "spwg";
-+ fsl,data-width = <18>;
-+ status = "okay";
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: hsd100pxn1 {
-+ clock-frequency = <65000000>;
-+ hactive = <1024>;
-+ vactive = <768>;
-+ hback-porch = <220>;
-+ hfront-porch = <40>;
-+ vback-porch = <21>;
-+ vfront-porch = <7>;
-+ hsync-len = <60>;
-+ vsync-len = <10>;
-+ };
-+ };
-+ };
+};
+
+&pcie {
+ status = "okay";
+};
+
-+&pwm1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm1>;
-+ status = "okay";
-+};
-+
+&pwm3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3>;
-+ status = "okay";
-+};
-+
-+&pwm4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm4>;
-+ status = "okay";
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
++ pinctrl-0 = <&pinctrl_pwm3_1>;
+ status = "okay";
+};
+
-+&uart1 {
++&esai {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
++ pinctrl-0 = <&pinctrl_esai_2>;
+ status = "okay";
+};
+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
++&hdmi_core {
++ ipu_id = <0>;
++ disp_id = <1>;
+ status = "okay";
+};
+
-+&usbh1 {
++&hdmi_video {
++ fsl,phy_reg_vlev = <0x0294>;
++ fsl,phy_reg_cksymtx = <0x800d>;
+ status = "okay";
+};
+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
++&hdmi_audio {
+ status = "okay";
+};
+
-+&usdhc3 {
++&hdmi_cec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ cd-gpios = <&gpio7 0 0>;
-+ wp-gpios = <&gpio7 1 0>;
-+ vmmc-supply = <&reg_3p3v>;
++ pinctrl-0 = <&pinctrl_hdmi_cec_1>;
+ status = "okay";
+};
+
-+&usdhc4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc4>;
-+ cd-gpios = <&gpio2 6 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
++&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.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-solidrun/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -10,6 +10,9 @@
- * http://www.gnu.org/copyleft/gpl.html
++++ linux-solidrun/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-04-24 07:58:12.876168828 +0200
+@@ -11,10 +11,30 @@
*/
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
/ {
++ aliases {
++ mxcfb0 = &mxcfb1;
++ mxcfb1 = &mxcfb2;
++ mxcfb2 = &mxcfb3;
++ mxcfb3 = &mxcfb4;
++ };
++
memory {
reg = <0x10000000 0x40000000>;
-@@ -17,62 +20,488 @@
+ };
++ battery: max8903@0 {
++ compatible = "fsl,max8903-charger";
++ pinctrl-names = "default";
++ dok_input = <&gpio2 24 1>;
++ uok_input = <&gpio1 27 1>;
++ chg_input = <&gpio3 23 1>;
++ flt_input = <&gpio5 2 1>;
++ fsl,dcm_always_high;
++ fsl,dc_valid;
++ fsl,usb_valid;
++ status = "okay";
++ };
++
regulators {
compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-- reg_usb_otg_vbus: usb_otg_vbus {
-+ reg_usb_otg_vbus: regulator@0 {
- compatible = "regulator-fixed";
-+ reg = <0>;
- regulator-name = "usb_otg_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
+@@ -26,29 +46,605 @@
gpio = <&gpio3 22 0>;
enable-active-high;
};
+
-+ reg_usb_h1_vbus: regulator@1 {
++ reg_usb_h1_vbus: usb_h1_vbus {
+ compatible = "regulator-fixed";
-+ reg = <1>;
+ regulator-name = "usb_h1_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
@@ -26323,44 +6031,68 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ enable-active-high;
+ };
+
-+ reg_audio: regulator@2 {
++ reg_usb_h1_vbus: usb_h1_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_h1_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&gpio1 29 0>;
++ enable-active-high;
++ };
++
++ reg_audio: wm8962_supply {
+ compatible = "regulator-fixed";
-+ reg = <2>;
+ regulator-name = "wm8962-supply";
+ gpio = <&gpio4 10 0>;
+ enable-active-high;
+ };
++
++ reg_mipi_dsi_pwr_on: mipi_dsi_pwr_on {
++ compatible = "regulator-fixed";
++ regulator-name = "mipi_dsi_pwr_on";
++ gpio = <&gpio6 14 0>;
++ enable-active-high;
++ };
++
++ reg_sensor: sensor_supply {
++ compatible = "regulator-fixed";
++ regulator-name = "sensor-supply";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ gpio = <&gpio2 31 0>;
++ startup-delay-us = <500>;
++ enable-active-high;
++ };
};
gpio-keys {
compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_keys>;
-+
+ power {
+ label = "Power Button";
-+ gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
++ gpios = <&gpio3 29 0>;
++ linux,code = <116>; /* KEY_POWER */
+ gpio-key,wakeup;
-+ linux,code = <KEY_POWER>;
+ };
volume-up {
label = "Volume Up";
-- gpios = <&gpio1 4 0>;
-- linux,code = <115>; /* KEY_VOLUMEUP */
-+ gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+ gpios = <&gpio1 4 0>;
+ gpio-key,wakeup;
-+ linux,code = <KEY_VOLUMEUP>;
+ linux,code = <115>; /* KEY_VOLUMEUP */
};
volume-down {
label = "Volume Down";
-- gpios = <&gpio1 5 0>;
-- linux,code = <114>; /* KEY_VOLUMEDOWN */
-+ gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+ gpios = <&gpio1 5 0>;
+ gpio-key,wakeup;
-+ linux,code = <KEY_VOLUMEDOWN>;
-+ };
+ linux,code = <114>; /* KEY_VOLUMEDOWN */
+ };
+ };
++
++ imx_drm: imx-drm {
++ compatible = "fsl,imx-drm";
++ crtcs = <&ipu1 0>, <&ipu1 1>;
++ connectors = <&ldb>;
+ };
+
+ sound {
@@ -26380,6 +6112,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ "DMICDAT", "DMIC";
+ mux-int-port = <2>;
+ mux-ext-port = <3>;
++ hp-det-gpios = <&gpio7 8 1>;
++ mic-det-gpios = <&gpio1 9 1>;
+ };
+
+ backlight {
@@ -26390,29 +6124,125 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ status = "okay";
+ };
+
-+ leds {
-+ compatible = "gpio-leds";
++ sound-hdmi {
++ compatible = "fsl,imx6q-audio-hdmi",
++ "fsl,imx-audio-hdmi";
++ model = "imx-audio-hdmi";
++ hdmi-controller = <&hdmi_audio>;
++ };
++
++ mxcfb1: fb@0 {
++ 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 = "disabled";
++ };
++
++ mxcfb2: fb@1 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "hdmi";
++ interface_pix_fmt = "RGB24";
++ mode_str ="1920x1080M@60";
++ default_bpp = <24>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "disabled";
++ };
++
++ mxcfb3: fb@2 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "lcd";
++ interface_pix_fmt = "RGB565";
++ mode_str ="CLAA-WVGA";
++ default_bpp = <16>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "disabled";
++ };
++
++ mxcfb4: fb@3 {
++ 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 = "disabled";
++ };
++
++ lcd@0 {
++ compatible = "fsl,lcd";
++ ipu_id = <0>;
++ disp_id = <0>;
++ default_ifmt = "RGB565";
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_leds>;
++ pinctrl-0 = <&pinctrl_ipu1_1>;
++ status = "okay";
++ };
++
++ backlight {
++ compatible = "pwm-backlight";
++ pwms = <&pwm1 0 5000000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <7>;
++ };
++
++ v4l2_cap_0 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <0>;
++ mclk_source = <0>;
++ status = "okay";
++ };
++
++ v4l2_cap_1 {
++ compatible = "fsl,imx6q-v4l2-capture";
++ ipu_id = <0>;
++ csi_id = <1>;
++ mclk_source = <0>;
++ status = "okay";
++ };
++
++ v4l2_out {
++ compatible = "fsl,mxc_v4l2_output";
++ status = "okay";
++ };
++
++ lvds_cabc_ctrl {
++ lvds0-gpios = <&gpio6 15 0>;
++ lvds1-gpios = <&gpio6 16 0>;
++ };
++
++ mipi_dsi_reset: mipi-dsi-reset {
++ compatible = "gpio-reset";
++ reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
++ reset-delay-us = <50>;
++ #reset-cells = <0>;
++ };
++};
+
-+ red {
-+ gpios = <&gpio1 2 0>;
-+ default-state = "on";
- };
- };
- };
-
+&audmux {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
++ pinctrl-0 = <&pinctrl_audmux_2>;
+ status = "okay";
+};
+
++&cpu0 {
++ arm-supply = <&sw1a_reg>;
++ soc-supply = <&sw1c_reg>;
++ pu-supply = <&pu_dummy>; /* use pu_dummy if VDDSOC share with VDDPU */
++};
++
+&ecspi1 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio4 9 0>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
++ pinctrl-0 = <&pinctrl_ecspi1_2>;
+ status = "okay";
+
+ flash: m25p80@0 {
@@ -26422,12 +6252,11 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ spi-max-frequency = <20000000>;
+ reg = <0>;
+ };
-+};
-+
+ };
+
&fec {
pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_enet_1>;
-+ pinctrl-0 = <&pinctrl_enet>;
+ pinctrl-0 = <&pinctrl_enet_1>;
phy-mode = "rgmii";
+ phy-reset-gpios = <&gpio1 25 0>;
+ status = "okay";
@@ -26436,7 +6265,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
++ pinctrl-0 = <&pinctrl_i2c1_2>;
+ status = "okay";
+
+ codec: wm8962@1a {
@@ -26451,6 +6280,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ PLLVDD-supply = <&reg_audio>;
+ SPKVDD1-supply = <&reg_audio>;
+ SPKVDD2-supply = <&reg_audio>;
++ amic-mono;
+ gpio-cfg = <
+ 0x0000 /* 0:Default */
+ 0x0000 /* 1:Default */
@@ -26460,14 +6290,84 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ 0x0000 /* 5:Default */
+ >;
+ };
++
++ ov564x: ov564x@3c {
++ compatible = "ovti,ov564x";
++ reg = <0x3c>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ipu1_2>;
++ clocks = <&clks 201>;
++ clock-names = "csi_mclk";
++ DOVDD-supply = <&vgen4_reg>; /* 1.8v */
++ AVDD-supply = <&vgen3_reg>; /* 2.8v, on rev C board is VGEN3,
++ on rev B board is VGEN5 */
++ DVDD-supply = <&vgen2_reg>; /* 1.5v*/
++ pwn-gpios = <&gpio1 16 1>; /* active low: SD1_DAT0 */
++ rst-gpios = <&gpio1 17 0>; /* active high: SD1_DAT1 */
++ csi_id = <0>;
++ mclk = <24000000>;
++ mclk_source = <0>;
++ };
++
++ mma8451@1c {
++ compatible = "fsl,mma8451";
++ reg = <0x1c>;
++ position = <1>;
++ vdd-supply = <&reg_sensor>;
++ vddio-supply = <&reg_sensor>;
++ };
++};
++
++&i2c3 {
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c3_2>;
++ status = "okay";
++
++ egalax_ts@04 {
++ compatible = "eeti,egalax_ts";
++ reg = <0x04>;
++ interrupt-parent = <&gpio6>;
++ interrupts = <7 2>;
++ wakeup-gpios = <&gpio6 7 0>;
++ };
+};
+
+&i2c2 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
++ pinctrl-0 = <&pinctrl_i2c2_2>;
+ status = "okay";
+
++ hdmi: edid@50 {
++ compatible = "fsl,imx6-hdmi-i2c";
++ reg = <0x50>;
++ };
++
++ max11801@48 {
++ compatible = "maxim,max11801";
++ reg = <0x48>;
++ interrupt-parent = <&gpio3>;
++ interrupts = <26 2>;
++ work-mode = <1>;/*DCM mode*/
++ };
++
++ ov5640_mipi: ov5640_mipi@3c { /* i2c2 driver */
++ compatible = "ovti,ov5640_mipi";
++ reg = <0x3c>;
++ clocks = <&clks 201>;
++ clock-names = "csi_mclk";
++ DOVDD-supply = <&vgen4_reg>; /* 1.8v */
++ AVDD-supply = <&vgen3_reg>; /* 2.8v, rev C board is VGEN3
++ rev B board is VGEN5 */
++ DVDD-supply = <&vgen2_reg>; /* 1.5v*/
++ pwn-gpios = <&gpio1 19 1>; /* active low: SD1_CLK */
++ rst-gpios = <&gpio1 20 0>; /* active high: SD1_DAT2 */
++ csi_id = <1>;
++ mclk = <24000000>;
++ mclk_source = <0>;
++ };
++
+ pmic: pfuze100@08 {
+ compatible = "fsl,pfuze100";
+ reg = <0x08>;
@@ -26566,163 +6466,99 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ };
+ };
+ };
++
++ egalax_ts@04 {
++ compatible = "eeti,egalax_ts";
++ reg = <0x04>;
++ interrupt-parent = <&gpio6>;
++ interrupts = <8 2>;
++ wakeup-gpios = <&gpio6 8 0>;
++ };
+};
+
+&i2c3 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c3_2>;
++ status = "okay";
++
++ egalax_ts@04 {
++ compatible = "eeti,egalax_ts";
++ reg = <0x04>;
++ interrupt-parent = <&gpio6>;
++ interrupts = <7 2>;
++ wakeup-gpios = <&gpio6 7 0>;
++ };
+
-+ egalax_ts@04 {
-+ compatible = "eeti,egalax_ts";
-+ reg = <0x04>;
-+ interrupt-parent = <&gpio6>;
-+ interrupts = <7 2>;
-+ wakeup-gpios = <&gpio6 7 0>;
++ mag3110@0e {
++ compatible = "fsl,mag3110";
++ reg = <0x0e>;
++ position = <2>;
++ vdd-supply = <&reg_sensor>;
++ vddio-supply = <&reg_sensor>;
++ interrupt-parent = <&gpio3>;
++ interrupts = <16 2>;
++ };
++
++ 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";
++ };
++
++ isl29023@44 {
++ compatible = "fsl,isl29023";
++ reg = <0x44>;
++ rext = <499>;
++ vdd-supply = <&reg_sensor>;
++ interrupt-parent = <&gpio3>;
++ interrupts = <9 2>;
+ };
+};
+
+&iomuxc {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
++ pinctrl-0 = <&pinctrl_hog_1>;
+
-+ imx6qdl-sabresd {
-+ pinctrl_hog: hoggrp {
++ hog {
++ pinctrl_hog_1: hoggrp-1 {
+ fsl,pins = <
++ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000
++ MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x80000000
+ MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
+ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
+ MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
++ MX6QDL_PAD_NANDF_ALE__GPIO6_IO08 0x80000000
++ MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
++ MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
++ MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x80000000
++ MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x80000000
++ MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x80000000
++ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x80000000
++ MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000
++ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
+ MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000
-+ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0
-+ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0
-+ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0
-+ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
-+ MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1
-+ MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_gpio_keys: gpio_keysgrp {
-+ fsl,pins = <
++ MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
++ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
++ MX6QDL_PAD_EIM_EB3__GPIO2_IO31 0x80000000
++ MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x80000000
++ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
++ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000
++ MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x80000000
+ MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000
-+ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000
-+ MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
-+ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_pwm1: pwm1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
-+ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
-+ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
-+ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
-+ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
-+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
-+ MX6QDL_PAD_NANDF_D4__SD2_DATA4 0x17059
-+ MX6QDL_PAD_NANDF_D5__SD2_DATA5 0x17059
-+ MX6QDL_PAD_NANDF_D6__SD2_DATA6 0x17059
-+ MX6QDL_PAD_NANDF_D7__SD2_DATA7 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
-+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
-+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
-+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
-+ >;
-+ };
-+ };
-+
-+ gpio_leds {
-+ pinctrl_gpio_leds: gpioledsgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
++ MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x80000000
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_1__WDOG2_B 0x80000000
++ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x80000000
+ >;
+ };
+ };
@@ -26755,7 +6591,30 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+
+&pwm1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm1>;
++ pinctrl-0 = <&pinctrl_pwm0_1>;
++ status = "okay";
++};
++
++&ldb {
++ ipu_id = <1>;
++ disp_id = <1>;
++ ext_ref = <1>;
++ mode = "sep1";
++ sec_ipu_id = <1>;
++ sec_disp_id = <0>;
++ status = "okay";
++};
++
++&pcie {
++ power-on-gpio = <&gpio3 19 0>;
++ reset-gpio = <&gpio7 12 0>;
++ status = "okay";
++};
++
++
++&pwm1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm1_1>;
+ status = "okay";
+};
+
@@ -26764,711 +6623,127 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
status = "okay";
};
- &uart1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1_1>;
-+ pinctrl-0 = <&pinctrl_uart1>;
+@@ -58,7 +654,25 @@
status = "okay";
};
++&mipi_csi {
++ status = "okay";
++ ipu_id = <0>;
++ csi_id = <1>;
++ v_channel = <0>;
++ lanes = <2>;
++};
++
++&mipi_dsi {
++ dev_id = <0>;
++ disp_id = <0>;
++ lcd_panel = "TRULY-WVGA";
++ disp-power-on-supply = <&reg_mipi_dsi_pwr_on>;
++ resets = <&mipi_dsi_reset>;
++ status = "okay";
++};
++
&usbh1 {
+ vbus-supply = <&reg_usb_h1_vbus>;
status = "okay";
};
- &usbotg {
- vbus-supply = <&reg_usb_otg_vbus>;
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usbotg_2>;
-+ pinctrl-0 = <&pinctrl_usbotg>;
- disable-over-current;
- status = "okay";
- };
-
+@@ -73,15 +687,68 @@
&usdhc2 {
pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc2_1>;
-+ pinctrl-0 = <&pinctrl_usdhc2>;
+ pinctrl-0 = <&pinctrl_usdhc2_1>;
+ bus-width = <8>;
cd-gpios = <&gpio2 2 0>;
wp-gpios = <&gpio2 3 0>;
++ no-1-8-v;
status = "okay";
-@@ -80,7 +509,8 @@
+ };
&usdhc3 {
pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc3_1>;
-+ pinctrl-0 = <&pinctrl_usdhc3>;
+ pinctrl-0 = <&pinctrl_usdhc3_1>;
+ bus-width = <8>;
cd-gpios = <&gpio2 0 0>;
wp-gpios = <&gpio2 1 0>;
- status = "okay";
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,265 @@
-+/*
-+ * Copyright 2013 Freescale Semiconductor, Inc.
-+ *
-+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+/ {
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_2p5v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_3p3v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx6-wandboard-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx6-wandboard-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <3>;
-+ };
-+
-+ sound-spdif {
-+ compatible = "fsl,imx-audio-spdif";
-+ model = "imx-spdif";
-+ spdif-controller = <&spdif>;
-+ spdif-out;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
++ no-1-8-v;
+ status = "okay";
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 201>;
-+ VDDA-supply = <&reg_2p5v>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6qdl-wandboard {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
-+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
-+ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
-+ MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x80000000 /* WL_REF_ON */
-+ MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000 /* WL_RST_N */
-+ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* WL_REG_ON */
-+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* WL_HOST_WAKE */
-+ MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* WL_WAKE */
-+ MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0
-+ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0
-+ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0
-+ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_spdif: spdifgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_RXD0__SPDIF_OUT 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
-+ MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc1: usdhc1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059
-+ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059
-+ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
-+ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
-+ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
-+ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
-+ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
-+ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
-+ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
-+ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
-+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio3 29 0>;
-+ interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
-+ <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
-+ status = "okay";
-+};
-+
-+&spdif {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_spdif>;
-+ status = "okay";
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ dr_mode = "peripheral";
-+ status = "okay";
-+};
-+
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1>;
-+ cd-gpios = <&gpio1 2 0>;
-+ status = "okay";
-+};
-+
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ non-removable;
-+ status = "okay";
-+};
-+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ cd-gpios = <&gpio3 9 0>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,372 @@
-+/*
-+ * Copyright 2013 Data Modul AG
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include "imx6q.dtsi"
-+
-+/ {
-+ model = "Data Modul eDM-QMX6 Board";
-+ compatible = "dmo,imx6q-edmqmx6", "fsl,imx6q";
-+
-+ aliases {
-+ gpio7 = &stmpe_gpio;
-+ };
-+
-+ memory {
-+ reg = <0x10000000 0x80000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p3v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_otg_vbus: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio7 12 0>;
-+ };
-+
-+ reg_usb_host1: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "usb_host1_en";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ gpio = <&gpio3 31 0>;
-+ enable-active-high;
-+ };
-+ };
-+
-+ gpio-leds {
-+ compatible = "gpio-leds";
-+
-+ led-blue {
-+ label = "blue";
-+ gpios = <&stmpe_gpio 8 GPIO_ACTIVE_HIGH>;
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ led-green {
-+ label = "green";
-+ gpios = <&stmpe_gpio 9 GPIO_ACTIVE_HIGH>;
-+ };
-+
-+ led-pink {
-+ label = "pink";
-+ gpios = <&stmpe_gpio 10 GPIO_ACTIVE_HIGH>;
-+ };
-+
-+ led-red {
-+ label = "red";
-+ gpios = <&stmpe_gpio 11 GPIO_ACTIVE_HIGH>;
-+ };
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio3 23 0>;
-+ phy-supply = <&vgen2_1v2_eth>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2
-+ &pinctrl_stmpe>;
-+ status = "okay";
-+
-+ pmic: pfuze100@08 {
-+ compatible = "fsl,pfuze100";
-+ reg = <0x08>;
-+ interrupt-parent = <&gpio3>;
-+ interrupts = <20 8>;
-+
-+ regulators {
-+ sw1a_reg: sw1ab {
-+ regulator-min-microvolt = <300000>;
-+ regulator-max-microvolt = <1875000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw1c_reg: sw1c {
-+ regulator-min-microvolt = <300000>;
-+ regulator-max-microvolt = <1875000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw2_reg: sw2 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3a_reg: sw3a {
-+ regulator-min-microvolt = <400000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3b_reg: sw3b {
-+ regulator-min-microvolt = <400000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw4_reg: sw4 {
-+ regulator-min-microvolt = <400000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-always-on;
-+ };
-+
-+ swbst_reg: swbst {
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5150000>;
-+ regulator-always-on;
-+ };
-+
-+ snvs_reg: vsnvs {
-+ regulator-min-microvolt = <1000000>;
-+ regulator-max-microvolt = <3000000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vref_reg: vrefddr {
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vgen1_reg: vgen1 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <1550000>;
-+ };
-+
-+ vgen2_1v2_eth: vgen2 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <1550000>;
-+ };
-+
-+ vdd_high_in: vgen3 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vgen4_reg: vgen4 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vgen5_reg: vgen5 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vgen6_reg: vgen6 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+ };
-+
-+ stmpe: stmpe1601@40 {
-+ compatible = "st,stmpe1601";
-+ reg = <0x40>;
-+ interrupts = <30 0>;
-+ interrupt-parent = <&gpio3>;
-+
-+ stmpe_gpio: stmpe_gpio {
-+ #gpio-cells = <2>;
-+ compatible = "st,stmpe-gpio";
-+ };
-+ };
-+
-+ temp1: ad7414@4c {
-+ compatible = "ad,ad7414";
-+ reg = <0x4c>;
-+ };
-+
-+ temp2: ad7414@4d {
-+ compatible = "ad,ad7414";
-+ reg = <0x4d>;
-+ };
-+
-+ rtc: m41t62@68 {
-+ compatible = "stm,m41t62";
-+ reg = <0x68>;
-+ };
+};
+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6q-dmo-edmqmx6 {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000
-+ MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_stmpe: stmpegrp {
-+ fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc4: usdhc4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
-+ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
-+ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
-+ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
-+ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
-+ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
-+ MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
-+ MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
-+ MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
-+ MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
-+ >;
-+ };
-+ };
++&usdhc4 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc4_1>;
++ bus-width = <8>;
++ non-removable;
++ no-1-8-v;
++ status = "okay";
+};
+
-+&sata {
-+ status = "okay";
++&vpu {
++ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
++&hdmi_core {
++ ipu_id = <0>;
++ disp_id = <0>;
+ status = "okay";
+};
+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
++&hdmi_video {
++ fsl,phy_reg_vlev = <0x0294>;
++ fsl,phy_reg_cksymtx = <0x800d>;
+ status = "okay";
+};
+
-+&usbh1 {
-+ vbus-supply = <&reg_usb_host1>;
-+ disable-over-current;
++&hdmi_audio {
+ status = "okay";
+};
+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
++&hdmi_cec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "okay";
-+};
++ pinctrl-0 = <&pinctrl_hdmi_cec_2>;
+ status = "okay";
+ };
+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
++&gpc {
++ fsl,cpu_pupscr_sw2iso = <0xf>;
++ fsl,cpu_pupscr_sw = <0xf>;
++ fsl,cpu_pdnscr_iso2sw = <0x1>;
++ fsl,cpu_pdnscr_iso = <0x1>;
++ fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */
++ fsl,wdog-reset = <2>; /* watchdog select of reset source */
++ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
+
-+&usdhc4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc4>;
-+ vmmc-supply = <&reg_3p3v>;
-+ non-removable;
-+ bus-width = <8>;
-+ status = "okay";
++&gpu {
++ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-solidrun/arch/arm/boot/dts/imx6q.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -8,10 +8,15 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6q.dtsi 2014-04-24 07:58:12.876168828 +0200
+@@ -8,15 +8,19 @@
*
*/
-#include "imx6qdl.dtsi"
-+#include <dt-bindings/interrupt-controller/irq.h>
#include "imx6q-pinfunc.h"
+#include "imx6qdl.dtsi"
/ {
+ aliases {
-+ spi4 = &ecspi5;
++ ipu1 = &ipu2;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
-@@ -25,8 +30,17 @@
+
+- cpu@0 {
++ cpu0: cpu@0 {
+ compatible = "arm,cortex-a9";
+ device_type = "cpu";
+ reg = <0>;
+@@ -25,8 +29,17 @@
/* kHz uV */
1200000 1275000
996000 1250000
@@ -27479,48 +6754,108 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
+ >;
+ fsl,soc-operating-points = <
+ /* ARM kHz SOC-PU uV */
-+ 1200000 1275000
-+ 996000 1250000
-+ 852000 1250000
-+ 792000 1175000
-+ 396000 1175000
++ 1200000 1275000
++ 996000 1250000
++ 852000 1250000
++ 792000 1175000
++ 396000 1175000
>;
clock-latency = <61036>; /* two CLK32 periods */
clocks = <&clks 104>, <&clks 6>, <&clks 16>,
-@@ -61,6 +75,12 @@
+@@ -61,6 +74,77 @@
};
soc {
++
++ 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>;
++ };
++
++ gpu: gpu@00130000 {
++ compatible = "fsl,imx6q-gpu";
++ reg = <0x00130000 0x4000>, <0x00134000 0x4000>,
++ <0x02204000 0x4000>, <0x0 0x0>;
++ reg-names = "iobase_3d", "iobase_2d",
++ "iobase_vg", "phys_baseaddr";
++ interrupts = <0 9 0x04>, <0 10 0x04>,<0 11 0x04>;
++ interrupt-names = "irq_3d", "irq_2d", "irq_vg";
++ clocks = <&clks 26>, <&clks 143>,
++ <&clks 27>, <&clks 121>,
++ <&clks 122>, <&clks 74>;
++ clock-names = "gpu2d_axi_clk", "openvg_axi_clk",
++ "gpu3d_axi_clk", "gpu2d_clk",
++ "gpu3d_clk", "gpu3d_shader_clk";
++ resets = <&src 0>, <&src 3>, <&src 3>;
++ reset-names = "gpu3d", "gpu2d", "gpuvg";
++ pu-supply = <&reg_pu>;
++ };
++
+ ocram: sram@00900000 {
+ compatible = "mmio-sram";
+ reg = <0x00900000 0x40000>;
+ clocks = <&clks 142>;
+ };
+
++ hdmi_core: hdmi_core@00120000 {
++ compatible = "fsl,imx6q-hdmi-core";
++ reg = <0x00120000 0x9000>;
++ clocks = <&clks 124>, <&clks 123>;
++ clock-names = "hdmi_isfr", "hdmi_iahb";
++ status = "disabled";
++ };
++
++ hdmi_video: hdmi_video@020e0000 {
++ compatible = "fsl,imx6q-hdmi-video";
++ reg = <0x020e0000 0x1000>;
++ reg-names = "hdmi_gpr";
++ interrupts = <0 115 0x04>;
++ clocks = <&clks 124>, <&clks 123>;
++ clock-names = "hdmi_isfr", "hdmi_iahb";
++ status = "disabled";
++ };
++
++ hdmi_audio: hdmi_audio@00120000 {
++ compatible = "fsl,imx6q-hdmi-audio";
++ clocks = <&clks 124>, <&clks 123>;
++ clock-names = "hdmi_isfr", "hdmi_iahb";
++ dmas = <&sdma 2 22 0>;
++ dma-names = "tx";
++ status = "disabled";
++ };
++
++ hdmi_cec: hdmi_cec@00120000 {
++ compatible = "fsl,imx6q-hdmi-cec";
++ interrupts = <0 115 0x04>;
++ status = "disabled";
++ };
++
++
aips-bus@02000000 { /* AIPS1 */
spba-bus@02000000 {
ecspi5: ecspi@02018000 {
-@@ -68,7 +88,7 @@
- #size-cells = <0>;
- compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
- reg = <0x02018000 0x4000>;
-- interrupts = <0 35 0x04>;
-+ interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks 116>, <&clks 116>;
- clock-names = "ipg", "per";
- status = "disabled";
-@@ -77,269 +97,134 @@
+@@ -75,288 +159,91 @@
+ };
+ };
++ vpu@02040000 {
++ status = "okay";
++ };
++
iomuxc: iomuxc@020e0000 {
compatible = "fsl,imx6q-iomuxc";
- reg = <0x020e0000 0x4000>;
-
+-
- /* shared pinctrl settings */
- audmux {
- pinctrl_audmux_1: audmux-1 {
-+ ipu2 {
-+ pinctrl_ipu2_1: ipu2grp-1 {
- fsl,pins = <
+- fsl,pins = <
- MX6Q_PAD_SD2_DAT0__AUD4_RXD 0x80000000
- MX6Q_PAD_SD2_DAT3__AUD4_TXC 0x80000000
- MX6Q_PAD_SD2_DAT2__AUD4_TXD 0x80000000
@@ -27534,41 +6869,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_CSI0_DAT4__AUD3_TXC 0x80000000
- MX6Q_PAD_CSI0_DAT5__AUD3_TXD 0x80000000
- MX6Q_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
-+ MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0x10
-+ MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15 0x10
-+ MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02 0x10
-+ MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03 0x10
-+ MX6QDL_PAD_DI0_PIN4__IPU2_DI0_PIN04 0x80000000
-+ MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0x10
-+ MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0x10
-+ MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0x10
-+ MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0x10
-+ MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0x10
-+ MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0x10
-+ MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0x10
-+ MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0x10
-+ MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0x10
-+ MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0x10
-+ MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0x10
-+ MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0x10
-+ MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0x10
-+ MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0x10
-+ MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0x10
-+ MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0x10
-+ MX6QDL_PAD_DISP0_DAT16__IPU2_DISP0_DATA16 0x10
-+ MX6QDL_PAD_DISP0_DAT17__IPU2_DISP0_DATA17 0x10
-+ MX6QDL_PAD_DISP0_DAT18__IPU2_DISP0_DATA18 0x10
-+ MX6QDL_PAD_DISP0_DAT19__IPU2_DISP0_DATA19 0x10
-+ MX6QDL_PAD_DISP0_DAT20__IPU2_DISP0_DATA20 0x10
-+ MX6QDL_PAD_DISP0_DAT21__IPU2_DISP0_DATA21 0x10
-+ MX6QDL_PAD_DISP0_DAT22__IPU2_DISP0_DATA22 0x10
-+ MX6QDL_PAD_DISP0_DAT23__IPU2_DISP0_DATA23 0x10
- >;
- };
- };
-+ };
-+ };
-
+- >;
+- };
+- };
+-
- ecspi1 {
- pinctrl_ecspi1_1: ecspi1grp-1 {
- fsl,pins = <
@@ -27578,15 +6882,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- >;
- };
- };
-+ sata: sata@02200000 {
-+ compatible = "fsl,imx6q-ahci";
-+ reg = <0x02200000 0x4000>;
-+ interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks 154>, <&clks 187>, <&clks 105>;
-+ clock-names = "sata", "sata_ref", "ahb";
-+ status = "disabled";
-+ };
-
+-
- ecspi3 {
- pinctrl_ecspi3_1: ecspi3grp-1 {
- fsl,pins = <
@@ -27596,17 +6892,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- >;
- };
- };
-+ ipu2: ipu@02800000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx6q-ipu";
-+ reg = <0x02800000 0x400000>;
-+ interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 7 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks 133>, <&clks 134>, <&clks 137>;
-+ clock-names = "bus", "di0", "di1";
-+ resets = <&src 4>;
-
+-
- enet {
- pinctrl_enet_1: enetgrp-1 {
- fsl,pins = <
@@ -27628,11 +6914,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
- >;
- };
-+ ipu2_di0: port@2 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <2>;
-
+-
- pinctrl_enet_2: enetgrp-2 {
- fsl,pins = <
- MX6Q_PAD_KEY_COL1__ENET_MDIO 0x1b0b0
@@ -27652,9 +6934,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
- >;
- };
-+ ipu2_di0_disp0: endpoint@0 {
- };
-
+- };
+-
- gpmi-nand {
- pinctrl_gpmi_nand_1: gpmi-nand-1 {
- fsl,pins = <
@@ -27679,10 +6960,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_SD4_DAT0__NAND_DQS 0x00b1
- >;
- };
-+ ipu2_di0_hdmi: endpoint@1 {
-+ remote-endpoint = <&hdmi_mux_2>;
- };
-
+- };
+-
- i2c1 {
- pinctrl_i2c1_1: i2c1grp-1 {
- fsl,pins = <
@@ -27690,9 +6969,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
- >;
- };
-+ ipu2_di0_mipi: endpoint@2 {
- };
-
+- };
+-
- i2c2 {
- pinctrl_i2c2_1: i2c2grp-1 {
- fsl,pins = <
@@ -27700,10 +6978,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
- >;
- };
-+ ipu2_di0_lvds0: endpoint@3 {
-+ remote-endpoint = <&lvds0_mux_2>;
- };
-
+- };
+-
- i2c3 {
- pinctrl_i2c3_1: i2c3grp-1 {
- fsl,pins = <
@@ -27711,11 +6987,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
- >;
- };
-+ ipu2_di0_lvds1: endpoint@4 {
-+ remote-endpoint = <&lvds1_mux_2>;
- };
-+ };
-
+- };
+-
- uart1 {
- pinctrl_uart1_1: uart1grp-1 {
- fsl,pins = <
@@ -27724,11 +6997,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- >;
- };
- };
-+ ipu2_di1: port@3 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <3>;
-
+-
- uart2 {
- pinctrl_uart2_1: uart2grp-1 {
- fsl,pins = <
@@ -27736,10 +7005,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
- >;
- };
-+ ipu2_di1_hdmi: endpoint@1 {
-+ remote-endpoint = <&hdmi_mux_3>;
- };
-
+- };
+-
- uart4 {
- pinctrl_uart4_1: uart4grp-1 {
- fsl,pins = <
@@ -27747,9 +7014,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
- >;
- };
-+ ipu2_di1_mipi: endpoint@2 {
- };
-
+- };
+-
- usbotg {
- pinctrl_usbotg_1: usbotggrp-1 {
- fsl,pins = <
@@ -27762,10 +7028,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
- >;
- };
-+ ipu2_di1_lvds0: endpoint@3 {
-+ remote-endpoint = <&lvds0_mux_3>;
- };
-
+- };
+-
- usdhc2 {
- pinctrl_usdhc2_1: usdhc2grp-1 {
- fsl,pins = <
@@ -27781,13 +7045,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_NANDF_D7__SD2_DATA7 0x17059
- >;
- };
-+ ipu2_di1_lvds1: endpoint@4 {
-+ remote-endpoint = <&lvds1_mux_3>;
- };
-+ };
-+ };
-+ };
-
+- };
+-
- usdhc3 {
- pinctrl_usdhc3_1: usdhc3grp-1 {
- fsl,pins = <
@@ -27803,12 +7062,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_SD3_DAT7__SD3_DATA7 0x17059
- >;
- };
-+ display-subsystem {
-+ compatible = "fsl,imx-display-subsystem";
-+ ports = <&ipu1_di0>, <&ipu1_di1>, <&ipu2_di0>, <&ipu2_di1>;
-+ };
-+};
-
+-
- pinctrl_usdhc3_2: usdhc3grp-2 {
- fsl,pins = <
- MX6Q_PAD_SD3_CMD__SD3_CMD 0x17059
@@ -27820,8 +7074,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- >;
- };
- };
-+&hdmi {
-+ compatible = "fsl,imx6q-hdmi";
++ };
++ };
- usdhc4 {
- pinctrl_usdhc4_1: usdhc4grp-1 {
@@ -27838,9 +7092,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- MX6Q_PAD_SD4_DAT7__SD4_DATA7 0x17059
- >;
- };
-+ port@2 {
-+ reg = <2>;
-
+-
- pinctrl_usdhc4_2: usdhc4grp-2 {
- fsl,pins = <
- MX6Q_PAD_SD4_CMD__SD4_CMD 0x17059
@@ -27852,1332 +7104,105 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- >;
- };
- };
-- };
-+ hdmi_mux_2: endpoint {
-+ remote-endpoint = <&ipu2_di0_hdmi>;
++ aips-bus@02100000 { /* AIPS2 */
++ 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";
++ status = "disabled";
+ };
};
-+ };
-- ipu2: ipu@02800000 {
++ sata: sata@02200000 {
++ compatible = "fsl,imx6q-ahci";
++ reg = <0x02200000 0x4000>;
++ interrupts = <0 39 0x04>;
++ clocks = <&clks 154>, <&clks 187>, <&clks 105>;
++ clock-names = "sata", "sata_ref", "ahb";
++ status = "disabled";
++ };
++
+ ipu2: ipu@02800000 {
- #crtc-cells = <1>;
-- compatible = "fsl,imx6q-ipu";
-- reg = <0x02800000 0x400000>;
-- interrupts = <0 8 0x4 0 7 0x4>;
+ compatible = "fsl,imx6q-ipu";
+ reg = <0x02800000 0x400000>;
+ interrupts = <0 8 0x4 0 7 0x4>;
- clocks = <&clks 133>, <&clks 134>, <&clks 137>;
- clock-names = "bus", "di0", "di1";
-- resets = <&src 4>;
-+ port@3 {
-+ reg = <3>;
-+
-+ hdmi_mux_3: endpoint {
-+ remote-endpoint = <&ipu2_di1_hdmi>;
++ clocks = <&clks 133>, <&clks 134>, <&clks 137>,
++ <&clks 41>, <&clks 42>,
++ <&clks 135>, <&clks 136>;
++ clock-names = "bus", "di0", "di1",
++ "di0_sel", "di1_sel",
++ "ldb_di0", "ldb_di1";
+ resets = <&src 4>;
++ bypass_reset = <0>;
};
};
};
-@@ -353,10 +238,56 @@
- "di0", "di1";
-
- lvds-channel@0 {
-- crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
-+ port@2 {
-+ reg = <2>;
-+
-+ lvds0_mux_2: endpoint {
-+ remote-endpoint = <&ipu2_di0_lvds0>;
-+ };
-+ };
-+
-+ port@3 {
-+ reg = <3>;
-+
-+ lvds0_mux_3: endpoint {
-+ remote-endpoint = <&ipu2_di1_lvds0>;
-+ };
-+ };
- };
- lvds-channel@1 {
+-&ldb {
+- clocks = <&clks 33>, <&clks 34>,
+- <&clks 39>, <&clks 40>, <&clks 41>, <&clks 42>,
+- <&clks 135>, <&clks 136>;
+- clock-names = "di0_pll", "di1_pll",
+- "di0_sel", "di1_sel", "di2_sel", "di3_sel",
+- "di0", "di1";
+-
+- lvds-channel@0 {
- crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
-+ port@2 {
-+ reg = <2>;
-+
-+ lvds1_mux_2: endpoint {
-+ remote-endpoint = <&ipu2_di0_lvds1>;
-+ };
-+ };
-+
-+ port@3 {
-+ reg = <3>;
-+
-+ lvds1_mux_3: endpoint {
-+ remote-endpoint = <&ipu2_di1_lvds1>;
-+ };
-+ };
-+ };
-+};
-+
-+&mipi_dsi {
-+ port@2 {
-+ reg = <2>;
-+
-+ mipi_mux_2: endpoint {
-+ remote-endpoint = <&ipu2_di0_mipi>;
-+ };
-+ };
-+
-+ port@3 {
-+ reg = <3>;
-+
-+ mipi_mux_3: endpoint {
-+ remote-endpoint = <&ipu2_di1_mipi>;
-+ };
- };
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-gk802.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gk802.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-gk802.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gk802.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,171 @@
-+/*
-+ * Copyright (C) 2013 Philipp Zabel
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+
-+/ {
-+ model = "Zealz GK802";
-+ compatible = "zealz,imx6q-gk802", "fsl,imx6q";
-+
-+ chosen {
-+ linux,stdout-path = &uart4;
-+ };
-+
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_3p3v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+
-+ recovery-button {
-+ label = "recovery";
-+ gpios = <&gpio3 16 1>;
-+ linux,code = <0x198>; /* KEY_RESTART */
-+ gpio-key,wakeup;
-+ };
-+ };
-+};
-+
-+/* Internal I2C */
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ clock-frequency = <100000>;
-+ status = "okay";
-+
-+ /* SDMC DM2016 1024 bit EEPROM + 128 bit OTP */
-+ eeprom: dm2016@51 {
-+ compatible = "sdmc,dm2016";
-+ reg = <0x51>;
-+ };
-+};
-+
-+/* External I2C via HDMI */
-+&i2c3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ clock-frequency = <100000>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6q-gk802 {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ /* Recovery button, active-low */
-+ MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x100b1
-+ /* RTL8192CU enable GPIO, active-low */
-+ MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_uart4: uart4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc4: usdhc4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
-+ MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
-+ MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
-+ MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
-+ MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
-+ MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
-+ >;
-+ };
-+ };
-+};
-+
-+&uart2 {
-+ status = "okay";
-+};
-+
-+&uart4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4>;
-+ status = "okay";
-+};
-+
-+/* External USB-A port (USBOTG) */
-+&usbotg {
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+/* Internal USB port (USBH1), connected to RTL8192CU */
-+&usbh1 {
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+/* External microSD */
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ bus-width = <4>;
-+ cd-gpios = <&gpio6 11 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-+
-+/* Internal microSD */
-+&usdhc4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc4>;
-+ bus-width = <4>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-gw51xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw51xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-gw51xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw51xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+#include "imx6qdl-gw54xx.dtsi"
-+
-+/ {
-+ model = "Gateworks Ventana i.MX6 Quad GW51XX";
-+ compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-gw52xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw52xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-gw52xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw52xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+#include "imx6qdl-gw52xx.dtsi"
-+
-+/ {
-+ model = "Gateworks Ventana i.MX6 Quad GW52XX";
-+ compatible = "gw,imx6q-gw52xx", "gw,ventana", "fsl,imx6q";
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-gw53xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw53xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-gw53xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw53xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+#include "imx6qdl-gw53xx.dtsi"
-+
-+/ {
-+ model = "Gateworks Ventana i.MX6 Quad GW53XX";
-+ compatible = "gw,imx6q-gw53xx", "gw,ventana", "fsl,imx6q";
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw5400-a.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-gw5400-a.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw5400-a.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,546 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+
-+/ {
-+ model = "Gateworks Ventana GW5400-A";
-+ compatible = "gw,imx6q-gw5400-a", "gw,ventana", "fsl,imx6q";
-+
-+ /* these are used by bootloader for disabling nodes */
-+ aliases {
-+ ethernet0 = &fec;
-+ ethernet1 = &eth1;
-+ i2c0 = &i2c1;
-+ i2c1 = &i2c2;
-+ i2c2 = &i2c3;
-+ led0 = &led0;
-+ led1 = &led1;
-+ led2 = &led2;
-+ sky2 = &eth1;
-+ ssi0 = &ssi1;
-+ spi0 = &ecspi1;
-+ usb0 = &usbh1;
-+ usb1 = &usbotg;
-+ usdhc2 = &usdhc3;
-+ };
-+
-+ chosen {
-+ bootargs = "console=ttymxc1,115200";
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ led0: user1 {
-+ label = "user1";
-+ gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-+ default-state = "on";
-+ linux,default-trigger = "heartbeat";
-+ };
-+
-+ led1: user2 {
-+ label = "user2";
-+ gpios = <&gpio4 10 0>; /* 106 -> MX6_PANLEDR */
-+ default-state = "off";
-+ };
-+
-+ led2: user3 {
-+ label = "user3";
-+ gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
-+ default-state = "off";
-+ };
-+ };
-+
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+
-+ pps {
-+ compatible = "pps-gpio";
-+ gpios = <&gpio1 5 0>;
-+ status = "okay";
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_1p0v: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "1P0V";
-+ regulator-min-microvolt = <1000000>;
-+ regulator-max-microvolt = <1000000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_3p3v: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_h1_vbus: regulator@2 {
-+ compatible = "regulator-fixed";
-+ reg = <2>;
-+ regulator-name = "usb_h1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_usb_otg_vbus: regulator@3 {
-+ compatible = "regulator-fixed";
-+ reg = <3>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio3 22 0>;
-+ enable-active-high;
-+ };
-+ };
-+
-+ sound {
-+ compatible = "fsl,imx6q-sabrelite-sgtl5000",
-+ "fsl,imx-audio-sgtl5000";
-+ model = "imx6q-sabrelite-sgtl5000";
-+ ssi-controller = <&ssi1>;
-+ audio-codec = <&codec>;
-+ audio-routing =
-+ "MIC_IN", "Mic Jack",
-+ "Mic Jack", "Mic Bias",
-+ "Headphone Jack", "HP_OUT";
-+ mux-int-port = <1>;
-+ mux-ext-port = <4>;
-+ };
-+};
-+
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux>;
-+ status = "okay";
-+};
-+
-+&ecspi1 {
-+ fsl,spi-num-chipselects = <1>;
-+ cs-gpios = <&gpio3 19 0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
-+ status = "okay";
-+
-+ flash: m25p80@0 {
-+ compatible = "sst,w25q256";
-+ spi-max-frequency = <30000000>;
-+ reg = <0>;
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio1 30 0>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ eeprom1: eeprom@50 {
-+ compatible = "atmel,24c02";
-+ reg = <0x50>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom2: eeprom@51 {
-+ compatible = "atmel,24c02";
-+ reg = <0x51>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom3: eeprom@52 {
-+ compatible = "atmel,24c02";
-+ reg = <0x52>;
-+ pagesize = <16>;
-+ };
-+
-+ eeprom4: eeprom@53 {
-+ compatible = "atmel,24c02";
-+ reg = <0x53>;
-+ pagesize = <16>;
-+ };
-+
-+ gpio: pca9555@23 {
-+ compatible = "nxp,pca9555";
-+ reg = <0x23>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ };
-+
-+ hwmon: gsc@29 {
-+ compatible = "gw,gsp";
-+ reg = <0x29>;
-+ };
-+
-+ rtc: ds1672@68 {
-+ compatible = "dallas,ds1672";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ status = "okay";
-+
-+ pmic: pfuze100@08 {
-+ compatible = "fsl,pfuze100";
-+ reg = <0x08>;
-+
-+ regulators {
-+ sw1a_reg: sw1ab {
-+ regulator-min-microvolt = <300000>;
-+ regulator-max-microvolt = <1875000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ regulator-ramp-delay = <6250>;
-+ };
-+
-+ sw1c_reg: sw1c {
-+ regulator-min-microvolt = <300000>;
-+ regulator-max-microvolt = <1875000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ regulator-ramp-delay = <6250>;
-+ };
-+
-+ sw2_reg: sw2 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <3950000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3a_reg: sw3a {
-+ regulator-min-microvolt = <400000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw3b_reg: sw3b {
-+ regulator-min-microvolt = <400000>;
-+ regulator-max-microvolt = <1975000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ sw4_reg: sw4 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ swbst_reg: swbst {
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5150000>;
-+ };
-+
-+ snvs_reg: vsnvs {
-+ regulator-min-microvolt = <1000000>;
-+ regulator-max-microvolt = <3000000>;
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vref_reg: vrefddr {
-+ regulator-boot-on;
-+ regulator-always-on;
-+ };
-+
-+ vgen1_reg: vgen1 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <1550000>;
-+ };
-+
-+ vgen2_reg: vgen2 {
-+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <1550000>;
-+ };
-+
-+ vgen3_reg: vgen3 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ vgen4_reg: vgen4 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vgen5_reg: vgen5 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vgen6_reg: vgen6 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+ };
-+
-+ pciswitch: pex8609@3f {
-+ compatible = "plx,pex8609";
-+ reg = <0x3f>;
-+ };
-+
-+ pciclkgen: si52147@6b {
-+ compatible = "sil,si52147";
-+ reg = <0x6b>;
-+ };
-+};
-+
-+&i2c3 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c3>;
-+ status = "okay";
-+
-+ accelerometer: mma8450@1c {
-+ compatible = "fsl,mma8450";
-+ reg = <0x1c>;
-+ };
-+
-+ codec: sgtl5000@0a {
-+ compatible = "fsl,sgtl5000";
-+ reg = <0x0a>;
-+ clocks = <&clks 201>;
-+ VDDA-supply = <&sw4_reg>;
-+ VDDIO-supply = <&reg_3p3v>;
-+ };
-+
-+ hdmiin: adv7611@4c {
-+ compatible = "adi,adv7611";
-+ reg = <0x4c>;
-+ };
-+
-+ touchscreen: egalax_ts@04 {
-+ compatible = "eeti,egalax_ts";
-+ reg = <0x04>;
-+ interrupt-parent = <&gpio7>;
-+ interrupts = <12 2>; /* gpio7_12 active low */
-+ wakeup-gpios = <&gpio7 12 0>;
-+ };
-+
-+ videoout: adv7393@2a {
-+ compatible = "adi,adv7393";
-+ reg = <0x2a>;
-+ };
-+
-+ videoin: adv7180@20 {
-+ compatible = "adi,adv7180";
-+ reg = <0x20>;
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6q-gw5400-a {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 /* OTG_PWR_EN */
-+ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 /* SPINOR_CS0# */
-+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000 /* PCIE IRQ */
-+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* PCIE RST */
-+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000130b0 /* AUD4_MCK */
-+ MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x80000000 /* GPS_PPS */
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* TOUCH_IRQ# */
-+ MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x80000000 /* user1 led */
-+ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000 /* user2 led */
-+ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 /* user3 led */
-+ MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x80000000 /* USBHUB_RST# */
-+ MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 0x80000000 /* MIPI_DIO */
-+ >;
-+ };
-+
-+ pinctrl_audmux: audmuxgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_DAT0__AUD4_RXD 0x130b0
-+ MX6QDL_PAD_SD2_DAT3__AUD4_TXC 0x130b0
-+ MX6QDL_PAD_SD2_DAT2__AUD4_TXD 0x110b0
-+ MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
-+ MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
-+ MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_i2c3: i2c3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart5: uart5grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+ };
-+};
-+
-+&ldb {
-+ status = "okay";
-+ lvds-channel@0 {
-+ crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
-+ };
-+};
-+
-+&pcie {
-+ reset-gpio = <&gpio1 29 0>;
-+ status = "okay";
-+
-+ eth1: sky2@8 { /* MAC/PHY on bus 8 */
-+ compatible = "marvell,sky2";
-+ };
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-+
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&uart5 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart5>;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <&reg_usb_h1_vbus>;
-+ status = "okay";
-+};
-+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ cd-gpios = <&gpio7 0 0>;
-+ vmmc-supply = <&reg_3p3v>;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-gw54xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw54xx.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-gw54xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw54xx.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright 2013 Gateworks Corporation
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+#include "imx6qdl-gw54xx.dtsi"
-+
-+/ {
-+ model = "Gateworks Ventana i.MX6 Quad GW54XX";
-+ compatible = "gw,imx6q-gw54xx", "gw,ventana", "fsl,imx6q";
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-nitrogen6x.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-nitrogen6x.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-nitrogen6x.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,25 @@
-+/*
-+ * Copyright 2013 Boundary Devices, Inc.
-+ * Copyright 2012 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+#include "imx6qdl-nitrogen6x.dtsi"
-+
-+/ {
-+ model = "Freescale i.MX6 Quad Nitrogen6x Board";
-+ compatible = "fsl,imx6q-nitrogen6x", "fsl,imx6q";
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,50 @@
-+/*
-+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx6q-phytec-pfla02.dtsi"
-+
-+/ {
-+ model = "Phytec phyFLEX-i.MX6 Quad Carrier-Board";
-+ compatible = "phytec,imx6q-pbab01", "phytec,imx6q-pfla02", "fsl,imx6q";
-+};
-+
-+&fec {
-+ status = "okay";
-+};
-+
-+&gpmi {
-+ status = "okay";
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-+
-+&uart4 {
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ status = "okay";
-+};
-+
-+&usdhc2 {
-+ status = "okay";
-+};
-+
-+&usdhc3 {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
---- linux-3.10.36/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,325 @@
-+/*
-+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "imx6q.dtsi"
-+
-+/ {
-+ model = "Phytec phyFLEX-i.MX6 Ouad";
-+ compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
-+
-+ memory {
-+ reg = <0x10000000 0x80000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_usb_otg_vbus: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "usb_otg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio4 15 0>;
-+ };
-+
-+ reg_usb_h1_vbus: regulator@1 {
-+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "usb_h1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio1 0 0>;
-+ };
-+ };
-+};
-+
-+&ecspi3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi3>;
-+ status = "okay";
-+ fsl,spi-num-chipselects = <1>;
-+ cs-gpios = <&gpio4 24 0>;
-+
-+ flash@0 {
-+ compatible = "m25p80";
-+ spi-max-frequency = <20000000>;
-+ reg = <0>;
-+ };
-+};
-+
-+&i2c1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+
-+ eeprom@50 {
-+ compatible = "atmel,24c32";
-+ reg = <0x50>;
-+ };
-+
-+ pmic@58 {
-+ compatible = "dialog,da9063";
-+ reg = <0x58>;
-+ interrupt-parent = <&gpio4>;
-+ interrupts = <17 0x8>; /* active-low GPIO4_17 */
-+
-+ regulators {
-+ vddcore_reg: bcore1 {
-+ regulator-min-microvolt = <730000>;
-+ regulator-max-microvolt = <1380000>;
-+ regulator-always-on;
-+ };
-+
-+ vddsoc_reg: bcore2 {
-+ regulator-min-microvolt = <730000>;
-+ regulator-max-microvolt = <1380000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_ddr3_reg: bpro {
-+ regulator-min-microvolt = <1500000>;
-+ regulator-max-microvolt = <1500000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_3v3_reg: bperi {
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_buckmem_reg: bmem {
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_eth_reg: bio {
-+ regulator-min-microvolt = <1200000>;
-+ regulator-max-microvolt = <1200000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_eth_io_reg: ldo4 {
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_mx6_snvs_reg: ldo5 {
-+ regulator-min-microvolt = <3000000>;
-+ regulator-max-microvolt = <3000000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_3v3_pmic_io_reg: ldo6 {
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+
-+ vdd_sd0_reg: ldo9 {
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ vdd_sd1_reg: ldo10 {
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ vdd_mx6_high_reg: ldo11 {
-+ regulator-min-microvolt = <3000000>;
-+ regulator-max-microvolt = <3000000>;
-+ regulator-always-on;
-+ };
-+ };
-+ };
-+};
-+
+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ imx6q-phytec-pfla02 {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
-+ MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24 0x80000000 /* SPI NOR chipselect */
-+ MX6QDL_PAD_DI0_PIN15__GPIO4_IO17 0x80000000 /* PMIC interrupt */
-+ >;
-+ };
-+
-+ pinctrl_ecspi3: ecspi3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1
-+ MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1
-+ MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
-+ >;
-+ };
-+
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
-+ >;
-+ };
-+
-+ pinctrl_gpmi_nand: gpminandgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
-+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
-+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
-+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
-+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
-+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
-+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
-+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
-+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
-+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
-+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
-+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
-+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
-+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
-+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
-+ MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_uart4: uart4grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbh1: usbh1grp {
++ ipu2 {
++ pinctrl_ipu2_1: ipu2grp-1 {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_0__USB_H1_PWR 0x80000000
++ MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0x10
++ MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15 0x10
++ MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02 0x10
++ MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03 0x10
++ MX6QDL_PAD_DI0_PIN4__IPU2_DI0_PIN04 0x80000000
++ MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0x10
++ MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0x10
++ MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0x10
++ MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0x10
++ MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0x10
++ MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0x10
++ MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0x10
++ MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0x10
++ MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0x10
++ MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0x10
++ MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0x10
++ MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0x10
++ MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0x10
++ MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0x10
++ MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0x10
++ MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0x10
++ MX6QDL_PAD_DISP0_DAT16__IPU2_DISP0_DATA16 0x10
++ MX6QDL_PAD_DISP0_DAT17__IPU2_DISP0_DATA17 0x10
++ MX6QDL_PAD_DISP0_DAT18__IPU2_DISP0_DATA18 0x10
++ MX6QDL_PAD_DISP0_DAT19__IPU2_DISP0_DATA19 0x10
++ MX6QDL_PAD_DISP0_DAT20__IPU2_DISP0_DATA20 0x10
++ MX6QDL_PAD_DISP0_DAT21__IPU2_DISP0_DATA21 0x10
++ MX6QDL_PAD_DISP0_DAT22__IPU2_DISP0_DATA22 0x10
++ MX6QDL_PAD_DISP0_DAT23__IPU2_DISP0_DATA23 0x10
+ >;
+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0
-+ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
-+ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
-+ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
-+ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
-+ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
-+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3_cdwp: usdhc3cdwp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x80000000
-+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
-+ >;
-+ };
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio3 23 0>;
-+ status = "disabled";
-+};
-+
-+&gpmi {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpmi_nand>;
-+ nand-on-flash-bbt;
-+ status = "disabled";
-+};
-+
-+&uart4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4>;
-+ status = "disabled";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <&reg_usb_h1_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh1>;
-+ status = "disabled";
-+};
-+
-+&usbotg {
-+ vbus-supply = <&reg_usb_otg_vbus>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ disable-over-current;
-+ status = "disabled";
-+};
-+
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ cd-gpios = <&gpio1 4 0>;
-+ wp-gpios = <&gpio1 2 0>;
-+ status = "disabled";
-+};
-+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3
-+ &pinctrl_usdhc3_cdwp>;
-+ cd-gpios = <&gpio1 27 0>;
-+ wp-gpios = <&gpio1 29 0>;
-+ status = "disabled";
+ };
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-pinfunc.h
+
+- lvds-channel@1 {
+- crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
+- };
++&hdmi {
++ compatible = "fsl,imx6q-hdmi";
++ crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
+ };
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-pinfunc.h linux-solidrun/arch/arm/boot/dts/imx6q-pinfunc.h
--- linux-3.10.36/arch/arm/boot/dts/imx6q-pinfunc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-pinfunc.h 2014-04-21 13:50:39.062713665 +0200
-@@ -14,1028 +14,1034 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6q-pinfunc.h 2014-04-24 07:58:12.876168828 +0200
+@@ -14,1028 +14,1032 @@
* The pin function ID is a tuple of
* <mux_reg conf_reg input_reg mux_mode input_val>
*/
@@ -30863,7 +8888,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stable-mx
+#define MX6QDL_PAD_GPIO_3__USB_H1_OC 0x22c 0x5fc 0x948 0x6 0x1
+#define MX6QDL_PAD_GPIO_3__MLB_CLK 0x22c 0x5fc 0x900 0x7 0x1
+#define MX6QDL_PAD_GPIO_6__ESAI_TX_CLK 0x230 0x600 0x870 0x0 0x1
-+#define MX6QDL_PAD_GPIO_6__ENET_IRQ 0x230 0x600 0x03c 0x11 0xff000609
+#define MX6QDL_PAD_GPIO_6__I2C3_SDA 0x230 0x600 0x8ac 0x2 0x1
+#define MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x230 0x600 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_6__SD2_LCTL 0x230 0x600 0x000 0x6 0x0
@@ -31215,7 +9239,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stable-mx
+#define MX6QDL_PAD_SD1_DAT2__WDOG1_RESET_B_DEB 0x34c 0x734 0x000 0x6 0x0
+#define MX6QDL_PAD_SD1_CLK__SD1_CLK 0x350 0x738 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK 0x350 0x738 0x828 0x1 0x0
-+#define MX6QDL_PAD_SD1_CLK__OSC32K_32K_OUT 0x350 0x738 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN 0x350 0x738 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x350 0x738 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_CLK__SD2_CLK 0x354 0x73c 0x000 0x0 0x0
@@ -31235,17 +9258,32 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stable-mx
+#define MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x35c 0x744 0x000 0x5 0x0
#endif /* __DTS_IMX6Q_PINFUNC_H */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -20,16 +20,6 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-04-24 07:58:12.876168828 +0200
+@@ -20,16 +20,22 @@
compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
};
-&iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
--
++&mxcfb1 {
++ status = "okay";
++};
++
++&mxcfb2 {
++ status = "okay";
++};
++
++&mxcfb3 {
++ status = "okay";
++};
++
++&mxcfb4 {
++ status = "okay";
++};
+
- hog {
- pinctrl_hog: hoggrp {
- fsl,pins = <
@@ -31257,9 +9295,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto.dts linux-linaro-stabl
+&sata {
+ status = "okay";
};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts 2014-04-24 07:58:12.876168828 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -31300,9 +9338,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts linux-linaro
+ status = "okay";
+ dr_mode = "peripheral";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts 2014-04-24 07:58:12.876168828 +0200
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -31322,9 +9360,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts linux-lin
+ /* pin conflict with flexcan1 */
+ status = "disabled";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts 2014-04-24 07:58:12.876168828 +0200
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -31374,93 +9412,56 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts linux-li
+&weim {
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabrelite.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabrelite.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabrelite.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -12,159 +12,13 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-04-24 07:58:12.876168828 +0200
+@@ -65,6 +65,12 @@
+ };
+ };
- /dts-v1/;
- #include "imx6q.dtsi"
-+#include "imx6qdl-sabrelite.dtsi"
++&audmux {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_audmux_1>;
++};
++
+ &ecspi1 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio3 19 0>;
+@@ -79,9 +85,27 @@
+ };
+ };
- / {
- model = "Freescale i.MX6 Quad SABRE Lite Board";
- compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";
--
-- memory {
-- reg = <0x10000000 0x40000000>;
-- };
--
-- regulators {
-- compatible = "simple-bus";
--
-- reg_2p5v: 2p5v {
-- compatible = "regulator-fixed";
-- regulator-name = "2P5V";
-- regulator-min-microvolt = <2500000>;
-- regulator-max-microvolt = <2500000>;
-- regulator-always-on;
-- };
--
-- reg_3p3v: 3p3v {
-- compatible = "regulator-fixed";
-- regulator-name = "3P3V";
-- regulator-min-microvolt = <3300000>;
-- regulator-max-microvolt = <3300000>;
-- regulator-always-on;
-- };
--
-- reg_usb_otg_vbus: usb_otg_vbus {
-- compatible = "regulator-fixed";
-- regulator-name = "usb_otg_vbus";
-- regulator-min-microvolt = <5000000>;
-- regulator-max-microvolt = <5000000>;
-- gpio = <&gpio3 22 0>;
-- enable-active-high;
-- };
-- };
--
-- sound {
-- compatible = "fsl,imx6q-sabrelite-sgtl5000",
-- "fsl,imx-audio-sgtl5000";
-- model = "imx6q-sabrelite-sgtl5000";
-- ssi-controller = <&ssi1>;
-- audio-codec = <&codec>;
-- audio-routing =
-- "MIC_IN", "Mic Jack",
-- "Mic Jack", "Mic Bias",
-- "Headphone Jack", "HP_OUT";
-- mux-int-port = <1>;
-- mux-ext-port = <4>;
-- };
--};
--
--&ecspi1 {
-- fsl,spi-num-chipselects = <1>;
-- cs-gpios = <&gpio3 19 0>;
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ecspi1_1>;
-- status = "okay";
--
-- flash: m25p80@0 {
-- compatible = "sst,sst25vf016b";
-- spi-max-frequency = <20000000>;
-- reg = <0>;
-- };
--};
--
-&ssi1 {
- fsl,mode = "i2s-slave";
-- status = "okay";
--};
--
--&iomuxc {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_hog>;
--
-- hog {
-- pinctrl_hog: hoggrp {
-- fsl,pins = <
++&fec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet_1>;
++ phy-mode = "rgmii";
++ phy-reset-gpios = <&gpio3 23 0>;
++ status = "okay";
++};
++
++&i2c1 {
+ status = "okay";
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c1_1>;
++
++ codec: sgtl5000@0a {
++ compatible = "fsl,sgtl5000";
++ reg = <0x0a>;
++ clocks = <&clks 201>;
++ VDDA-supply = <&reg_2p5v>;
++ VDDIO-supply = <&reg_3p3v>;
++ };
+ };
+
+ &iomuxc {
+@@ -91,36 +115,69 @@
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
- MX6Q_PAD_NANDF_D6__GPIO2_IO06 0x80000000
- MX6Q_PAD_NANDF_D7__GPIO2_IO07 0x80000000
- MX6Q_PAD_EIM_D19__GPIO3_IO19 0x80000000
@@ -31469,49 +9470,85 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro-stabl
- MX6Q_PAD_SD3_DAT5__GPIO7_IO00 0x80000000
- MX6Q_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0
- MX6Q_PAD_GPIO_0__CCM_CLKO1 0x80000000
-- >;
-- };
-- };
--};
--
++ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000
++ MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x80000000
++ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000
++ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000
++ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
++ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000
++ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0
++ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000
++ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
+ >;
+ };
+ };
+ };
+
-&usbotg {
- vbus-supply = <&reg_usb_otg_vbus>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usbotg_1>;
- disable-over-current;
-- status = "okay";
++&ldb {
++ status = "okay";
++
++ lvds-channel@0 {
++ fsl,data-mapping = "spwg";
++ fsl,data-width = <18>;
++ status = "okay";
++
++ display-timings {
++ native-mode = <&timing0>;
++ timing0: hsd100pxn1 {
++ clock-frequency = <65000000>;
++ hactive = <1024>;
++ vactive = <768>;
++ hback-porch = <220>;
++ hfront-porch = <40>;
++ vback-porch = <21>;
++ vfront-porch = <7>;
++ hsync-len = <60>;
++ vsync-len = <10>;
++ };
++ };
++ };
++};
++
++&sata {
+ status = "okay";
};
--&usbh1 {
-+&sata {
++&ssi1 {
++ fsl,mode = "i2s-slave";
++ status = "okay";
++};
++
++&uart2 {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_1>;
++};
++
+ &usbh1 {
status = "okay";
};
--
+
-&fec {
-- pinctrl-names = "default";
++&usbotg {
++ vbus-supply = <&reg_usb_otg_vbus>;
+ pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_enet_1>;
- phy-mode = "rgmii";
- phy-reset-gpios = <&gpio3 23 0>;
-- status = "okay";
--};
--
--&usdhc3 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc3_2>;
-- cd-gpios = <&gpio7 0 0>;
-- wp-gpios = <&gpio7 1 0>;
-- vmmc-supply = <&reg_3p3v>;
-- status = "okay";
--};
--
--&usdhc4 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc4_2>;
-- cd-gpios = <&gpio2 6 0>;
-- wp-gpios = <&gpio2 7 0>;
-- vmmc-supply = <&reg_3p3v>;
-- status = "okay";
--};
++ pinctrl-0 = <&pinctrl_usbotg_1>;
++ disable-over-current;
+ status = "okay";
+ };
+
+@@ -141,30 +198,3 @@
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+ };
-
-&audmux {
- status = "okay";
@@ -31539,10 +9576,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro-stabl
- VDDIO-supply = <&reg_3p3v>;
- };
-};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabresd.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -20,20 +20,6 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabresd.dts 2014-04-24 07:58:12.876168828 +0200
+@@ -20,20 +20,32 @@
compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
};
@@ -31562,12 +9599,38 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd.dts linux-linaro-stable-
- >;
- };
- };
++&imx_drm {
++ crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
++};
++
+&sata {
+ status = "okay";
++};
++
++&mxcfb1 {
++ status = "okay";
++};
++
++&mxcfb2 {
++ status = "okay";
++};
++
++&mxcfb3 {
++ status = "okay";
++};
++
++&mxcfb4 {
++ status = "okay";
++};
++
++&battery {
++ offset-charger = <1900>;
++ offset-discharger = <1694>;
++ offset-usb-charger = <1685>;
};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-04-24 07:58:12.876168828 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -31592,9 +9655,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-linaro-st
+&i2c2 {
+ status = "disable";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-ldo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-ldo.dts linux-solidrun/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-ldo.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-ldo.dts 2014-04-21 13:50:39.062713665 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6q-sabresd-ldo.dts 2014-04-24 07:58:12.876168828 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
@@ -31630,219 +9693,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sabresd-ldo.dts linux-linaro-sta
+&vpu {
+ pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-sbc6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sbc6x.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -17,28 +17,78 @@
- };
- };
-
-+
- &fec {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_enet_1>;
-+ pinctrl-0 = <&pinctrl_enet>;
- phy-mode = "rgmii";
- status = "okay";
- };
-
-+&iomuxc {
-+ imx6q-sbc6x {
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg: usbotggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+ };
-+};
-+
- &uart1 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1_1>;
-+ pinctrl-0 = <&pinctrl_uart1>;
- status = "okay";
- };
-
- &usbotg {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usbotg_1>;
-+ pinctrl-0 = <&pinctrl_usbotg>;
- disable-over-current;
- status = "okay";
- };
-
- &usdhc3 {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usdhc3_2>;
-+ pinctrl-0 = <&pinctrl_usdhc3>;
- status = "okay";
- };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-udoo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-udoo.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-udoo.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-udoo.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,89 @@
-+/*
-+ * Copyright 2013 Freescale Semiconductor, Inc.
-+ *
-+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+
-+/ {
-+ model = "Udoo i.MX6 Quad Board";
-+ compatible = "udoo,imx6q-udoo", "fsl,imx6q";
-+
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet>;
-+ phy-mode = "rgmii";
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ imx6q-udoo {
-+ pinctrl_enet: enetgrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
-+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
-+ };
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ non-removable;
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6q-wandboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-wandboard.dts
---- linux-3.10.36/arch/arm/boot/dts/imx6q-wandboard.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-wandboard.dts 2014-04-21 13:50:39.062713665 +0200
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright 2013 Freescale Semiconductor, Inc.
-+ *
-+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+#include "imx6qdl-wandboard.dtsi"
-+
-+/ {
-+ model = "Wandboard i.MX6 Quad Board";
-+ compatible = "wand,imx6q-wandboard", "fsl,imx6q";
-+
-+ memory {
-+ reg = <0x10000000 0x80000000>;
-+ };
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-solidrun/arch/arm/boot/dts/imx6sl.dtsi
--- linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,800 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6sl.dtsi 2014-04-24 07:58:12.880168841 +0200
+@@ -0,0 +1,1255 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
@@ -31852,28 +9706,22 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ *
+ */
+
-+#include <dt-bindings/interrupt-controller/irq.h>
+#include "skeleton.dtsi"
+#include "imx6sl-pinfunc.h"
+#include <dt-bindings/clock/imx6sl-clock.h>
+
+/ {
+ aliases {
-+ ethernet0 = &fec;
-+ gpio0 = &gpio1;
-+ gpio1 = &gpio2;
-+ gpio2 = &gpio3;
-+ gpio3 = &gpio4;
-+ gpio4 = &gpio5;
+ serial0 = &uart1;
+ serial1 = &uart2;
+ serial2 = &uart3;
+ serial3 = &uart4;
+ serial4 = &uart5;
-+ spi0 = &ecspi1;
-+ spi1 = &ecspi2;
-+ spi2 = &ecspi3;
-+ spi3 = &ecspi4;
++ gpio0 = &gpio1;
++ gpio1 = &gpio2;
++ gpio2 = &gpio3;
++ gpio3 = &gpio4;
++ gpio4 = &gpio5;
+ usbphy0 = &usbphy1;
+ usbphy1 = &usbphy2;
+ };
@@ -31882,22 +9730,22 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ cpu@0 {
++ cpu0: cpu@0 {
+ compatible = "arm,cortex-a9";
+ device_type = "cpu";
+ reg = <0x0>;
+ next-level-cache = <&L2>;
+ operating-points = <
-+ /* kHz uV */
++ /* kHz uV */
+ 996000 1275000
+ 792000 1175000
+ 396000 975000
+ >;
+ fsl,soc-operating-points = <
+ /* ARM kHz SOC-PU uV */
-+ 996000 1225000
-+ 792000 1175000
-+ 396000 1175000
++ 996000 1225000
++ 792000 1175000
++ 396000 1175000
+ >;
+ clock-latency = <61036>; /* two CLK32 periods */
+ clocks = <&clks IMX6SL_CLK_ARM>, <&clks IMX6SL_CLK_PLL2_PFD2>,
@@ -31936,6 +9784,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ };
+ };
+
++ pu_dummy: pudummy_reg {
++ compatible = "fsl,imx6-dummy-pureg"; /* only used in ldo-bypass */
++ };
++
+ soc {
+ #address-cells = <1>;
+ #size-cells = <1>;
@@ -31943,16 +9795,28 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ interrupt-parent = <&intc>;
+ ranges;
+
-+ ocram: sram@00900000 {
-+ compatible = "mmio-sram";
-+ reg = <0x00900000 0x20000>;
-+ clocks = <&clks IMX6SL_CLK_OCRAM>;
++ busfreq { /* BUSFREQ */
++ compatible = "fsl,imx6_busfreq";
++ clocks = <&clks IMX6SL_CLK_PLL2_BUS>, <&clks IMX6SL_CLK_PLL2_PFD2>,
++ <&clks IMX6SL_CLK_PLL2_198M>, <&clks IMX6SL_CLK_ARM>,
++ <&clks IMX6SL_CLK_PLL3_USB_OTG>, <&clks IMX6SL_CLK_PERIPH>,
++ <&clks IMX6SL_CLK_PRE_PERIPH_SEL>, <&clks IMX6SL_CLK_PERIPH_CLK2>,
++ <&clks IMX6SL_CLK_PERIPH_CLK2_SEL>, <&clks IMX6SL_CLK_OSC>,
++ <&clks IMX6SL_CLK_PLL1_SYS>, <&clks IMX6SL_CLK_PERIPH2>,
++ <&clks IMX6SL_CLK_AHB>, <&clks IMX6SL_CLK_OCRAM>,
++ <&clks IMX6SL_CLK_PLL1_SW>, <&clks IMX6SL_CLK_PRE_PERIPH2_SEL>,
++ <&clks IMX6SL_CLK_PERIPH2_CLK2_SEL>, <&clks IMX6SL_CLK_PERIPH2_CLK2>,
++ <&clks IMX6SL_CLK_STEP>;
++ clock-names = "pll2_bus", "pll2_pfd2_396m", "pll2_198m", "arm", "pll3_usb_otg", "periph",
++ "periph_pre", "periph_clk2", "periph_clk2_sel", "osc", "pll1_sys", "periph2", "ahb", "ocram", "pll1_sw",
++ "periph2_pre", "periph2_clk2_sel", "periph2_clk2", "step";
++ fsl,max_ddr_freq = <400000000>;
+ };
+
+ L2: l2-cache@00a02000 {
+ compatible = "arm,pl310-cache";
+ reg = <0x00a02000 0x1000>;
-+ interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 92 0x04>;
+ cache-unified;
+ cache-level = <2>;
+ arm,tag-latency = <4 2 3>;
@@ -31961,7 +9825,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+
+ pmu {
+ compatible = "arm,cortex-a9-pmu";
-+ interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 94 0x04>;
+ };
+
+ aips1: aips-bus@02000000 {
@@ -31979,8 +9843,26 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ ranges;
+
+ spdif: spdif@02004000 {
++ compatible = "fsl,imx6sl-spdif",
++ "fsl,imx35-spdif";
+ reg = <0x02004000 0x4000>;
-+ interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 52 0x04>;
++ dmas = <&sdma 14 18 0>,
++ <&sdma 15 18 0>;
++ dma-names = "rx", "tx";
++ clocks = <&clks IMX6SL_CLK_SPDIF>,
++ <&clks IMX6SL_CLK_OSC>,
++ <&clks IMX6SL_CLK_SPDIF>,
++ <&clks 0>, <&clks 0>, <&clks 0>,
++ <&clks IMX6SL_CLK_IPG>,
++ <&clks 0>, <&clks 0>,
++ <&clks IMX6SL_CLK_SPBA>;
++ clock-names = "core", "rxtx0",
++ "rxtx1", "rxtx2",
++ "rxtx3", "rxtx4",
++ "rxtx5", "rxtx6",
++ "rxtx7", "dma";
++ status = "disabled";
+ };
+
+ ecspi1: ecspi@02008000 {
@@ -31988,7 +9870,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #size-cells = <0>;
+ compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi";
+ reg = <0x02008000 0x4000>;
-+ interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 31 0x04>;
+ clocks = <&clks IMX6SL_CLK_ECSPI1>,
+ <&clks IMX6SL_CLK_ECSPI1>;
+ clock-names = "ipg", "per";
@@ -32000,7 +9882,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #size-cells = <0>;
+ compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi";
+ reg = <0x0200c000 0x4000>;
-+ interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 32 0x04>;
+ clocks = <&clks IMX6SL_CLK_ECSPI2>,
+ <&clks IMX6SL_CLK_ECSPI2>;
+ clock-names = "ipg", "per";
@@ -32012,7 +9894,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #size-cells = <0>;
+ compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi";
+ reg = <0x02010000 0x4000>;
-+ interrupts = <0 33 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 33 0x04>;
+ clocks = <&clks IMX6SL_CLK_ECSPI3>,
+ <&clks IMX6SL_CLK_ECSPI3>;
+ clock-names = "ipg", "per";
@@ -32024,7 +9906,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #size-cells = <0>;
+ compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi";
+ reg = <0x02014000 0x4000>;
-+ interrupts = <0 34 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 34 0x04>;
+ clocks = <&clks IMX6SL_CLK_ECSPI4>,
+ <&clks IMX6SL_CLK_ECSPI4>;
+ clock-names = "ipg", "per";
@@ -32032,109 +9914,79 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ };
+
+ uart5: serial@02018000 {
-+ compatible = "fsl,imx6sl-uart",
-+ "fsl,imx6q-uart", "fsl,imx21-uart";
++ compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+ reg = <0x02018000 0x4000>;
-+ interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 30 0x04>;
+ clocks = <&clks IMX6SL_CLK_UART>,
+ <&clks IMX6SL_CLK_UART_SERIAL>;
+ clock-names = "ipg", "per";
-+ dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
-+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ uart1: serial@02020000 {
-+ compatible = "fsl,imx6sl-uart",
-+ "fsl,imx6q-uart", "fsl,imx21-uart";
++ compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+ reg = <0x02020000 0x4000>;
-+ interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 26 0x04>;
+ clocks = <&clks IMX6SL_CLK_UART>,
+ <&clks IMX6SL_CLK_UART_SERIAL>;
+ clock-names = "ipg", "per";
-+ dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
-+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ uart2: serial@02024000 {
-+ compatible = "fsl,imx6sl-uart",
-+ "fsl,imx6q-uart", "fsl,imx21-uart";
++ compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+ reg = <0x02024000 0x4000>;
-+ interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 27 0x04>;
+ clocks = <&clks IMX6SL_CLK_UART>,
+ <&clks IMX6SL_CLK_UART_SERIAL>;
+ clock-names = "ipg", "per";
-+ dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
-+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ ssi1: ssi@02028000 {
-+ compatible = "fsl,imx6sl-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
++ compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ reg = <0x02028000 0x4000>;
-+ interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks IMX6SL_CLK_SSI1>;
-+ dmas = <&sdma 37 1 0>,
-+ <&sdma 38 1 0>;
-+ dma-names = "rx", "tx";
-+ fsl,fifo-depth = <15>;
++ interrupts = <0 46 0x04>;
++ clocks = <&clks IMX6SL_CLK_SSI1>, <&clks IMX6SL_CLK_SSI1>;
++ clock-names = "ipg", "baud";
+ status = "disabled";
+ };
+
+ ssi2: ssi@0202c000 {
-+ compatible = "fsl,imx6sl-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
++ compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ reg = <0x0202c000 0x4000>;
-+ interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks IMX6SL_CLK_SSI2>;
-+ dmas = <&sdma 41 1 0>,
-+ <&sdma 42 1 0>;
-+ dma-names = "rx", "tx";
-+ fsl,fifo-depth = <15>;
++ interrupts = <0 47 0x04>;
++ clocks = <&clks IMX6SL_CLK_SSI2>, <&clks IMX6SL_CLK_SSI2>;
++ clock-names = "ipg", "baud";
+ status = "disabled";
+ };
+
+ ssi3: ssi@02030000 {
-+ compatible = "fsl,imx6sl-ssi",
-+ "fsl,imx51-ssi",
-+ "fsl,imx21-ssi";
++ compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
+ reg = <0x02030000 0x4000>;
-+ interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks IMX6SL_CLK_SSI3>;
-+ dmas = <&sdma 45 1 0>,
-+ <&sdma 46 1 0>;
-+ dma-names = "rx", "tx";
-+ fsl,fifo-depth = <15>;
++ interrupts = <0 48 0x04>;
++ clocks = <&clks IMX6SL_CLK_SSI3>, <&clks IMX6SL_CLK_SSI3>;
++ clock-names = "ipg", "baud";
+ status = "disabled";
+ };
+
+ uart3: serial@02034000 {
-+ compatible = "fsl,imx6sl-uart",
-+ "fsl,imx6q-uart", "fsl,imx21-uart";
++ compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+ reg = <0x02034000 0x4000>;
-+ interrupts = <0 28 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 28 0x04>;
+ clocks = <&clks IMX6SL_CLK_UART>,
+ <&clks IMX6SL_CLK_UART_SERIAL>;
+ clock-names = "ipg", "per";
-+ dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
-+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ uart4: serial@02038000 {
-+ compatible = "fsl,imx6sl-uart",
-+ "fsl,imx6q-uart", "fsl,imx21-uart";
++ compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+ reg = <0x02038000 0x4000>;
-+ interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 29 0x04>;
+ clocks = <&clks IMX6SL_CLK_UART>,
+ <&clks IMX6SL_CLK_UART_SERIAL>;
+ clock-names = "ipg", "per";
-+ dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
-+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+ };
@@ -32143,7 +9995,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #pwm-cells = <2>;
+ compatible = "fsl,imx6sl-pwm", "fsl,imx27-pwm";
+ reg = <0x02080000 0x4000>;
-+ interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 83 0x04>;
+ clocks = <&clks IMX6SL_CLK_PWM1>,
+ <&clks IMX6SL_CLK_PWM1>;
+ clock-names = "ipg", "per";
@@ -32153,7 +10005,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #pwm-cells = <2>;
+ compatible = "fsl,imx6sl-pwm", "fsl,imx27-pwm";
+ reg = <0x02084000 0x4000>;
-+ interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 84 0x04>;
+ clocks = <&clks IMX6SL_CLK_PWM2>,
+ <&clks IMX6SL_CLK_PWM2>;
+ clock-names = "ipg", "per";
@@ -32163,7 +10015,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #pwm-cells = <2>;
+ compatible = "fsl,imx6sl-pwm", "fsl,imx27-pwm";
+ reg = <0x02088000 0x4000>;
-+ interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 85 0x04>;
+ clocks = <&clks IMX6SL_CLK_PWM3>,
+ <&clks IMX6SL_CLK_PWM3>;
+ clock-names = "ipg", "per";
@@ -32173,7 +10025,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #pwm-cells = <2>;
+ compatible = "fsl,imx6sl-pwm", "fsl,imx27-pwm";
+ reg = <0x0208c000 0x4000>;
-+ interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 86 0x04>;
+ clocks = <&clks IMX6SL_CLK_PWM4>,
+ <&clks IMX6SL_CLK_PWM4>;
+ clock-names = "ipg", "per";
@@ -32182,7 +10034,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ gpt: gpt@02098000 {
+ compatible = "fsl,imx6sl-gpt";
+ reg = <0x02098000 0x4000>;
-+ interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 55 0x04>;
+ clocks = <&clks IMX6SL_CLK_GPT>,
+ <&clks IMX6SL_CLK_GPT_SERIAL>;
+ clock-names = "ipg", "per";
@@ -32191,8 +10043,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ gpio1: gpio@0209c000 {
+ compatible = "fsl,imx6sl-gpio", "fsl,imx35-gpio";
+ reg = <0x0209c000 0x4000>;
-+ interrupts = <0 66 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 67 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 66 0x04 0 67 0x04>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
@@ -32202,8 +10053,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ gpio2: gpio@020a0000 {
+ compatible = "fsl,imx6sl-gpio", "fsl,imx35-gpio";
+ reg = <0x020a0000 0x4000>;
-+ interrupts = <0 68 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 69 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 68 0x04 0 69 0x04>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
@@ -32213,8 +10063,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ gpio3: gpio@020a4000 {
+ compatible = "fsl,imx6sl-gpio", "fsl,imx35-gpio";
+ reg = <0x020a4000 0x4000>;
-+ interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 71 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 70 0x04 0 71 0x04>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
@@ -32224,8 +10073,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ gpio4: gpio@020a8000 {
+ compatible = "fsl,imx6sl-gpio", "fsl,imx35-gpio";
+ reg = <0x020a8000 0x4000>;
-+ interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 73 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 72 0x04 0 73 0x04>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
@@ -32235,8 +10083,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ gpio5: gpio@020ac000 {
+ compatible = "fsl,imx6sl-gpio", "fsl,imx35-gpio";
+ reg = <0x020ac000 0x4000>;
-+ interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 75 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 74 0x04 0 75 0x04>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
@@ -32246,21 +10093,21 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ kpp: kpp@020b8000 {
+ compatible = "fsl,imx6sl-kpp", "fsl,imx21-kpp";
+ reg = <0x020b8000 0x4000>;
-+ interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 82 0x04>;
+ clocks = <&clks IMX6SL_CLK_DUMMY>;
+ };
+
+ wdog1: wdog@020bc000 {
+ compatible = "fsl,imx6sl-wdt", "fsl,imx21-wdt";
+ reg = <0x020bc000 0x4000>;
-+ interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 80 0x04>;
+ clocks = <&clks IMX6SL_CLK_DUMMY>;
+ };
+
+ wdog2: wdog@020c0000 {
+ compatible = "fsl,imx6sl-wdt", "fsl,imx21-wdt";
+ reg = <0x020c0000 0x4000>;
-+ interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 81 0x04>;
+ clocks = <&clks IMX6SL_CLK_DUMMY>;
+ status = "disabled";
+ };
@@ -32268,8 +10115,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ clks: ccm@020c4000 {
+ compatible = "fsl,imx6sl-ccm";
+ reg = <0x020c4000 0x4000>;
-+ interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 88 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 87 0x04 0 88 0x04>;
+ #clock-cells = <1>;
+ };
+
@@ -32278,9 +10124,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ "fsl,imx6q-anatop",
+ "syscon", "simple-bus";
+ reg = <0x020c8000 0x1000>;
-+ interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 54 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 127 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;
+
+ regulator-1p1@110 {
+ compatible = "fsl,anatop-regulator";
@@ -32326,7 +10170,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+
+ reg_arm: regulator-vddcore@140 {
+ compatible = "fsl,anatop-regulator";
-+ regulator-name = "vddarm";
++ regulator-name = "cpu";
+ regulator-min-microvolt = <725000>;
+ regulator-max-microvolt = <1450000>;
+ regulator-always-on;
@@ -32346,7 +10190,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ regulator-name = "vddpu";
+ regulator-min-microvolt = <725000>;
+ regulator-max-microvolt = <1450000>;
-+ regulator-always-on;
+ anatop-reg-offset = <0x140>;
+ anatop-vol-bit-shift = <9>;
+ anatop-vol-bit-width = <5>;
@@ -32376,10 +10219,18 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ };
+ };
+
++ tempmon: tempmon {
++ compatible = "fsl,imx6sl-tempmon", "fsl,imx6q-tempmon";
++ interrupts = <0 49 0x04>;
++ fsl,tempmon = <&anatop>;
++ fsl,tempmon-data = <&ocotp>;
++ clocks = <&clks IMX6SL_CLK_PLL3_USB_OTG>;
++ };
++
+ usbphy1: usbphy@020c9000 {
+ compatible = "fsl,imx6sl-usbphy", "fsl,imx23-usbphy";
+ reg = <0x020c9000 0x1000>;
-+ interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 44 0x04>;
+ clocks = <&clks IMX6SL_CLK_USBPHY1>;
+ fsl,anatop = <&anatop>;
+ };
@@ -32387,7 +10238,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ usbphy2: usbphy@020ca000 {
+ compatible = "fsl,imx6sl-usbphy", "fsl,imx23-usbphy";
+ reg = <0x020ca000 0x1000>;
-+ interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 45 0x04>;
+ clocks = <&clks IMX6SL_CLK_USBPHY2>;
+ fsl,anatop = <&anatop>;
+ };
@@ -32401,86 +10252,468 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ snvs-rtc-lp@34 {
+ compatible = "fsl,sec-v4.0-mon-rtc-lp";
+ reg = <0x34 0x58>;
-+ interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 20 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 19 0x04 0 20 0x04>;
+ };
+ };
+
+ epit1: epit@020d0000 {
+ reg = <0x020d0000 0x4000>;
-+ interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 56 0x04>;
+ };
+
+ epit2: epit@020d4000 {
+ reg = <0x020d4000 0x4000>;
-+ interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 57 0x04>;
+ };
+
+ src: src@020d8000 {
+ compatible = "fsl,imx6sl-src", "fsl,imx51-src";
+ reg = <0x020d8000 0x4000>;
-+ interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>,
-+ <0 96 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 91 0x04 0 96 0x04>;
+ #reset-cells = <1>;
+ };
+
++ ocram: sram@00900000 {
++ compatible = "mmio-sram";
++ reg = <0x00900000 0x20000>;
++ clocks = <&clks IMX6SL_CLK_OCRAM>;
++ };
++
+ gpc: gpc@020dc000 {
+ compatible = "fsl,imx6sl-gpc", "fsl,imx6q-gpc";
+ reg = <0x020dc000 0x4000>;
-+ interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 89 0x04>;
++ clocks = <&clks IMX6SL_CLK_GPU2D_PODF>, <&clks IMX6SL_CLK_GPU2D_OVG>,
++ <&clks IMX6SL_CLK_IPG>, <&clks IMX6SL_CLK_LCDIF_AXI>,
++ <&clks IMX6SL_CLK_LCDIF_PIX>, <&clks IMX6SL_CLK_EPDC_AXI>,
++ <&clks IMX6SL_CLK_EPDC_PIX>, <&clks IMX6SL_CLK_PXP_AXI>;
++ clock-names = "gpu2d_podf", "gpu2d_ovg", "ipg", "lcd_axi",
++ "lcd_pix", "epdc_axi", "epdc_pix", "pxp_axi";
++ pu-supply = <&reg_pu>;
+ };
+
+ gpr: iomuxc-gpr@020e0000 {
-+ compatible = "fsl,imx6sl-iomuxc-gpr",
-+ "fsl,imx6q-iomuxc-gpr", "syscon";
++ compatible = "fsl,imx6sl-iomuxc-gpr", "syscon";
+ reg = <0x020e0000 0x38>;
+ };
+
+ iomuxc: iomuxc@020e0000 {
+ compatible = "fsl,imx6sl-iomuxc";
+ reg = <0x020e0000 0x4000>;
++
++ audmux {
++ pinctrl_audmux_1: audmux-1 {
++ fsl,pins = <
++ MX6SL_PAD_AUD_RXD__AUD3_RXD 0x4130B0
++ MX6SL_PAD_AUD_TXC__AUD3_TXC 0x4130B0
++ MX6SL_PAD_AUD_TXD__AUD3_TXD 0x4110B0
++ MX6SL_PAD_AUD_TXFS__AUD3_TXFS 0x4130B0
++ MX6SL_PAD_AUD_MCLK__AUDIO_CLK_OUT 0x4130B0
++ >;
++ };
++ };
++
++ csi {
++ pinctrl_csi_0: csigrp-0 {
++ fsl,pins = <
++ MX6SL_PAD_EPDC_GDRL__CSI_MCLK 0x110b0
++ MX6SL_PAD_EPDC_GDCLK__CSI_PIXCLK 0x110b0
++ MX6SL_PAD_EPDC_GDSP__CSI_VSYNC 0x110b0
++ MX6SL_PAD_EPDC_GDOE__CSI_HSYNC 0x110b0
++ MX6SL_PAD_EPDC_SDLE__CSI_DATA09 0x110b0
++ MX6SL_PAD_EPDC_SDCLK__CSI_DATA08 0x110b0
++ MX6SL_PAD_EPDC_D7__CSI_DATA07 0x110b0
++ MX6SL_PAD_EPDC_D6__CSI_DATA06 0x110b0
++ MX6SL_PAD_EPDC_D5__CSI_DATA05 0x110b0
++ MX6SL_PAD_EPDC_D4__CSI_DATA04 0x110b0
++ MX6SL_PAD_EPDC_D3__CSI_DATA03 0x110b0
++ MX6SL_PAD_EPDC_D2__CSI_DATA02 0x110b0
++ MX6SL_PAD_EPDC_D1__CSI_DATA01 0x110b0
++ MX6SL_PAD_EPDC_D0__CSI_DATA00 0x110b0
++ MX6SL_PAD_EPDC_SDSHR__GPIO1_IO26 0x80000000
++ MX6SL_PAD_EPDC_SDOE__GPIO1_IO25 0x80000000
++ >;
++ };
++ };
++
++ ecspi1 {
++ pinctrl_ecspi1_1: ecspi1grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO 0x100b1
++ MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI 0x100b1
++ MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK 0x100b1
++ >;
++ };
++ };
++
++ epdc {
++ pinctrl_epdc_0: epdcgrp-0 {
++ fsl,pins = <
++ MX6SL_PAD_EPDC_D0__EPDC_DATA00 0x80000000
++ MX6SL_PAD_EPDC_D1__EPDC_DATA01 0x80000000
++ MX6SL_PAD_EPDC_D2__EPDC_DATA02 0x80000000
++ MX6SL_PAD_EPDC_D3__EPDC_DATA03 0x80000000
++ MX6SL_PAD_EPDC_D4__EPDC_DATA04 0x80000000
++ MX6SL_PAD_EPDC_D5__EPDC_DATA05 0x80000000
++ MX6SL_PAD_EPDC_D6__EPDC_DATA06 0x80000000
++ MX6SL_PAD_EPDC_D7__EPDC_DATA07 0x80000000
++ MX6SL_PAD_EPDC_D8__EPDC_DATA08 0x80000000
++ MX6SL_PAD_EPDC_D9__EPDC_DATA09 0x80000000
++ MX6SL_PAD_EPDC_D10__EPDC_DATA10 0x80000000
++ MX6SL_PAD_EPDC_D11__EPDC_DATA11 0x80000000
++ MX6SL_PAD_EPDC_D12__EPDC_DATA12 0x80000000
++ MX6SL_PAD_EPDC_D13__EPDC_DATA13 0x80000000
++ MX6SL_PAD_EPDC_D14__EPDC_DATA14 0x80000000
++ MX6SL_PAD_EPDC_D15__EPDC_DATA15 0x80000000
++ MX6SL_PAD_EPDC_GDCLK__EPDC_GDCLK 0x80000000
++ MX6SL_PAD_EPDC_GDSP__EPDC_GDSP 0x80000000
++ MX6SL_PAD_EPDC_GDOE__EPDC_GDOE 0x80000000
++ MX6SL_PAD_EPDC_GDRL__EPDC_GDRL 0x80000000
++ MX6SL_PAD_EPDC_SDCLK__EPDC_SDCLK_P 0x80000000
++ MX6SL_PAD_EPDC_SDOE__EPDC_SDOE 0x80000000
++ MX6SL_PAD_EPDC_SDLE__EPDC_SDLE 0x80000000
++ MX6SL_PAD_EPDC_SDSHR__EPDC_SDSHR 0x80000000
++ MX6SL_PAD_EPDC_BDR0__EPDC_BDR0 0x80000000
++ MX6SL_PAD_EPDC_SDCE0__EPDC_SDCE0 0x80000000
++ MX6SL_PAD_EPDC_SDCE1__EPDC_SDCE1 0x80000000
++ MX6SL_PAD_EPDC_SDCE2__EPDC_SDCE2 0x80000000
++ >;
++ };
++ };
++
++ fec {
++ pinctrl_fec_1: fecgrp-1 {
++ fsl,pins = <
++ MX6SL_PAD_FEC_MDC__FEC_MDC 0x1b0b0
++ MX6SL_PAD_FEC_MDIO__FEC_MDIO 0x1b0b0
++ MX6SL_PAD_FEC_CRS_DV__FEC_RX_DV 0x1b0b0
++ MX6SL_PAD_FEC_RXD0__FEC_RX_DATA0 0x1b0b0
++ MX6SL_PAD_FEC_RXD1__FEC_RX_DATA1 0x1b0b0
++ MX6SL_PAD_FEC_TX_EN__FEC_TX_EN 0x1b0b0
++ MX6SL_PAD_FEC_TXD0__FEC_TX_DATA0 0x1b0b0
++ MX6SL_PAD_FEC_TXD1__FEC_TX_DATA1 0x1b0b0
++ MX6SL_PAD_FEC_REF_CLK__FEC_REF_OUT 0x4001b0a8
++ >;
++ };
++ };
++
++ spdif {
++ pinctrl_spdif_1: spdifgrp-1 {
++ fsl,pins = <
++ MX6SL_PAD_SD2_DAT4__SPDIF_OUT 0x80000000
++ >;
++ };
++ };
++
++ uart1 {
++ pinctrl_uart1_1: uart1grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_UART1_RXD__UART1_RX_DATA 0x1b0b1
++ MX6SL_PAD_UART1_TXD__UART1_TX_DATA 0x1b0b1
++ >;
++ };
++ };
++
++ usbotg1 {
++ pinctrl_usbotg1_1: usbotg1grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID 0x17059
++ >;
++ };
++
++ pinctrl_usbotg1_2: usbotg1grp-2 {
++ fsl,pins = <
++ MX6SL_PAD_FEC_RXD0__USB_OTG1_ID 0x17059
++ >;
++ };
++
++ pinctrl_usbotg1_3: usbotg1grp-3 {
++ fsl,pins = <
++ MX6SL_PAD_LCD_DAT1__USB_OTG1_ID 0x17059
++ >;
++ };
++
++ pinctrl_usbotg1_4: usbotg1grp-4 {
++ fsl,pins = <
++ MX6SL_PAD_REF_CLK_32K__USB_OTG1_ID 0x17059
++ >;
++ };
++
++ pinctrl_usbotg1_5: usbotg1grp-5 {
++ fsl,pins = <
++ MX6SL_PAD_SD3_DAT0__USB_OTG1_ID 0x17059
++ >;
++ };
++ };
++
++ usbotg2 {
++ pinctrl_usbotg2_1: usbotg2grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_ECSPI1_SCLK__USB_OTG2_OC 0x17059
++ >;
++ };
++
++ pinctrl_usbotg2_2: usbotg2grp-2 {
++ fsl,pins = <
++ MX6SL_PAD_ECSPI2_SCLK__USB_OTG2_OC 0x17059
++ >;
++ };
++
++ pinctrl_usbotg2_3: usbotg2grp-3 {
++ fsl,pins = <
++ MX6SL_PAD_KEY_ROW5__USB_OTG2_OC 0x17059
++ >;
++ };
++
++ pinctrl_usbotg2_4: usbotg2grp-4 {
++ fsl,pins = <
++ MX6SL_PAD_SD3_DAT2__USB_OTG2_OC 0x17059
++ >;
++ };
++ };
++
++ usdhc1 {
++ pinctrl_usdhc1_1: usdhc1grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_SD1_CMD__SD1_CMD 0x17059
++ MX6SL_PAD_SD1_CLK__SD1_CLK 0x10059
++ MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x17059
++ MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x17059
++ MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x17059
++ MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x17059
++ MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x17059
++ MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x17059
++ MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x17059
++ MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x17059
++ >;
++ };
++ };
++
++ usdhc2 {
++ pinctrl_usdhc2_1: usdhc2grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_SD2_CMD__SD2_CMD 0x17059
++ MX6SL_PAD_SD2_CLK__SD2_CLK 0x10059
++ MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x17059
++ MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x17059
++ MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x17059
++ MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x17059
++ >;
++ };
++
++ pinctrl_usdhc2_1_100mhz: usdhc2grp-1-100mhz {
++ fsl,pins = <
++ MX6SL_PAD_SD2_CMD__SD2_CMD 0x170b9
++ MX6SL_PAD_SD2_CLK__SD2_CLK 0x100b9
++ MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x170b9
++ MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x170b9
++ MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x170b9
++ MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x170b9
++ >;
++ };
++
++ pinctrl_usdhc2_1_200mhz: usdhc2grp-1-200mhz {
++ fsl,pins = <
++ MX6SL_PAD_SD2_CMD__SD2_CMD 0x170f9
++ MX6SL_PAD_SD2_CLK__SD2_CLK 0x100f9
++ MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x170f9
++ MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x170f9
++ MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x170f9
++ MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x170f9
++ >;
++ };
++ };
++
++ usdhc3 {
++ pinctrl_usdhc3_1: usdhc3grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_SD3_CMD__SD3_CMD 0x17059
++ MX6SL_PAD_SD3_CLK__SD3_CLK 0x10059
++ MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x17059
++ MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x17059
++ MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x17059
++ MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x17059
++ >;
++ };
++
++ pinctrl_usdhc3_1_100mhz: usdhc3grp-1-100mhz {
++ fsl,pins = <
++ MX6SL_PAD_SD3_CMD__SD3_CMD 0x170b9
++ MX6SL_PAD_SD3_CLK__SD3_CLK 0x100b9
++ MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x170b9
++ MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x170b9
++ MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x170b9
++ MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x170b9
++ >;
++ };
++
++ pinctrl_usdhc3_1_200mhz: usdhc3grp-1-200mhz {
++ fsl,pins = <
++ MX6SL_PAD_SD3_CMD__SD3_CMD 0x170f9
++ MX6SL_PAD_SD3_CLK__SD3_CLK 0x100f9
++ MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x170f9
++ MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x170f9
++ MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x170f9
++ MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x170f9
++ >;
++ };
++ };
++
++ i2c1 {
++ pinctrl_i2c1_1: i2c1grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_I2C1_SCL__I2C1_SCL 0x4001b8b1
++ MX6SL_PAD_I2C1_SDA__I2C1_SDA 0x4001b8b1
++ >;
++ };
++ };
++
++ i2c2 {
++ pinctrl_i2c2_1: i2c2grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_I2C2_SCL__I2C2_SCL 0x4001b8b1
++ MX6SL_PAD_I2C2_SDA__I2C2_SDA 0x4001b8b1
++ >;
++ };
++ };
++
++ i2c3 {
++ pinctrl_i2c3_1: i2c3grp-1 {
++ fsl,pins = <
++ MX6SL_PAD_EPDC_SDCE2__I2C3_SCL 0x4001b8b1
++ MX6SL_PAD_EPDC_SDCE3__I2C3_SDA 0x4001b8b1
++ >;
++ };
++ };
++
++ kpp {
++ pinctrl_kpp_1: kpp_grp_1 {
++ fsl,pins = <
++ MX6SL_PAD_KEY_ROW0__KEY_ROW0 0x1b010
++ MX6SL_PAD_KEY_ROW1__KEY_ROW1 0x1b010
++ MX6SL_PAD_KEY_ROW2__KEY_ROW2 0x1b0b0
++ MX6SL_PAD_KEY_COL0__KEY_COL0 0x1b0b0
++ MX6SL_PAD_KEY_COL1__KEY_COL1 0x1b0b0
++ MX6SL_PAD_KEY_COL2__KEY_COL2 0x1b0b0
++ >;
++ };
++
++ pinctrl_kpp_1_sleep: kpp_grp_1_sleep {
++ fsl,pins = <
++ MX6SL_PAD_KEY_ROW0__GPIO3_IO25 0x3080
++ MX6SL_PAD_KEY_ROW1__GPIO3_IO27 0x3080
++ MX6SL_PAD_KEY_ROW2__GPIO3_IO29 0x3080
++ MX6SL_PAD_KEY_COL0__GPIO3_IO24 0x3080
++ MX6SL_PAD_KEY_COL1__GPIO3_IO26 0x3080
++ MX6SL_PAD_KEY_COL2__GPIO3_IO28 0x3080
++ >;
++ };
++ };
++
++ lcdif {
++ pinctrl_lcdif_dat_0: lcdifdatgrp-0 {
++ fsl,pins = <
++ MX6SL_PAD_LCD_DAT0__LCD_DATA00 0x1b0b0
++ MX6SL_PAD_LCD_DAT1__LCD_DATA01 0x1b0b0
++ MX6SL_PAD_LCD_DAT2__LCD_DATA02 0x1b0b0
++ MX6SL_PAD_LCD_DAT3__LCD_DATA03 0x1b0b0
++ MX6SL_PAD_LCD_DAT4__LCD_DATA04 0x1b0b0
++ MX6SL_PAD_LCD_DAT5__LCD_DATA05 0x1b0b0
++ MX6SL_PAD_LCD_DAT6__LCD_DATA06 0x1b0b0
++ MX6SL_PAD_LCD_DAT7__LCD_DATA07 0x1b0b0
++ MX6SL_PAD_LCD_DAT8__LCD_DATA08 0x1b0b0
++ MX6SL_PAD_LCD_DAT9__LCD_DATA09 0x1b0b0
++ MX6SL_PAD_LCD_DAT10__LCD_DATA10 0x1b0b0
++ MX6SL_PAD_LCD_DAT11__LCD_DATA11 0x1b0b0
++ MX6SL_PAD_LCD_DAT12__LCD_DATA12 0x1b0b0
++ MX6SL_PAD_LCD_DAT13__LCD_DATA13 0x1b0b0
++ MX6SL_PAD_LCD_DAT14__LCD_DATA14 0x1b0b0
++ MX6SL_PAD_LCD_DAT15__LCD_DATA15 0x1b0b0
++ MX6SL_PAD_LCD_DAT16__LCD_DATA16 0x1b0b0
++ MX6SL_PAD_LCD_DAT17__LCD_DATA17 0x1b0b0
++ MX6SL_PAD_LCD_DAT18__LCD_DATA18 0x1b0b0
++ MX6SL_PAD_LCD_DAT19__LCD_DATA19 0x1b0b0
++ MX6SL_PAD_LCD_DAT20__LCD_DATA20 0x1b0b0
++ MX6SL_PAD_LCD_DAT21__LCD_DATA21 0x1b0b0
++ MX6SL_PAD_LCD_DAT22__LCD_DATA22 0x1b0b0
++ MX6SL_PAD_LCD_DAT23__LCD_DATA23 0x1b0b0
++ >;
++ };
++
++ pinctrl_lcdif_ctrl_0: lcdifctrlgrp-0 {
++ fsl,pins = <
++ MX6SL_PAD_LCD_CLK__LCD_CLK 0x1b0b0
++ MX6SL_PAD_LCD_ENABLE__LCD_ENABLE 0x1b0b0
++ MX6SL_PAD_LCD_HSYNC__LCD_HSYNC 0x1b0b0
++ MX6SL_PAD_LCD_VSYNC__LCD_VSYNC 0x1b0b0
++ >;
++ };
++ };
++
++ pwm1 {
++ pinctrl_pwm1_0: pwm1grp-0 {
++ fsl,pins = <
++ MX6SL_PAD_PWM1__PWM1_OUT 0x110b0
++ >;
++ };
++ };
+ };
+
+ csi: csi@020e4000 {
++ compatible = "fsl,imx6sl-csi";
+ reg = <0x020e4000 0x4000>;
-+ interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 7 0x04>;
++ status = "disabled";
+ };
+
+ spdc: spdc@020e8000 {
+ reg = <0x020e8000 0x4000>;
-+ interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 6 0x04>;
+ };
+
+ sdma: sdma@020ec000 {
+ compatible = "fsl,imx6sl-sdma", "fsl,imx35-sdma";
+ reg = <0x020ec000 0x4000>;
-+ interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 2 0x04>;
+ clocks = <&clks IMX6SL_CLK_SDMA>,
+ <&clks IMX6SL_CLK_SDMA>;
+ clock-names = "ipg", "ahb";
-+ #dma-cells = <3>;
++ iram = <&ocram>;
+ /* imx6sl reuses imx6q sdma firmware */
+ fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+ };
+
+ pxp: pxp@020f0000 {
++ compatible = "fsl,imx6sl-pxp-dma", "fsl,imx6dl-pxp-dma";
+ reg = <0x020f0000 0x4000>;
-+ interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 98 0x04>;
++ clocks = <&clks 111>;
++ clock-names = "pxp-axi";
++ status = "disabled";
+ };
+
+ epdc: epdc@020f4000 {
++ compatible = "fsl,imx6sl-epdc", "fsl,imx6dl-epdc";
+ reg = <0x020f4000 0x4000>;
-+ interrupts = <0 97 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 97 0x04>;
++ clocks = <&clks IMX6SL_CLK_EPDC_AXI>,
++ <&clks IMX6SL_CLK_EPDC_PIX>;
++ clock-names = "epdc_axi", "epdc_pix";
+ };
+
+ lcdif: lcdif@020f8000 {
++ compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif";
+ reg = <0x020f8000 0x4000>;
-+ interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 39 0x04>;
++ clocks = <&clks IMX6SL_CLK_LCDIF_PIX>,
++ <&clks IMX6SL_CLK_LCDIF_AXI>;
++ clock-names = "pix", "axi";
++ status = "disabled";
+ };
+
+ dcp: dcp@020fc000 {
+ reg = <0x020fc000 0x4000>;
-+ interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 99 0x04>;
+ };
+ };
+
@@ -32494,17 +10727,18 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ usbotg1: usb@02184000 {
+ compatible = "fsl,imx6sl-usb", "fsl,imx27-usb";
+ reg = <0x02184000 0x200>;
-+ interrupts = <0 43 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 43 0x04>;
+ clocks = <&clks IMX6SL_CLK_USBOH3>;
+ fsl,usbphy = <&usbphy1>;
+ fsl,usbmisc = <&usbmisc 0>;
++ fsl,anatop = <&anatop>;
+ status = "disabled";
+ };
+
+ usbotg2: usb@02184200 {
+ compatible = "fsl,imx6sl-usb", "fsl,imx27-usb";
+ reg = <0x02184200 0x200>;
-+ interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 42 0x04>;
+ clocks = <&clks IMX6SL_CLK_USBOH3>;
+ fsl,usbphy = <&usbphy2>;
+ fsl,usbmisc = <&usbmisc 1>;
@@ -32514,7 +10748,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ usbh: usb@02184400 {
+ compatible = "fsl,imx6sl-usb", "fsl,imx27-usb";
+ reg = <0x02184400 0x200>;
-+ interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 40 0x04>;
+ clocks = <&clks IMX6SL_CLK_USBOH3>;
+ fsl,usbmisc = <&usbmisc 2>;
+ status = "disabled";
@@ -32530,8 +10764,8 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ fec: ethernet@02188000 {
+ compatible = "fsl,imx6sl-fec", "fsl,imx25-fec";
+ reg = <0x02188000 0x4000>;
-+ interrupts = <0 114 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks IMX6SL_CLK_ENET_REF>,
++ interrupts = <0 114 0x04>;
++ clocks = <&clks IMX6SL_CLK_ENET>,
+ <&clks IMX6SL_CLK_ENET_REF>;
+ clock-names = "ipg", "ahb";
+ status = "disabled";
@@ -32540,7 +10774,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ usdhc1: usdhc@02190000 {
+ compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ reg = <0x02190000 0x4000>;
-+ interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 22 0x04>;
+ clocks = <&clks IMX6SL_CLK_USDHC1>,
+ <&clks IMX6SL_CLK_USDHC1>,
+ <&clks IMX6SL_CLK_USDHC1>;
@@ -32552,7 +10786,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ usdhc2: usdhc@02194000 {
+ compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ reg = <0x02194000 0x4000>;
-+ interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 23 0x04>;
+ clocks = <&clks IMX6SL_CLK_USDHC2>,
+ <&clks IMX6SL_CLK_USDHC2>,
+ <&clks IMX6SL_CLK_USDHC2>;
@@ -32564,7 +10798,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ usdhc3: usdhc@02198000 {
+ compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ reg = <0x02198000 0x4000>;
-+ interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 24 0x04>;
+ clocks = <&clks IMX6SL_CLK_USDHC3>,
+ <&clks IMX6SL_CLK_USDHC3>,
+ <&clks IMX6SL_CLK_USDHC3>;
@@ -32576,7 +10810,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ usdhc4: usdhc@0219c000 {
+ compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ reg = <0x0219c000 0x4000>;
-+ interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 25 0x04>;
+ clocks = <&clks IMX6SL_CLK_USDHC4>,
+ <&clks IMX6SL_CLK_USDHC4>,
+ <&clks IMX6SL_CLK_USDHC4>;
@@ -32590,7 +10824,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #size-cells = <0>;
+ compatible = "fsl,imx6sl-i2c", "fsl,imx21-i2c";
+ reg = <0x021a0000 0x4000>;
-+ interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 36 0x04>;
+ clocks = <&clks IMX6SL_CLK_I2C1>;
+ status = "disabled";
+ };
@@ -32600,7 +10834,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #size-cells = <0>;
+ compatible = "fsl,imx6sl-i2c", "fsl,imx21-i2c";
+ reg = <0x021a4000 0x4000>;
-+ interrupts = <0 37 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 37 0x04>;
+ clocks = <&clks IMX6SL_CLK_I2C2>;
+ status = "disabled";
+ };
@@ -32610,7 +10844,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ #size-cells = <0>;
+ compatible = "fsl,imx6sl-i2c", "fsl,imx21-i2c";
+ reg = <0x021a8000 0x4000>;
-+ interrupts = <0 38 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 38 0x04>;
+ clocks = <&clks IMX6SL_CLK_I2C3>;
+ status = "disabled";
+ };
@@ -32622,17 +10856,23 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+
+ rngb: rngb@021b4000 {
+ reg = <0x021b4000 0x4000>;
-+ interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 5 0x04>;
+ };
+
+ weim: weim@021b8000 {
+ reg = <0x021b8000 0x4000>;
-+ interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <0 14 0x04>;
++ };
++
++ ocotp: ocotp-ctrl@021bc000 {
++ compatible = "syscon";
++ reg = <0x021bc000 0x4000>;
+ };
+
-+ ocotp: ocotp@021bc000 {
-+ compatible = "fsl,imx6sl-ocotp";
++ ocotp-fuse@021bc000 {
++ compatible = "fsl,imx6sl-ocotp", "fsl,imx6q-ocotp";
+ reg = <0x021bc000 0x4000>;
++ clocks = <&clks IMX6SL_CLK_OCOTP>;
+ };
+
+ audmux: audmux@021d8000 {
@@ -32640,12 +10880,81 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
+ reg = <0x021d8000 0x4000>;
+ status = "disabled";
+ };
++
++ gpu: gpu@02200000 {
++ compatible = "fsl,imx6sl-gpu", "fsl,imx6q-gpu";
++ reg = <0x02200000 0x4000>, <0x02204000 0x4000>,
++ <0x80000000 0x0>;
++ reg-names = "iobase_2d", "iobase_vg",
++ "phys_baseaddr";
++ interrupts = <0 10 0x04>, <0 11 0x04>;
++ interrupt-names = "irq_2d", "irq_vg";
++ clocks = <&clks IMX6SL_CLK_MMDC_ROOT>,
++ <&clks IMX6SL_CLK_MMDC_ROOT>,
++ <&clks IMX6SL_CLK_GPU2D_OVG>;
++ clock-names = "gpu2d_axi_clk", "openvg_axi_clk",
++ "gpu2d_clk";
++ resets = <&src 3>, <&src 3>;
++ reset-names = "gpu2d", "gpuvg";
++ pu-supply = <&reg_pu>;
++ };
++
++ };
++
++ pinctrl_fec_1_sleep: fecgrp-1-sleep {
++ fsl,pins = <
++ MX6SL_PAD_FEC_MDC__GPIO4_IO23 0x3080
++ MX6SL_PAD_FEC_CRS_DV__GPIO4_IO25 0x3080
++ MX6SL_PAD_FEC_RXD0__GPIO4_IO17 0x3080
++ MX6SL_PAD_FEC_RXD1__GPIO4_IO18 0x3080
++ MX6SL_PAD_FEC_TX_EN__GPIO4_IO22 0x3080
++ MX6SL_PAD_FEC_TXD0__GPIO4_IO24 0x3080
++ MX6SL_PAD_FEC_TXD1__GPIO4_IO16 0x3080
++ MX6SL_PAD_FEC_REF_CLK__GPIO4_IO26 0x3080
++ >;
++ };
++
++ pinctrl_pwm1_0_sleep: pwm1grp-0-sleep {
++ fsl,pins = <
++ MX6SL_PAD_PWM1__GPIO3_IO23 0x3080
++ >;
+ };
++
++ pinctrl_usdhc1_1_100mhz: usdhc1grp-1-100mhz {
++ fsl,pins = <
++ MX6SL_PAD_SD1_CMD__SD1_CMD 0x170b9
++ MX6SL_PAD_SD1_CLK__SD1_CLK 0x100b9
++ MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x170b9
++ MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x170b9
++ MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x170b9
++ MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x170b9
++ MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x170b9
++ MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x170b9
++ MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x170b9
++ MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x170b9
++ >;
++ };
++
++ pinctrl_usdhc1_1_200mhz: usdhc1grp-1-200mhz {
++ fsl,pins = <
++ MX6SL_PAD_SD1_CMD__SD1_CMD 0x170f9
++ MX6SL_PAD_SD1_CLK__SD1_CLK 0x100f9
++ MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x170f9
++ MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x170f9
++ MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x170f9
++ MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x170f9
++ MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x170f9
++ MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x170f9
++ MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x170f9
++ MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x170f9
++ >;
++ };
++
+ };
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-csi.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-solidrun/arch/arm/boot/dts/imx6sl-evk-csi.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-csi.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-04-21 13:50:39.066713682 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-04-24 07:58:12.876168828 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -32674,10 +10983,10 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-linaro-stable
+&epdc {
+ status = "disabled";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-solidrun/arch/arm/boot/dts/imx6sl-evk.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk.dts 2014-04-21 13:50:39.066713682 +0200
-@@ -0,0 +1,530 @@
++++ linux-solidrun/arch/arm/boot/dts/imx6sl-evk.dts 2014-04-24 07:58:12.876168828 +0200
+@@ -0,0 +1,604 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ *
@@ -32688,8 +10997,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+
+/dts-v1/;
+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
+#include "imx6sl.dtsi"
+
+/ {
@@ -32700,64 +11007,83 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ reg = <0x80000000 0x40000000>;
+ };
+
-+ leds {
-+ compatible = "gpio-leds";
++ battery: max8903@0 {
++ compatible = "fsl,max8903-charger";
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_led>;
-+
-+ user {
-+ label = "debug";
-+ gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>;
-+ linux,default-trigger = "heartbeat";
-+ };
++ dok_input = <&gpio4 13 1>;
++ uok_input = <&gpio4 13 1>;
++ chg_input = <&gpio4 15 1>;
++ flt_input = <&gpio4 14 1>;
++ fsl,dcm_always_high;
++ fsl,dc_valid;
++ fsl,adc_disable;
++ status = "okay";
+ };
-+
+ regulators {
+ compatible = "simple-bus";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ reg_usb_otg1_vbus: regulator@0 {
-+ compatible = "regulator-fixed";
-+ reg = <0>;
-+ regulator-name = "usb_otg1_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio4 0 0>;
-+ enable-active-high;
-+ };
+
-+ reg_usb_otg2_vbus: regulator@1 {
++ reg_lcd_3v3: lcd-3v3 {
+ compatible = "regulator-fixed";
-+ reg = <1>;
-+ regulator-name = "usb_otg2_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio4 2 0>;
++ regulator-name = "lcd-3v3";
++ gpio = <&gpio4 3 0>;
+ enable-active-high;
+ };
+
-+ reg_aud3v: regulator@2 {
++ reg_aud3v: wm8962_supply_3v15 {
+ compatible = "regulator-fixed";
-+ reg = <2>;
+ regulator-name = "wm8962-supply-3v15";
+ regulator-min-microvolt = <3150000>;
+ regulator-max-microvolt = <3150000>;
+ regulator-boot-on;
+ };
+
-+ reg_aud4v: regulator@3 {
++ reg_aud4v: wm8962_supply_4v2 {
+ compatible = "regulator-fixed";
-+ reg = <3>;
+ regulator-name = "wm8962-supply-4v2";
+ regulator-min-microvolt = <4325000>;
+ regulator-max-microvolt = <4325000>;
+ regulator-boot-on;
+ };
++
++ reg_usb_otg1_vbus: usb_otg1_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_otg1_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&gpio4 0 0>;
++ enable-active-high;
++ };
++
++ reg_usb_otg2_vbus: usb_otg2_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_otg2_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&gpio4 2 0>;
++ enable-active-high;
++ };
++ };
++
++ backlight {
++ compatible = "pwm-backlight";
++ pwms = <&pwm1 0 5000000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <6>;
++ };
++
++ csi_v4l2_cap {
++ compatible = "fsl,imx6sl-csi-v4l2";
++ status = "disabled";
++ };
++
++ pxp_v4l2_out {
++ compatible = "fsl,imx6sl-pxp-v4l2";
++ status = "okay";
+ };
+
+ sound {
-+ compatible = "fsl,imx6sl-evk-wm8962", "fsl,imx-audio-wm8962";
++ compatible = "fsl,imx6q-sabresd-wm8962",
++ "fsl,imx-audio-wm8962";
+ model = "wm8962-audio";
+ ssi-controller = <&ssi2>;
+ audio-codec = <&codec>;
@@ -32768,22 +11094,43 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ "Ext Spk", "SPKOUTR",
+ "AMIC", "MICBIAS",
+ "IN3R", "AMIC";
++ amic-mono;
+ mux-int-port = <2>;
+ mux-ext-port = <3>;
++ hp-det-gpios = <&gpio4 19 1>;
++ };
++
++ sound-spdif {
++ compatible = "fsl,imx-audio-spdif",
++ "fsl,imx6sl-evk-spdif";
++ model = "imx-spdif";
++ spdif-controller = <&spdif>;
++ spdif-out;
++ };
++
++ sii902x_reset: sii902x-reset {
++ compatible = "gpio-reset";
++ reset-gpios = <&gpio2 19 1>;
++ reset-delay-us = <100000>;
++ #reset-cells = <0>;
+ };
+};
+
+&audmux {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux3>;
++ pinctrl-0 = <&pinctrl_audmux_1>;
+ status = "okay";
+};
+
++&csi {
++ status = "disabled";
++};
++
+&ecspi1 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio4 11 0>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
++ pinctrl-0 = <&pinctrl_ecspi1_1>;
+ status = "okay";
+
+ flash: m25p80@0 {
@@ -32795,17 +11142,35 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ };
+};
+
-+&fec {
++&epdc {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
++ pinctrl-0 = <&pinctrl_epdc_0>;
++ V3P3-supply = <&V3P3_reg>;
++ VCOM-supply = <&VCOM_reg>;
++ DISPLAY-supply = <&DISPLAY_reg>;
++ status = "okay";
++};
++
++&cpu0 {
++ arm-supply = <&sw1a_reg>;
++ soc-supply = <&sw1c_reg>;
++ pu-supply = <&pu_dummy>; /* use pu_dummy if VDDSOC share with VDDPU */
++};
++
++&fec {
++ pinctrl-names = "default", "sleep";
++ pinctrl-0 = <&pinctrl_fec_1>;
++ pinctrl-1 = <&pinctrl_fec_1_sleep>;
+ phy-mode = "rmii";
++ phy-reset-gpios = <&gpio4 21 0>; /* GPIO4_21 */
++ phy-reset-duration = <1>;
+ status = "okay";
+};
+
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
++ pinctrl-0 = <&pinctrl_i2c1_1>;
+ status = "okay";
+
+ pmic: pfuze100@08 {
@@ -32875,7 +11240,6 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ vgen1_reg: vgen1 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
-+ regulator-always-on;
+ };
+
+ vgen2_reg: vgen2 {
@@ -32886,6 +11250,7 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ vgen3_reg: vgen3 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
++ regulator-always-on;
+ };
+
+ vgen4_reg: vgen4 {
@@ -32907,12 +11272,94 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ };
+ };
+ };
++
++ elan@10 {
++ compatible = "elan,elan-touch";
++ reg = <0x10>;
++ interrupt-parent = <&gpio2>;
++ interrupts = <10 2>;
++ gpio_elan_cs = <&gpio2 9 0>;
++ gpio_elan_rst = <&gpio4 4 0>;
++ gpio_intr = <&gpio2 10 0>;
++ status = "okay";
++ };
++
++ max17135@48 {
++ compatible = "maxim,max17135";
++ reg = <0x48>;
++ vneg_pwrup = <1>;
++ gvee_pwrup = <2>;
++ vpos_pwrup = <10>;
++ gvdd_pwrup = <12>;
++ gvdd_pwrdn = <1>;
++ vpos_pwrdn = <2>;
++ gvee_pwrdn = <8>;
++ vneg_pwrdn = <10>;
++ gpio_pmic_pwrgood = <&gpio2 13 0>;
++ gpio_pmic_vcom_ctrl = <&gpio2 3 0>;
++ gpio_pmic_wakeup = <&gpio2 14 0>;
++ gpio_pmic_v3p3 = <&gpio2 7 0>;
++ gpio_pmic_intr = <&gpio2 12 0>;
++
++ regulators {
++ DISPLAY_reg: DISPLAY {
++ regulator-name = "DISPLAY";
++ };
++
++ GVDD_reg: GVDD {
++ /* 20v */
++ regulator-name = "GVDD";
++ };
++
++ GVEE_reg: GVEE {
++ /* -22v */
++ regulator-name = "GVEE";
++ };
++
++ HVINN_reg: HVINN {
++ /* -22v */
++ regulator-name = "HVINN";
++ };
++
++ HVINP_reg: HVINP {
++ /* 20v */
++ regulator-name = "HVINP";
++ };
++
++ VCOM_reg: VCOM {
++ regulator-name = "VCOM";
++ /* 2's-compliment, -4325000 */
++ regulator-min-microvolt = <0xffbe0178>;
++ /* 2's-compliment, -500000 */
++ regulator-max-microvolt = <0xfff85ee0>;
++ };
++
++ VNEG_reg: VNEG {
++ /* -15v */
++ regulator-name = "VNEG";
++ };
++
++ VPOS_reg: VPOS {
++ /* 15v */
++ regulator-name = "VPOS";
++ };
++
++ V3P3_reg: V3P3 {
++ regulator-name = "V3P3";
++ };
++ };
++ };
++
++ mma8450@1c {
++ compatible = "fsl,mma8450";
++ reg = <0x1c>;
++ };
+};
+
+&i2c2 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
++ pinctrl-0 = <&pinctrl_i2c2_1>;
+ status = "okay";
+
+ codec: wm8962@1a {
@@ -32927,14 +11374,49 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ PLLVDD-supply = <&vgen3_reg>;
+ SPKVDD1-supply = <&reg_aud4v>;
+ SPKVDD2-supply = <&reg_aud4v>;
++ amic-mono;
++ };
++
++ sii902x@39 {
++ compatible = "SiI,sii902x";
++ interrupt-parent = <&gpio2>;
++ interrupts = <10 2>;
++ mode_str ="1280x720M@60";
++ bits-per-pixel = <32>;
++ resets = <&sii902x_reset>;
++ reg = <0x39>;
+ };
+};
+
-+&iomuxc {
++&i2c3 {
++ clock-frequency = <100000>;
+ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c3_1>;
++ status = "disabled";
++
++ ov564x: ov564x@3c {
++ compatible = "ovti,ov564x";
++ reg = <0x3c>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_csi_0>;
++ clocks = <&clks IMX6SL_CLK_CSI>;
++ clock-names = "csi_mclk";
++ AVDD-supply = <&vgen6_reg>; /* 2.8v */
++ DVDD-supply = <&vgen2_reg>; /* 1.5v*/
++ pwn-gpios = <&gpio1 25 1>;
++ rst-gpios = <&gpio1 26 0>;
++ csi_id = <0>;
++ mclk = <24000000>;
++ mclk_source = <0>;
++ };
++};
++
++&iomuxc {
++ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&pinctrl_hog>;
++ pinctrl-1 = <&pinctrl_hog_sleep>;
+
-+ imx6sl-evk {
++ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
+ MX6SL_PAD_KEY_ROW7__GPIO4_IO07 0x17059
@@ -32942,214 +11424,96 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+ MX6SL_PAD_SD2_DAT7__GPIO5_IO00 0x17059
+ MX6SL_PAD_SD2_DAT6__GPIO4_IO29 0x17059
+ MX6SL_PAD_REF_CLK_32K__GPIO3_IO22 0x17059
++ MX6SL_PAD_FEC_TX_CLK__GPIO4_IO21 0x80000000
++ MX6SL_PAD_KEY_ROW5__GPIO4_IO03 0x110b0
++ MX6SL_PAD_EPDC_VCOM0__GPIO2_IO03 0x80000000
++ MX6SL_PAD_EPDC_PWRSTAT__GPIO2_IO13 0x80000000
++ MX6SL_PAD_EPDC_PWRCTRL0__GPIO2_IO07 0x80000000
++ MX6SL_PAD_EPDC_PWRWAKEUP__GPIO2_IO14 0x80000000
++ MX6SL_PAD_EPDC_PWRINT__GPIO2_IO12 0x80000000
++ MX6SL_PAD_EPDC_PWRCTRL3__GPIO2_IO10 0x170b0
++ MX6SL_PAD_EPDC_PWRCTRL2__GPIO2_IO09 0x80000000
++ MX6SL_PAD_KEY_COL6__GPIO4_IO04 0x110b0
++ MX6SL_PAD_ECSPI2_MISO__GPIO4_IO14 0x17000
++ MX6SL_PAD_ECSPI2_MOSI__GPIO4_IO13 0x17000
++ MX6SL_PAD_ECSPI2_SS0__GPIO4_IO15 0x17000
++ MX6SL_PAD_FEC_RX_ER__GPIO4_IO19 0x1b0b0
++ MX6SL_PAD_LCD_RESET__GPIO2_IO19 0x1b0b0
+ MX6SL_PAD_KEY_COL4__GPIO4_IO00 0x80000000
+ MX6SL_PAD_KEY_COL5__GPIO4_IO02 0x80000000
-+ MX6SL_PAD_AUD_MCLK__AUDIO_CLK_OUT 0x4130b0
-+ >;
-+ };
-+
-+ pinctrl_audmux3: audmux3grp {
-+ fsl,pins = <
-+ MX6SL_PAD_AUD_RXD__AUD3_RXD 0x4130b0
-+ MX6SL_PAD_AUD_TXC__AUD3_TXC 0x4130b0
-+ MX6SL_PAD_AUD_TXD__AUD3_TXD 0x4110b0
-+ MX6SL_PAD_AUD_TXFS__AUD3_TXFS 0x4130b0
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO 0x100b1
-+ MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI 0x100b1
-+ MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK 0x100b1
-+ >;
-+ };
-+
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX6SL_PAD_FEC_MDC__FEC_MDC 0x1b0b0
-+ MX6SL_PAD_FEC_MDIO__FEC_MDIO 0x1b0b0
-+ MX6SL_PAD_FEC_CRS_DV__FEC_RX_DV 0x1b0b0
-+ MX6SL_PAD_FEC_RXD0__FEC_RX_DATA0 0x1b0b0
-+ MX6SL_PAD_FEC_RXD1__FEC_RX_DATA1 0x1b0b0
-+ MX6SL_PAD_FEC_TX_EN__FEC_TX_EN 0x1b0b0
-+ MX6SL_PAD_FEC_TXD0__FEC_TX_DATA0 0x1b0b0
-+ MX6SL_PAD_FEC_TXD1__FEC_TX_DATA1 0x1b0b0
-+ MX6SL_PAD_FEC_REF_CLK__FEC_REF_OUT 0x4001b0a8
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6SL_PAD_I2C1_SCL__I2C1_SCL 0x4001b8b1
-+ MX6SL_PAD_I2C1_SDA__I2C1_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX6SL_PAD_I2C2_SCL__I2C2_SCL 0x4001b8b1
-+ MX6SL_PAD_I2C2_SDA__I2C2_SDA 0x4001b8b1
-+ >;
-+ };
-+
-+ pinctrl_led: ledgrp {
-+ fsl,pins = <
-+ MX6SL_PAD_HSIC_STROBE__GPIO3_IO20 0x17059
-+ >;
-+ };
-+
-+ pinctrl_kpp: kppgrp {
-+ fsl,pins = <
-+ MX6SL_PAD_KEY_ROW0__KEY_ROW0 0x1b010
-+ MX6SL_PAD_KEY_ROW1__KEY_ROW1 0x1b010
-+ MX6SL_PAD_KEY_ROW2__KEY_ROW2 0x1b0b0
-+ MX6SL_PAD_KEY_COL0__KEY_COL0 0x110b0
-+ MX6SL_PAD_KEY_COL1__KEY_COL1 0x110b0
-+ MX6SL_PAD_KEY_COL2__KEY_COL2 0x110b0
-+ >;
-+ };
-+
-+ pinctrl_uart1: uart1grp {
-+ fsl,pins = <
-+ MX6SL_PAD_UART1_RXD__UART1_RX_DATA 0x1b0b1
-+ MX6SL_PAD_UART1_TXD__UART1_TX_DATA 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_usbotg1: usbotg1grp {
-+ fsl,pins = <
-+ MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc1: usdhc1grp {
-+ fsl,pins = <
-+ MX6SL_PAD_SD1_CMD__SD1_CMD 0x17059
-+ MX6SL_PAD_SD1_CLK__SD1_CLK 0x10059
-+ MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x17059
-+ MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x17059
-+ MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x17059
-+ MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x17059
-+ MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x17059
-+ MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x17059
-+ MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x17059
-+ MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
-+ fsl,pins = <
-+ MX6SL_PAD_SD1_CMD__SD1_CMD 0x170b9
-+ MX6SL_PAD_SD1_CLK__SD1_CLK 0x100b9
-+ MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x170b9
-+ MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x170b9
-+ MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x170b9
-+ MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x170b9
-+ MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x170b9
-+ MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x170b9
-+ MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x170b9
-+ MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x170b9
-+ >;
-+ };
-+
-+ pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
-+ fsl,pins = <
-+ MX6SL_PAD_SD1_CMD__SD1_CMD 0x170f9
-+ MX6SL_PAD_SD1_CLK__SD1_CLK 0x100f9
-+ MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x170f9
-+ MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x170f9
-+ MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x170f9
-+ MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x170f9
-+ MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x170f9
-+ MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x170f9
-+ MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x170f9
-+ MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x170f9
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6SL_PAD_SD2_CMD__SD2_CMD 0x17059
-+ MX6SL_PAD_SD2_CLK__SD2_CLK 0x10059
-+ MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x17059
-+ MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x17059
-+ MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x17059
-+ MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x17059
+ >;
+ };
+
-+ pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
++ pinctrl_hog_sleep: hoggrp_sleep {
+ fsl,pins = <
-+ MX6SL_PAD_SD2_CMD__SD2_CMD 0x170b9
-+ MX6SL_PAD_SD2_CLK__SD2_CLK 0x100b9
-+ MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x170b9
-+ MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x170b9
-+ MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x170b9
-+ MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x170b9
++ MX6SL_PAD_KEY_ROW5__GPIO4_IO03 0x3080
++ MX6SL_PAD_KEY_COL6__GPIO4_IO04 0x3080
++ MX6SL_PAD_LCD_RESET__GPIO2_IO19 0x3080
+ >;
+ };
++ };
++};
+
-+ pinctrl_usdhc2_200mhz: usdhc2grp200mhz {
-+ fsl,pins = <
-+ MX6SL_PAD_SD2_CMD__SD2_CMD 0x170f9
-+ MX6SL_PAD_SD2_CLK__SD2_CLK 0x100f9
-+ MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x170f9
-+ MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x170f9
-+ MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x170f9
-+ MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x170f9
-+ >;
-+ };
++&kpp {
++ pinctrl-names = "default", "sleep";
++ pinctrl-0 = <&pinctrl_kpp_1>;
++ pinctrl-1 = <&pinctrl_kpp_1_sleep>;
++ linux,keymap = <
++ 0x00000067 /* KEY_UP */
++ 0x0001006c /* KEY_DOWN */
++ 0x0002001c /* KEY_ENTER */
++ 0x01000066 /* KEY_HOME */
++ 0x0101006a /* KEY_RIGHT */
++ 0x01020069 /* KEY_LEFT */
++ 0x02000072 /* KEY_VOLUMEDOWN */
++ 0x02010073 /* KEY_VOLUMEUP */
++ >;
++ status = "okay";
++};
+
-+ pinctrl_usdhc3: usdhc3grp {
-+ fsl,pins = <
-+ MX6SL_PAD_SD3_CMD__SD3_CMD 0x17059
-+ MX6SL_PAD_SD3_CLK__SD3_CLK 0x10059
-+ MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-+ MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-+ MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-+ MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-+ >;
-+ };
++&lcdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_lcdif_dat_0
++ &pinctrl_lcdif_ctrl_0>;
++ lcd-supply = <&reg_lcd_3v3>;
++ display = <&display>;
++ status = "okay";
+
-+ pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
-+ fsl,pins = <
-+ MX6SL_PAD_SD3_CMD__SD3_CMD 0x170b9
-+ MX6SL_PAD_SD3_CLK__SD3_CLK 0x100b9
-+ MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x170b9
-+ MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x170b9
-+ MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x170b9
-+ MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x170b9
-+ >;
-+ };
++ display: display {
++ bits-per-pixel = <16>;
++ bus-width = <24>;
+
-+ pinctrl_usdhc3_200mhz: usdhc3grp200mhz {
-+ fsl,pins = <
-+ MX6SL_PAD_SD3_CMD__SD3_CMD 0x170f9
-+ MX6SL_PAD_SD3_CLK__SD3_CLK 0x100f9
-+ MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x170f9
-+ MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x170f9
-+ MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x170f9
-+ MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x170f9
-+ >;
++ display-timings {
++ native-mode = <&timing0>;
++ timing0: timing0 {
++ clock-frequency = <33500000>;
++ hactive = <800>;
++ vactive = <480>;
++ hback-porch = <89>;
++ hfront-porch = <164>;
++ vback-porch = <23>;
++ vfront-porch = <10>;
++ hsync-len = <10>;
++ vsync-len = <10>;
++ hsync-active = <0>;
++ vsync-active = <0>;
++ de-active = <1>;
++ pixelclk-active = <0>;
++ };
+ };
+ };
+};
+
-+&kpp {
++&pwm1 {
++ pinctrl-names = "default", "sleep";
++ pinctrl-0 = <&pinctrl_pwm1_0>;
++ pinctrl-1 = <&pinctrl_pwm1_0_sleep>;
++ status = "okay";
++};
++
++&spdif {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_kpp>;
-+ linux,keymap = <
-+ MATRIX_KEY(0x0, 0x0, KEY_UP) /* ROW0, COL0 */
-+ MATRIX_KEY(0x0, 0x1, KEY_DOWN) /* ROW0, COL1 */
-+ MATRIX_KEY(0x0, 0x2, KEY_ENTER) /* ROW0, COL2 */
-+ MATRIX_KEY(0x1, 0x0, KEY_HOME) /* ROW1, COL0 */
-+ MATRIX_KEY(0x1, 0x1, KEY_RIGHT) /* ROW1, COL1 */
-+ MATRIX_KEY(0x1, 0x2, KEY_LEFT) /* ROW1, COL2 */
-+ MATRIX_KEY(0x2, 0x0, KEY_VOLUMEDOWN) /* ROW2, COL0 */
-+ MATRIX_KEY(0x2, 0x1, KEY_VOLUMEUP) /* ROW2, COL1 */
-+ >;
++ pinctrl-0 = <&pinctrl_spdif_1>;
+ status = "okay";
+};
+
@@ -33160,15 +11524,16 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+
+&uart1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
++ pinctrl-0 = <&pinctrl_uart1_1>;
+ status = "okay";
+};
+
+&usbotg1 {
+ vbus-supply = <&reg_usb_otg1_vbus>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg1>;
++ pinctrl-0 = <&pinctrl_usbotg1_1>;
+ disable-over-current;
++ imx6-usb-charger-detection;
+ status = "okay";
+};
+
@@ -33181,9 +11546,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+
+&usdhc1 {
+ pinctrl-names = "default", "state_100mhz", "state_200mhz";
-+ pinctrl-0 = <&pinctrl_usdhc1>;
-+ pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
-+ pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
++ pinctrl-0 = <&pinctrl_usdhc1_1>;
++ pinctrl-1 = <&pinctrl_usdhc1_1_100mhz>;
++ pinctrl-2 = <&pinctrl_usdhc1_1_200mhz>;
+ bus-width = <8>;
+ cd-gpios = <&gpio4 7 0>;
+ wp-gpios = <&gpio4 6 0>;
@@ -33192,9 +11557,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+
+&usdhc2 {
+ pinctrl-names = "default", "state_100mhz", "state_200mhz";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
-+ pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
++ pinctrl-0 = <&pinctrl_usdhc2_1>;
++ pinctrl-1 = <&pinctrl_usdhc2_1_100mhz>;
++ pinctrl-2 = <&pinctrl_usdhc2_1_200mhz>;
+ cd-gpios = <&gpio5 0 0>;
+ wp-gpios = <&gpio4 29 0>;
+ status = "okay";
@@ -33202,15 +11567,33 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+
+&usdhc3 {
+ pinctrl-names = "default", "state_100mhz", "state_200mhz";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
-+ pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
++ pinctrl-0 = <&pinctrl_usdhc3_1>;
++ pinctrl-1 = <&pinctrl_usdhc3_1_100mhz>;
++ pinctrl-2 = <&pinctrl_usdhc3_1_200mhz>;
+ cd-gpios = <&gpio3 22 0>;
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-ldo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-ldo.dts
++
++&pxp {
++ status = "okay";
++};
++
++&gpc {
++ fsl,cpu_pupscr_sw2iso = <0xf>;
++ fsl,cpu_pupscr_sw = <0xf>;
++ fsl,cpu_pdnscr_iso2sw = <0x1>;
++ fsl,cpu_pdnscr_iso = <0x1>;
++ fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */
++ fsl,wdog-reset = <1>; /* watchdog select of reset source */
++ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
++};
++
++&gpu {
++ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
++};
+diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-ldo.dts linux-solidrun/arch/arm/boot/dts/imx6sl-evk-ldo.dts
--- linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-ldo.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-ldo.dts 2014-04-21 13:50:39.066713682 +0200
++++ linux-solidrun/arch/arm/boot/dts/imx6sl-evk-ldo.dts 2014-04-24 07:58:12.876168828 +0200
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -33237,9 +11620,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/imx6sl-evk-ldo.dts linux-linaro-stable
+&gpu {
+ pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h
+diff -Nur linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-solidrun/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h
--- linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-04-21 13:50:42.842729606 +0200
++++ linux-solidrun/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-04-24 07:58:34.356244411 +0200
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -33393,9 +11776,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock
+#define IMX6SL_CLK_CLK_END 137
+
+#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h
+diff -Nur linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h linux-solidrun/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h
--- linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h 2014-04-21 13:50:42.842729606 +0200
++++ linux-solidrun/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h 2014-04-24 07:58:34.356244411 +0200
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -33562,9 +11945,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.
+#define VF610_CLK_END 150
+
+#endif /* __DT_BINDINGS_CLOCK_VF610_H */
-diff -Nur linux-3.10.36/arch/arm/boot/dts/Makefile linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile
+diff -Nur linux-3.10.36/arch/arm/boot/dts/Makefile linux-solidrun/arch/arm/boot/dts/Makefile
--- linux-3.10.36/arch/arm/boot/dts/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile 2014-04-21 13:50:39.050713614 +0200
++++ linux-solidrun/arch/arm/boot/dts/Makefile 2014-04-24 07:58:12.796168547 +0200
@@ -113,14 +113,31 @@
imx53-mba53.dtb \
imx53-qsb.dtb \
@@ -33614,9 +11997,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/Makefile linux-linaro-stable-mx6/arch/
dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb
dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8505-ref.dtb \
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,159 @@
+/*
+ * ARM Ltd. Fast Models
@@ -33777,9 +12160,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-linaro-
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,165 @@
+/*
+ * ARM Ltd. Fast Models
@@ -33946,9 +12329,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-linaro-
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,177 @@
+/*
+ * ARM Ltd. Fast Models
@@ -34127,9 +12510,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-linaro-
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,171 @@
+/*
+ * ARM Ltd. Fast Models
@@ -34302,9 +12685,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-linaro-s
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,183 @@
+/*
+ * ARM Ltd. Fast Models
@@ -34489,9 +12872,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-linaro-s
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-solidrun/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,231 @@
+/*
+ * ARM Ltd. Fast Models
@@ -34724,9 +13107,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-
+ };
+ };
+ };
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-solidrun/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,244 @@
+/*
+ * ARM Ltd. Fast Models
@@ -34972,9 +13355,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-lin
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-solidrun/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts
--- linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-04-21 13:50:39.070713699 +0200
++++ linux-solidrun/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-04-24 07:58:12.916168970 +0200
@@ -0,0 +1,358 @@
+/*
+ * ARM Ltd. Fast Models
@@ -35334,9 +13717,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-lin
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2m.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2m.dtsi linux-solidrun/arch/arm/boot/dts/vexpress-v2m.dtsi
--- linux-3.10.36/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-04-24 07:58:12.940169053 +0200
@@ -227,6 +227,7 @@
};
@@ -35345,9 +13728,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2m.dtsi linux-linaro-stable-
compatible = "arm,pl111", "arm,primecell";
reg = <0x1f000 0x1000>;
interrupts = <14>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-solidrun/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
--- linux-3.10.36/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-04-24 07:58:12.940169053 +0200
@@ -228,6 +228,7 @@
};
@@ -35356,9 +13739,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-linaro-sta
compatible = "arm,pl111", "arm,primecell";
reg = <0x1f0000 0x1000>;
interrupts = <14>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
--- linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-04-24 07:58:12.940169053 +0200
@@ -9,11 +9,13 @@
/dts-v1/;
@@ -35615,9 +13998,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-linaro-
dcc {
compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>;
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
--- linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-04-24 07:58:12.940169053 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -35636,9 +14019,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-linaro
};
memory-controller@2b0a0000 {
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
--- linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-04-24 07:58:12.940169053 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -35657,9 +14040,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-linaro-sta
};
memory-controller@2a150000 {
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca9.dts
--- linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-04-24 07:58:12.940169053 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -35678,9 +14061,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-linaro-stab
};
memory-controller@100e0000 {
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vf610.dtsi
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610.dtsi linux-solidrun/arch/arm/boot/dts/vf610.dtsi
--- linux-3.10.36/arch/arm/boot/dts/vf610.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610.dtsi 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vf610.dtsi 2014-04-24 07:58:12.940169053 +0200
@@ -0,0 +1,464 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
@@ -36146,9 +14529,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610.dtsi linux-linaro-stable-mx6/arc
+ };
+ };
+};
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-pinfunc.h
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610-pinfunc.h linux-solidrun/arch/arm/boot/dts/vf610-pinfunc.h
--- linux-3.10.36/arch/arm/boot/dts/vf610-pinfunc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-pinfunc.h 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vf610-pinfunc.h 2014-04-24 07:58:12.940169053 +0200
@@ -0,0 +1,810 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
@@ -36960,9 +15343,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610-pinfunc.h linux-linaro-stable-mx
+#define VF610_PAD_PTA7__VIU_PIX_CLK 0x218 0x3AC ALT1 0x1
+
+#endif
-diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610-twr.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-twr.dts
+diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610-twr.dts linux-solidrun/arch/arm/boot/dts/vf610-twr.dts
--- linux-3.10.36/arch/arm/boot/dts/vf610-twr.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-twr.dts 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/boot/dts/vf610-twr.dts 2014-04-24 07:58:12.940169053 +0200
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
@@ -37021,9 +15404,9 @@ diff -Nur linux-3.10.36/arch/arm/boot/dts/vf610-twr.dts linux-linaro-stable-mx6/
+ pinctrl-0 = <&pinctrl_uart1_1>;
+ status = "okay";
+};
-diff -Nur linux-3.10.36/arch/arm/common/bL_switcher.c linux-linaro-stable-mx6/arch/arm/common/bL_switcher.c
+diff -Nur linux-3.10.36/arch/arm/common/bL_switcher.c linux-solidrun/arch/arm/common/bL_switcher.c
--- linux-3.10.36/arch/arm/common/bL_switcher.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/common/bL_switcher.c 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/common/bL_switcher.c 2014-04-24 07:58:12.948169082 +0200
@@ -0,0 +1,864 @@
+/*
+ * arch/arm/common/bL_switcher.c -- big.LITTLE cluster switcher core driver
@@ -37889,9 +16272,9 @@ diff -Nur linux-3.10.36/arch/arm/common/bL_switcher.c linux-linaro-stable-mx6/ar
+}
+
+late_initcall(bL_switcher_init);
-diff -Nur linux-3.10.36/arch/arm/common/bL_switcher_dummy_if.c linux-linaro-stable-mx6/arch/arm/common/bL_switcher_dummy_if.c
+diff -Nur linux-3.10.36/arch/arm/common/bL_switcher_dummy_if.c linux-solidrun/arch/arm/common/bL_switcher_dummy_if.c
--- linux-3.10.36/arch/arm/common/bL_switcher_dummy_if.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/common/bL_switcher_dummy_if.c 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/common/bL_switcher_dummy_if.c 2014-04-24 07:58:12.948169082 +0200
@@ -0,0 +1,71 @@
+/*
+ * arch/arm/common/bL_switcher_dummy_if.c -- b.L switcher dummy interface
@@ -37964,9 +16347,9 @@ diff -Nur linux-3.10.36/arch/arm/common/bL_switcher_dummy_if.c linux-linaro-stab
+
+module_init(bL_switcher_dummy_if_init);
+module_exit(bL_switcher_dummy_if_exit);
-diff -Nur linux-3.10.36/arch/arm/common/Makefile linux-linaro-stable-mx6/arch/arm/common/Makefile
+diff -Nur linux-3.10.36/arch/arm/common/Makefile linux-solidrun/arch/arm/common/Makefile
--- linux-3.10.36/arch/arm/common/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/common/Makefile 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/common/Makefile 2014-04-24 07:58:12.948169082 +0200
@@ -14,5 +14,9 @@
obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
@@ -37977,9 +16360,9 @@ diff -Nur linux-3.10.36/arch/arm/common/Makefile linux-linaro-stable-mx6/arch/ar
AFLAGS_mcpm_head.o := -march=armv7-a
AFLAGS_vlock.o := -march=armv7-a
+CFLAGS_REMOVE_mcpm_entry.o = -pg
-diff -Nur linux-3.10.36/arch/arm/common/mcpm_entry.c linux-linaro-stable-mx6/arch/arm/common/mcpm_entry.c
+diff -Nur linux-3.10.36/arch/arm/common/mcpm_entry.c linux-solidrun/arch/arm/common/mcpm_entry.c
--- linux-3.10.36/arch/arm/common/mcpm_entry.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/common/mcpm_entry.c 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/common/mcpm_entry.c 2014-04-24 07:58:12.948169082 +0200
@@ -27,6 +27,18 @@
sync_cache_w(&mcpm_entry_vectors[cluster][cpu]);
}
@@ -37999,9 +16382,9 @@ diff -Nur linux-3.10.36/arch/arm/common/mcpm_entry.c linux-linaro-stable-mx6/arc
static const struct mcpm_platform_ops *platform_ops;
int __init mcpm_platform_register(const struct mcpm_platform_ops *ops)
-diff -Nur linux-3.10.36/arch/arm/common/mcpm_head.S linux-linaro-stable-mx6/arch/arm/common/mcpm_head.S
+diff -Nur linux-3.10.36/arch/arm/common/mcpm_head.S linux-solidrun/arch/arm/common/mcpm_head.S
--- linux-3.10.36/arch/arm/common/mcpm_head.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/common/mcpm_head.S 2014-04-21 13:50:39.078713733 +0200
++++ linux-solidrun/arch/arm/common/mcpm_head.S 2014-04-24 07:58:12.948169082 +0200
@@ -71,12 +71,19 @@
* position independent way.
*/
@@ -38044,9 +16427,9 @@ diff -Nur linux-3.10.36/arch/arm/common/mcpm_head.S linux-linaro-stable-mx6/arch
.type mcpm_power_up_setup_phys, #object
ENTRY(mcpm_power_up_setup_phys)
.space 4 @ set by mcpm_sync_init()
-diff -Nur linux-3.10.36/arch/arm/configs/imx_v6_v7_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v6_v7_defconfig
+diff -Nur linux-3.10.36/arch/arm/configs/imx_v6_v7_defconfig linux-solidrun/arch/arm/configs/imx_v6_v7_defconfig
--- linux-3.10.36/arch/arm/configs/imx_v6_v7_defconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v6_v7_defconfig 2014-04-21 13:50:39.090713783 +0200
++++ linux-solidrun/arch/arm/configs/imx_v6_v7_defconfig 2014-04-24 07:58:12.968169153 +0200
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
@@ -38292,9 +16675,9 @@ diff -Nur linux-3.10.36/arch/arm/configs/imx_v6_v7_defconfig linux-linaro-stable
CONFIG_JFFS2_FS=y
CONFIG_UBIFS_FS=y
CONFIG_NFS_FS=y
-diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig
+diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig linux-solidrun/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig
--- linux-3.10.36/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig 2014-04-21 13:50:39.090713783 +0200
++++ linux-solidrun/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig 2014-04-24 07:58:12.968169153 +0200
@@ -0,0 +1,384 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -38680,9 +17063,9 @@ diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig l
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
-diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_defconfig
+diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_defconfig linux-solidrun/arch/arm/configs/imx_v7_defconfig
--- linux-3.10.36/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_defconfig 2014-04-21 13:50:39.090713783 +0200
++++ linux-solidrun/arch/arm/configs/imx_v7_defconfig 2014-04-24 07:58:12.968169153 +0200
@@ -0,0 +1,332 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -39016,9 +17399,9 @@ diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_defconfig linux-linaro-stable-mx
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
-diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_mfg_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_mfg_defconfig
+diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_mfg_defconfig linux-solidrun/arch/arm/configs/imx_v7_mfg_defconfig
--- linux-3.10.36/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_mfg_defconfig 2014-04-21 13:50:39.090713783 +0200
++++ linux-solidrun/arch/arm/configs/imx_v7_mfg_defconfig 2014-04-24 07:58:12.968169153 +0200
@@ -0,0 +1,341 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -39361,9 +17744,9 @@ diff -Nur linux-3.10.36/arch/arm/configs/imx_v7_mfg_defconfig linux-linaro-stabl
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
-diff -Nur linux-3.10.36/arch/arm/include/asm/arch_timer.h linux-linaro-stable-mx6/arch/arm/include/asm/arch_timer.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/arch_timer.h linux-solidrun/arch/arm/include/asm/arch_timer.h
--- linux-3.10.36/arch/arm/include/asm/arch_timer.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/arch_timer.h 2014-04-21 13:50:39.098713817 +0200
++++ linux-solidrun/arch/arm/include/asm/arch_timer.h 2014-04-24 07:58:13.000169264 +0200
@@ -96,7 +96,7 @@
asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl));
@@ -39373,9 +17756,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/arch_timer.h linux-linaro-stable-mx
asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
}
-diff -Nur linux-3.10.36/arch/arm/include/asm/bL_switcher.h linux-linaro-stable-mx6/arch/arm/include/asm/bL_switcher.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/bL_switcher.h linux-solidrun/arch/arm/include/asm/bL_switcher.h
--- linux-3.10.36/arch/arm/include/asm/bL_switcher.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/bL_switcher.h 2014-04-21 13:50:39.098713817 +0200
++++ linux-solidrun/arch/arm/include/asm/bL_switcher.h 2014-04-24 07:58:13.004169278 +0200
@@ -0,0 +1,83 @@
+/*
+ * arch/arm/include/asm/bL_switcher.h
@@ -39460,9 +17843,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/bL_switcher.h linux-linaro-stable-m
+#endif /* CONFIG_BL_SWITCHER */
+
+#endif
-diff -Nur linux-3.10.36/arch/arm/include/asm/cacheflush.h linux-linaro-stable-mx6/arch/arm/include/asm/cacheflush.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/cacheflush.h linux-solidrun/arch/arm/include/asm/cacheflush.h
--- linux-3.10.36/arch/arm/include/asm/cacheflush.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/cacheflush.h 2014-04-21 13:50:39.098713817 +0200
++++ linux-solidrun/arch/arm/include/asm/cacheflush.h 2014-04-24 07:58:13.016169321 +0200
@@ -212,7 +212,6 @@
static inline void __flush_icache_all(void)
{
@@ -39522,9 +17905,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/cacheflush.h linux-linaro-stable-mx
+ "r9","r10","lr","memory" )
+
#endif
-diff -Nur linux-3.10.36/arch/arm/include/asm/cp15.h linux-linaro-stable-mx6/arch/arm/include/asm/cp15.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/cp15.h linux-solidrun/arch/arm/include/asm/cp15.h
--- linux-3.10.36/arch/arm/include/asm/cp15.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/cp15.h 2014-04-21 13:50:39.098713817 +0200
++++ linux-solidrun/arch/arm/include/asm/cp15.h 2014-04-24 07:58:13.016169321 +0200
@@ -61,6 +61,20 @@
isb();
}
@@ -39546,9 +17929,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/cp15.h linux-linaro-stable-mx6/arch
#ifndef CONFIG_SMP
extern void adjust_cr(unsigned long mask, unsigned long set);
#endif
-diff -Nur linux-3.10.36/arch/arm/include/asm/glue-cache.h linux-linaro-stable-mx6/arch/arm/include/asm/glue-cache.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/glue-cache.h linux-solidrun/arch/arm/include/asm/glue-cache.h
--- linux-3.10.36/arch/arm/include/asm/glue-cache.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/glue-cache.h 2014-04-21 13:50:39.102713834 +0200
++++ linux-solidrun/arch/arm/include/asm/glue-cache.h 2014-04-24 07:58:13.028169363 +0200
@@ -102,19 +102,19 @@
#endif
@@ -39577,9 +17960,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/glue-cache.h linux-linaro-stable-mx
#endif
#if !defined(_CACHE) && !defined(MULTI_CACHE)
-diff -Nur linux-3.10.36/arch/arm/include/asm/hardirq.h linux-linaro-stable-mx6/arch/arm/include/asm/hardirq.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/hardirq.h linux-solidrun/arch/arm/include/asm/hardirq.h
--- linux-3.10.36/arch/arm/include/asm/hardirq.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/hardirq.h 2014-04-21 13:50:39.102713834 +0200
++++ linux-solidrun/arch/arm/include/asm/hardirq.h 2014-04-24 07:58:13.028169363 +0200
@@ -5,7 +5,7 @@
#include <linux/threads.h>
#include <asm/irq.h>
@@ -39589,9 +17972,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/hardirq.h linux-linaro-stable-mx6/a
typedef struct {
unsigned int __softirq_pending;
-diff -Nur linux-3.10.36/arch/arm/include/asm/mach/arch.h linux-linaro-stable-mx6/arch/arm/include/asm/mach/arch.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/mach/arch.h linux-solidrun/arch/arm/include/asm/mach/arch.h
--- linux-3.10.36/arch/arm/include/asm/mach/arch.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/mach/arch.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/mach/arch.h 2014-04-24 07:58:13.040169406 +0200
@@ -8,6 +8,8 @@
* published by the Free Software Foundation.
*/
@@ -39620,9 +18003,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/mach/arch.h linux-linaro-stable-mx6
void (*fixup)(struct tag *, char **,
struct meminfo *);
void (*reserve)(void);/* reserve mem blocks */
-diff -Nur linux-3.10.36/arch/arm/include/asm/mach/pci.h linux-linaro-stable-mx6/arch/arm/include/asm/mach/pci.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/mach/pci.h linux-solidrun/arch/arm/include/asm/mach/pci.h
--- linux-3.10.36/arch/arm/include/asm/mach/pci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/mach/pci.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/mach/pci.h 2014-04-24 07:58:13.040169406 +0200
@@ -35,6 +35,8 @@
resource_size_t start,
resource_size_t size,
@@ -39651,9 +18034,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/mach/pci.h linux-linaro-stable-mx6/
-extern void pci_v3_postinit(void);
-
#endif /* __ASM_MACH_PCI_H */
-diff -Nur linux-3.10.36/arch/arm/include/asm/mcpm.h linux-linaro-stable-mx6/arch/arm/include/asm/mcpm.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/mcpm.h linux-solidrun/arch/arm/include/asm/mcpm.h
--- linux-3.10.36/arch/arm/include/asm/mcpm.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/mcpm.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/mcpm.h 2014-04-24 07:58:13.040169406 +0200
@@ -42,6 +42,14 @@
void mcpm_set_entry_vector(unsigned cpu, unsigned cluster, void *ptr);
@@ -39669,9 +18052,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/mcpm.h linux-linaro-stable-mx6/arch
* CPU/cluster power operations API for higher subsystems to use.
*/
-diff -Nur linux-3.10.36/arch/arm/include/asm/outercache.h linux-linaro-stable-mx6/arch/arm/include/asm/outercache.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/outercache.h linux-solidrun/arch/arm/include/asm/outercache.h
--- linux-3.10.36/arch/arm/include/asm/outercache.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/outercache.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/outercache.h 2014-04-24 07:58:13.040169406 +0200
@@ -37,10 +37,10 @@
void (*resume)(void);
};
@@ -39685,9 +18068,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/outercache.h linux-linaro-stable-mx
static inline void outer_inv_range(phys_addr_t start, phys_addr_t end)
{
if (outer_cache.inv_range)
-diff -Nur linux-3.10.36/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/pmu.h linux-solidrun/arch/arm/include/asm/pmu.h
--- linux-3.10.36/arch/arm/include/asm/pmu.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/pmu.h 2014-04-24 07:58:13.048169434 +0200
@@ -62,9 +62,19 @@
raw_spinlock_t pmu_lock;
};
@@ -39717,9 +18100,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/arch/
int num_events;
atomic_t active_events;
struct mutex reserve_mutex;
-diff -Nur linux-3.10.36/arch/arm/include/asm/psci.h linux-linaro-stable-mx6/arch/arm/include/asm/psci.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/psci.h linux-solidrun/arch/arm/include/asm/psci.h
--- linux-3.10.36/arch/arm/include/asm/psci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/psci.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/psci.h 2014-04-24 07:58:13.048169434 +0200
@@ -16,6 +16,10 @@
#define PSCI_POWER_STATE_TYPE_STANDBY 0
@@ -39754,9 +18137,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/psci.h linux-linaro-stable-mx6/arch
+}
+#endif
#endif /* __ASM_ARM_PSCI_H */
-diff -Nur linux-3.10.36/arch/arm/include/asm/smp.h linux-linaro-stable-mx6/arch/arm/include/asm/smp.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/smp.h linux-solidrun/arch/arm/include/asm/smp.h
--- linux-3.10.36/arch/arm/include/asm/smp.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/smp.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/smp.h 2014-04-24 07:58:13.052169447 +0200
@@ -81,6 +81,8 @@
extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
extern void arch_send_wakeup_ipi_mask(const struct cpumask *mask);
@@ -39766,9 +18149,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/smp.h linux-linaro-stable-mx6/arch/
struct smp_operations {
#ifdef CONFIG_SMP
/*
-diff -Nur linux-3.10.36/arch/arm/include/asm/spinlock.h linux-linaro-stable-mx6/arch/arm/include/asm/spinlock.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/spinlock.h linux-solidrun/arch/arm/include/asm/spinlock.h
--- linux-3.10.36/arch/arm/include/asm/spinlock.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/spinlock.h 2014-04-21 13:50:39.106713851 +0200
++++ linux-solidrun/arch/arm/include/asm/spinlock.h 2014-04-24 07:58:13.052169447 +0200
@@ -97,22 +97,19 @@
static inline int arch_spin_trylock(arch_spinlock_t *lock)
@@ -39869,9 +18252,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/spinlock.h linux-linaro-stable-mx6/
}
/* read_can_lock - would read_trylock() succeed? */
-diff -Nur linux-3.10.36/arch/arm/include/asm/topology.h linux-linaro-stable-mx6/arch/arm/include/asm/topology.h
+diff -Nur linux-3.10.36/arch/arm/include/asm/topology.h linux-solidrun/arch/arm/include/asm/topology.h
--- linux-3.10.36/arch/arm/include/asm/topology.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/topology.h 2014-04-21 13:50:39.110713868 +0200
++++ linux-solidrun/arch/arm/include/asm/topology.h 2014-04-24 07:58:13.060169475 +0200
@@ -26,11 +26,45 @@
void init_cpu_topology(void);
void store_cpu_topology(unsigned int cpuid);
@@ -39918,9 +18301,9 @@ diff -Nur linux-3.10.36/arch/arm/include/asm/topology.h linux-linaro-stable-mx6/
#endif
-diff -Nur linux-3.10.36/arch/arm/include/debug/imx-uart.h linux-linaro-stable-mx6/arch/arm/include/debug/imx-uart.h
+diff -Nur linux-3.10.36/arch/arm/include/debug/imx-uart.h linux-solidrun/arch/arm/include/debug/imx-uart.h
--- linux-3.10.36/arch/arm/include/debug/imx-uart.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/debug/imx-uart.h 2014-04-21 13:50:39.110713868 +0200
++++ linux-solidrun/arch/arm/include/debug/imx-uart.h 2014-04-24 07:58:13.072169518 +0200
@@ -65,6 +65,14 @@
#define IMX6Q_UART_BASE_ADDR(n) IMX6Q_UART##n##_BASE_ADDR
#define IMX6Q_UART_BASE(n) IMX6Q_UART_BASE_ADDR(n)
@@ -39945,9 +18328,9 @@ diff -Nur linux-3.10.36/arch/arm/include/debug/imx-uart.h linux-linaro-stable-mx
#endif
#endif /* __DEBUG_IMX_UART_H */
-diff -Nur linux-3.10.36/arch/arm/include/debug/vf.S linux-linaro-stable-mx6/arch/arm/include/debug/vf.S
+diff -Nur linux-3.10.36/arch/arm/include/debug/vf.S linux-solidrun/arch/arm/include/debug/vf.S
--- linux-3.10.36/arch/arm/include/debug/vf.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/include/debug/vf.S 2014-04-21 13:50:39.110713868 +0200
++++ linux-solidrun/arch/arm/include/debug/vf.S 2014-04-24 07:58:13.072169518 +0200
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -39975,9 +18358,9 @@ diff -Nur linux-3.10.36/arch/arm/include/debug/vf.S linux-linaro-stable-mx6/arch
+
+ .macro waituart,rd,rx
+ .endm
-diff -Nur linux-3.10.36/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/Kconfig
+diff -Nur linux-3.10.36/arch/arm/Kconfig linux-solidrun/arch/arm/Kconfig
--- linux-3.10.36/arch/arm/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/Kconfig 2014-04-21 13:50:39.046713598 +0200
++++ linux-solidrun/arch/arm/Kconfig 2014-04-24 07:58:12.788168518 +0200
@@ -1494,6 +1494,109 @@
MultiThreading at a cost of slightly increased overhead in some
places. If unsure say N here.
@@ -40128,9 +18511,9 @@ diff -Nur linux-3.10.36/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/Kconfi
default "11"
help
The kernel memory allocator divides physically contiguous memory
-diff -Nur linux-3.10.36/arch/arm/Kconfig.debug linux-linaro-stable-mx6/arch/arm/Kconfig.debug
+diff -Nur linux-3.10.36/arch/arm/Kconfig.debug linux-solidrun/arch/arm/Kconfig.debug
--- linux-3.10.36/arch/arm/Kconfig.debug 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/Kconfig.debug 2014-04-21 13:50:39.046713598 +0200
++++ linux-solidrun/arch/arm/Kconfig.debug 2014-04-24 07:58:12.788168518 +0200
@@ -251,6 +251,13 @@
Say Y here if you want kernel low-level debugging support
on i.MX6Q/DL.
@@ -40187,9 +18570,9 @@ diff -Nur linux-3.10.36/arch/arm/Kconfig.debug linux-linaro-stable-mx6/arch/arm/
default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "mach/debug-macro.S"
-diff -Nur linux-3.10.36/arch/arm/kernel/bios32.c linux-linaro-stable-mx6/arch/arm/kernel/bios32.c
+diff -Nur linux-3.10.36/arch/arm/kernel/bios32.c linux-solidrun/arch/arm/kernel/bios32.c
--- linux-3.10.36/arch/arm/kernel/bios32.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/bios32.c 2014-04-21 13:50:39.114713884 +0200
++++ linux-solidrun/arch/arm/kernel/bios32.c 2014-04-24 07:58:13.076169532 +0200
@@ -363,6 +363,20 @@
}
EXPORT_SYMBOL(pcibios_fixup_bus);
@@ -40220,9 +18603,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/bios32.c linux-linaro-stable-mx6/arch/ar
INIT_LIST_HEAD(&sys->resources);
if (hw->private_data)
-diff -Nur linux-3.10.36/arch/arm/kernel/head.S linux-linaro-stable-mx6/arch/arm/kernel/head.S
+diff -Nur linux-3.10.36/arch/arm/kernel/head.S linux-solidrun/arch/arm/kernel/head.S
--- linux-3.10.36/arch/arm/kernel/head.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/head.S 2014-04-21 13:50:39.114713884 +0200
++++ linux-solidrun/arch/arm/kernel/head.S 2014-04-24 07:58:13.080169546 +0200
@@ -342,7 +342,6 @@
.long __turn_mmu_on_end
@@ -40231,9 +18614,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/head.S linux-linaro-stable-mx6/arch/arm/
ENTRY(secondary_startup)
/*
* Common entry point for secondary CPUs.
-diff -Nur linux-3.10.36/arch/arm/kernel/hw_breakpoint.c linux-linaro-stable-mx6/arch/arm/kernel/hw_breakpoint.c
+diff -Nur linux-3.10.36/arch/arm/kernel/hw_breakpoint.c linux-solidrun/arch/arm/kernel/hw_breakpoint.c
--- linux-3.10.36/arch/arm/kernel/hw_breakpoint.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/hw_breakpoint.c 2014-04-21 13:50:39.114713884 +0200
++++ linux-solidrun/arch/arm/kernel/hw_breakpoint.c 2014-04-24 07:58:13.080169546 +0200
@@ -1049,7 +1049,8 @@
static void __init pm_init(void)
@@ -40244,9 +18627,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/hw_breakpoint.c linux-linaro-stable-mx6/
}
#else
static inline void pm_init(void)
-diff -Nur linux-3.10.36/arch/arm/kernel/Makefile linux-linaro-stable-mx6/arch/arm/kernel/Makefile
+diff -Nur linux-3.10.36/arch/arm/kernel/Makefile linux-solidrun/arch/arm/kernel/Makefile
--- linux-3.10.36/arch/arm/kernel/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/Makefile 2014-04-21 13:50:39.114713884 +0200
++++ linux-solidrun/arch/arm/kernel/Makefile 2014-04-24 07:58:13.076169532 +0200
@@ -82,6 +82,9 @@
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
@@ -40258,9 +18641,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/Makefile linux-linaro-stable-mx6/arch/ar
+endif
extra-y := $(head-y) vmlinux.lds
-diff -Nur linux-3.10.36/arch/arm/kernel/perf_event.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event.c
+diff -Nur linux-3.10.36/arch/arm/kernel/perf_event.c linux-solidrun/arch/arm/kernel/perf_event.c
--- linux-3.10.36/arch/arm/kernel/perf_event.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event.c 2014-04-21 13:50:39.118713901 +0200
++++ linux-solidrun/arch/arm/kernel/perf_event.c 2014-04-24 07:58:13.084169560 +0200
@@ -12,6 +12,7 @@
*/
#define pr_fmt(fmt) "hw perfevents: " fmt
@@ -40329,9 +18712,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/perf_event.c linux-linaro-stable-mx6/arc
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
-diff -Nur linux-3.10.36/arch/arm/kernel/perf_event_cpu.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event_cpu.c
+diff -Nur linux-3.10.36/arch/arm/kernel/perf_event_cpu.c linux-solidrun/arch/arm/kernel/perf_event_cpu.c
--- linux-3.10.36/arch/arm/kernel/perf_event_cpu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_cpu.c 2014-04-21 13:50:39.118713901 +0200
++++ linux-solidrun/arch/arm/kernel/perf_event_cpu.c 2014-04-24 07:58:13.084169560 +0200
@@ -19,6 +19,7 @@
#define pr_fmt(fmt) "CPU PMU: " fmt
@@ -40595,9 +18978,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/perf_event_cpu.c linux-linaro-stable-mx6
return err;
}
-diff -Nur linux-3.10.36/arch/arm/kernel/perf_event_v7.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event_v7.c
+diff -Nur linux-3.10.36/arch/arm/kernel/perf_event_v7.c linux-solidrun/arch/arm/kernel/perf_event_v7.c
--- linux-3.10.36/arch/arm/kernel/perf_event_v7.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_v7.c 2014-04-21 13:50:39.118713901 +0200
++++ linux-solidrun/arch/arm/kernel/perf_event_v7.c 2014-04-24 07:58:13.084169560 +0200
@@ -950,6 +950,51 @@
}
#endif
@@ -40704,9 +19087,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/perf_event_v7.c linux-linaro-stable-mx6/
cpu_pmu->map_event = armv7_a7_map_event;
cpu_pmu->num_events = armv7_read_num_pmnc_events();
cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
-diff -Nur linux-3.10.36/arch/arm/kernel/process.c linux-linaro-stable-mx6/arch/arm/kernel/process.c
+diff -Nur linux-3.10.36/arch/arm/kernel/process.c linux-solidrun/arch/arm/kernel/process.c
--- linux-3.10.36/arch/arm/kernel/process.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/process.c 2014-04-21 13:50:39.118713901 +0200
++++ linux-solidrun/arch/arm/kernel/process.c 2014-04-24 07:58:13.084169560 +0200
@@ -170,8 +170,10 @@
*/
void arch_cpu_idle(void)
@@ -40718,9 +19101,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/process.c linux-linaro-stable-mx6/arch/a
}
static char reboot_mode = 'h';
-diff -Nur linux-3.10.36/arch/arm/kernel/psci.c linux-linaro-stable-mx6/arch/arm/kernel/psci.c
+diff -Nur linux-3.10.36/arch/arm/kernel/psci.c linux-solidrun/arch/arm/kernel/psci.c
--- linux-3.10.36/arch/arm/kernel/psci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/psci.c 2014-04-21 13:50:39.118713901 +0200
++++ linux-solidrun/arch/arm/kernel/psci.c 2014-04-24 07:58:13.084169560 +0200
@@ -17,6 +17,7 @@
#include <linux/init.h>
@@ -40817,9 +19200,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/psci.c linux-linaro-stable-mx6/arch/arm/
}
-early_initcall(psci_init);
+early_param("psci", early_psci);
-diff -Nur linux-3.10.36/arch/arm/kernel/psci_smp.c linux-linaro-stable-mx6/arch/arm/kernel/psci_smp.c
+diff -Nur linux-3.10.36/arch/arm/kernel/psci_smp.c linux-solidrun/arch/arm/kernel/psci_smp.c
--- linux-3.10.36/arch/arm/kernel/psci_smp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/kernel/psci_smp.c 2014-04-21 13:50:39.118713901 +0200
++++ linux-solidrun/arch/arm/kernel/psci_smp.c 2014-04-24 07:58:13.084169560 +0200
@@ -0,0 +1,84 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -40905,9 +19288,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/psci_smp.c linux-linaro-stable-mx6/arch/
+ .smp_boot_secondary = psci_boot_secondary,
+ .cpu_die = psci_cpu_die,
+};
-diff -Nur linux-3.10.36/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arch/arm/kernel/setup.c
+diff -Nur linux-3.10.36/arch/arm/kernel/setup.c linux-solidrun/arch/arm/kernel/setup.c
--- linux-3.10.36/arch/arm/kernel/setup.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/setup.c 2014-04-21 13:50:39.118713901 +0200
++++ linux-solidrun/arch/arm/kernel/setup.c 2014-04-24 07:58:13.084169560 +0200
@@ -37,6 +37,7 @@
#include <asm/cputype.h>
#include <asm/elf.h>
@@ -41008,9 +19391,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arch/arm
smp_init_cpus();
}
#endif
-diff -Nur linux-3.10.36/arch/arm/kernel/sleep.S linux-linaro-stable-mx6/arch/arm/kernel/sleep.S
+diff -Nur linux-3.10.36/arch/arm/kernel/sleep.S linux-solidrun/arch/arm/kernel/sleep.S
--- linux-3.10.36/arch/arm/kernel/sleep.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/sleep.S 2014-04-21 13:50:39.122713918 +0200
++++ linux-solidrun/arch/arm/kernel/sleep.S 2014-04-24 07:58:13.084169560 +0200
@@ -4,6 +4,7 @@
#include <asm/assembler.h>
#include <asm/glue-cache.h>
@@ -41069,9 +19452,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/sleep.S linux-linaro-stable-mx6/arch/arm
+cpu_map_ptr:
+ .long __cpu_logical_map - .
+#endif
-diff -Nur linux-3.10.36/arch/arm/kernel/smp.c linux-linaro-stable-mx6/arch/arm/kernel/smp.c
+diff -Nur linux-3.10.36/arch/arm/kernel/smp.c linux-solidrun/arch/arm/kernel/smp.c
--- linux-3.10.36/arch/arm/kernel/smp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/smp.c 2014-04-21 13:50:39.122713918 +0200
++++ linux-solidrun/arch/arm/kernel/smp.c 2014-04-24 07:58:13.084169560 +0200
@@ -46,6 +46,9 @@
#include <asm/virt.h>
#include <asm/mach/arch.h>
@@ -41154,9 +19537,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/smp.c linux-linaro-stable-mx6/arch/arm/k
set_irq_regs(old_regs);
}
-diff -Nur linux-3.10.36/arch/arm/kernel/topology.c linux-linaro-stable-mx6/arch/arm/kernel/topology.c
+diff -Nur linux-3.10.36/arch/arm/kernel/topology.c linux-solidrun/arch/arm/kernel/topology.c
--- linux-3.10.36/arch/arm/kernel/topology.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/topology.c 2014-04-21 13:50:39.122713918 +0200
++++ linux-solidrun/arch/arm/kernel/topology.c 2014-04-24 07:58:13.088169573 +0200
@@ -23,6 +23,7 @@
#include <linux/slab.h>
@@ -41306,9 +19689,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/topology.c linux-linaro-stable-mx6/arch/
/*
* init_cpu_topology is called at boot when only one cpu is running
* which prevent simultaneous write access to cpu_topology array
-diff -Nur linux-3.10.36/arch/arm/kernel/traps.c linux-linaro-stable-mx6/arch/arm/kernel/traps.c
+diff -Nur linux-3.10.36/arch/arm/kernel/traps.c linux-solidrun/arch/arm/kernel/traps.c
--- linux-3.10.36/arch/arm/kernel/traps.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/traps.c 2014-04-21 13:50:39.122713918 +0200
++++ linux-solidrun/arch/arm/kernel/traps.c 2014-04-24 07:58:13.088169573 +0200
@@ -61,7 +61,7 @@
void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
{
@@ -41318,9 +19701,9 @@ diff -Nur linux-3.10.36/arch/arm/kernel/traps.c linux-linaro-stable-mx6/arch/arm
#else
printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
#endif
-diff -Nur linux-3.10.36/arch/arm/lib/backtrace.S linux-linaro-stable-mx6/arch/arm/lib/backtrace.S
+diff -Nur linux-3.10.36/arch/arm/lib/backtrace.S linux-solidrun/arch/arm/lib/backtrace.S
--- linux-3.10.36/arch/arm/lib/backtrace.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/lib/backtrace.S 2014-04-21 13:50:39.126713935 +0200
++++ linux-solidrun/arch/arm/lib/backtrace.S 2014-04-24 07:58:13.096169603 +0200
@@ -80,14 +80,14 @@
ldr r1, [sv_pc, #-4] @ if stmfd sp!, {args} exists,
@@ -41370,9 +19753,9 @@ diff -Nur linux-3.10.36/arch/arm/lib/backtrace.S linux-linaro-stable-mx6/arch/ar
+ .word 0xe92d0000 >> 11 @ stmfd sp!, {}
#endif
-diff -Nur linux-3.10.36/arch/arm/mach-exynos/mach-exynos5-dt.c linux-linaro-stable-mx6/arch/arm/mach-exynos/mach-exynos5-dt.c
+diff -Nur linux-3.10.36/arch/arm/mach-exynos/mach-exynos5-dt.c linux-solidrun/arch/arm/mach-exynos/mach-exynos5-dt.c
--- linux-3.10.36/arch/arm/mach-exynos/mach-exynos5-dt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-exynos/mach-exynos5-dt.c 2014-04-21 13:50:39.154714053 +0200
++++ linux-solidrun/arch/arm/mach-exynos/mach-exynos5-dt.c 2014-04-24 07:58:13.324170404 +0200
@@ -14,6 +14,7 @@
#include <linux/memblock.h>
#include <linux/io.h>
@@ -41425,9 +19808,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-exynos/mach-exynos5-dt.c linux-linaro-stab
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.10.36/arch/arm/mach-highbank/highbank.c linux-linaro-stable-mx6/arch/arm/mach-highbank/highbank.c
+diff -Nur linux-3.10.36/arch/arm/mach-highbank/highbank.c linux-solidrun/arch/arm/mach-highbank/highbank.c
--- linux-3.10.36/arch/arm/mach-highbank/highbank.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-highbank/highbank.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-highbank/highbank.c 2014-04-24 07:58:13.340170460 +0200
@@ -65,12 +65,14 @@
HB_JUMP_TABLE_PHYS(cpu) + 15);
}
@@ -41462,9 +19845,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-highbank/highbank.c linux-linaro-stable-mx
}
static void __init highbank_timer_init(void)
-diff -Nur linux-3.10.36/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/anatop.c linux-solidrun/arch/arm/mach-imx/anatop.c
--- linux-3.10.36/arch/arm/mach-imx/anatop.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/anatop.c 2014-04-24 07:58:13.392170644 +0200
@@ -9,6 +9,7 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -41640,9 +20023,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/arch/
+
+ imx_anatop_usb_chrg_detect_disable();
}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq_ddr3.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_ddr3.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq_ddr3.c linux-solidrun/arch/arm/mach-imx/busfreq_ddr3.c
--- linux-3.10.36/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_ddr3.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/busfreq_ddr3.c 2014-04-24 07:58:13.404170685 +0200
@@ -0,0 +1,476 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -42120,9 +20503,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq_ddr3.c linux-linaro-stable-mx6
+
+ return 0;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq-imx6.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq-imx6.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq-imx6.c linux-solidrun/arch/arm/mach-imx/busfreq-imx6.c
--- linux-3.10.36/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq-imx6.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/busfreq-imx6.c 2014-04-24 07:58:13.404170685 +0200
@@ -0,0 +1,938 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -43062,9 +21445,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq-imx6.c linux-linaro-stable-mx6
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("BusFreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq_lpddr2.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_lpddr2.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq_lpddr2.c linux-solidrun/arch/arm/mach-imx/busfreq_lpddr2.c
--- linux-3.10.36/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_lpddr2.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/busfreq_lpddr2.c 2014-04-24 07:58:13.404170685 +0200
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -43249,9 +21632,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/busfreq_lpddr2.c linux-linaro-stable-m
+
+ return 0;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk.c linux-solidrun/arch/arm/mach-imx/clk.c
--- linux-3.10.36/arch/arm/mach-imx/clk.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk.c 2014-04-24 07:58:13.408170699 +0200
@@ -1,4 +1,65 @@
+#include <linux/clk.h>
+#include <linux/err.h>
@@ -43318,9 +21701,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk.c linux-linaro-stable-mx6/arch/arm
+ *val ^= CSCMR1_FIXUP;
+ return;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-fixup-div.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-div.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-fixup-div.c linux-solidrun/arch/arm/mach-imx/clk-fixup-div.c
--- linux-3.10.36/arch/arm/mach-imx/clk-fixup-div.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-div.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-fixup-div.c 2014-04-24 07:58:13.404170685 +0200
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -43451,9 +21834,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-fixup-div.c linux-linaro-stable-mx
+
+ return clk;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-fixup-mux.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-mux.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-fixup-mux.c linux-solidrun/arch/arm/mach-imx/clk-fixup-mux.c
--- linux-3.10.36/arch/arm/mach-imx/clk-fixup-mux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-mux.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-fixup-mux.c 2014-04-24 07:58:13.404170685 +0200
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -43562,9 +21945,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-fixup-mux.c linux-linaro-stable-mx
+
+ return clk;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-gate2.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-gate2.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-gate2.c linux-solidrun/arch/arm/mach-imx/clk-gate2.c
--- linux-3.10.36/arch/arm/mach-imx/clk-gate2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-gate2.c 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-gate2.c 2014-04-24 07:58:13.404170685 +0200
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2010-2011 Canonical Ltd <jeremy.kerr@canonical.com>
@@ -43582,9 +21965,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-gate2.c linux-linaro-stable-mx6/ar
return 1;
return 0;
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk.h linux-linaro-stable-mx6/arch/arm/mach-imx/clk.h
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk.h linux-solidrun/arch/arm/mach-imx/clk.h
--- linux-3.10.36/arch/arm/mach-imx/clk.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk.h 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk.h 2014-04-24 07:58:13.408170699 +0200
@@ -6,6 +6,8 @@
extern spinlock_t imx_ccm_lock;
@@ -43628,9 +22011,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk.h linux-linaro-stable-mx6/arch/arm
static inline struct clk *imx_clk_fixed(const char *name, int rate)
{
return clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate);
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx51-imx53.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx51-imx53.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx51-imx53.c linux-solidrun/arch/arm/mach-imx/clk-imx51-imx53.c
--- linux-3.10.36/arch/arm/mach-imx/clk-imx51-imx53.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx51-imx53.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-imx51-imx53.c 2014-04-24 07:58:13.408170699 +0200
@@ -123,11 +123,13 @@
{
int i;
@@ -43694,9 +22077,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx51-imx53.c linux-linaro-stable-
+ return mx53_clocks_init(0, 0, 0, 0);
}
-#endif
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6q.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx6q.c linux-solidrun/arch/arm/mach-imx/clk-imx6q.c
--- linux-3.10.36/arch/arm/mach-imx/clk-imx6q.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6q.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-imx6q.c 2014-04-24 07:58:13.408170699 +0200
@@ -14,7 +14,6 @@
#include <linux/types.h>
#include <linux/clk.h>
@@ -44353,9 +22736,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx6q.c linux-linaro-stable-mx6/ar
- return 0;
}
+CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6sl.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx6sl.c linux-solidrun/arch/arm/mach-imx/clk-imx6sl.c
--- linux-3.10.36/arch/arm/mach-imx/clk-imx6sl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6sl.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-imx6sl.c 2014-04-24 07:58:13.408170699 +0200
@@ -0,0 +1,493 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -44850,9 +23233,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-imx6sl.c linux-linaro-stable-mx6/a
+ mxc_timer_init(base, irq);
+}
+CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init);
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-pfd.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pfd.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-pfd.c linux-solidrun/arch/arm/mach-imx/clk-pfd.c
--- linux-3.10.36/arch/arm/mach-imx/clk-pfd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pfd.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-pfd.c 2014-04-24 07:58:13.408170699 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -44956,9 +23339,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-pfd.c linux-linaro-stable-mx6/arch
};
struct clk *imx_clk_pfd(const char *name, const char *parent_name,
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-pllv3.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pllv3.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-pllv3.c linux-solidrun/arch/arm/mach-imx/clk-pllv3.c
--- linux-3.10.36/arch/arm/mach-imx/clk-pllv3.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pllv3.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-pllv3.c 2014-04-24 07:58:13.408170699 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -45350,9 +23733,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-pllv3.c linux-linaro-stable-mx6/ar
init.name = name;
init.ops = ops;
-diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-vf610.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-vf610.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-vf610.c linux-solidrun/arch/arm/mach-imx/clk-vf610.c
--- linux-3.10.36/arch/arm/mach-imx/clk-vf610.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-vf610.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/clk-vf610.c 2014-04-24 07:58:13.408170699 +0200
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -45675,9 +24058,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/clk-vf610.c linux-linaro-stable-mx6/ar
+ of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
+}
+CLK_OF_DECLARE(vf610, "fsl,vf610-ccm", vf610_clocks_init);
-diff -Nur linux-3.10.36/arch/arm/mach-imx/common.h linux-linaro-stable-mx6/arch/arm/mach-imx/common.h
+diff -Nur linux-3.10.36/arch/arm/mach-imx/common.h linux-solidrun/arch/arm/mach-imx/common.h
--- linux-3.10.36/arch/arm/mach-imx/common.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/common.h 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/common.h 2014-04-24 07:58:13.408170699 +0200
@@ -14,6 +14,7 @@
struct platform_device;
struct pt_regs;
@@ -45772,9 +24155,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/common.h linux-linaro-stable-mx6/arch/
extern struct smp_operations imx_smp_ops;
#endif
-diff -Nur linux-3.10.36/arch/arm/mach-imx/cpu.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpu.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/cpu.c linux-solidrun/arch/arm/mach-imx/cpu.c
--- linux-3.10.36/arch/arm/mach-imx/cpu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpu.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/cpu.c 2014-04-24 07:58:13.424170756 +0200
@@ -1,6 +1,9 @@
#include <linux/module.h>
@@ -45897,9 +24280,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/cpu.c linux-linaro-stable-mx6/arch/arm
+ kfree(soc_dev_attr);
+ return NULL;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h
+diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle.h linux-solidrun/arch/arm/mach-imx/cpuidle.h
--- linux-3.10.36/arch/arm/mach-imx/cpuidle.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/cpuidle.h 2014-04-24 07:58:13.424170756 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -45924,9 +24307,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6/arch
+ return 0;
+}
#endif
-diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6q.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6q.c linux-solidrun/arch/arm/mach-imx/cpuidle-imx6q.c
--- linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6q.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6q.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/cpuidle-imx6q.c 2014-04-24 07:58:13.424170756 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -45957,9 +24340,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6q.c linux-linaro-stable-mx
return cpuidle_register(&imx6q_cpuidle_driver, NULL);
}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6sl.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6sl.c linux-solidrun/arch/arm/mach-imx/cpuidle-imx6sl.c
--- linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6sl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-04-24 07:58:13.424170756 +0200
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc.
@@ -46106,9 +24489,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/cpuidle-imx6sl.c linux-linaro-stable-m
+
+ return cpuidle_register(&imx6sl_cpuidle_driver, NULL);
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/ddr3_freq_imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/ddr3_freq_imx6.S
+diff -Nur linux-3.10.36/arch/arm/mach-imx/ddr3_freq_imx6.S linux-solidrun/arch/arm/mach-imx/ddr3_freq_imx6.S
--- linux-3.10.36/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-04-21 13:50:39.162714087 +0200
++++ linux-solidrun/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-04-24 07:58:13.424170756 +0200
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -47003,9 +25386,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/ddr3_freq_imx6.S linux-linaro-stable-m
+ENTRY(mx6_do_ddr_freq_change)
+ .word mx6_ddr3_freq_change
+ .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change
-diff -Nur linux-3.10.36/arch/arm/mach-imx/gpc.c linux-linaro-stable-mx6/arch/arm/mach-imx/gpc.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/gpc.c linux-solidrun/arch/arm/mach-imx/gpc.c
--- linux-3.10.36/arch/arm/mach-imx/gpc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/gpc.c 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/gpc.c 2014-04-24 07:58:13.432170783 +0200
@@ -10,30 +10,127 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -47482,9 +25865,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/gpc.c linux-linaro-stable-mx6/arch/arm
+MODULE_AUTHOR("Anson Huang <b20788@freescale.com>");
+MODULE_DESCRIPTION("Freescale i.MX GPC driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/arch/arm/mach-imx/hardware.h linux-linaro-stable-mx6/arch/arm/mach-imx/hardware.h
+diff -Nur linux-3.10.36/arch/arm/mach-imx/hardware.h linux-solidrun/arch/arm/mach-imx/hardware.h
--- linux-3.10.36/arch/arm/mach-imx/hardware.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/hardware.h 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/hardware.h 2014-04-24 07:58:13.432170783 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -47510,9 +25893,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/hardware.h linux-linaro-stable-mx6/arc
#include "mx3x.h"
#include "mx31.h"
#include "mx35.h"
-diff -Nur linux-3.10.36/arch/arm/mach-imx/hotplug.c linux-linaro-stable-mx6/arch/arm/mach-imx/hotplug.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/hotplug.c linux-solidrun/arch/arm/mach-imx/hotplug.c
--- linux-3.10.36/arch/arm/mach-imx/hotplug.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/hotplug.c 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/hotplug.c 2014-04-24 07:58:13.448170840 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Freescale Semiconductor, Inc.
@@ -47530,9 +25913,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/hotplug.c linux-linaro-stable-mx6/arch
}
int imx_cpu_kill(unsigned int cpu)
-diff -Nur linux-3.10.36/arch/arm/mach-imx/imx25-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx25-dt.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/imx25-dt.c linux-solidrun/arch/arm/mach-imx/imx25-dt.c
--- linux-3.10.36/arch/arm/mach-imx/imx25-dt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx25-dt.c 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/imx25-dt.c 2014-04-24 07:58:13.448170840 +0200
@@ -19,6 +19,8 @@
static void __init imx25_dt_init(void)
@@ -47542,9 +25925,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/imx25-dt.c linux-linaro-stable-mx6/arc
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/imx27-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx27-dt.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/imx27-dt.c linux-solidrun/arch/arm/mach-imx/imx27-dt.c
--- linux-3.10.36/arch/arm/mach-imx/imx27-dt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx27-dt.c 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/imx27-dt.c 2014-04-24 07:58:13.448170840 +0200
@@ -22,6 +22,8 @@
{
struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
@@ -47554,9 +25937,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/imx27-dt.c linux-linaro-stable-mx6/arc
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
platform_device_register_full(&devinfo);
-diff -Nur linux-3.10.36/arch/arm/mach-imx/imx31-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx31-dt.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/imx31-dt.c linux-solidrun/arch/arm/mach-imx/imx31-dt.c
--- linux-3.10.36/arch/arm/mach-imx/imx31-dt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx31-dt.c 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/imx31-dt.c 2014-04-24 07:58:13.448170840 +0200
@@ -20,6 +20,8 @@
static void __init imx31_dt_init(void)
@@ -47566,9 +25949,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/imx31-dt.c linux-linaro-stable-mx6/arc
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/imx51-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx51-dt.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/imx51-dt.c linux-solidrun/arch/arm/mach-imx/imx51-dt.c
--- linux-3.10.36/arch/arm/mach-imx/imx51-dt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx51-dt.c 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/imx51-dt.c 2014-04-24 07:58:13.448170840 +0200
@@ -23,6 +23,8 @@
{
struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
@@ -47578,9 +25961,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/imx51-dt.c linux-linaro-stable-mx6/arc
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
platform_device_register_full(&devinfo);
}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/imx6sl_wfi.S linux-linaro-stable-mx6/arch/arm/mach-imx/imx6sl_wfi.S
+diff -Nur linux-3.10.36/arch/arm/mach-imx/imx6sl_wfi.S linux-solidrun/arch/arm/mach-imx/imx6sl_wfi.S
--- linux-3.10.36/arch/arm/mach-imx/imx6sl_wfi.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx6sl_wfi.S 2014-04-21 13:50:39.166714104 +0200
++++ linux-solidrun/arch/arm/mach-imx/imx6sl_wfi.S 2014-04-24 07:58:13.452170854 +0200
@@ -0,0 +1,639 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -48221,9 +26604,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/imx6sl_wfi.S linux-linaro-stable-mx6/a
+
+ /* Restore registers */
+ mov pc, lr
-diff -Nur linux-3.10.36/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig
+diff -Nur linux-3.10.36/arch/arm/mach-imx/Kconfig linux-solidrun/arch/arm/mach-imx/Kconfig
--- linux-3.10.36/arch/arm/mach-imx/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/Kconfig 2014-04-24 07:58:13.392170644 +0200
@@ -1,5 +1,6 @@
config ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
@@ -48306,9 +26689,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/arch/a
endif
source "arch/arm/mach-imx/devices/Kconfig"
-diff -Nur linux-3.10.36/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/lpddr2_freq_imx6.S
+diff -Nur linux-3.10.36/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-solidrun/arch/arm/mach-imx/lpddr2_freq_imx6.S
--- linux-3.10.36/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-04-21 13:50:39.170714121 +0200
++++ linux-solidrun/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-04-24 07:58:13.456170868 +0200
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -48794,9 +27177,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-linaro-stable
+ENTRY(mx6_lpddr2_do_iram)
+ .word mx6_lpddr2_freq_change
+ .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx53.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx53.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx53.c linux-solidrun/arch/arm/mach-imx/mach-imx53.c
--- linux-3.10.36/arch/arm/mach-imx/mach-imx53.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx53.c 2014-04-21 13:50:39.170714121 +0200
++++ linux-solidrun/arch/arm/mach-imx/mach-imx53.c 2014-04-24 07:58:13.456170868 +0200
@@ -21,6 +21,7 @@
#include <asm/mach/time.h>
@@ -48814,9 +27197,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx53.c linux-linaro-stable-mx6/a
if (of_machine_is_compatible("fsl,imx53-qsb"))
imx53_qsb_init();
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6q.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx6q.c linux-solidrun/arch/arm/mach-imx/mach-imx6q.c
--- linux-3.10.36/arch/arm/mach-imx/mach-imx6q.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6q.c 2014-04-21 13:50:39.170714121 +0200
++++ linux-solidrun/arch/arm/mach-imx/mach-imx6q.c 2014-04-24 07:58:13.460170881 +0200
@@ -10,12 +10,14 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -49418,9 +27801,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx6q.c linux-linaro-stable-mx6/a
- .restart = imx6q_restart,
+ .restart = mxc_restart,
MACHINE_END
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6sl.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx6sl.c linux-solidrun/arch/arm/mach-imx/mach-imx6sl.c
--- linux-3.10.36/arch/arm/mach-imx/mach-imx6sl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6sl.c 2014-04-21 13:50:39.170714121 +0200
++++ linux-solidrun/arch/arm/mach-imx/mach-imx6sl.c 2014-04-24 07:58:13.460170881 +0200
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -49571,9 +27954,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-imx6sl.c linux-linaro-stable-mx6/
+ .dt_compat = imx6sl_dt_compat,
+ .restart = mxc_restart,
+MACHINE_END
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-vf610.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-vf610.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-vf610.c linux-solidrun/arch/arm/mach-imx/mach-vf610.c
--- linux-3.10.36/arch/arm/mach-imx/mach-vf610.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-vf610.c 2014-04-21 13:50:39.170714121 +0200
++++ linux-solidrun/arch/arm/mach-imx/mach-vf610.c 2014-04-24 07:58:13.460170881 +0200
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -49625,9 +28008,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mach-vf610.c linux-linaro-stable-mx6/a
+ .dt_compat = vf610_dt_compat,
+ .restart = mxc_restart,
+MACHINE_END
-diff -Nur linux-3.10.36/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile
+diff -Nur linux-3.10.36/arch/arm/mach-imx/Makefile linux-solidrun/arch/arm/mach-imx/Makefile
--- linux-3.10.36/arch/arm/mach-imx/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile 2014-04-21 13:50:39.158714070 +0200
++++ linux-solidrun/arch/arm/mach-imx/Makefile 2014-04-24 07:58:13.392170644 +0200
@@ -15,7 +15,8 @@
obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y)
@@ -49676,9 +28059,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/arch/
+obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o
+
obj-y += devices/
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx1.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx1.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx1.c linux-solidrun/arch/arm/mach-imx/mm-imx1.c
--- linux-3.10.36/arch/arm/mach-imx/mm-imx1.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx1.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mm-imx1.c 2014-04-24 07:58:13.464170896 +0200
@@ -39,7 +39,6 @@
void __init imx1_init_early(void)
{
@@ -49695,9 +28078,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx1.c linux-linaro-stable-mx6/arch
mxc_device_init();
mxc_register_gpio("imx1-gpio", 0, MX1_GPIO1_BASE_ADDR, SZ_256,
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx21.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx21.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx21.c linux-solidrun/arch/arm/mach-imx/mm-imx21.c
--- linux-3.10.36/arch/arm/mach-imx/mm-imx21.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx21.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mm-imx21.c 2014-04-24 07:58:13.464170896 +0200
@@ -66,7 +66,6 @@
void __init imx21_init_early(void)
{
@@ -49714,9 +28097,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx21.c linux-linaro-stable-mx6/arc
mxc_device_init();
mxc_register_gpio("imx21-gpio", 0, MX21_GPIO1_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx25.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx25.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx25.c linux-solidrun/arch/arm/mach-imx/mm-imx25.c
--- linux-3.10.36/arch/arm/mach-imx/mm-imx25.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx25.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mm-imx25.c 2014-04-24 07:58:13.464170896 +0200
@@ -54,7 +54,6 @@
{
mxc_set_cpu_type(MXC_CPU_MX25);
@@ -49733,9 +28116,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx25.c linux-linaro-stable-mx6/arc
mxc_device_init();
/* i.mx25 has the i.mx35 type gpio */
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx27.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx27.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx27.c linux-solidrun/arch/arm/mach-imx/mm-imx27.c
--- linux-3.10.36/arch/arm/mach-imx/mm-imx27.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx27.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mm-imx27.c 2014-04-24 07:58:13.468170911 +0200
@@ -66,7 +66,6 @@
void __init imx27_init_early(void)
{
@@ -49752,9 +28135,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx27.c linux-linaro-stable-mx6/arc
mxc_device_init();
/* i.mx27 has the i.mx21 type gpio */
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx3.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx3.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx3.c linux-solidrun/arch/arm/mach-imx/mm-imx3.c
--- linux-3.10.36/arch/arm/mach-imx/mm-imx3.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx3.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mm-imx3.c 2014-04-24 07:58:13.468170911 +0200
@@ -138,7 +138,6 @@
void __init imx31_init_early(void)
{
@@ -49787,9 +28170,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx3.c linux-linaro-stable-mx6/arch
mxc_device_init();
mxc_register_gpio("imx35-gpio", 0, MX35_GPIO1_BASE_ADDR, SZ_16K, MX35_INT_GPIO1, 0);
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx5.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx5.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx5.c linux-solidrun/arch/arm/mach-imx/mm-imx5.c
--- linux-3.10.36/arch/arm/mach-imx/mm-imx5.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx5.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mm-imx5.c 2014-04-24 07:58:13.468170911 +0200
@@ -83,7 +83,6 @@
imx51_ipu_mipi_setup();
mxc_set_cpu_type(MXC_CPU_MX51);
@@ -49814,9 +28197,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mm-imx5.c linux-linaro-stable-mx6/arch
mxc_device_init();
/* i.mx51 has the i.mx35 type gpio */
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mx6.h linux-linaro-stable-mx6/arch/arm/mach-imx/mx6.h
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mx6.h linux-solidrun/arch/arm/mach-imx/mx6.h
--- linux-3.10.36/arch/arm/mach-imx/mx6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mx6.h 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mx6.h 2014-04-24 07:58:13.468170911 +0200
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -49853,9 +28236,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mx6.h linux-linaro-stable-mx6/arch/arm
+
+#define MX6_SUSPEND_IRAM_SIZE 0x1000
+#endif
-diff -Nur linux-3.10.36/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h
+diff -Nur linux-3.10.36/arch/arm/mach-imx/mxc.h linux-solidrun/arch/arm/mach-imx/mxc.h
--- linux-3.10.36/arch/arm/mach-imx/mxc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/mxc.h 2014-04-24 07:58:13.468170911 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007, 2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -49900,9 +28283,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arch/arm
#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35())
#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27())
-diff -Nur linux-3.10.36/arch/arm/mach-imx/pm-imx6.c linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/pm-imx6.c linux-solidrun/arch/arm/mach-imx/pm-imx6.c
--- linux-3.10.36/arch/arm/mach-imx/pm-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/pm-imx6.c 2014-04-24 07:58:13.472170925 +0200
@@ -0,0 +1,379 @@
+/*
+ * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -50283,9 +28666,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/pm-imx6.c linux-linaro-stable-mx6/arch
+ else
+ cpu_type = MXC_CPU_IMX6SL;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/pm-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6q.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/pm-imx6q.c linux-solidrun/arch/arm/mach-imx/pm-imx6q.c
--- linux-3.10.36/arch/arm/mach-imx/pm-imx6q.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6q.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/arch/arm/mach-imx/pm-imx6q.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -50348,9 +28731,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/pm-imx6q.c linux-linaro-stable-mx6/arc
-{
- suspend_set_ops(&imx6q_pm_ops);
-}
-diff -Nur linux-3.10.36/arch/arm/mach-imx/src.c linux-linaro-stable-mx6/arch/arm/mach-imx/src.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/src.c linux-solidrun/arch/arm/mach-imx/src.c
--- linux-3.10.36/arch/arm/mach-imx/src.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/src.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/src.c 2014-04-24 07:58:13.472170925 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Freescale Semiconductor, Inc.
@@ -50388,9 +28771,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/src.c linux-linaro-stable-mx6/arch/arm
void __init imx_src_init(void)
{
struct device_node *np;
-diff -Nur linux-3.10.36/arch/arm/mach-imx/suspend-imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/suspend-imx6.S
+diff -Nur linux-3.10.36/arch/arm/mach-imx/suspend-imx6.S linux-solidrun/arch/arm/mach-imx/suspend-imx6.S
--- linux-3.10.36/arch/arm/mach-imx/suspend-imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/suspend-imx6.S 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/suspend-imx6.S 2014-04-24 07:58:13.476170939 +0200
@@ -0,0 +1,801 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -51193,9 +29576,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/suspend-imx6.S linux-linaro-stable-mx6
+ bic r7, r7, #0x1
+ str r7, [r8, #MX6Q_MMDC_MAPSR]
+ mov pc, lr
-diff -Nur linux-3.10.36/arch/arm/mach-imx/system.c linux-linaro-stable-mx6/arch/arm/mach-imx/system.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/system.c linux-solidrun/arch/arm/mach-imx/system.c
--- linux-3.10.36/arch/arm/mach-imx/system.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/system.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/system.c 2014-04-24 07:58:13.476170939 +0200
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 ARM Limited
@@ -51364,9 +29747,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/system.c linux-linaro-stable-mx6/arch/
+ l2x0_of_init(0, ~0UL);
}
+#endif
-diff -Nur linux-3.10.36/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/arch/arm/mach-imx/time.c
+diff -Nur linux-3.10.36/arch/arm/mach-imx/time.c linux-solidrun/arch/arm/mach-imx/time.c
--- linux-3.10.36/arch/arm/mach-imx/time.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/time.c 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-imx/time.c 2014-04-24 07:58:13.476170939 +0200
@@ -60,7 +60,11 @@
#define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
#define V2_TCTL_CLK_IPG (1 << 6)
@@ -51430,9 +29813,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/arch/ar
__raw_writel(tctl_val, timer_base + MXC_TCTL);
-diff -Nur linux-3.10.36/arch/arm/mach-integrator/Makefile linux-linaro-stable-mx6/arch/arm/mach-integrator/Makefile
+diff -Nur linux-3.10.36/arch/arm/mach-integrator/Makefile linux-solidrun/arch/arm/mach-integrator/Makefile
--- linux-3.10.36/arch/arm/mach-integrator/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-integrator/Makefile 2014-04-21 13:50:39.174714138 +0200
++++ linux-solidrun/arch/arm/mach-integrator/Makefile 2014-04-24 07:58:13.476170939 +0200
@@ -8,5 +8,5 @@
obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o
obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o
@@ -51440,9 +29823,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-integrator/Makefile linux-linaro-stable-mx
-obj-$(CONFIG_PCI) += pci_v3.o pci.o
+obj-$(CONFIG_PCI) += pci_v3.o
obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o
-diff -Nur linux-3.10.36/arch/arm/mach-integrator/pci.c linux-linaro-stable-mx6/arch/arm/mach-integrator/pci.c
+diff -Nur linux-3.10.36/arch/arm/mach-integrator/pci.c linux-solidrun/arch/arm/mach-integrator/pci.c
--- linux-3.10.36/arch/arm/mach-integrator/pci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-integrator/pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/arch/arm/mach-integrator/pci.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,113 +0,0 @@
-/*
- * linux/arch/arm/mach-integrator/pci-integrator.c
@@ -51557,9 +29940,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-integrator/pci.c linux-linaro-stable-mx6/a
-}
-
-subsys_initcall(integrator_pci_init);
-diff -Nur linux-3.10.36/arch/arm/mach-integrator/pci_v3.c linux-linaro-stable-mx6/arch/arm/mach-integrator/pci_v3.c
+diff -Nur linux-3.10.36/arch/arm/mach-integrator/pci_v3.c linux-solidrun/arch/arm/mach-integrator/pci_v3.c
--- linux-3.10.36/arch/arm/mach-integrator/pci_v3.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-integrator/pci_v3.c 2014-04-21 13:50:39.178714154 +0200
++++ linux-solidrun/arch/arm/mach-integrator/pci_v3.c 2014-04-24 07:58:13.480170953 +0200
@@ -35,6 +35,7 @@
#include <asm/signal.h>
#include <asm/mach/pci.h>
@@ -51687,9 +30070,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-integrator/pci_v3.c linux-linaro-stable-mx
+}
+
+subsys_initcall(integrator_pci_init);
-diff -Nur linux-3.10.36/arch/arm/mach-omap2/gpmc.c linux-linaro-stable-mx6/arch/arm/mach-omap2/gpmc.c
+diff -Nur linux-3.10.36/arch/arm/mach-omap2/gpmc.c linux-solidrun/arch/arm/mach-omap2/gpmc.c
--- linux-3.10.36/arch/arm/mach-omap2/gpmc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-omap2/gpmc.c 2014-04-21 13:50:39.230714374 +0200
++++ linux-solidrun/arch/arm/mach-omap2/gpmc.c 2014-04-24 07:58:13.756171923 +0200
@@ -1335,7 +1335,7 @@
of_property_read_bool(np, "gpmc,time-para-granularity");
}
@@ -51708,9 +30091,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-omap2/gpmc.c linux-linaro-stable-mx6/arch/
static int gpmc_probe_onenand_child(struct platform_device *pdev,
struct device_node *child)
{
-diff -Nur linux-3.10.36/arch/arm/mach-sa1100/include/mach/collie.h linux-linaro-stable-mx6/arch/arm/mach-sa1100/include/mach/collie.h
+diff -Nur linux-3.10.36/arch/arm/mach-sa1100/include/mach/collie.h linux-solidrun/arch/arm/mach-sa1100/include/mach/collie.h
--- linux-3.10.36/arch/arm/mach-sa1100/include/mach/collie.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-sa1100/include/mach/collie.h 2014-04-21 13:50:39.290714627 +0200
++++ linux-solidrun/arch/arm/mach-sa1100/include/mach/collie.h 2014-04-24 07:58:14.032172894 +0200
@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_COLLIE_H
#define __ASM_ARCH_COLLIE_H
@@ -51720,9 +30103,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-sa1100/include/mach/collie.h linux-linaro-
extern void locomolcd_power(int on);
#define COLLIE_SCOOP_GPIO_BASE (GPIO_MAX + 1)
-diff -Nur linux-3.10.36/arch/arm/mach-tegra/common.c linux-linaro-stable-mx6/arch/arm/mach-tegra/common.c
+diff -Nur linux-3.10.36/arch/arm/mach-tegra/common.c linux-solidrun/arch/arm/mach-tegra/common.c
--- linux-3.10.36/arch/arm/mach-tegra/common.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-tegra/common.c 2014-04-21 13:50:39.302714678 +0200
++++ linux-solidrun/arch/arm/mach-tegra/common.c 2014-04-24 07:58:14.124173218 +0200
@@ -22,7 +22,6 @@
#include <linux/io.h>
#include <linux/clk.h>
@@ -51752,9 +30135,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-tegra/common.c linux-linaro-stable-mx6/arc
cache_type = readl(p + L2X0_CACHE_TYPE);
aux_ctrl = (cache_type & 0x700) << (17-8);
aux_ctrl |= 0x7C400001;
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/core.h linux-linaro-stable-mx6/arch/arm/mach-vexpress/core.h
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/core.h linux-solidrun/arch/arm/mach-vexpress/core.h
--- linux-3.10.36/arch/arm/mach-vexpress/core.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/core.h 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/core.h 2014-04-24 07:58:14.164173359 +0200
@@ -6,6 +6,8 @@
void vexpress_dt_smp_map_io(void);
@@ -51764,9 +30147,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/core.h linux-linaro-stable-mx6/ar
extern struct smp_operations vexpress_smp_ops;
extern void vexpress_cpu_die(unsigned int cpu);
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/dcscb.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb.c
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/dcscb.c linux-solidrun/arch/arm/mach-vexpress/dcscb.c
--- linux-3.10.36/arch/arm/mach-vexpress/dcscb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb.c 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/dcscb.c 2014-04-24 07:58:14.164173359 +0200
@@ -0,0 +1,236 @@
+/*
+ * arch/arm/mach-vexpress/dcscb.c - Dual Cluster System Configuration Block
@@ -52004,9 +30387,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/dcscb.c linux-linaro-stable-mx6/a
+}
+
+early_initcall(dcscb_init);
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/dcscb_setup.S linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb_setup.S
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/dcscb_setup.S linux-solidrun/arch/arm/mach-vexpress/dcscb_setup.S
--- linux-3.10.36/arch/arm/mach-vexpress/dcscb_setup.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb_setup.S 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/dcscb_setup.S 2014-04-24 07:58:14.164173359 +0200
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/include/asm/dcscb_setup.S
@@ -52046,9 +30429,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/dcscb_setup.S linux-linaro-stable
+ bx lr
+
+ENDPROC(dcscb_power_up_setup)
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/include/mach/tc2.h linux-linaro-stable-mx6/arch/arm/mach-vexpress/include/mach/tc2.h
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/include/mach/tc2.h linux-solidrun/arch/arm/mach-vexpress/include/mach/tc2.h
--- linux-3.10.36/arch/arm/mach-vexpress/include/mach/tc2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/include/mach/tc2.h 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/include/mach/tc2.h 2014-04-24 07:58:14.164173359 +0200
@@ -0,0 +1,10 @@
+#ifndef __MACH_TC2_H
+#define __MACH_TC2_H
@@ -52060,9 +30443,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/include/mach/tc2.h linux-linaro-s
+#define TC2_MAX_CLUSTERS 2
+
+#endif
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/Kconfig linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/Kconfig linux-solidrun/arch/arm/mach-vexpress/Kconfig
--- linux-3.10.36/arch/arm/mach-vexpress/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/Kconfig 2014-04-24 07:58:14.164173359 +0200
@@ -1,5 +1,7 @@
config ARCH_VEXPRESS
bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7
@@ -52095,9 +30478,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/Kconfig linux-linaro-stable-mx6/a
+ Support for CPU and cluster power management on TC2.
endmenu
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/Makefile linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/Makefile linux-solidrun/arch/arm/mach-vexpress/Makefile
--- linux-3.10.36/arch/arm/mach-vexpress/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/Makefile 2014-04-24 07:58:14.164173359 +0200
@@ -6,5 +6,13 @@
obj-y := v2m.o
@@ -52112,9 +30495,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/Makefile linux-linaro-stable-mx6/
+endif
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/platsmp.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/platsmp.c
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/platsmp.c linux-solidrun/arch/arm/mach-vexpress/platsmp.c
--- linux-3.10.36/arch/arm/mach-vexpress/platsmp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/platsmp.c 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/platsmp.c 2014-04-24 07:58:14.168173373 +0200
@@ -12,9 +12,11 @@
#include <linux/errno.h>
#include <linux/smp.h>
@@ -52149,9 +30532,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/platsmp.c linux-linaro-stable-mx6
+#endif
+ return false;
+}
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm.c
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm.c linux-solidrun/arch/arm/mach-vexpress/tc2_pm.c
--- linux-3.10.36/arch/arm/mach-vexpress/tc2_pm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm.c 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/tc2_pm.c 2014-04-24 07:58:14.168173373 +0200
@@ -0,0 +1,277 @@
+/*
+ * arch/arm/mach-vexpress/tc2_pm.c - TC2 power management support
@@ -52430,9 +30813,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm.c linux-linaro-stable-mx6/
+}
+
+early_initcall(tc2_pm_init);
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_psci.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_psci.c
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_psci.c linux-solidrun/arch/arm/mach-vexpress/tc2_pm_psci.c
--- linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_psci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-04-24 07:58:14.168173373 +0200
@@ -0,0 +1,173 @@
+/*
+ * arch/arm/mach-vexpress/tc2_pm_psci.c - TC2 PSCI support
@@ -52607,9 +30990,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_psci.c linux-linaro-stable
+}
+
+early_initcall(tc2_pm_psci_init);
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_setup.S linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_setup.S
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_setup.S linux-solidrun/arch/arm/mach-vexpress/tc2_pm_setup.S
--- linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_setup.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_setup.S 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/tc2_pm_setup.S 2014-04-24 07:58:14.168173373 +0200
@@ -0,0 +1,68 @@
+/*
+ * arch/arm/include/asm/tc2_pm_setup.S
@@ -52679,9 +31062,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/tc2_pm_setup.S linux-linaro-stabl
+ bx lr
+
+ENDPROC(tc2_pm_power_up_setup)
-diff -Nur linux-3.10.36/arch/arm/mach-vexpress/v2m.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/v2m.c
+diff -Nur linux-3.10.36/arch/arm/mach-vexpress/v2m.c linux-solidrun/arch/arm/mach-vexpress/v2m.c
--- linux-3.10.36/arch/arm/mach-vexpress/v2m.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/v2m.c 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-vexpress/v2m.c 2014-04-24 07:58:14.168173373 +0200
@@ -10,6 +10,7 @@
#include <linux/smp.h>
#include <linux/init.h>
@@ -52739,17 +31122,17 @@ diff -Nur linux-3.10.36/arch/arm/mach-vexpress/v2m.c linux-linaro-stable-mx6/arc
.map_io = v2m_dt_map_io,
.init_early = v2m_dt_init_early,
.init_irq = irqchip_init,
-diff -Nur linux-3.10.36/arch/arm/mach-virt/Makefile linux-linaro-stable-mx6/arch/arm/mach-virt/Makefile
+diff -Nur linux-3.10.36/arch/arm/mach-virt/Makefile linux-solidrun/arch/arm/mach-virt/Makefile
--- linux-3.10.36/arch/arm/mach-virt/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-virt/Makefile 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-virt/Makefile 2014-04-24 07:58:14.168173373 +0200
@@ -3,4 +3,3 @@
#
obj-y := virt.o
-obj-$(CONFIG_SMP) += platsmp.o
-diff -Nur linux-3.10.36/arch/arm/mach-virt/platsmp.c linux-linaro-stable-mx6/arch/arm/mach-virt/platsmp.c
+diff -Nur linux-3.10.36/arch/arm/mach-virt/platsmp.c linux-solidrun/arch/arm/mach-virt/platsmp.c
--- linux-3.10.36/arch/arm/mach-virt/platsmp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-virt/platsmp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/arch/arm/mach-virt/platsmp.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-/*
- * Dummy Virtual Machine - does what it says on the tin.
@@ -52801,9 +31184,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-virt/platsmp.c linux-linaro-stable-mx6/arc
- .smp_prepare_cpus = virt_smp_prepare_cpus,
- .smp_boot_secondary = virt_boot_secondary,
-};
-diff -Nur linux-3.10.36/arch/arm/mach-virt/virt.c linux-linaro-stable-mx6/arch/arm/mach-virt/virt.c
+diff -Nur linux-3.10.36/arch/arm/mach-virt/virt.c linux-solidrun/arch/arm/mach-virt/virt.c
--- linux-3.10.36/arch/arm/mach-virt/virt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-virt/virt.c 2014-04-21 13:50:39.314714728 +0200
++++ linux-solidrun/arch/arm/mach-virt/virt.c 2014-04-24 07:58:14.168173373 +0200
@@ -36,11 +36,8 @@
NULL
};
@@ -52816,9 +31199,9 @@ diff -Nur linux-3.10.36/arch/arm/mach-virt/virt.c linux-linaro-stable-mx6/arch/a
- .smp = smp_ops(virt_smp_ops),
.dt_compat = virt_dt_match,
MACHINE_END
-diff -Nur linux-3.10.36/arch/arm/mm/cache-v7.S linux-linaro-stable-mx6/arch/arm/mm/cache-v7.S
+diff -Nur linux-3.10.36/arch/arm/mm/cache-v7.S linux-solidrun/arch/arm/mm/cache-v7.S
--- linux-3.10.36/arch/arm/mm/cache-v7.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/cache-v7.S 2014-04-21 13:50:39.318714745 +0200
++++ linux-solidrun/arch/arm/mm/cache-v7.S 2014-04-24 07:58:14.188173444 +0200
@@ -146,18 +146,18 @@
ldr r7, =0x7fff
ands r7, r7, r1, lsr #13 @ extract max number of the index size
@@ -52845,9 +31228,9 @@ diff -Nur linux-3.10.36/arch/arm/mm/cache-v7.S linux-linaro-stable-mx6/arch/arm/
bge loop1
skip:
add r10, r10, #2 @ increment cache number
-diff -Nur linux-3.10.36/arch/arm/mm/dma-mapping.c linux-linaro-stable-mx6/arch/arm/mm/dma-mapping.c
+diff -Nur linux-3.10.36/arch/arm/mm/dma-mapping.c linux-solidrun/arch/arm/mm/dma-mapping.c
--- linux-3.10.36/arch/arm/mm/dma-mapping.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/dma-mapping.c 2014-04-21 13:50:39.318714745 +0200
++++ linux-solidrun/arch/arm/mm/dma-mapping.c 2014-04-24 07:58:14.188173444 +0200
@@ -1311,7 +1311,7 @@
*handle = DMA_ERROR_CODE;
size = PAGE_ALIGN(size);
@@ -52857,9 +31240,9 @@ diff -Nur linux-3.10.36/arch/arm/mm/dma-mapping.c linux-linaro-stable-mx6/arch/a
return __iommu_alloc_atomic(dev, size, handle);
pages = __iommu_alloc_buffer(dev, size, gfp, attrs);
-diff -Nur linux-3.10.36/arch/arm/mm/fault.c linux-linaro-stable-mx6/arch/arm/mm/fault.c
+diff -Nur linux-3.10.36/arch/arm/mm/fault.c linux-solidrun/arch/arm/mm/fault.c
--- linux-3.10.36/arch/arm/mm/fault.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/fault.c 2014-04-21 13:50:39.318714745 +0200
++++ linux-solidrun/arch/arm/mm/fault.c 2014-04-24 07:58:14.188173444 +0200
@@ -446,8 +446,16 @@
if (pud_none(*pud_k))
@@ -52889,9 +31272,9 @@ diff -Nur linux-3.10.36/arch/arm/mm/fault.c linux-linaro-stable-mx6/arch/arm/mm/
return 0;
bad_area:
-diff -Nur linux-3.10.36/arch/arm/mm/proc-v6.S linux-linaro-stable-mx6/arch/arm/mm/proc-v6.S
+diff -Nur linux-3.10.36/arch/arm/mm/proc-v6.S linux-solidrun/arch/arm/mm/proc-v6.S
--- linux-3.10.36/arch/arm/mm/proc-v6.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/proc-v6.S 2014-04-21 13:50:39.322714762 +0200
++++ linux-solidrun/arch/arm/mm/proc-v6.S 2014-04-24 07:58:14.192173457 +0200
@@ -206,6 +206,7 @@
mcr p15, 0, r0, c7, c14, 0 @ clean+invalidate D cache
mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache
@@ -52909,9 +31292,9 @@ diff -Nur linux-3.10.36/arch/arm/mm/proc-v6.S linux-linaro-stable-mx6/arch/arm/m
adr r5, v6_crval
ldmia r5, {r5, r6}
#ifdef CONFIG_CPU_ENDIAN_BE8
-diff -Nur linux-3.10.36/arch/arm/mm/proc-v7.S linux-linaro-stable-mx6/arch/arm/mm/proc-v7.S
+diff -Nur linux-3.10.36/arch/arm/mm/proc-v7.S linux-solidrun/arch/arm/mm/proc-v7.S
--- linux-3.10.36/arch/arm/mm/proc-v7.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/proc-v7.S 2014-04-21 13:50:39.322714762 +0200
++++ linux-solidrun/arch/arm/mm/proc-v7.S 2014-04-24 07:58:14.196173471 +0200
@@ -329,6 +329,7 @@
3: mov r10, #0
@@ -52928,9 +31311,9 @@ diff -Nur linux-3.10.36/arch/arm/mm/proc-v7.S linux-linaro-stable-mx6/arch/arm/m
#ifndef CONFIG_ARM_THUMBEE
mrc p15, 0, r0, c0, c1, 0 @ read ID_PFR0 for ThumbEE
and r0, r0, #(0xf << 12) @ ThumbEE enabled field
-diff -Nur linux-3.10.36/arch/arm/plat-versatile/headsmp.S linux-linaro-stable-mx6/arch/arm/plat-versatile/headsmp.S
+diff -Nur linux-3.10.36/arch/arm/plat-versatile/headsmp.S linux-solidrun/arch/arm/plat-versatile/headsmp.S
--- linux-3.10.36/arch/arm/plat-versatile/headsmp.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/plat-versatile/headsmp.S 2014-04-21 13:50:39.338714829 +0200
++++ linux-solidrun/arch/arm/plat-versatile/headsmp.S 2014-04-24 07:58:14.244173640 +0200
@@ -11,8 +11,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
@@ -52940,9 +31323,9 @@ diff -Nur linux-3.10.36/arch/arm/plat-versatile/headsmp.S linux-linaro-stable-mx
/*
* Realview/Versatile Express specific entry point for secondary CPUs.
* This provides a "holding pen" into which all secondary cores are held
-diff -Nur linux-3.10.36/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-linaro-stable-mx6/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
+diff -Nur linux-3.10.36/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-solidrun/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
--- linux-3.10.36/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-04-21 13:50:39.338714829 +0200
++++ linux-solidrun/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-04-24 07:58:14.252173668 +0200
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) 2013, ARM Limited. All rights reserved.
@@ -53231,9 +31614,9 @@ diff -Nur linux-3.10.36/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-linaro
+ };
+ };
+};
-diff -Nur linux-3.10.36/arch/arm64/boot/dts/Makefile linux-linaro-stable-mx6/arch/arm64/boot/dts/Makefile
+diff -Nur linux-3.10.36/arch/arm64/boot/dts/Makefile linux-solidrun/arch/arm64/boot/dts/Makefile
--- linux-3.10.36/arch/arm64/boot/dts/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/Makefile 2014-04-21 13:50:39.338714829 +0200
++++ linux-solidrun/arch/arm64/boot/dts/Makefile 2014-04-24 07:58:14.252173668 +0200
@@ -1,4 +1,5 @@
-dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
+dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
@@ -53241,9 +31624,9 @@ diff -Nur linux-3.10.36/arch/arm64/boot/dts/Makefile linux-linaro-stable-mx6/arc
targets += dtbs
targets += $(dtb-y)
-diff -Nur linux-3.10.36/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
+diff -Nur linux-3.10.36/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-solidrun/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
--- linux-3.10.36/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-04-21 13:50:39.338714829 +0200
++++ linux-solidrun/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-04-24 07:58:14.252173668 +0200
@@ -182,6 +182,15 @@
interrupts = <14>;
clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
@@ -53260,9 +31643,9 @@ diff -Nur linux-3.10.36/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-linar
};
};
-diff -Nur linux-3.10.36/arch/arm64/include/asm/cacheflush.h linux-linaro-stable-mx6/arch/arm64/include/asm/cacheflush.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/cacheflush.h linux-solidrun/arch/arm64/include/asm/cacheflush.h
--- linux-3.10.36/arch/arm64/include/asm/cacheflush.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/cacheflush.h 2014-04-21 13:50:39.342714846 +0200
++++ linux-solidrun/arch/arm64/include/asm/cacheflush.h 2014-04-24 07:58:14.256173683 +0200
@@ -116,7 +116,6 @@
static inline void __flush_icache_all(void)
{
@@ -53271,9 +31654,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/cacheflush.h linux-linaro-stable-
}
#define flush_dcache_mmap_lock(mapping) \
-diff -Nur linux-3.10.36/arch/arm64/include/asm/cmpxchg.h linux-linaro-stable-mx6/arch/arm64/include/asm/cmpxchg.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/cmpxchg.h linux-solidrun/arch/arm64/include/asm/cmpxchg.h
--- linux-3.10.36/arch/arm64/include/asm/cmpxchg.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/cmpxchg.h 2014-04-21 13:50:39.342714846 +0200
++++ linux-solidrun/arch/arm64/include/asm/cmpxchg.h 2014-04-24 07:58:14.256173683 +0200
@@ -158,17 +158,23 @@
return ret;
}
@@ -53308,9 +31691,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/cmpxchg.h linux-linaro-stable-mx6
#define cmpxchg64(ptr,o,n) cmpxchg((ptr),(o),(n))
#define cmpxchg64_local(ptr,o,n) cmpxchg_local((ptr),(o),(n))
-diff -Nur linux-3.10.36/arch/arm64/include/asm/cpu_ops.h linux-linaro-stable-mx6/arch/arm64/include/asm/cpu_ops.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/cpu_ops.h linux-solidrun/arch/arm64/include/asm/cpu_ops.h
--- linux-3.10.36/arch/arm64/include/asm/cpu_ops.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/cpu_ops.h 2014-04-21 13:50:39.342714846 +0200
++++ linux-solidrun/arch/arm64/include/asm/cpu_ops.h 2014-04-24 07:58:14.256173683 +0200
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 ARM Ltd.
@@ -53371,9 +31754,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/cpu_ops.h linux-linaro-stable-mx6
+extern void __init cpu_read_bootcpu_ops(void);
+
+#endif /* ifndef __ASM_CPU_OPS_H */
-diff -Nur linux-3.10.36/arch/arm64/include/asm/irq.h linux-linaro-stable-mx6/arch/arm64/include/asm/irq.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/irq.h linux-solidrun/arch/arm64/include/asm/irq.h
--- linux-3.10.36/arch/arm64/include/asm/irq.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/irq.h 2014-04-21 13:50:39.342714846 +0200
++++ linux-solidrun/arch/arm64/include/asm/irq.h 2014-04-24 07:58:14.260173697 +0200
@@ -4,6 +4,7 @@
#include <asm-generic/irq.h>
@@ -53382,9 +31765,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/irq.h linux-linaro-stable-mx6/arc
extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
#endif
-diff -Nur linux-3.10.36/arch/arm64/include/asm/pgtable-3level-types.h linux-linaro-stable-mx6/arch/arm64/include/asm/pgtable-3level-types.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/pgtable-3level-types.h linux-solidrun/arch/arm64/include/asm/pgtable-3level-types.h
--- linux-3.10.36/arch/arm64/include/asm/pgtable-3level-types.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/pgtable-3level-types.h 2014-04-21 13:50:39.342714846 +0200
++++ linux-solidrun/arch/arm64/include/asm/pgtable-3level-types.h 2014-04-24 07:58:14.260173697 +0200
@@ -16,6 +16,8 @@
#ifndef __ASM_PGTABLE_3LEVEL_TYPES_H
#define __ASM_PGTABLE_3LEVEL_TYPES_H
@@ -53394,9 +31777,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/pgtable-3level-types.h linux-lina
typedef u64 pteval_t;
typedef u64 pmdval_t;
typedef u64 pgdval_t;
-diff -Nur linux-3.10.36/arch/arm64/include/asm/psci.h linux-linaro-stable-mx6/arch/arm64/include/asm/psci.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/psci.h linux-solidrun/arch/arm64/include/asm/psci.h
--- linux-3.10.36/arch/arm64/include/asm/psci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/psci.h 2014-04-21 13:50:39.342714846 +0200
++++ linux-solidrun/arch/arm64/include/asm/psci.h 2014-04-24 07:58:14.260173697 +0200
@@ -14,25 +14,6 @@
#ifndef __ASM_PSCI_H
#define __ASM_PSCI_H
@@ -53423,9 +31806,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/psci.h linux-linaro-stable-mx6/ar
int psci_init(void);
#endif /* __ASM_PSCI_H */
-diff -Nur linux-3.10.36/arch/arm64/include/asm/smp.h linux-linaro-stable-mx6/arch/arm64/include/asm/smp.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/smp.h linux-solidrun/arch/arm64/include/asm/smp.h
--- linux-3.10.36/arch/arm64/include/asm/smp.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/smp.h 2014-04-21 13:50:39.346714863 +0200
++++ linux-solidrun/arch/arm64/include/asm/smp.h 2014-04-24 07:58:14.260173697 +0200
@@ -60,21 +60,14 @@
void *stack;
};
@@ -53452,9 +31835,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/smp.h linux-linaro-stable-mx6/arc
+extern void cpu_die(void);
#endif /* ifndef __ASM_SMP_H */
-diff -Nur linux-3.10.36/arch/arm64/include/asm/topology.h linux-linaro-stable-mx6/arch/arm64/include/asm/topology.h
+diff -Nur linux-3.10.36/arch/arm64/include/asm/topology.h linux-solidrun/arch/arm64/include/asm/topology.h
--- linux-3.10.36/arch/arm64/include/asm/topology.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/topology.h 2014-04-21 13:50:39.346714863 +0200
++++ linux-solidrun/arch/arm64/include/asm/topology.h 2014-04-24 07:58:14.260173697 +0200
@@ -0,0 +1,73 @@
+#ifndef _ASM_ARM_TOPOLOGY_H
+#define _ASM_ARM_TOPOLOGY_H
@@ -53529,9 +31912,9 @@ diff -Nur linux-3.10.36/arch/arm64/include/asm/topology.h linux-linaro-stable-mx
+#include <asm-generic/topology.h>
+
+#endif /* _ASM_ARM_TOPOLOGY_H */
-diff -Nur linux-3.10.36/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm64/Kconfig
+diff -Nur linux-3.10.36/arch/arm64/Kconfig linux-solidrun/arch/arm64/Kconfig
--- linux-3.10.36/arch/arm64/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/Kconfig 2014-04-21 13:50:39.338714829 +0200
++++ linux-solidrun/arch/arm64/Kconfig 2014-04-24 07:58:14.252173668 +0200
@@ -144,12 +144,139 @@
If you don't know what to do here, say N.
@@ -53687,9 +32070,9 @@ diff -Nur linux-3.10.36/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm64/Kc
source "net/Kconfig"
source "drivers/Kconfig"
-diff -Nur linux-3.10.36/arch/arm64/kernel/cpu_ops.c linux-linaro-stable-mx6/arch/arm64/kernel/cpu_ops.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/cpu_ops.c linux-solidrun/arch/arm64/kernel/cpu_ops.c
--- linux-3.10.36/arch/arm64/kernel/cpu_ops.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/cpu_ops.c 2014-04-21 13:50:39.346714863 +0200
++++ linux-solidrun/arch/arm64/kernel/cpu_ops.c 2014-04-24 07:58:14.264173710 +0200
@@ -0,0 +1,99 @@
+/*
+ * CPU kernel entry/exit control
@@ -53790,9 +32173,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/cpu_ops.c linux-linaro-stable-mx6/arch
+ }
+ }
+}
-diff -Nur linux-3.10.36/arch/arm64/kernel/cputable.c linux-linaro-stable-mx6/arch/arm64/kernel/cputable.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/cputable.c linux-solidrun/arch/arm64/kernel/cputable.c
--- linux-3.10.36/arch/arm64/kernel/cputable.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/cputable.c 2014-04-21 13:50:39.346714863 +0200
++++ linux-solidrun/arch/arm64/kernel/cputable.c 2014-04-24 07:58:14.264173710 +0200
@@ -22,7 +22,7 @@
extern unsigned long __cpu_setup(void);
@@ -53802,9 +32185,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/cputable.c linux-linaro-stable-mx6/arc
{
.cpu_id_val = 0x000f0000,
.cpu_id_mask = 0x000f0000,
-diff -Nur linux-3.10.36/arch/arm64/kernel/head.S linux-linaro-stable-mx6/arch/arm64/kernel/head.S
+diff -Nur linux-3.10.36/arch/arm64/kernel/head.S linux-solidrun/arch/arm64/kernel/head.S
--- linux-3.10.36/arch/arm64/kernel/head.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/head.S 2014-04-21 13:50:39.346714863 +0200
++++ linux-solidrun/arch/arm64/kernel/head.S 2014-04-24 07:58:14.264173710 +0200
@@ -217,7 +217,6 @@
.quad PAGE_OFFSET
@@ -53831,9 +32214,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/head.S linux-linaro-stable-mx6/arch/ar
ENTRY(secondary_startup)
/*
-diff -Nur linux-3.10.36/arch/arm64/kernel/irq.c linux-linaro-stable-mx6/arch/arm64/kernel/irq.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/irq.c linux-solidrun/arch/arm64/kernel/irq.c
--- linux-3.10.36/arch/arm64/kernel/irq.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/irq.c 2014-04-21 13:50:39.346714863 +0200
++++ linux-solidrun/arch/arm64/kernel/irq.c 2014-04-24 07:58:14.264173710 +0200
@@ -81,3 +81,64 @@
if (!handle_arch_irq)
panic("No interrupt controller found.");
@@ -53899,9 +32282,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/irq.c linux-linaro-stable-mx6/arch/arm
+ local_irq_restore(flags);
+}
+#endif /* CONFIG_HOTPLUG_CPU */
-diff -Nur linux-3.10.36/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/arch/arm64/kernel/Makefile
+diff -Nur linux-3.10.36/arch/arm64/kernel/Makefile linux-solidrun/arch/arm64/kernel/Makefile
--- linux-3.10.36/arch/arm64/kernel/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/Makefile 2014-04-21 13:50:39.346714863 +0200
++++ linux-solidrun/arch/arm64/kernel/Makefile 2014-04-24 07:58:14.264173710 +0200
@@ -9,15 +9,16 @@
arm64-obj-y := cputable.o debug-monitors.o entry.o irq.o fpsimd.o \
entry-fpsimd.o process.o ptrace.o setup.o signal.o \
@@ -53921,9 +32304,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/arch/
obj-y += $(arm64-obj-y) vdso/
obj-m += $(arm64-obj-m)
-diff -Nur linux-3.10.36/arch/arm64/kernel/process.c linux-linaro-stable-mx6/arch/arm64/kernel/process.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/process.c linux-solidrun/arch/arm64/kernel/process.c
--- linux-3.10.36/arch/arm64/kernel/process.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/process.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/process.c 2014-04-24 07:58:14.268173724 +0200
@@ -102,6 +102,13 @@
local_irq_enable();
}
@@ -53938,9 +32321,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/process.c linux-linaro-stable-mx6/arch
void machine_shutdown(void)
{
#ifdef CONFIG_SMP
-diff -Nur linux-3.10.36/arch/arm64/kernel/psci.c linux-linaro-stable-mx6/arch/arm64/kernel/psci.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/psci.c linux-solidrun/arch/arm64/kernel/psci.c
--- linux-3.10.36/arch/arm64/kernel/psci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/psci.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/psci.c 2014-04-24 07:58:14.268173724 +0200
@@ -17,12 +17,32 @@
#include <linux/init.h>
@@ -54044,9 +32427,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/psci.c linux-linaro-stable-mx6/arch/ar
+};
+
+#endif
-diff -Nur linux-3.10.36/arch/arm64/kernel/setup.c linux-linaro-stable-mx6/arch/arm64/kernel/setup.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/setup.c linux-solidrun/arch/arm64/kernel/setup.c
--- linux-3.10.36/arch/arm64/kernel/setup.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/setup.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/setup.c 2014-04-24 07:58:14.268173724 +0200
@@ -45,6 +45,7 @@
#include <asm/cputype.h>
#include <asm/elf.h>
@@ -54075,9 +32458,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/setup.c linux-linaro-stable-mx6/arch/a
#ifdef CONFIG_SMP
smp_init_cpus();
#endif
-diff -Nur linux-3.10.36/arch/arm64/kernel/smp.c linux-linaro-stable-mx6/arch/arm64/kernel/smp.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/smp.c linux-solidrun/arch/arm64/kernel/smp.c
--- linux-3.10.36/arch/arm64/kernel/smp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/smp.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/smp.c 2014-04-24 07:58:14.268173724 +0200
@@ -39,6 +39,7 @@
#include <asm/atomic.h>
#include <asm/cacheflush.h>
@@ -54424,9 +32807,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/smp.c linux-linaro-stable-mx6/arch/arm
if (err)
continue;
-diff -Nur linux-3.10.36/arch/arm64/kernel/smp_psci.c linux-linaro-stable-mx6/arch/arm64/kernel/smp_psci.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/smp_psci.c linux-solidrun/arch/arm64/kernel/smp_psci.c
--- linux-3.10.36/arch/arm64/kernel/smp_psci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/smp_psci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/arch/arm64/kernel/smp_psci.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-/*
- * PSCI SMP initialisation
@@ -54481,9 +32864,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/smp_psci.c linux-linaro-stable-mx6/arc
- .init_cpu = smp_psci_init_cpu,
- .prepare_cpu = smp_psci_prepare_cpu,
-};
-diff -Nur linux-3.10.36/arch/arm64/kernel/smp_spin_table.c linux-linaro-stable-mx6/arch/arm64/kernel/smp_spin_table.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/smp_spin_table.c linux-solidrun/arch/arm64/kernel/smp_spin_table.c
--- linux-3.10.36/arch/arm64/kernel/smp_spin_table.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/smp_spin_table.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/smp_spin_table.c 2014-04-24 07:58:14.268173724 +0200
@@ -16,15 +16,39 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -54598,9 +32981,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/smp_spin_table.c linux-linaro-stable-m
+ .cpu_boot = smp_spin_table_cpu_boot,
+ .cpu_postboot = smp_spin_table_cpu_postboot,
};
-diff -Nur linux-3.10.36/arch/arm64/kernel/stacktrace.c linux-linaro-stable-mx6/arch/arm64/kernel/stacktrace.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/stacktrace.c linux-solidrun/arch/arm64/kernel/stacktrace.c
--- linux-3.10.36/arch/arm64/kernel/stacktrace.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/stacktrace.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/stacktrace.c 2014-04-24 07:58:14.268173724 +0200
@@ -48,11 +48,7 @@
frame->sp = fp + 0x10;
@@ -54614,9 +32997,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/stacktrace.c linux-linaro-stable-mx6/a
return 0;
}
-diff -Nur linux-3.10.36/arch/arm64/kernel/topology.c linux-linaro-stable-mx6/arch/arm64/kernel/topology.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/topology.c linux-solidrun/arch/arm64/kernel/topology.c
--- linux-3.10.36/arch/arm64/kernel/topology.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/topology.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/topology.c 2014-04-24 07:58:14.268173724 +0200
@@ -0,0 +1,537 @@
+/*
+ * arch/arm64/kernel/topology.c
@@ -55155,9 +33538,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/topology.c linux-linaro-stable-mx6/arc
+
+ parse_dt_topology();
+}
-diff -Nur linux-3.10.36/arch/arm64/kernel/vdso/gettimeofday.S linux-linaro-stable-mx6/arch/arm64/kernel/vdso/gettimeofday.S
+diff -Nur linux-3.10.36/arch/arm64/kernel/vdso/gettimeofday.S linux-solidrun/arch/arm64/kernel/vdso/gettimeofday.S
--- linux-3.10.36/arch/arm64/kernel/vdso/gettimeofday.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/vdso/gettimeofday.S 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/vdso/gettimeofday.S 2014-04-24 07:58:14.268173724 +0200
@@ -103,8 +103,6 @@
bl __do_get_tspec
seqcnt_check w9, 1b
@@ -55186,9 +33569,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/vdso/gettimeofday.S linux-linaro-stabl
7:
mov x30, x2
8: /* Syscall fallback. */
-diff -Nur linux-3.10.36/arch/arm64/kernel/vdso/Makefile linux-linaro-stable-mx6/arch/arm64/kernel/vdso/Makefile
+diff -Nur linux-3.10.36/arch/arm64/kernel/vdso/Makefile linux-solidrun/arch/arm64/kernel/vdso/Makefile
--- linux-3.10.36/arch/arm64/kernel/vdso/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/vdso/Makefile 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/vdso/Makefile 2014-04-24 07:58:14.268173724 +0200
@@ -48,7 +48,7 @@
# Actual build commands
@@ -55198,9 +33581,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/vdso/Makefile linux-linaro-stable-mx6/
quiet_cmd_vdsoas = VDSOA $@
cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
-diff -Nur linux-3.10.36/arch/arm64/kernel/vdso.c linux-linaro-stable-mx6/arch/arm64/kernel/vdso.c
+diff -Nur linux-3.10.36/arch/arm64/kernel/vdso.c linux-solidrun/arch/arm64/kernel/vdso.c
--- linux-3.10.36/arch/arm64/kernel/vdso.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/vdso.c 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/vdso.c 2014-04-24 07:58:14.268173724 +0200
@@ -235,8 +235,6 @@
vdso_data->use_syscall = use_syscall;
vdso_data->xtime_coarse_sec = xtime_coarse.tv_sec;
@@ -55219,9 +33602,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/vdso.c linux-linaro-stable-mx6/arch/ar
}
smp_wmb();
-diff -Nur linux-3.10.36/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S
+diff -Nur linux-3.10.36/arch/arm64/kernel/vmlinux.lds.S linux-solidrun/arch/arm64/kernel/vmlinux.lds.S
--- linux-3.10.36/arch/arm64/kernel/vmlinux.lds.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S 2014-04-21 13:50:39.350714880 +0200
++++ linux-solidrun/arch/arm64/kernel/vmlinux.lds.S 2014-04-24 07:58:14.268173724 +0200
@@ -41,7 +41,6 @@
}
.text : { /* Real text segment */
@@ -55230,9 +33613,9 @@ diff -Nur linux-3.10.36/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable-mx6/
__exception_text_start = .;
*(.exception.text)
__exception_text_end = .;
-diff -Nur linux-3.10.36/arch/arm64/mm/mmu.c linux-linaro-stable-mx6/arch/arm64/mm/mmu.c
+diff -Nur linux-3.10.36/arch/arm64/mm/mmu.c linux-solidrun/arch/arm64/mm/mmu.c
--- linux-3.10.36/arch/arm64/mm/mmu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/mm/mmu.c 2014-04-21 13:50:39.354714897 +0200
++++ linux-solidrun/arch/arm64/mm/mmu.c 2014-04-24 07:58:14.272173738 +0200
@@ -203,18 +203,10 @@
do {
next = pmd_addr_end(addr, end);
@@ -55254,9 +33637,9 @@ diff -Nur linux-3.10.36/arch/arm64/mm/mmu.c linux-linaro-stable-mx6/arch/arm64/m
phys += next - addr;
} while (pmd++, addr = next, addr != end);
}
-diff -Nur linux-3.10.36/arch/avr32/boards/mimc200/fram.c linux-linaro-stable-mx6/arch/avr32/boards/mimc200/fram.c
+diff -Nur linux-3.10.36/arch/avr32/boards/mimc200/fram.c linux-solidrun/arch/avr32/boards/mimc200/fram.c
--- linux-3.10.36/arch/avr32/boards/mimc200/fram.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/avr32/boards/mimc200/fram.c 2014-04-21 13:50:39.354714897 +0200
++++ linux-solidrun/arch/avr32/boards/mimc200/fram.c 2014-04-24 07:58:14.280173767 +0200
@@ -11,7 +11,6 @@
#define FRAM_VERSION "1.0"
@@ -55265,9 +33648,9 @@ diff -Nur linux-3.10.36/arch/avr32/boards/mimc200/fram.c linux-linaro-stable-mx6
#include <linux/proc_fs.h>
#include <linux/mm.h>
#include <linux/io.h>
-diff -Nur linux-3.10.36/arch/avr32/Makefile linux-linaro-stable-mx6/arch/avr32/Makefile
+diff -Nur linux-3.10.36/arch/avr32/Makefile linux-solidrun/arch/avr32/Makefile
--- linux-3.10.36/arch/avr32/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/avr32/Makefile 2014-04-21 13:50:39.354714897 +0200
++++ linux-solidrun/arch/avr32/Makefile 2014-04-24 07:58:14.276173752 +0200
@@ -11,7 +11,7 @@
KBUILD_DEFCONFIG := atstk1002_defconfig
@@ -55277,9 +33660,9 @@ diff -Nur linux-3.10.36/arch/avr32/Makefile linux-linaro-stable-mx6/arch/avr32/M
KBUILD_AFLAGS += -mrelax -mno-pic
KBUILD_CFLAGS_MODULE += -mno-relax
LDFLAGS_vmlinux += --relax
-diff -Nur linux-3.10.36/arch/mips/include/asm/mipsregs.h linux-linaro-stable-mx6/arch/mips/include/asm/mipsregs.h
+diff -Nur linux-3.10.36/arch/mips/include/asm/mipsregs.h linux-solidrun/arch/mips/include/asm/mipsregs.h
--- linux-3.10.36/arch/mips/include/asm/mipsregs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/mips/include/asm/mipsregs.h 2014-04-21 13:50:39.678716264 +0200
++++ linux-solidrun/arch/mips/include/asm/mipsregs.h 2014-04-24 07:58:16.076180084 +0200
@@ -14,7 +14,6 @@
#define _ASM_MIPSREGS_H
@@ -55288,9 +33671,9 @@ diff -Nur linux-3.10.36/arch/mips/include/asm/mipsregs.h linux-linaro-stable-mx6
#include <asm/hazards.h>
#include <asm/war.h>
-diff -Nur linux-3.10.36/arch/mips/include/asm/pci.h linux-linaro-stable-mx6/arch/mips/include/asm/pci.h
+diff -Nur linux-3.10.36/arch/mips/include/asm/pci.h linux-solidrun/arch/mips/include/asm/pci.h
--- linux-3.10.36/arch/mips/include/asm/pci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/mips/include/asm/pci.h 2014-04-21 13:50:39.694716331 +0200
++++ linux-solidrun/arch/mips/include/asm/pci.h 2014-04-24 07:58:16.096180155 +0200
@@ -137,11 +137,6 @@
return channel ? 15 : 14;
}
@@ -55303,9 +33686,9 @@ diff -Nur linux-3.10.36/arch/mips/include/asm/pci.h linux-linaro-stable-mx6/arch
extern char * (*pcibios_plat_setup)(char *str);
#ifdef CONFIG_OF
-diff -Nur linux-3.10.36/arch/powerpc/include/asm/pci.h linux-linaro-stable-mx6/arch/powerpc/include/asm/pci.h
+diff -Nur linux-3.10.36/arch/powerpc/include/asm/pci.h linux-solidrun/arch/powerpc/include/asm/pci.h
--- linux-3.10.36/arch/powerpc/include/asm/pci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/powerpc/include/asm/pci.h 2014-04-21 13:50:39.862717039 +0200
++++ linux-solidrun/arch/powerpc/include/asm/pci.h 2014-04-24 07:58:16.684182223 +0200
@@ -113,11 +113,6 @@
/* Decide whether to display the domain number in /proc */
extern int pci_proc_domain(struct pci_bus *bus);
@@ -55318,9 +33701,9 @@ diff -Nur linux-3.10.36/arch/powerpc/include/asm/pci.h linux-linaro-stable-mx6/a
struct vm_area_struct;
/* Map a range of PCI memory or I/O space for a device into user space */
int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,
-diff -Nur linux-3.10.36/arch/powerpc/include/asm/prom.h linux-linaro-stable-mx6/arch/powerpc/include/asm/prom.h
+diff -Nur linux-3.10.36/arch/powerpc/include/asm/prom.h linux-solidrun/arch/powerpc/include/asm/prom.h
--- linux-3.10.36/arch/powerpc/include/asm/prom.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/powerpc/include/asm/prom.h 2014-04-21 13:50:39.862717039 +0200
++++ linux-solidrun/arch/powerpc/include/asm/prom.h 2014-04-24 07:58:16.700182279 +0200
@@ -43,9 +43,6 @@
extern void kdump_move_device_tree(void);
@@ -55331,9 +33714,9 @@ diff -Nur linux-3.10.36/arch/powerpc/include/asm/prom.h linux-linaro-stable-mx6/
/* cache lookup */
struct device_node *of_find_next_cache_node(struct device_node *np);
-diff -Nur linux-3.10.36/arch/powerpc/kernel/crash_dump.c linux-linaro-stable-mx6/arch/powerpc/kernel/crash_dump.c
+diff -Nur linux-3.10.36/arch/powerpc/kernel/crash_dump.c linux-solidrun/arch/powerpc/kernel/crash_dump.c
--- linux-3.10.36/arch/powerpc/kernel/crash_dump.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/powerpc/kernel/crash_dump.c 2014-04-21 13:50:39.874717091 +0200
++++ linux-solidrun/arch/powerpc/kernel/crash_dump.c 2014-04-24 07:58:16.760182490 +0200
@@ -108,19 +108,17 @@
size_t csize, unsigned long offset, int userbuf)
{
@@ -55357,9 +33740,9 @@ diff -Nur linux-3.10.36/arch/powerpc/kernel/crash_dump.c linux-linaro-stable-mx6
csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);
iounmap(vaddr);
}
-diff -Nur linux-3.10.36/arch/powerpc/kernel/prom.c linux-linaro-stable-mx6/arch/powerpc/kernel/prom.c
+diff -Nur linux-3.10.36/arch/powerpc/kernel/prom.c linux-solidrun/arch/powerpc/kernel/prom.c
--- linux-3.10.36/arch/powerpc/kernel/prom.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/powerpc/kernel/prom.c 2014-04-21 13:50:39.886717141 +0200
++++ linux-solidrun/arch/powerpc/kernel/prom.c 2014-04-24 07:58:16.780182560 +0200
@@ -827,49 +827,10 @@
__initcall(prom_reconfig_setup);
#endif
@@ -55412,9 +33795,9 @@ diff -Nur linux-3.10.36/arch/powerpc/kernel/prom.c linux-linaro-stable-mx6/arch/
#if defined(CONFIG_DEBUG_FS) && defined(DEBUG)
static struct debugfs_blob_wrapper flat_dt_blob;
-diff -Nur linux-3.10.36/arch/powerpc/kernel/reloc_64.S linux-linaro-stable-mx6/arch/powerpc/kernel/reloc_64.S
+diff -Nur linux-3.10.36/arch/powerpc/kernel/reloc_64.S linux-solidrun/arch/powerpc/kernel/reloc_64.S
--- linux-3.10.36/arch/powerpc/kernel/reloc_64.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/powerpc/kernel/reloc_64.S 2014-04-21 13:50:39.886717141 +0200
++++ linux-solidrun/arch/powerpc/kernel/reloc_64.S 2014-04-24 07:58:16.784182574 +0200
@@ -81,7 +81,6 @@
6: blr
@@ -55423,9 +33806,9 @@ diff -Nur linux-3.10.36/arch/powerpc/kernel/reloc_64.S linux-linaro-stable-mx6/a
p_dyn: .llong __dynamic_start - 0b
p_rela: .llong __rela_dyn_start - 0b
p_st: .llong _stext - 0b
-diff -Nur linux-3.10.36/arch/powerpc/platforms/pseries/hotplug-cpu.c linux-linaro-stable-mx6/arch/powerpc/platforms/pseries/hotplug-cpu.c
+diff -Nur linux-3.10.36/arch/powerpc/platforms/pseries/hotplug-cpu.c linux-solidrun/arch/powerpc/platforms/pseries/hotplug-cpu.c
--- linux-3.10.36/arch/powerpc/platforms/pseries/hotplug-cpu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/powerpc/platforms/pseries/hotplug-cpu.c 2014-04-21 13:50:39.942717377 +0200
++++ linux-solidrun/arch/powerpc/platforms/pseries/hotplug-cpu.c 2014-04-24 07:58:16.912183026 +0200
@@ -34,7 +34,12 @@
#include "offline_states.h"
@@ -55477,9 +33860,9 @@ diff -Nur linux-3.10.36/arch/powerpc/platforms/pseries/hotplug-cpu.c linux-linar
qcss_tok == RTAS_UNKNOWN_SERVICE) {
printk(KERN_INFO "CPU Hotplug not supported by firmware "
"- disabling.\n");
-diff -Nur linux-3.10.36/arch/s390/crypto/aes_s390.c linux-linaro-stable-mx6/arch/s390/crypto/aes_s390.c
+diff -Nur linux-3.10.36/arch/s390/crypto/aes_s390.c linux-solidrun/arch/s390/crypto/aes_s390.c
--- linux-3.10.36/arch/s390/crypto/aes_s390.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/s390/crypto/aes_s390.c 2014-04-21 13:50:39.958717444 +0200
++++ linux-solidrun/arch/s390/crypto/aes_s390.c 2014-04-24 07:58:17.008183364 +0200
@@ -25,7 +25,6 @@
#include <linux/err.h>
#include <linux/module.h>
@@ -55599,9 +33982,9 @@ diff -Nur linux-3.10.36/arch/s390/crypto/aes_s390.c linux-linaro-stable-mx6/arch
return ret;
}
-diff -Nur linux-3.10.36/arch/s390/crypto/des_s390.c linux-linaro-stable-mx6/arch/s390/crypto/des_s390.c
+diff -Nur linux-3.10.36/arch/s390/crypto/des_s390.c linux-solidrun/arch/s390/crypto/des_s390.c
--- linux-3.10.36/arch/s390/crypto/des_s390.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/s390/crypto/des_s390.c 2014-04-21 13:50:39.958717444 +0200
++++ linux-solidrun/arch/s390/crypto/des_s390.c 2014-04-24 07:58:17.008183364 +0200
@@ -25,7 +25,6 @@
#define DES3_KEY_SIZE (3 * DES_KEY_SIZE)
@@ -55802,9 +34185,9 @@ diff -Nur linux-3.10.36/arch/s390/crypto/des_s390.c linux-linaro-stable-mx6/arch
return ret;
}
-diff -Nur linux-3.10.36/arch/s390/include/asm/pci.h linux-linaro-stable-mx6/arch/s390/include/asm/pci.h
+diff -Nur linux-3.10.36/arch/s390/include/asm/pci.h linux-solidrun/arch/s390/include/asm/pci.h
--- linux-3.10.36/arch/s390/include/asm/pci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/s390/include/asm/pci.h 2014-04-21 13:50:39.962717462 +0200
++++ linux-solidrun/arch/s390/include/asm/pci.h 2014-04-24 07:58:17.068183574 +0200
@@ -21,10 +21,6 @@
int pci_domain_nr(struct pci_bus *);
int pci_proc_domain(struct pci_bus *);
@@ -55816,9 +34199,9 @@ diff -Nur linux-3.10.36/arch/s390/include/asm/pci.h linux-linaro-stable-mx6/arch
#define ZPCI_BUS_NR 0 /* default bus number */
#define ZPCI_DEVFN 0 /* default device number */
-diff -Nur linux-3.10.36/arch/s390/kernel/head64.S linux-linaro-stable-mx6/arch/s390/kernel/head64.S
+diff -Nur linux-3.10.36/arch/s390/kernel/head64.S linux-solidrun/arch/s390/kernel/head64.S
--- linux-3.10.36/arch/s390/kernel/head64.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/s390/kernel/head64.S 2014-04-21 13:50:39.970717496 +0200
++++ linux-solidrun/arch/s390/kernel/head64.S 2014-04-24 07:58:17.104183700 +0200
@@ -59,7 +59,7 @@
.quad 0 # cr12: tracing off
.quad 0 # cr13: home space segment table
@@ -55845,9 +34228,9 @@ diff -Nur linux-3.10.36/arch/s390/kernel/head64.S linux-linaro-stable-mx6/arch/s
ENTRY(_ehead)
-diff -Nur linux-3.10.36/arch/s390/mm/page-states.c linux-linaro-stable-mx6/arch/s390/mm/page-states.c
+diff -Nur linux-3.10.36/arch/s390/mm/page-states.c linux-solidrun/arch/s390/mm/page-states.c
--- linux-3.10.36/arch/s390/mm/page-states.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/s390/mm/page-states.c 2014-04-21 13:50:39.982717546 +0200
++++ linux-solidrun/arch/s390/mm/page-states.c 2014-04-24 07:58:17.140183828 +0200
@@ -12,8 +12,6 @@
#include <linux/mm.h>
#include <linux/gfp.h>
@@ -55872,9 +34255,9 @@ diff -Nur linux-3.10.36/arch/s390/mm/page-states.c linux-linaro-stable-mx6/arch/
asm volatile(
" .insn rrf,0xb9ab0000,%1,%1,0,0\n"
"0: la %0,0\n"
-diff -Nur linux-3.10.36/arch/x86/include/asm/pci.h linux-linaro-stable-mx6/arch/x86/include/asm/pci.h
+diff -Nur linux-3.10.36/arch/x86/include/asm/pci.h linux-solidrun/arch/x86/include/asm/pci.h
--- linux-3.10.36/arch/x86/include/asm/pci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/include/asm/pci.h 2014-04-21 13:50:40.174718356 +0200
++++ linux-solidrun/arch/x86/include/asm/pci.h 2014-04-24 07:58:18.260187767 +0200
@@ -100,29 +100,6 @@
extern void pci_iommu_alloc(void);
@@ -55922,9 +34305,9 @@ diff -Nur linux-3.10.36/arch/x86/include/asm/pci.h linux-linaro-stable-mx6/arch/
#endif
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-diff -Nur linux-3.10.36/arch/x86/include/asm/topology.h linux-linaro-stable-mx6/arch/x86/include/asm/topology.h
+diff -Nur linux-3.10.36/arch/x86/include/asm/topology.h linux-solidrun/arch/x86/include/asm/topology.h
--- linux-3.10.36/arch/x86/include/asm/topology.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/include/asm/topology.h 2014-04-21 13:50:40.178718373 +0200
++++ linux-solidrun/arch/x86/include/asm/topology.h 2014-04-24 07:58:18.268187795 +0200
@@ -119,10 +119,9 @@
extern const struct cpumask *cpu_coregroup_mask(int cpu);
@@ -55937,9 +34320,9 @@ diff -Nur linux-3.10.36/arch/x86/include/asm/topology.h linux-linaro-stable-mx6/
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
#define topology_thread_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
-diff -Nur linux-3.10.36/arch/x86/include/asm/xen/page.h linux-linaro-stable-mx6/arch/x86/include/asm/xen/page.h
+diff -Nur linux-3.10.36/arch/x86/include/asm/xen/page.h linux-solidrun/arch/x86/include/asm/xen/page.h
--- linux-3.10.36/arch/x86/include/asm/xen/page.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/include/asm/xen/page.h 2014-04-21 13:50:40.182718389 +0200
++++ linux-solidrun/arch/x86/include/asm/xen/page.h 2014-04-24 07:58:18.272187810 +0200
@@ -79,38 +79,30 @@
return get_phys_to_machine(pfn) != INVALID_P2M_ENTRY;
}
@@ -55998,9 +34381,9 @@ diff -Nur linux-3.10.36/arch/x86/include/asm/xen/page.h linux-linaro-stable-mx6/
/*
* pfn is ~0 if there are no entries in the m2p for mfn or if the
-diff -Nur linux-3.10.36/arch/x86/kernel/cpu/common.c linux-linaro-stable-mx6/arch/x86/kernel/cpu/common.c
+diff -Nur linux-3.10.36/arch/x86/kernel/cpu/common.c linux-solidrun/arch/x86/kernel/cpu/common.c
--- linux-3.10.36/arch/x86/kernel/cpu/common.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/cpu/common.c 2014-04-21 13:50:40.190718424 +0200
++++ linux-solidrun/arch/x86/kernel/cpu/common.c 2014-04-24 07:58:18.296187894 +0200
@@ -284,13 +284,8 @@
raw_local_save_flags(eflags);
BUG_ON(eflags & X86_EFLAGS_AC);
@@ -56016,9 +34399,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/cpu/common.c linux-linaro-stable-mx6/arc
}
/*
-diff -Nur linux-3.10.36/arch/x86/kernel/cpu/intel.c linux-linaro-stable-mx6/arch/x86/kernel/cpu/intel.c
+diff -Nur linux-3.10.36/arch/x86/kernel/cpu/intel.c linux-solidrun/arch/x86/kernel/cpu/intel.c
--- linux-3.10.36/arch/x86/kernel/cpu/intel.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/cpu/intel.c 2014-04-21 13:50:40.190718424 +0200
++++ linux-solidrun/arch/x86/kernel/cpu/intel.c 2014-04-24 07:58:18.296187894 +0200
@@ -628,7 +628,7 @@
tlb_flushall_shift = 5;
break;
@@ -56028,9 +34411,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/cpu/intel.c linux-linaro-stable-mx6/arch
break;
default:
tlb_flushall_shift = 6;
-diff -Nur linux-3.10.36/arch/x86/kernel/cpu/perf_event.c linux-linaro-stable-mx6/arch/x86/kernel/cpu/perf_event.c
+diff -Nur linux-3.10.36/arch/x86/kernel/cpu/perf_event.c linux-solidrun/arch/x86/kernel/cpu/perf_event.c
--- linux-3.10.36/arch/x86/kernel/cpu/perf_event.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/cpu/perf_event.c 2014-04-21 13:50:40.194718440 +0200
++++ linux-solidrun/arch/x86/kernel/cpu/perf_event.c 2014-04-24 07:58:18.300187908 +0200
@@ -1165,9 +1165,6 @@
for (i = 0; i < cpuc->n_events; i++) {
if (event == cpuc->event_list[i]) {
@@ -56041,9 +34424,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/cpu/perf_event.c linux-linaro-stable-mx6
if (x86_pmu.put_event_constraints)
x86_pmu.put_event_constraints(cpuc, event);
-diff -Nur linux-3.10.36/arch/x86/kernel/ftrace.c linux-linaro-stable-mx6/arch/x86/kernel/ftrace.c
+diff -Nur linux-3.10.36/arch/x86/kernel/ftrace.c linux-solidrun/arch/x86/kernel/ftrace.c
--- linux-3.10.36/arch/x86/kernel/ftrace.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/ftrace.c 2014-04-21 13:50:40.198718457 +0200
++++ linux-solidrun/arch/x86/kernel/ftrace.c 2014-04-24 07:58:18.308187935 +0200
@@ -77,7 +77,8 @@
return addr >= start && addr < end;
}
@@ -56201,9 +34584,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/ftrace.c linux-linaro-stable-mx6/arch/x8
}
#endif /* !CONFIG_DYNAMIC_FTRACE */
-diff -Nur linux-3.10.36/arch/x86/kernel/head_32.S linux-linaro-stable-mx6/arch/x86/kernel/head_32.S
+diff -Nur linux-3.10.36/arch/x86/kernel/head_32.S linux-solidrun/arch/x86/kernel/head_32.S
--- linux-3.10.36/arch/x86/kernel/head_32.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/head_32.S 2014-04-21 13:50:40.198718457 +0200
++++ linux-solidrun/arch/x86/kernel/head_32.S 2014-04-24 07:58:18.308187935 +0200
@@ -566,10 +566,6 @@
/* This is global to keep gas from relaxing the jumps */
ENTRY(early_idt_handler)
@@ -56226,9 +34609,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/head_32.S linux-linaro-stable-mx6/arch/x
iret
ENDPROC(early_idt_handler)
-diff -Nur linux-3.10.36/arch/x86/kernel/head_64.S linux-linaro-stable-mx6/arch/x86/kernel/head_64.S
+diff -Nur linux-3.10.36/arch/x86/kernel/head_64.S linux-solidrun/arch/x86/kernel/head_64.S
--- linux-3.10.36/arch/x86/kernel/head_64.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/head_64.S 2014-04-21 13:50:40.198718457 +0200
++++ linux-solidrun/arch/x86/kernel/head_64.S 2014-04-24 07:58:18.308187935 +0200
@@ -343,9 +343,6 @@
ENTRY(early_idt_handler)
cld
@@ -56250,9 +34633,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/head_64.S linux-linaro-stable-mx6/arch/x
INTERRUPT_RETURN
ENDPROC(early_idt_handler)
-diff -Nur linux-3.10.36/arch/x86/kernel/i387.c linux-linaro-stable-mx6/arch/x86/kernel/i387.c
+diff -Nur linux-3.10.36/arch/x86/kernel/i387.c linux-solidrun/arch/x86/kernel/i387.c
--- linux-3.10.36/arch/x86/kernel/i387.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/i387.c 2014-04-21 13:50:40.202718474 +0200
++++ linux-solidrun/arch/x86/kernel/i387.c 2014-04-24 07:58:18.308187935 +0200
@@ -86,19 +86,10 @@
void __kernel_fpu_end(void)
@@ -56276,9 +34659,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/i387.c linux-linaro-stable-mx6/arch/x86/
}
EXPORT_SYMBOL(__kernel_fpu_end);
-diff -Nur linux-3.10.36/arch/x86/kernel/pci-dma.c linux-linaro-stable-mx6/arch/x86/kernel/pci-dma.c
+diff -Nur linux-3.10.36/arch/x86/kernel/pci-dma.c linux-solidrun/arch/x86/kernel/pci-dma.c
--- linux-3.10.36/arch/x86/kernel/pci-dma.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/pci-dma.c 2014-04-21 13:50:40.206718491 +0200
++++ linux-solidrun/arch/x86/kernel/pci-dma.c 2014-04-24 07:58:18.312187950 +0200
@@ -100,10 +100,8 @@
flag |= __GFP_ZERO;
again:
@@ -56291,9 +34674,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/pci-dma.c linux-linaro-stable-mx6/arch/x
if (!page)
page = alloc_pages_node(dev_to_node(dev), flag, get_order(size));
if (!page)
-diff -Nur linux-3.10.36/arch/x86/kernel/quirks.c linux-linaro-stable-mx6/arch/x86/kernel/quirks.c
+diff -Nur linux-3.10.36/arch/x86/kernel/quirks.c linux-solidrun/arch/x86/kernel/quirks.c
--- linux-3.10.36/arch/x86/kernel/quirks.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/quirks.c 2014-04-21 13:50:40.206718491 +0200
++++ linux-solidrun/arch/x86/kernel/quirks.c 2014-04-24 07:58:18.312187950 +0200
@@ -529,7 +529,7 @@
return;
@@ -56303,9 +34686,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/quirks.c linux-linaro-stable-mx6/arch/x8
/*
* Some hardware may return an invalid node ID,
* so check it first:
-diff -Nur linux-3.10.36/arch/x86/kernel/x86_init.c linux-linaro-stable-mx6/arch/x86/kernel/x86_init.c
+diff -Nur linux-3.10.36/arch/x86/kernel/x86_init.c linux-solidrun/arch/x86/kernel/x86_init.c
--- linux-3.10.36/arch/x86/kernel/x86_init.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/x86_init.c 2014-04-21 13:50:40.210718508 +0200
++++ linux-solidrun/arch/x86/kernel/x86_init.c 2014-04-24 07:58:18.316187965 +0200
@@ -107,6 +107,8 @@
};
@@ -56344,9 +34727,9 @@ diff -Nur linux-3.10.36/arch/x86/kernel/x86_init.c linux-linaro-stable-mx6/arch/
struct x86_io_apic_ops x86_io_apic_ops = {
.init = native_io_apic_init_mappings,
.read = native_io_apic_read,
-diff -Nur linux-3.10.36/arch/x86/kvm/mmu.c linux-linaro-stable-mx6/arch/x86/kvm/mmu.c
+diff -Nur linux-3.10.36/arch/x86/kvm/mmu.c linux-solidrun/arch/x86/kvm/mmu.c
--- linux-3.10.36/arch/x86/kvm/mmu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kvm/mmu.c 2014-04-21 13:50:40.214718524 +0200
++++ linux-solidrun/arch/x86/kvm/mmu.c 2014-04-24 07:58:18.320187979 +0200
@@ -2585,9 +2585,6 @@
int emulate = 0;
gfn_t pseudo_gfn;
@@ -56387,9 +34770,9 @@ diff -Nur linux-3.10.36/arch/x86/kvm/mmu.c linux-linaro-stable-mx6/arch/x86/kvm/
walk_shadow_page_lockless_begin(vcpu);
for_each_shadow_entry_lockless(vcpu, addr, iterator, spte) {
sptes[iterator.level-1] = spte;
-diff -Nur linux-3.10.36/arch/x86/kvm/paging_tmpl.h linux-linaro-stable-mx6/arch/x86/kvm/paging_tmpl.h
+diff -Nur linux-3.10.36/arch/x86/kvm/paging_tmpl.h linux-solidrun/arch/x86/kvm/paging_tmpl.h
--- linux-3.10.36/arch/x86/kvm/paging_tmpl.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kvm/paging_tmpl.h 2014-04-21 13:50:40.214718524 +0200
++++ linux-solidrun/arch/x86/kvm/paging_tmpl.h 2014-04-24 07:58:18.320187979 +0200
@@ -423,9 +423,6 @@
if (FNAME(gpte_changed)(vcpu, gw, top_level))
goto out_gpte_changed;
@@ -56412,9 +34795,9 @@ diff -Nur linux-3.10.36/arch/x86/kvm/paging_tmpl.h linux-linaro-stable-mx6/arch/
spin_lock(&vcpu->kvm->mmu_lock);
for_each_shadow_entry(vcpu, gva, iterator) {
level = iterator.level;
-diff -Nur linux-3.10.36/arch/x86/kvm/svm.c linux-linaro-stable-mx6/arch/x86/kvm/svm.c
+diff -Nur linux-3.10.36/arch/x86/kvm/svm.c linux-solidrun/arch/x86/kvm/svm.c
--- linux-3.10.36/arch/x86/kvm/svm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kvm/svm.c 2014-04-21 13:50:40.214718524 +0200
++++ linux-solidrun/arch/x86/kvm/svm.c 2014-04-24 07:58:18.324187993 +0200
@@ -2985,8 +2985,10 @@
u8 cr8_prev = kvm_get_cr8(&svm->vcpu);
/* instruction emulation calls kvm_set_cr8() */
@@ -56436,9 +34819,9 @@ diff -Nur linux-3.10.36/arch/x86/kvm/svm.c linux-linaro-stable-mx6/arch/x86/kvm/
if (irr == -1)
return;
-diff -Nur linux-3.10.36/arch/x86/kvm/vmx.c linux-linaro-stable-mx6/arch/x86/kvm/vmx.c
+diff -Nur linux-3.10.36/arch/x86/kvm/vmx.c linux-solidrun/arch/x86/kvm/vmx.c
--- linux-3.10.36/arch/x86/kvm/vmx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kvm/vmx.c 2014-04-21 13:50:40.214718524 +0200
++++ linux-solidrun/arch/x86/kvm/vmx.c 2014-04-24 07:58:18.324187993 +0200
@@ -7133,8 +7133,8 @@
struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -56449,9 +34832,9 @@ diff -Nur linux-3.10.36/arch/x86/kvm/vmx.c linux-linaro-stable-mx6/arch/x86/kvm/
kfree(vmx->guest_msrs);
kvm_vcpu_uninit(vcpu);
kmem_cache_free(kvm_vcpu_cache, vmx);
-diff -Nur linux-3.10.36/arch/x86/kvm/x86.c linux-linaro-stable-mx6/arch/x86/kvm/x86.c
+diff -Nur linux-3.10.36/arch/x86/kvm/x86.c linux-solidrun/arch/x86/kvm/x86.c
--- linux-3.10.36/arch/x86/kvm/x86.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kvm/x86.c 2014-04-21 13:50:40.218718541 +0200
++++ linux-solidrun/arch/x86/kvm/x86.c 2014-04-24 07:58:18.324187993 +0200
@@ -5982,7 +5982,7 @@
frag->len -= len;
}
@@ -56461,9 +34844,9 @@ diff -Nur linux-3.10.36/arch/x86/kvm/x86.c linux-linaro-stable-mx6/arch/x86/kvm/
vcpu->mmio_needed = 0;
if (vcpu->mmio_is_write)
return 1;
-diff -Nur linux-3.10.36/arch/x86/mm/fault.c linux-linaro-stable-mx6/arch/x86/mm/fault.c
+diff -Nur linux-3.10.36/arch/x86/mm/fault.c linux-solidrun/arch/x86/mm/fault.c
--- linux-3.10.36/arch/x86/mm/fault.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/mm/fault.c 2014-04-21 13:50:40.226718575 +0200
++++ linux-solidrun/arch/x86/mm/fault.c 2014-04-24 07:58:18.368188147 +0200
@@ -989,12 +989,6 @@
static inline bool smap_violation(int error_code, struct pt_regs *regs)
@@ -56492,9 +34875,9 @@ diff -Nur linux-3.10.36/arch/x86/mm/fault.c linux-linaro-stable-mx6/arch/x86/mm/
}
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
-diff -Nur linux-3.10.36/arch/x86/net/bpf_jit.S linux-linaro-stable-mx6/arch/x86/net/bpf_jit.S
+diff -Nur linux-3.10.36/arch/x86/net/bpf_jit.S linux-solidrun/arch/x86/net/bpf_jit.S
--- linux-3.10.36/arch/x86/net/bpf_jit.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/net/bpf_jit.S 2014-04-21 13:50:40.230718592 +0200
++++ linux-solidrun/arch/x86/net/bpf_jit.S 2014-04-24 07:58:18.376188174 +0200
@@ -140,7 +140,7 @@
push %r9; \
push SKBDATA; \
@@ -56504,9 +34887,9 @@ diff -Nur linux-3.10.36/arch/x86/net/bpf_jit.S linux-linaro-stable-mx6/arch/x86/
call bpf_internal_load_pointer_neg_helper; \
test %rax,%rax; \
pop SKBDATA; \
-diff -Nur linux-3.10.36/arch/x86/xen/p2m.c linux-linaro-stable-mx6/arch/x86/xen/p2m.c
+diff -Nur linux-3.10.36/arch/x86/xen/p2m.c linux-solidrun/arch/x86/xen/p2m.c
--- linux-3.10.36/arch/x86/xen/p2m.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/xen/p2m.c 2014-04-21 13:50:40.246718659 +0200
++++ linux-solidrun/arch/x86/xen/p2m.c 2014-04-24 07:58:18.404188274 +0200
@@ -878,6 +878,7 @@
unsigned long uninitialized_var(address);
unsigned level;
@@ -56545,9 +34928,9 @@ diff -Nur linux-3.10.36/arch/x86/xen/p2m.c linux-linaro-stable-mx6/arch/x86/xen/
m2p_find_override(mfn) == NULL)
set_phys_to_machine(pfn, mfn);
-diff -Nur linux-3.10.36/arch/x86/xen/smp.c linux-linaro-stable-mx6/arch/x86/xen/smp.c
+diff -Nur linux-3.10.36/arch/x86/xen/smp.c linux-solidrun/arch/x86/xen/smp.c
--- linux-3.10.36/arch/x86/xen/smp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/xen/smp.c 2014-04-21 13:50:40.246718659 +0200
++++ linux-solidrun/arch/x86/xen/smp.c 2014-04-24 07:58:18.404188274 +0200
@@ -245,15 +245,6 @@
old memory can be recycled */
make_lowmem_page_readwrite(xen_initial_gdt);
@@ -56564,9 +34947,9 @@ diff -Nur linux-3.10.36/arch/x86/xen/smp.c linux-linaro-stable-mx6/arch/x86/xen/
xen_filter_cpu_maps();
xen_setup_vcpu_info_placement();
}
-diff -Nur linux-3.10.36/arch/xtensa/include/asm/traps.h linux-linaro-stable-mx6/arch/xtensa/include/asm/traps.h
+diff -Nur linux-3.10.36/arch/xtensa/include/asm/traps.h linux-solidrun/arch/xtensa/include/asm/traps.h
--- linux-3.10.36/arch/xtensa/include/asm/traps.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/xtensa/include/asm/traps.h 2014-04-21 13:50:40.254718693 +0200
++++ linux-solidrun/arch/xtensa/include/asm/traps.h 2014-04-24 07:58:18.412188303 +0200
@@ -22,37 +22,25 @@
static inline void spill_registers(void)
@@ -56621,9 +35004,9 @@ diff -Nur linux-3.10.36/arch/xtensa/include/asm/traps.h linux-linaro-stable-mx6/
}
#endif /* _XTENSA_TRAPS_H */
-diff -Nur linux-3.10.36/arch/xtensa/kernel/entry.S linux-linaro-stable-mx6/arch/xtensa/kernel/entry.S
+diff -Nur linux-3.10.36/arch/xtensa/kernel/entry.S linux-solidrun/arch/xtensa/kernel/entry.S
--- linux-3.10.36/arch/xtensa/kernel/entry.S 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/xtensa/kernel/entry.S 2014-04-21 13:50:40.254718693 +0200
++++ linux-solidrun/arch/xtensa/kernel/entry.S 2014-04-24 07:58:18.428188359 +0200
@@ -1912,43 +1912,6 @@
ENDPROC(system_call)
@@ -56723,9 +35106,9 @@ diff -Nur linux-3.10.36/arch/xtensa/kernel/entry.S linux-linaro-stable-mx6/arch/
rsync
retw
-diff -Nur linux-3.10.36/block/blk-core.c linux-linaro-stable-mx6/block/blk-core.c
+diff -Nur linux-3.10.36/block/blk-core.c linux-solidrun/block/blk-core.c
--- linux-3.10.36/block/blk-core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk-core.c 2014-04-21 13:50:40.262718727 +0200
++++ linux-solidrun/block/blk-core.c 2014-04-24 07:58:18.444188414 +0200
@@ -3191,7 +3191,8 @@
/* used for unplugging and affects IO latency/throughput - HIGHPRI */
@@ -56736,9 +35119,9 @@ diff -Nur linux-3.10.36/block/blk-core.c linux-linaro-stable-mx6/block/blk-core.
if (!kblockd_workqueue)
panic("Failed to create kblockd\n");
-diff -Nur linux-3.10.36/block/blk.h linux-linaro-stable-mx6/block/blk.h
+diff -Nur linux-3.10.36/block/blk.h linux-solidrun/block/blk.h
--- linux-3.10.36/block/blk.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk.h 2014-04-21 13:50:40.266718744 +0200
++++ linux-solidrun/block/blk.h 2014-04-24 07:58:18.448188428 +0200
@@ -96,7 +96,7 @@
q->flush_queue_delayed = 1;
return NULL;
@@ -56748,9 +35131,9 @@ diff -Nur linux-3.10.36/block/blk.h linux-linaro-stable-mx6/block/blk.h
!q->elevator->type->ops.elevator_dispatch_fn(q, 0))
return NULL;
}
-diff -Nur linux-3.10.36/block/blk-ioc.c linux-linaro-stable-mx6/block/blk-ioc.c
+diff -Nur linux-3.10.36/block/blk-ioc.c linux-solidrun/block/blk-ioc.c
--- linux-3.10.36/block/blk-ioc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk-ioc.c 2014-04-21 13:50:40.262718727 +0200
++++ linux-solidrun/block/blk-ioc.c 2014-04-24 07:58:18.448188428 +0200
@@ -144,7 +144,8 @@
if (atomic_long_dec_and_test(&ioc->refcount)) {
spin_lock_irqsave(&ioc->lock, flags);
@@ -56761,9 +35144,9 @@ diff -Nur linux-3.10.36/block/blk-ioc.c linux-linaro-stable-mx6/block/blk-ioc.c
else
free_ioc = true;
spin_unlock_irqrestore(&ioc->lock, flags);
-diff -Nur linux-3.10.36/block/blk-lib.c linux-linaro-stable-mx6/block/blk-lib.c
+diff -Nur linux-3.10.36/block/blk-lib.c linux-solidrun/block/blk-lib.c
--- linux-3.10.36/block/blk-lib.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk-lib.c 2014-04-21 13:50:40.262718727 +0200
++++ linux-solidrun/block/blk-lib.c 2014-04-24 07:58:18.448188428 +0200
@@ -121,14 +121,6 @@
atomic_inc(&bb.done);
@@ -56779,9 +35162,9 @@ diff -Nur linux-3.10.36/block/blk-lib.c linux-linaro-stable-mx6/block/blk-lib.c
}
blk_finish_plug(&plug);
-diff -Nur linux-3.10.36/block/genhd.c linux-linaro-stable-mx6/block/genhd.c
+diff -Nur linux-3.10.36/block/genhd.c linux-solidrun/block/genhd.c
--- linux-3.10.36/block/genhd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/block/genhd.c 2014-04-21 13:50:40.266718744 +0200
++++ linux-solidrun/block/genhd.c 2014-04-24 07:58:18.448188428 +0200
@@ -1489,9 +1489,11 @@
intv = disk_events_poll_jiffies(disk);
set_timer_slack(&ev->dwork.timer, intv / 4);
@@ -56816,9 +35199,9 @@ diff -Nur linux-3.10.36/block/genhd.c linux-linaro-stable-mx6/block/genhd.c
spin_unlock_irq(&ev->lock);
-diff -Nur linux-3.10.36/Documentation/ABI/testing/sysfs-class-mtd linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-mtd
+diff -Nur linux-3.10.36/Documentation/ABI/testing/sysfs-class-mtd linux-solidrun/Documentation/ABI/testing/sysfs-class-mtd
--- linux-3.10.36/Documentation/ABI/testing/sysfs-class-mtd 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-mtd 2014-04-21 13:50:38.694712113 +0200
++++ linux-solidrun/Documentation/ABI/testing/sysfs-class-mtd 2014-04-24 07:58:11.868165282 +0200
@@ -104,7 +104,7 @@
One of the following ASCII strings, representing the device
type:
@@ -56856,9 +35239,9 @@ diff -Nur linux-3.10.36/Documentation/ABI/testing/sysfs-class-mtd linux-linaro-s
+
+ 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.36/Documentation/arm/small_task_packing.txt linux-linaro-stable-mx6/Documentation/arm/small_task_packing.txt
+diff -Nur linux-3.10.36/Documentation/arm/small_task_packing.txt linux-solidrun/Documentation/arm/small_task_packing.txt
--- linux-3.10.36/Documentation/arm/small_task_packing.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/arm/small_task_packing.txt 2014-04-21 13:50:38.798712551 +0200
++++ linux-solidrun/Documentation/arm/small_task_packing.txt 2014-04-24 07:58:11.952165579 +0200
@@ -0,0 +1,136 @@
+Small Task Packing in the big.LITTLE MP Reference Patch Set
+
@@ -56996,9 +35379,9 @@ diff -Nur linux-3.10.36/Documentation/arm/small_task_packing.txt linux-linaro-st
+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.36/Documentation/devicetree/bindings/arm/cci.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/cci.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/cci.txt linux-solidrun/Documentation/devicetree/bindings/arm/cci.txt
--- linux-3.10.36/Documentation/devicetree/bindings/arm/cci.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/cci.txt 2014-04-21 13:50:38.826712670 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/arm/cci.txt 2014-04-24 07:58:12.092166070 +0200
@@ -0,0 +1,172 @@
+=======================================================
+ARM CCI cache coherent interconnect binding description
@@ -57172,9 +35555,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/cci.txt linux-lina
+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.36/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-solidrun/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt
--- linux-3.10.36/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-04-21 13:50:38.826712670 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-04-24 07:58:12.092166070 +0200
@@ -0,0 +1,64 @@
+Freescale Busfreq driver
+
@@ -57240,9 +35623,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.t
+ 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.36/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-solidrun/Documentation/devicetree/bindings/arm/imx/gpc.txt
--- linux-3.10.36/Documentation/devicetree/bindings/arm/imx/gpc.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-04-21 13:50:38.826712670 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-04-24 07:58:12.092166070 +0200
@@ -0,0 +1,20 @@
+Freescale imx GPC bindings
+
@@ -57264,9 +35647,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/pmu.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/pmu.txt linux-solidrun/Documentation/devicetree/bindings/arm/pmu.txt
--- linux-3.10.36/Documentation/devicetree/bindings/arm/pmu.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt 2014-04-21 13:50:38.834712703 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/arm/pmu.txt 2014-04-24 07:58:12.120166168 +0200
@@ -16,6 +16,9 @@
"arm,arm1176-pmu"
"arm,arm1136-pmu"
@@ -57277,9 +35660,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/pmu.txt linux-lina
Example:
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt linux-solidrun/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt
--- linux-3.10.36/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 2014-04-21 13:50:38.838712720 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 2014-04-24 07:58:12.120166168 +0200
@@ -0,0 +1,19 @@
+ARM Dual Cluster System Configuration Block
+-------------------------------------------
@@ -57300,9 +35683,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt lin
+ compatible = "arm,rtsm,dcscb";
+ reg = <0x60000000 0x1000>;
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/bus/imx-weim.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/bus/imx-weim.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/bus/imx-weim.txt linux-solidrun/Documentation/devicetree/bindings/bus/imx-weim.txt
--- linux-3.10.36/Documentation/devicetree/bindings/bus/imx-weim.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/bus/imx-weim.txt 2014-04-21 13:50:38.846712754 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/bus/imx-weim.txt 2014-04-24 07:58:12.132166212 +0200
@@ -0,0 +1,49 @@
+Device tree bindings for i.MX Wireless External Interface Module (WEIM)
+
@@ -57353,9 +35736,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/bus/imx-weim.txt linux
+ 0x0000c000 0x1404a38e 0x00000000>;
+ };
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-solidrun/Documentation/devicetree/bindings/clock/imx6q-clock.txt
--- linux-3.10.36/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-04-21 13:50:38.846712754 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-04-24 07:58:12.140166240 +0200
@@ -89,8 +89,6 @@
gpu3d_shader 74
ipu1_podf 75
@@ -57395,9 +35778,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/imx6q-clock.txt
Examples:
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/imx6sl-clock.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6sl-clock.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/imx6sl-clock.txt linux-solidrun/Documentation/devicetree/bindings/clock/imx6sl-clock.txt
--- linux-3.10.36/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 2014-04-21 13:50:38.846712754 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 2014-04-24 07:58:12.140166240 +0200
@@ -0,0 +1,10 @@
+* Clock bindings for Freescale i.MX6 SoloLite
+
@@ -57409,9 +35792,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/imx6sl-clock.txt
+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.36/Documentation/devicetree/bindings/clock/vf610-clock.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/vf610-clock.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/vf610-clock.txt linux-solidrun/Documentation/devicetree/bindings/clock/vf610-clock.txt
--- linux-3.10.36/Documentation/devicetree/bindings/clock/vf610-clock.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/vf610-clock.txt 2014-04-21 13:50:38.846712754 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/clock/vf610-clock.txt 2014-04-24 07:58:12.152166281 +0200
@@ -0,0 +1,26 @@
+* Clock bindings for Freescale Vybrid VF610 SOC
+
@@ -57439,9 +35822,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/clock/vf610-clock.txt
+ clocks = <&clks VF610_CLK_UART1>;
+ clock-names = "ipg";
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt linux-solidrun/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt
--- linux-3.10.36/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 2014-04-21 13:50:38.846712754 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 2014-04-24 07:58:12.152166281 +0200
@@ -0,0 +1,59 @@
+iMX6q/iMX6dl/iMX6sl specific CPUFREQ settings
+
@@ -57502,9 +35885,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.
+ next-level-cache = <&L2>;
+ };
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-solidrun/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
--- linux-3.10.36/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-04-21 13:50:38.850712771 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-04-24 07:58:12.152166281 +0200
@@ -4,14 +4,71 @@
- compatible : Should be "fsl,<chip>-sdma"
- reg : Should contain SDMA registers location and length
@@ -57577,9 +35960,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt l
+ dma-names = "rx", "tx";
+ fsl,fifo-depth = <15>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt linux-solidrun/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt
--- linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 2014-04-21 13:50:38.850712771 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 2014-04-24 07:58:12.156166297 +0200
@@ -0,0 +1,30 @@
+* Freescale MXC Electrophoretic Display Controller (EPDC)
+
@@ -57611,9 +35994,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt lin
+ DISPLAY_supply = <&DISPLAY_reg>;
+ status = "disabled";
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-solidrun/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt
--- linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-04-21 13:50:38.850712771 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-04-24 07:58:12.156166297 +0200
@@ -0,0 +1,146 @@
+* FSL IPUv3 Display/FB
+
@@ -57761,9 +36144,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt li
+ resets = <&mipi_dsi_reset>;
+ status = "okay";
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/mxsfb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/mxsfb.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/mxsfb.txt linux-solidrun/Documentation/devicetree/bindings/fb/mxsfb.txt
--- linux-3.10.36/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-04-21 13:50:38.850712771 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-04-24 07:58:12.156166297 +0200
@@ -3,6 +3,9 @@
Required properties:
- compatible: Should be "fsl,<chip>-lcdif". Supported chips include
@@ -57785,9 +36168,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/fb/mxsfb.txt linux-lin
display: display {
bits-per-pixel = <32>;
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt linux-solidrun/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt
--- linux-3.10.36/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 2014-04-21 13:50:38.854712788 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 2014-04-24 07:58:12.172166351 +0200
@@ -0,0 +1,23 @@
+* ELAN Resistive Touch Controller
+
@@ -57812,9 +36195,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/input/touchscreen/elan
+ gpio_intr = <&gpio3 28 0>;
+ status = "okay";
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/leds/leds-pwm.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-solidrun/Documentation/devicetree/bindings/leds/leds-pwm.txt
--- linux-3.10.36/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-04-21 13:50:38.858712805 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-04-24 07:58:12.172166351 +0200
@@ -13,6 +13,9 @@
For the pwms and pwm-names property please refer to:
Documentation/devicetree/bindings/pwm/pwm.txt
@@ -57825,9 +36208,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/leds/leds-pwm.txt linu
- label : (optional)
see Documentation/devicetree/bindings/leds/common.txt
- linux,default-trigger : (optional)
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mfd/vexpress-spc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mfd/vexpress-spc.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mfd/vexpress-spc.txt linux-solidrun/Documentation/devicetree/bindings/mfd/vexpress-spc.txt
--- linux-3.10.36/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 2014-04-21 13:50:38.862712821 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 2014-04-24 07:58:12.184166396 +0200
@@ -0,0 +1,35 @@
+* ARM Versatile Express Serial Power Controller device tree bindings
+
@@ -57864,9 +36247,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mfd/vexpress-spc.txt l
+ reg = <0 0x7FFF0000 0 0x1000>;
+ interrupts = <0 95 4>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mlb/mlb150.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mlb/mlb150.txt linux-solidrun/Documentation/devicetree/bindings/mlb/mlb150.txt
--- linux-3.10.36/Documentation/devicetree/bindings/mlb/mlb150.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-04-21 13:50:38.862712821 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-04-24 07:58:12.188166408 +0200
@@ -0,0 +1,22 @@
+* Freescale Media Local Bus Host Controller (MLB) for i.MX6Q/DL
+
@@ -57890,9 +36273,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mlb/mlb150.txt linux-l
+ clock-names = "mlb", "pll8_mlb";
+ iram = <&ocram>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt linux-solidrun/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
--- linux-3.10.36/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-04-21 13:50:38.862712821 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-04-24 07:58:12.192166421 +0200
@@ -12,6 +12,11 @@
Optional properties:
- fsl,cd-controller : Indicate to use controller internal card detection
@@ -57905,9 +36288,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
Examples:
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mmc/mmc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mmc/mmc.txt linux-solidrun/Documentation/devicetree/bindings/mmc/mmc.txt
--- linux-3.10.36/Documentation/devicetree/bindings/mmc/mmc.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt 2014-04-21 13:50:38.862712821 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/mmc/mmc.txt 2014-04-24 07:58:12.192166421 +0200
@@ -5,6 +5,8 @@
Interpreted by the OF core:
- reg: Registers location and length.
@@ -57933,9 +36316,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mmc/mmc.txt linux-lina
*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.36/Documentation/devicetree/bindings/mtd/gpmi-nand.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mtd/gpmi-nand.txt linux-solidrun/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
--- linux-3.10.36/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-04-21 13:50:38.862712821 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-04-24 07:58:12.196166436 +0200
@@ -17,6 +17,14 @@
Optional properties:
- nand-on-flash-bbt: boolean to enable on flash bbt option if not
@@ -57951,9 +36334,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/mtd/gpmi-nand.txt linu
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.36/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt linux-solidrun/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
--- linux-3.10.36/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-04-21 13:50:38.866712838 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-04-24 07:58:12.200166451 +0200
@@ -15,6 +15,13 @@
Optional properties:
@@ -57968,9 +36351,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/net/can/fsl-flexcan.tx
Example:
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pci/designware-pcie.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/designware-pcie.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pci/designware-pcie.txt linux-solidrun/Documentation/devicetree/bindings/pci/designware-pcie.txt
--- linux-3.10.36/Documentation/devicetree/bindings/pci/designware-pcie.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/designware-pcie.txt 2014-04-21 13:50:38.866712838 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/pci/designware-pcie.txt 2014-04-24 07:58:12.200166451 +0200
@@ -0,0 +1,81 @@
+* Synopsis Designware PCIe interface
+
@@ -58053,9 +36436,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pci/designware-pcie.tx
+ pcie@2a0000 {
+ reset-gpio = <&pin_ctrl 22 0>;
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pci/mvebu-pci.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/mvebu-pci.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pci/mvebu-pci.txt linux-solidrun/Documentation/devicetree/bindings/pci/mvebu-pci.txt
--- linux-3.10.36/Documentation/devicetree/bindings/pci/mvebu-pci.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/mvebu-pci.txt 2014-04-21 13:50:38.866712838 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/pci/mvebu-pci.txt 2014-04-24 07:58:12.200166451 +0200
@@ -0,0 +1,221 @@
+* Marvell EBU PCIe interfaces
+
@@ -58278,9 +36661,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pci/mvebu-pci.txt linu
+ status = "disabled";
+ };
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt linux-solidrun/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt
--- linux-3.10.36/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt 2014-04-21 13:50:38.866712838 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt 2014-04-24 07:58:12.204166465 +0200
@@ -0,0 +1,41 @@
+Freescale Vybrid VF610 IOMUX Controller
+
@@ -58323,9 +36706,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinc
+
+Please refer to vf610-pinfunc.h in device tree source folder
+for all available PIN_FUNC_ID for Vybrid VF610.
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-solidrun/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
--- linux-3.10.36/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-04-21 13:50:38.870712855 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-04-24 07:58:12.204166465 +0200
@@ -71,6 +71,13 @@
name for integer state ID 0, list entry 1 for state ID 1, and
so on.
@@ -58340,9 +36723,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/pinctrl/pinctrl-bindin
For example:
/* For a client device requiring named states */
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/regulator/max17135-regulator.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/max17135-regulator.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/regulator/max17135-regulator.txt linux-solidrun/Documentation/devicetree/bindings/regulator/max17135-regulator.txt
--- linux-3.10.36/Documentation/devicetree/bindings/regulator/max17135-regulator.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/max17135-regulator.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/regulator/max17135-regulator.txt 2014-04-24 07:58:12.236166577 +0200
@@ -0,0 +1,112 @@
+Maxim MAX17135 Voltage Regulator
+
@@ -58456,9 +36839,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/regulator/max17135-reg
+ };
+ };
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/regulator/pfuze100.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/pfuze100.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/regulator/pfuze100.txt linux-solidrun/Documentation/devicetree/bindings/regulator/pfuze100.txt
--- linux-3.10.36/Documentation/devicetree/bindings/regulator/pfuze100.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/pfuze100.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/regulator/pfuze100.txt 2014-04-24 07:58:12.236166577 +0200
@@ -0,0 +1,115 @@
+PFUZE100 family of regulators
+
@@ -58575,9 +36958,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/regulator/pfuze100.txt
+ };
+ };
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/reset/gpio-reset.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-solidrun/Documentation/devicetree/bindings/reset/gpio-reset.txt
--- linux-3.10.36/Documentation/devicetree/bindings/reset/gpio-reset.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-04-24 07:58:12.248166619 +0200
@@ -0,0 +1,35 @@
+GPIO reset controller
+=====================
@@ -58614,9 +36997,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/reset/gpio-reset.txt l
+ /* ... */
+ resets = <&sii902x_reset>; /* active-low GPIO5_0, 10 ms delay */
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/cs42888.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/cs42888.txt linux-solidrun/Documentation/devicetree/bindings/sound/cs42888.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/cs42888.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/cs42888.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,29 @@
+CS42888 audio CODEC
+
@@ -58647,9 +37030,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/cs42888.txt linu
+ VLS-supply = <&reg_audio>;
+ VLC-supply = <&reg_audio>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-solidrun/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,23 @@
+* Freescale Asynchronous Sample Rate Converter (ASRC)
+
@@ -58674,9 +37057,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
+ fsl,asrc-dma-tx-events = <20 21 22>;
+ status = "okay";
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-easi.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-easi.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-easi.txt linux-solidrun/Documentation/devicetree/bindings/sound/fsl-easi.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-easi.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-easi.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/fsl-easi.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,26 @@
+* Freescale Enhanced Serial Audio Interface (ESAI)
+
@@ -58704,9 +37087,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl-easi.txt lin
+ fsl,flags = <1>;
+ status = "disabled";
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl,spdif.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl,spdif.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl,spdif.txt linux-solidrun/Documentation/devicetree/bindings/sound/fsl,spdif.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/fsl,spdif.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl,spdif.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/fsl,spdif.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,54 @@
+Freescale Sony/Philips Digital Interface Format (S/PDIF) Controller
+
@@ -58762,9 +37145,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/fsl,spdif.txt li
+
+ status = "okay";
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,25 @@
+Freescale i.MX audio complex with CS42888 codec
+
@@ -58791,9 +37174,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-cs4288
+ asrc-controller = <&asrc_p2p>;
+ audio-codec = <&codec>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,24 @@
+Freescale i.MX audio complex with si476x codec
+
@@ -58819,9 +37202,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-si476x
+ mux-int-port = <2>;
+ mux-ext-port = <5>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,34 @@
+Freescale i.MX audio complex with S/PDIF transceiver
+
@@ -58857,9 +37240,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-spdif.
+ spdif-out;
+ spdif-in;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-04-21 13:50:38.874712872 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-04-24 07:58:12.256166648 +0200
@@ -0,0 +1,54 @@
+Freescale i.MX audio complex with WM8962 codec
+
@@ -58915,9 +37298,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/imx-audio-wm8962
+ hp-det-gpios = <&gpio7 8 1>;
+ mic-det-gpios = <&gpio1 9 1>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/wm8962.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/wm8962.txt linux-solidrun/Documentation/devicetree/bindings/sound/wm8962.txt
--- linux-3.10.36/Documentation/devicetree/bindings/sound/wm8962.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt 2014-04-21 13:50:38.878712889 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/sound/wm8962.txt 2014-04-24 07:58:12.260166662 +0200
@@ -8,9 +8,40 @@
- reg : the I2C address of the device.
@@ -58959,9 +37342,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/sound/wm8962.txt linux
+ 0x0000 /* 5:Default */
+ >;
};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/spi/spi-bus.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/spi/spi-bus.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/spi/spi-bus.txt linux-solidrun/Documentation/devicetree/bindings/spi/spi-bus.txt
--- linux-3.10.36/Documentation/devicetree/bindings/spi/spi-bus.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/spi/spi-bus.txt 2014-04-21 13:50:38.878712889 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/spi/spi-bus.txt 2014-04-24 07:58:12.260166662 +0200
@@ -55,6 +55,16 @@
chip select active high
- spi-3wire - (optional) Empty property indicating device requires
@@ -58979,9 +37362,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/spi/spi-bus.txt linux-
If a gpio chipselect is used for the SPI slave the gpio number will be passed
via the cs_gpio
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/thermal/imx-thermal.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/thermal/imx-thermal.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/thermal/imx-thermal.txt linux-solidrun/Documentation/devicetree/bindings/thermal/imx-thermal.txt
--- linux-3.10.36/Documentation/devicetree/bindings/thermal/imx-thermal.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/thermal/imx-thermal.txt 2014-04-21 13:50:38.878712889 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/thermal/imx-thermal.txt 2014-04-24 07:58:12.264166676 +0200
@@ -0,0 +1,17 @@
+* Temperature Monitor (TEMPMON) on Freescale i.MX SoCs
+
@@ -59000,9 +37383,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/thermal/imx-thermal.tx
+ fsl,tempmon = <&anatop>;
+ fsl,tempmon-data = <&ocotp>;
+};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt linux-solidrun/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
--- linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt 2014-04-21 13:50:38.878712889 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt 2014-04-24 07:58:12.276166718 +0200
@@ -8,6 +8,8 @@
Optional properties:
- fsl,uart-has-rtscts : Indicate the uart has rts and cts
@@ -59018,9 +37401,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-imx-uar
fsl,uart-has-rtscts;
+ fsl,dte-mode;
};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt linux-solidrun/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt
--- linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt 2014-04-21 13:50:38.878712889 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt 2014-04-24 07:58:12.276166718 +0200
@@ -0,0 +1,14 @@
+* Freescale low power universal asynchronous receiver/transmitter (lpuart)
+
@@ -59036,9 +37419,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.
+ reg = <0x40027000 0x1000>;
+ interrupts = <0 61 0x00>;
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt linux-solidrun/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
--- linux-3.10.36/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt 2014-04-21 13:50:38.882712906 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt 2014-04-24 07:58:12.276166718 +0200
@@ -5,6 +5,12 @@
- reg: Should contain registers location and length
- interrupts: Should contain controller interrupt
@@ -59072,9 +37455,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt li
+ imx6-usb-charger-detection;
+ fsl,anatop = <&anatop>;
};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/mxs-phy.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-solidrun/Documentation/devicetree/bindings/usb/mxs-phy.txt
--- linux-3.10.36/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-04-21 13:50:38.882712906 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-04-24 07:58:12.280166733 +0200
@@ -1,13 +1,16 @@
* Freescale MXS USB Phy Device
@@ -59093,9 +37476,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-
interrupts = <0 44 0x04>;
+ fsl,anatop = <&anatop>;
};
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt linux-solidrun/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt
--- linux-3.10.36/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-04-21 13:50:38.882712906 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-04-24 07:58:12.284166747 +0200
@@ -0,0 +1,61 @@
+* Freescale CMOS Sensor Interface (CSI) V4L2 Capture
+
@@ -59158,9 +37541,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,csi-v4l2-cap
+ mclk = <24000000>;
+ mclk_source = <0>;
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-solidrun/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt
--- linux-3.10.36/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-04-21 13:50:38.882712906 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-04-24 07:58:12.284166747 +0200
@@ -0,0 +1,42 @@
+* Freescale MIPI CSI2 Controller for i.MX6DQ/i.MX6SDL
+
@@ -59204,9 +37587,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,mipi-csi2.tx
+ v_channel = <0>;
+ lanes = <2>;
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,pxp.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-solidrun/Documentation/devicetree/bindings/video/fsl,pxp.txt
--- linux-3.10.36/Documentation/devicetree/bindings/video/fsl,pxp.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-04-21 13:50:38.882712906 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-04-24 07:58:12.284166747 +0200
@@ -0,0 +1,30 @@
+* Freescale PxP Controller for i.MX6DL, i.MX6SL
+
@@ -59238,9 +37621,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,pxp.txt linu
+ &pxp {
+ status = "okay";
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-solidrun/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt
--- linux-3.10.36/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-04-21 13:50:38.882712906 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-04-24 07:58:12.284166747 +0200
@@ -0,0 +1,102 @@
+* Freescale V4L2 Capture for i.MX6DQ/i.MX6SDL
+
@@ -59344,9 +37727,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/fsl,v4l2-capture
+ mclk_source = <0>;
+ cvbs = <1>;
+ };
-diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt
+diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-solidrun/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt
--- linux-3.10.36/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-04-21 13:50:38.882712906 +0200
++++ linux-solidrun/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-04-24 07:58:12.284166747 +0200
@@ -0,0 +1,20 @@
+Device-Tree bindings for hdmi video driver
+
@@ -59368,9 +37751,9 @@ diff -Nur linux-3.10.36/Documentation/devicetree/bindings/video/mxc_hdmi_video.t
+ fsl,phy_reg_cksymtx = <0x800d>;
+ };
+
-diff -Nur linux-3.10.36/Documentation/DocBook/mtdnand.tmpl linux-linaro-stable-mx6/Documentation/DocBook/mtdnand.tmpl
+diff -Nur linux-3.10.36/Documentation/DocBook/mtdnand.tmpl linux-solidrun/Documentation/DocBook/mtdnand.tmpl
--- linux-3.10.36/Documentation/DocBook/mtdnand.tmpl 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/DocBook/mtdnand.tmpl 2014-04-21 13:50:38.758712383 +0200
++++ linux-solidrun/Documentation/DocBook/mtdnand.tmpl 2014-04-24 07:58:11.896165382 +0200
@@ -1222,10 +1222,6 @@
#define NAND_BBT_VERSION 0x00000100
/* Create a bbt if none axists */
@@ -59382,9 +37765,9 @@ diff -Nur linux-3.10.36/Documentation/DocBook/mtdnand.tmpl linux-linaro-stable-m
/* Write bbt if neccecary */
#define NAND_BBT_WRITE 0x00001000
/* Read and write back block contents when writing bbt */
-diff -Nur linux-3.10.36/Documentation/driver-model/devres.txt linux-linaro-stable-mx6/Documentation/driver-model/devres.txt
+diff -Nur linux-3.10.36/Documentation/driver-model/devres.txt linux-solidrun/Documentation/driver-model/devres.txt
--- linux-3.10.36/Documentation/driver-model/devres.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/driver-model/devres.txt 2014-04-21 13:50:38.886712923 +0200
++++ linux-solidrun/Documentation/driver-model/devres.txt 2014-04-24 07:58:12.300166802 +0200
@@ -293,3 +293,6 @@
PHY
devm_usb_get_phy()
@@ -59392,9 +37775,9 @@ diff -Nur linux-3.10.36/Documentation/driver-model/devres.txt linux-linaro-stabl
+
+SPI
+ devm_spi_register_master()
-diff -Nur linux-3.10.36/Documentation/kernel-parameters.txt linux-linaro-stable-mx6/Documentation/kernel-parameters.txt
+diff -Nur linux-3.10.36/Documentation/kernel-parameters.txt linux-solidrun/Documentation/kernel-parameters.txt
--- linux-3.10.36/Documentation/kernel-parameters.txt 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/kernel-parameters.txt 2014-04-21 13:50:38.926713091 +0200
++++ linux-solidrun/Documentation/kernel-parameters.txt 2014-04-24 07:58:12.492167478 +0200
@@ -1240,6 +1240,15 @@
See comment before ip2_setup() in
drivers/char/ip2/ip2base.c.
@@ -59433,9 +37816,9 @@ diff -Nur linux-3.10.36/Documentation/kernel-parameters.txt linux-linaro-stable-
x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
default x2apic cluster mode on platforms
supporting x2apic.
-diff -Nur linux-3.10.36/Documentation/vm/zswap.txt linux-linaro-stable-mx6/Documentation/vm/zswap.txt
+diff -Nur linux-3.10.36/Documentation/vm/zswap.txt linux-solidrun/Documentation/vm/zswap.txt
--- linux-3.10.36/Documentation/vm/zswap.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/vm/zswap.txt 2014-04-21 13:50:39.002713412 +0200
++++ linux-solidrun/Documentation/vm/zswap.txt 2014-04-24 07:58:12.668168097 +0200
@@ -0,0 +1,72 @@
+Overview:
+
@@ -59509,9 +37892,9 @@ diff -Nur linux-3.10.36/Documentation/vm/zswap.txt linux-linaro-stable-mx6/Docum
+
+A debugfs interface is provided for various statistic about pool size, number
+of pages stored, and various counters for the reasons pages are rejected.
-diff -Nur linux-3.10.36/drivers/acpi/pci_irq.c linux-linaro-stable-mx6/drivers/acpi/pci_irq.c
+diff -Nur linux-3.10.36/drivers/acpi/pci_irq.c linux-solidrun/drivers/acpi/pci_irq.c
--- linux-3.10.36/drivers/acpi/pci_irq.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/acpi/pci_irq.c 2014-04-21 13:50:40.314718946 +0200
++++ linux-solidrun/drivers/acpi/pci_irq.c 2014-04-24 07:58:18.516188668 +0200
@@ -432,7 +432,6 @@
pin_name(pin));
}
@@ -59520,9 +37903,9 @@ diff -Nur linux-3.10.36/drivers/acpi/pci_irq.c linux-linaro-stable-mx6/drivers/a
return 0;
}
-diff -Nur linux-3.10.36/drivers/acpi/processor_throttling.c linux-linaro-stable-mx6/drivers/acpi/processor_throttling.c
+diff -Nur linux-3.10.36/drivers/acpi/processor_throttling.c linux-solidrun/drivers/acpi/processor_throttling.c
--- linux-3.10.36/drivers/acpi/processor_throttling.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/acpi/processor_throttling.c 2014-04-21 13:50:40.318718963 +0200
++++ linux-solidrun/drivers/acpi/processor_throttling.c 2014-04-24 07:58:18.520188683 +0200
@@ -59,12 +59,6 @@
int target_state; /* target T-state */
};
@@ -59666,9 +38049,9 @@ diff -Nur linux-3.10.36/drivers/acpi/processor_throttling.c linux-linaro-stable-
return ret;
}
-diff -Nur linux-3.10.36/drivers/acpi/resource.c linux-linaro-stable-mx6/drivers/acpi/resource.c
+diff -Nur linux-3.10.36/drivers/acpi/resource.c linux-solidrun/drivers/acpi/resource.c
--- linux-3.10.36/drivers/acpi/resource.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/acpi/resource.c 2014-04-21 13:50:40.318718963 +0200
++++ linux-solidrun/drivers/acpi/resource.c 2014-04-24 07:58:18.520188683 +0200
@@ -77,24 +77,18 @@
switch (ares->type) {
case ACPI_RESOURCE_TYPE_MEMORY24:
@@ -59711,9 +38094,9 @@ diff -Nur linux-3.10.36/drivers/acpi/resource.c linux-linaro-stable-mx6/drivers/
acpi_dev_get_ioresource(res, fixed_io->address,
fixed_io->address_length,
ACPI_DECODE_10);
-diff -Nur linux-3.10.36/drivers/acpi/sleep.c linux-linaro-stable-mx6/drivers/acpi/sleep.c
+diff -Nur linux-3.10.36/drivers/acpi/sleep.c linux-solidrun/drivers/acpi/sleep.c
--- linux-3.10.36/drivers/acpi/sleep.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/acpi/sleep.c 2014-04-21 13:50:40.318718963 +0200
++++ linux-solidrun/drivers/acpi/sleep.c 2014-04-24 07:58:18.520188683 +0200
@@ -78,17 +78,6 @@
return 0;
}
@@ -59782,9 +38165,9 @@ diff -Nur linux-3.10.36/drivers/acpi/sleep.c linux-linaro-stable-mx6/drivers/acp
sleep_states[ACPI_STATE_S5] = 1;
pm_power_off_prepare = acpi_power_off_prepare;
pm_power_off = acpi_power_off;
-diff -Nur linux-3.10.36/drivers/acpi/video.c linux-linaro-stable-mx6/drivers/acpi/video.c
+diff -Nur linux-3.10.36/drivers/acpi/video.c linux-solidrun/drivers/acpi/video.c
--- linux-3.10.36/drivers/acpi/video.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/acpi/video.c 2014-04-21 13:50:40.318718963 +0200
++++ linux-solidrun/drivers/acpi/video.c 2014-04-24 07:58:18.520188683 +0200
@@ -733,7 +733,6 @@
union acpi_object *o;
struct acpi_video_device_brightness *br = NULL;
@@ -59807,9 +38190,9 @@ diff -Nur linux-3.10.36/drivers/acpi/video.c linux-linaro-stable-mx6/drivers/acp
if (br->levels[count] > max_level)
max_level = br->levels[count];
-diff -Nur linux-3.10.36/drivers/ata/ahci.c linux-linaro-stable-mx6/drivers/ata/ahci.c
+diff -Nur linux-3.10.36/drivers/ata/ahci.c linux-solidrun/drivers/ata/ahci.c
--- linux-3.10.36/drivers/ata/ahci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ahci.c 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/ahci.c 2014-04-24 07:58:18.524188696 +0200
@@ -61,7 +61,6 @@
/* board IDs by feature in alphabetical order */
board_ahci,
@@ -59845,9 +38228,9 @@ diff -Nur linux-3.10.36/drivers/ata/ahci.c linux-linaro-stable-mx6/drivers/ata/a
/* Enmotus */
{ PCI_DEVICE(0x1c44, 0x8000), board_ahci },
-diff -Nur linux-3.10.36/drivers/ata/ahci.h linux-linaro-stable-mx6/drivers/ata/ahci.h
+diff -Nur linux-3.10.36/drivers/ata/ahci.h linux-solidrun/drivers/ata/ahci.h
--- linux-3.10.36/drivers/ata/ahci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ahci.h 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/ahci.h 2014-04-24 07:58:18.524188696 +0200
@@ -337,6 +337,7 @@
.sdev_attrs = ahci_sdev_attrs
@@ -59864,9 +38247,9 @@ diff -Nur linux-3.10.36/drivers/ata/ahci.h linux-linaro-stable-mx6/drivers/ata/a
static inline void __iomem *__ahci_port_base(struct ata_host *host,
unsigned int port_no)
-diff -Nur linux-3.10.36/drivers/ata/ahci_imx.c linux-linaro-stable-mx6/drivers/ata/ahci_imx.c
+diff -Nur linux-3.10.36/drivers/ata/ahci_imx.c linux-solidrun/drivers/ata/ahci_imx.c
--- linux-3.10.36/drivers/ata/ahci_imx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/ata/ahci_imx.c 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/ahci_imx.c 2014-04-24 07:58:18.524188696 +0200
@@ -0,0 +1,351 @@
+/*
+ * copyright (c) 2013 Freescale Semiconductor, Inc.
@@ -60219,9 +38602,9 @@ diff -Nur linux-3.10.36/drivers/ata/ahci_imx.c linux-linaro-stable-mx6/drivers/a
+MODULE_AUTHOR("Richard Zhu <Hong-Xing.Zhu@freescale.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ahci:imx");
-diff -Nur linux-3.10.36/drivers/ata/ahci_platform.c linux-linaro-stable-mx6/drivers/ata/ahci_platform.c
+diff -Nur linux-3.10.36/drivers/ata/ahci_platform.c linux-solidrun/drivers/ata/ahci_platform.c
--- linux-3.10.36/drivers/ata/ahci_platform.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ahci_platform.c 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/ahci_platform.c 2014-04-24 07:58:18.524188696 +0200
@@ -49,10 +49,11 @@
};
MODULE_DEVICE_TABLE(platform, ahci_devtype);
@@ -60235,9 +38618,9 @@ diff -Nur linux-3.10.36/drivers/ata/ahci_platform.c linux-linaro-stable-mx6/driv
static struct ata_port_operations ahci_platform_retry_srst_ops = {
.inherits = &ahci_pmp_retry_srst_ops,
-diff -Nur linux-3.10.36/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers/ata/Kconfig
+diff -Nur linux-3.10.36/drivers/ata/Kconfig linux-solidrun/drivers/ata/Kconfig
--- linux-3.10.36/drivers/ata/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/Kconfig 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/Kconfig 2014-04-24 07:58:18.524188696 +0200
@@ -97,6 +97,15 @@
If unsure, say N.
@@ -60254,9 +38637,9 @@ diff -Nur linux-3.10.36/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers/ata/
config SATA_FSL
tristate "Freescale 3.0Gbps SATA support"
depends on FSL_SOC
-diff -Nur linux-3.10.36/drivers/ata/libahci.c linux-linaro-stable-mx6/drivers/ata/libahci.c
+diff -Nur linux-3.10.36/drivers/ata/libahci.c linux-solidrun/drivers/ata/libahci.c
--- linux-3.10.36/drivers/ata/libahci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/libahci.c 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/libahci.c 2014-04-24 07:58:18.524188696 +0200
@@ -89,7 +89,6 @@
static int ahci_hardreset(struct ata_link *link, unsigned int *class,
unsigned long deadline);
@@ -60282,9 +38665,9 @@ diff -Nur linux-3.10.36/drivers/ata/libahci.c linux-linaro-stable-mx6/drivers/at
static void ahci_post_internal_cmd(struct ata_queued_cmd *qc)
{
-diff -Nur linux-3.10.36/drivers/ata/libata-core.c linux-linaro-stable-mx6/drivers/ata/libata-core.c
+diff -Nur linux-3.10.36/drivers/ata/libata-core.c linux-solidrun/drivers/ata/libata-core.c
--- linux-3.10.36/drivers/ata/libata-core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/libata-core.c 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/libata-core.c 2014-04-24 07:58:18.528188710 +0200
@@ -4152,7 +4152,6 @@
/* Seagate Momentus SpinPoint M8 seem to have FPMDA_AA issues */
@@ -60293,9 +38676,9 @@ diff -Nur linux-3.10.36/drivers/ata/libata-core.c linux-linaro-stable-mx6/driver
/* Blacklist entries taken from Silicon Image 3124/3132
Windows driver .inf file - also several Linux problem reports */
-diff -Nur linux-3.10.36/drivers/ata/libata-pmp.c linux-linaro-stable-mx6/drivers/ata/libata-pmp.c
+diff -Nur linux-3.10.36/drivers/ata/libata-pmp.c linux-solidrun/drivers/ata/libata-pmp.c
--- linux-3.10.36/drivers/ata/libata-pmp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/libata-pmp.c 2014-04-21 13:50:40.326718997 +0200
++++ linux-solidrun/drivers/ata/libata-pmp.c 2014-04-24 07:58:18.528188710 +0200
@@ -447,11 +447,8 @@
* otherwise. Don't try hard to recover it.
*/
@@ -60310,9 +38693,9 @@ diff -Nur linux-3.10.36/drivers/ata/libata-pmp.c linux-linaro-stable-mx6/drivers
ata_for_each_link(link, ap, EDGE) {
/* SRST breaks detection and disks get misclassified
* LPM disabled to avoid potential problems
-diff -Nur linux-3.10.36/drivers/ata/Makefile linux-linaro-stable-mx6/drivers/ata/Makefile
+diff -Nur linux-3.10.36/drivers/ata/Makefile linux-solidrun/drivers/ata/Makefile
--- linux-3.10.36/drivers/ata/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/Makefile 2014-04-21 13:50:40.322718980 +0200
++++ linux-solidrun/drivers/ata/Makefile 2014-04-24 07:58:18.524188696 +0200
@@ -10,6 +10,7 @@
obj-$(CONFIG_SATA_SIL24) += sata_sil24.o
obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o
@@ -60321,9 +38704,9 @@ diff -Nur linux-3.10.36/drivers/ata/Makefile linux-linaro-stable-mx6/drivers/ata
# SFF w/ custom DMA
obj-$(CONFIG_PDC_ADMA) += pdc_adma.o
-diff -Nur linux-3.10.36/drivers/ata/sata_sil.c linux-linaro-stable-mx6/drivers/ata/sata_sil.c
+diff -Nur linux-3.10.36/drivers/ata/sata_sil.c linux-solidrun/drivers/ata/sata_sil.c
--- linux-3.10.36/drivers/ata/sata_sil.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_sil.c 2014-04-21 13:50:40.338719048 +0200
++++ linux-solidrun/drivers/ata/sata_sil.c 2014-04-24 07:58:18.544188767 +0200
@@ -157,7 +157,6 @@
{ "ST380011ASL", SIL_QUIRK_MOD15WRITE },
{ "ST3120022ASL", SIL_QUIRK_MOD15WRITE },
@@ -60332,9 +38715,9 @@ diff -Nur linux-3.10.36/drivers/ata/sata_sil.c linux-linaro-stable-mx6/drivers/a
{ "Maxtor 4D060H3", SIL_QUIRK_UDMA5MAX },
{ }
};
-diff -Nur linux-3.10.36/drivers/base/base.h linux-linaro-stable-mx6/drivers/base/base.h
+diff -Nur linux-3.10.36/drivers/base/base.h linux-solidrun/drivers/base/base.h
--- linux-3.10.36/drivers/base/base.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/base.h 2014-04-21 13:50:40.350719098 +0200
++++ linux-solidrun/drivers/base/base.h 2014-04-24 07:58:18.556188808 +0200
@@ -119,6 +119,11 @@
return drv->bus->match ? drv->bus->match(dev, drv) : 1;
}
@@ -60347,9 +38730,9 @@ diff -Nur linux-3.10.36/drivers/base/base.h linux-linaro-stable-mx6/drivers/base
extern char *make_class_name(const char *name, struct kobject *kobj);
extern int devres_release_all(struct device *dev);
-diff -Nur linux-3.10.36/drivers/base/bus.c linux-linaro-stable-mx6/drivers/base/bus.c
+diff -Nur linux-3.10.36/drivers/base/bus.c linux-solidrun/drivers/base/bus.c
--- linux-3.10.36/drivers/base/bus.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/bus.c 2014-04-21 13:50:40.350719098 +0200
++++ linux-solidrun/drivers/base/bus.c 2014-04-24 07:58:18.556188808 +0200
@@ -499,6 +499,9 @@
error = device_add_attrs(bus, dev);
if (error)
@@ -60377,9 +38760,9 @@ diff -Nur linux-3.10.36/drivers/base/bus.c linux-linaro-stable-mx6/drivers/base/
if (klist_node_attached(&dev->p->knode_bus))
klist_del(&dev->p->knode_bus);
-diff -Nur linux-3.10.36/drivers/base/component.c linux-linaro-stable-mx6/drivers/base/component.c
+diff -Nur linux-3.10.36/drivers/base/component.c linux-solidrun/drivers/base/component.c
--- linux-3.10.36/drivers/base/component.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/base/component.c 2014-04-21 13:50:40.350719098 +0200
++++ linux-solidrun/drivers/base/component.c 2014-04-24 07:58:18.556188808 +0200
@@ -0,0 +1,382 @@
+/*
+ * Componentized device handling.
@@ -60763,9 +39146,9 @@ diff -Nur linux-3.10.36/drivers/base/component.c linux-linaro-stable-mx6/drivers
+EXPORT_SYMBOL_GPL(component_del);
+
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/base/core.c linux-linaro-stable-mx6/drivers/base/core.c
+diff -Nur linux-3.10.36/drivers/base/core.c linux-solidrun/drivers/base/core.c
--- linux-3.10.36/drivers/base/core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/core.c 2014-04-21 13:50:40.350719098 +0200
++++ linux-solidrun/drivers/base/core.c 2014-04-24 07:58:18.556188808 +0200
@@ -461,8 +461,7 @@
device_remove_bin_file(dev, &attrs[i]);
}
@@ -60787,9 +39170,9 @@ diff -Nur linux-3.10.36/drivers/base/core.c linux-linaro-stable-mx6/drivers/base
{
int i;
-diff -Nur linux-3.10.36/drivers/base/Makefile linux-linaro-stable-mx6/drivers/base/Makefile
+diff -Nur linux-3.10.36/drivers/base/Makefile linux-solidrun/drivers/base/Makefile
--- linux-3.10.36/drivers/base/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/Makefile 2014-04-21 13:50:40.350719098 +0200
++++ linux-solidrun/drivers/base/Makefile 2014-04-24 07:58:18.556188808 +0200
@@ -1,6 +1,6 @@
# Makefile for the Linux device tree
@@ -60798,9 +39181,9 @@ diff -Nur linux-3.10.36/drivers/base/Makefile linux-linaro-stable-mx6/drivers/ba
driver.o class.o platform.o \
cpu.o firmware.o init.o map.o devres.o \
attribute_container.o transport_class.o \
-diff -Nur linux-3.10.36/drivers/base/pinctrl.c linux-linaro-stable-mx6/drivers/base/pinctrl.c
+diff -Nur linux-3.10.36/drivers/base/pinctrl.c linux-solidrun/drivers/base/pinctrl.c
--- linux-3.10.36/drivers/base/pinctrl.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/pinctrl.c 2014-04-21 13:50:40.354719115 +0200
++++ linux-solidrun/drivers/base/pinctrl.c 2014-04-24 07:58:18.560188822 +0200
@@ -48,6 +48,25 @@
goto cleanup_get;
}
@@ -60827,9 +39210,9 @@ diff -Nur linux-3.10.36/drivers/base/pinctrl.c linux-linaro-stable-mx6/drivers/b
return 0;
/*
-diff -Nur linux-3.10.36/drivers/base/regmap/internal.h linux-linaro-stable-mx6/drivers/base/regmap/internal.h
+diff -Nur linux-3.10.36/drivers/base/regmap/internal.h linux-solidrun/drivers/base/regmap/internal.h
--- linux-3.10.36/drivers/base/regmap/internal.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/regmap/internal.h 2014-04-21 13:50:40.358719132 +0200
++++ linux-solidrun/drivers/base/regmap/internal.h 2014-04-24 07:58:18.564188837 +0200
@@ -52,6 +52,7 @@
struct regmap {
struct mutex mutex;
@@ -60838,9 +39221,9 @@ diff -Nur linux-3.10.36/drivers/base/regmap/internal.h linux-linaro-stable-mx6/d
regmap_lock lock;
regmap_unlock unlock;
void *lock_arg; /* This is passed to lock/unlock functions */
-diff -Nur linux-3.10.36/drivers/base/regmap/regmap.c linux-linaro-stable-mx6/drivers/base/regmap/regmap.c
+diff -Nur linux-3.10.36/drivers/base/regmap/regmap.c linux-solidrun/drivers/base/regmap/regmap.c
--- linux-3.10.36/drivers/base/regmap/regmap.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/regmap/regmap.c 2014-04-21 13:50:40.358719132 +0200
++++ linux-solidrun/drivers/base/regmap/regmap.c 2014-04-24 07:58:18.564188837 +0200
@@ -302,13 +302,16 @@
static void regmap_lock_spinlock(void *__map)
{
@@ -60860,9 +39243,9 @@ diff -Nur linux-3.10.36/drivers/base/regmap/regmap.c linux-linaro-stable-mx6/dri
}
static void dev_get_regmap_release(struct device *dev, void *res)
-diff -Nur linux-3.10.36/drivers/block/aoe/aoecmd.c linux-linaro-stable-mx6/drivers/block/aoe/aoecmd.c
+diff -Nur linux-3.10.36/drivers/block/aoe/aoecmd.c linux-solidrun/drivers/block/aoe/aoecmd.c
--- linux-3.10.36/drivers/block/aoe/aoecmd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/block/aoe/aoecmd.c 2014-04-21 13:50:40.362719149 +0200
++++ linux-solidrun/drivers/block/aoe/aoecmd.c 2014-04-24 07:58:18.588188922 +0200
@@ -899,7 +899,7 @@
* but this has never been seen here.
*/
@@ -60872,9 +39255,9 @@ diff -Nur linux-3.10.36/drivers/block/aoe/aoecmd.c linux-linaro-stable-mx6/drive
pr_crit("page tail used for block I/O\n");
BUG();
}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_conf.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_conf.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_conf.c linux-solidrun/drivers/block/enhanceio/eio_conf.c
--- linux-3.10.36/drivers/block/enhanceio/eio_conf.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_conf.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_conf.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,2630 @@
+/*
+ * eio_conf.c
@@ -63506,9 +41889,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_conf.c linux-linaro-stable-m
+MODULE_AUTHOR("STEC, Inc. based on code by Facebook");
+
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_fifo.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_fifo.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_fifo.c linux-solidrun/drivers/block/enhanceio/eio_fifo.c
--- linux-3.10.36/drivers/block/enhanceio/eio_fifo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_fifo.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_fifo.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,239 @@
+/*
+ * eio_fifo.c
@@ -63749,9 +42132,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_fifo.c linux-linaro-stable-m
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("FIFO policy for EnhanceIO");
+MODULE_AUTHOR("STEC, Inc. based on code by Facebook");
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio.h
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio.h linux-solidrun/drivers/block/enhanceio/eio.h
--- linux-3.10.36/drivers/block/enhanceio/eio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio.h 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio.h 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,1150 @@
+/*
+ * eio.h
@@ -64903,9 +43286,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio.h linux-linaro-stable-mx6/dr
+#define EIO_CACHE(dmc) (EIO_MD8(dmc) ? (void *)dmc->cache_md8 : (void *)dmc->cache)
+
+#endif /* !EIO_INC_H */
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ioctl.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ioctl.c linux-solidrun/drivers/block/enhanceio/eio_ioctl.c
--- linux-3.10.36/drivers/block/enhanceio/eio_ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_ioctl.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,157 @@
+/*
+ * eio_ioctl.c
@@ -65064,9 +43447,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ioctl.c linux-linaro-stable-
+{
+ return eio_ioctl(filp, cmd, arg);
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ioctl.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.h
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ioctl.h linux-solidrun/drivers/block/enhanceio/eio_ioctl.h
--- linux-3.10.36/drivers/block/enhanceio/eio_ioctl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.h 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_ioctl.h 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,86 @@
+/*
+ * eio_ioctl.h
@@ -65154,9 +43537,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ioctl.h linux-linaro-stable-
+#endif /* __KERNEL__ */
+
+#endif /* !EIO_IOCTL_H */
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_lru.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_lru.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_lru.c linux-solidrun/drivers/block/enhanceio/eio_lru.c
--- linux-3.10.36/drivers/block/enhanceio/eio_lru.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_lru.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_lru.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,322 @@
+/*
+ * eio_lru.c
@@ -65480,9 +43863,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_lru.c linux-linaro-stable-mx
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("LRU policy for EnhanceIO");
+MODULE_AUTHOR("STEC, Inc. based on code by Facebook");
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_main.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_main.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_main.c linux-solidrun/drivers/block/enhanceio/eio_main.c
--- linux-3.10.36/drivers/block/enhanceio/eio_main.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_main.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_main.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,3546 @@
+/*
+ * eio_main.c
@@ -69030,9 +47413,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_main.c linux-linaro-stable-m
+
+ spin_unlock_irqrestore(&dmc->dirty_set_lru_lock, flags);
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_mem.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_mem.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_mem.c linux-solidrun/drivers/block/enhanceio/eio_mem.c
--- linux-3.10.36/drivers/block/enhanceio/eio_mem.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_mem.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_mem.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,236 @@
+/*
+ * eio_mem.c
@@ -69270,9 +47653,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_mem.c linux-linaro-stable-mx
+ dbn != 0) /* we're replacing sector 0 */
+ dmc->index_zero = dmc->assoc;
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_policy.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_policy.c linux-solidrun/drivers/block/enhanceio/eio_policy.c
--- linux-3.10.36/drivers/block/enhanceio/eio_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_policy.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,146 @@
+/*
+ * eio_policy.c
@@ -69420,9 +47803,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_policy.c linux-linaro-stable
+ if (p_ops && p_ops->sp_name == CACHE_REPL_LRU)
+ p_ops->sp_policy.lru->sl_reclaim_lru_movetail(dmc, i, p_ops);
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_policy.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.h
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_policy.h linux-solidrun/drivers/block/enhanceio/eio_policy.h
--- linux-3.10.36/drivers/block/enhanceio/eio_policy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.h 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_policy.h 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,105 @@
+/*
+ * eio_policy.h
@@ -69529,9 +47912,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_policy.h linux-linaro-stable
+void eio_put_policy(struct eio_policy *);
+
+#endif /* EIO_POLICY_H */
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_procfs.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_procfs.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_procfs.c linux-solidrun/drivers/block/enhanceio/eio_procfs.c
--- linux-3.10.36/drivers/block/enhanceio/eio_procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_procfs.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_procfs.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,1932 @@
+/*
+ * eio_procfs.c
@@ -71465,9 +49848,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_procfs.c linux-linaro-stable
+
+ return single_open(file, &eio_config_show, PDE_DATA(inode));
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_rand.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_rand.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_rand.c linux-solidrun/drivers/block/enhanceio/eio_rand.c
--- linux-3.10.36/drivers/block/enhanceio/eio_rand.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_rand.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_rand.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,201 @@
+/*
+ * eio_rand.c
@@ -71670,9 +50053,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_rand.c linux-linaro-stable-m
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("RAND policy for EnhanceIO");
+MODULE_AUTHOR("STEC, Inc. based on code by Facebook");
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_setlru.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_setlru.c linux-solidrun/drivers/block/enhanceio/eio_setlru.c
--- linux-3.10.36/drivers/block/enhanceio/eio_setlru.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_setlru.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,170 @@
+/*
+ * eio_setlru.c
@@ -71844,9 +50227,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_setlru.c linux-linaro-stable
+
+ return 0;
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_setlru.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.h
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_setlru.h linux-solidrun/drivers/block/enhanceio/eio_setlru.h
--- linux-3.10.36/drivers/block/enhanceio/eio_setlru.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.h 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_setlru.h 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,49 @@
+/*
+ * eio_setlru.h
@@ -71897,9 +50280,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_setlru.h linux-linaro-stable
+int lru_rem_head(struct lru_ls *llist, index_t *index, u_int64_t *key);
+
+#endif /* _EIO_SETLRU_H_ */
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_subr.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_subr.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_subr.c linux-solidrun/drivers/block/enhanceio/eio_subr.c
--- linux-3.10.36/drivers/block/enhanceio/eio_subr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_subr.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_subr.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,444 @@
+/*
+ * eio_subr.c
@@ -72345,9 +50728,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_subr.c linux-linaro-stable-m
+ pr_info(" resume_caching:cache %s is restored to ACTIVE mode.\n",
+ dmc->cache_name);
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ttc.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.c
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ttc.c linux-solidrun/drivers/block/enhanceio/eio_ttc.c
--- linux-3.10.36/drivers/block/enhanceio/eio_ttc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.c 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_ttc.c 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,1665 @@
+/*
+ * True Transparent Caching (TTC) code.
@@ -74014,9 +52397,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ttc.c linux-linaro-stable-mx
+ }
+ return;
+}
-diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ttc.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.h
+diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ttc.h linux-solidrun/drivers/block/enhanceio/eio_ttc.h
--- linux-3.10.36/drivers/block/enhanceio/eio_ttc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.h 2014-04-21 13:50:40.374719199 +0200
++++ linux-solidrun/drivers/block/enhanceio/eio_ttc.h 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2012 STEC, Inc. All rights not specifically granted
@@ -74170,9 +52553,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/eio_ttc.h linux-linaro-stable-mx
+#endif /* __KERNEL__ */
+
+#endif /* EIO_TTC_H */
-diff -Nur linux-3.10.36/drivers/block/enhanceio/Kconfig linux-linaro-stable-mx6/drivers/block/enhanceio/Kconfig
+diff -Nur linux-3.10.36/drivers/block/enhanceio/Kconfig linux-solidrun/drivers/block/enhanceio/Kconfig
--- linux-3.10.36/drivers/block/enhanceio/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/Kconfig 2014-04-21 13:50:40.370719182 +0200
++++ linux-solidrun/drivers/block/enhanceio/Kconfig 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,21 @@
+#
+# EnhanceIO caching solution by STEC INC.
@@ -74195,9 +52578,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/Kconfig linux-linaro-stable-mx6/
+ the caching engine module.
+
+ If unsure, say N.
-diff -Nur linux-3.10.36/drivers/block/enhanceio/Makefile linux-linaro-stable-mx6/drivers/block/enhanceio/Makefile
+diff -Nur linux-3.10.36/drivers/block/enhanceio/Makefile linux-solidrun/drivers/block/enhanceio/Makefile
--- linux-3.10.36/drivers/block/enhanceio/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/block/enhanceio/Makefile 2014-04-21 13:50:40.370719182 +0200
++++ linux-solidrun/drivers/block/enhanceio/Makefile 2014-04-24 07:58:18.596188950 +0200
@@ -0,0 +1,66 @@
+# test
+# Makefile for EnhanceIO block device caching.
@@ -74265,9 +52648,9 @@ diff -Nur linux-3.10.36/drivers/block/enhanceio/Makefile linux-linaro-stable-mx6
+$(RHEL5_TREE):
+ rpmbuild -bp --target=`uname -m` $(RHEL5_SPEC) 2>&1 | tee `dirname $(RHEL5_SPEC)`/prep.log
+
-diff -Nur linux-3.10.36/drivers/block/Kconfig linux-linaro-stable-mx6/drivers/block/Kconfig
+diff -Nur linux-3.10.36/drivers/block/Kconfig linux-solidrun/drivers/block/Kconfig
--- linux-3.10.36/drivers/block/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/block/Kconfig 2014-04-21 13:50:40.362719149 +0200
++++ linux-solidrun/drivers/block/Kconfig 2014-04-24 07:58:18.572188865 +0200
@@ -541,4 +541,6 @@
To compile this driver as a module, choose M here: the
module will be called rsxx.
@@ -74275,9 +52658,9 @@ diff -Nur linux-3.10.36/drivers/block/Kconfig linux-linaro-stable-mx6/drivers/bl
+source "drivers/block/enhanceio/Kconfig"
+
endif # BLK_DEV
-diff -Nur linux-3.10.36/drivers/block/Makefile linux-linaro-stable-mx6/drivers/block/Makefile
+diff -Nur linux-3.10.36/drivers/block/Makefile linux-solidrun/drivers/block/Makefile
--- linux-3.10.36/drivers/block/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/block/Makefile 2014-04-21 13:50:40.362719149 +0200
++++ linux-solidrun/drivers/block/Makefile 2014-04-24 07:58:18.584188907 +0200
@@ -42,5 +42,7 @@
obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
@@ -74286,9 +52669,9 @@ diff -Nur linux-3.10.36/drivers/block/Makefile linux-linaro-stable-mx6/drivers/b
+
nvme-y := nvme-core.o nvme-scsi.o
swim_mod-y := swim.o swim_asm.o
-diff -Nur linux-3.10.36/drivers/block/xen-blkfront.c linux-linaro-stable-mx6/drivers/block/xen-blkfront.c
+diff -Nur linux-3.10.36/drivers/block/xen-blkfront.c linux-solidrun/drivers/block/xen-blkfront.c
--- linux-3.10.36/drivers/block/xen-blkfront.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/block/xen-blkfront.c 2014-04-21 13:50:40.386719250 +0200
++++ linux-solidrun/drivers/block/xen-blkfront.c 2014-04-24 07:58:18.612189006 +0200
@@ -1518,16 +1518,13 @@
case XenbusStateReconfiguring:
case XenbusStateReconfigured:
@@ -74307,9 +52690,9 @@ diff -Nur linux-3.10.36/drivers/block/xen-blkfront.c linux-linaro-stable-mx6/dri
case XenbusStateClosing:
blkfront_closing(info);
break;
-diff -Nur linux-3.10.36/drivers/bus/arm-cci.c linux-linaro-stable-mx6/drivers/bus/arm-cci.c
+diff -Nur linux-3.10.36/drivers/bus/arm-cci.c linux-solidrun/drivers/bus/arm-cci.c
--- linux-3.10.36/drivers/bus/arm-cci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/bus/arm-cci.c 2014-04-21 13:50:40.390719267 +0200
++++ linux-solidrun/drivers/bus/arm-cci.c 2014-04-24 07:58:18.624189047 +0200
@@ -0,0 +1,945 @@
+/*
+ * CCI cache coherent interconnect driver
@@ -75256,9 +53639,9 @@ diff -Nur linux-3.10.36/drivers/bus/arm-cci.c linux-linaro-stable-mx6/drivers/bu
+core_initcall(cci_pmu_init);
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ARM CCI support");
-diff -Nur linux-3.10.36/drivers/bus/imx-weim.c linux-linaro-stable-mx6/drivers/bus/imx-weim.c
+diff -Nur linux-3.10.36/drivers/bus/imx-weim.c linux-solidrun/drivers/bus/imx-weim.c
--- linux-3.10.36/drivers/bus/imx-weim.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/bus/imx-weim.c 2014-04-21 13:50:40.390719267 +0200
++++ linux-solidrun/drivers/bus/imx-weim.c 2014-04-24 07:58:18.624189047 +0200
@@ -0,0 +1,138 @@
+/*
+ * EIM driver for Freescale's i.MX chips
@@ -75398,9 +53781,9 @@ diff -Nur linux-3.10.36/drivers/bus/imx-weim.c linux-linaro-stable-mx6/drivers/b
+MODULE_AUTHOR("Freescale Semiconductor Inc.");
+MODULE_DESCRIPTION("i.MX EIM Controller Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/bus/Kconfig linux-linaro-stable-mx6/drivers/bus/Kconfig
+diff -Nur linux-3.10.36/drivers/bus/Kconfig linux-solidrun/drivers/bus/Kconfig
--- linux-3.10.36/drivers/bus/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/bus/Kconfig 2014-04-21 13:50:40.390719267 +0200
++++ linux-solidrun/drivers/bus/Kconfig 2014-04-24 07:58:18.624189047 +0200
@@ -4,6 +4,15 @@
menu "Bus devices"
@@ -75429,9 +53812,9 @@ diff -Nur linux-3.10.36/drivers/bus/Kconfig linux-linaro-stable-mx6/drivers/bus/
+ Driver supporting the CCI cache coherent interconnect for ARM
+ platforms.
endmenu
-diff -Nur linux-3.10.36/drivers/bus/Makefile linux-linaro-stable-mx6/drivers/bus/Makefile
+diff -Nur linux-3.10.36/drivers/bus/Makefile linux-solidrun/drivers/bus/Makefile
--- linux-3.10.36/drivers/bus/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/bus/Makefile 2014-04-21 13:50:40.390719267 +0200
++++ linux-solidrun/drivers/bus/Makefile 2014-04-24 07:58:18.624189047 +0200
@@ -2,8 +2,11 @@
# Makefile for the bus drivers.
#
@@ -75444,9 +53827,9 @@ diff -Nur linux-3.10.36/drivers/bus/Makefile linux-linaro-stable-mx6/drivers/bus
obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o
+# CCI cache coherent interconnect for ARM platforms
+obj-$(CONFIG_ARM_CCI) += arm-cci.o
-diff -Nur linux-3.10.36/drivers/char/fsl_otp.c linux-linaro-stable-mx6/drivers/char/fsl_otp.c
+diff -Nur linux-3.10.36/drivers/char/fsl_otp.c linux-solidrun/drivers/char/fsl_otp.c
--- linux-3.10.36/drivers/char/fsl_otp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/char/fsl_otp.c 2014-04-21 13:50:40.394719284 +0200
++++ linux-solidrun/drivers/char/fsl_otp.c 2014-04-24 07:58:18.632189076 +0200
@@ -0,0 +1,299 @@
+/*
+ * Freescale On-Chip OTP driver
@@ -75747,9 +54130,9 @@ diff -Nur linux-3.10.36/drivers/char/fsl_otp.c linux-linaro-stable-mx6/drivers/c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Huang Shijie <b32955@freescale.com>");
+MODULE_DESCRIPTION("Freescale i.MX OCOTP driver");
-diff -Nur linux-3.10.36/drivers/char/Kconfig linux-linaro-stable-mx6/drivers/char/Kconfig
+diff -Nur linux-3.10.36/drivers/char/Kconfig linux-solidrun/drivers/char/Kconfig
--- linux-3.10.36/drivers/char/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/char/Kconfig 2014-04-21 13:50:40.390719267 +0200
++++ linux-solidrun/drivers/char/Kconfig 2014-04-24 07:58:18.624189047 +0200
@@ -94,6 +94,21 @@
If unsure, say N.
@@ -75772,9 +54155,9 @@ diff -Nur linux-3.10.36/drivers/char/Kconfig linux-linaro-stable-mx6/drivers/cha
config PRINTER
tristate "Parallel printer support"
depends on PARPORT
-diff -Nur linux-3.10.36/drivers/char/Makefile linux-linaro-stable-mx6/drivers/char/Makefile
+diff -Nur linux-3.10.36/drivers/char/Makefile linux-solidrun/drivers/char/Makefile
--- linux-3.10.36/drivers/char/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/char/Makefile 2014-04-21 13:50:40.390719267 +0200
++++ linux-solidrun/drivers/char/Makefile 2014-04-24 07:58:18.624189047 +0200
@@ -17,6 +17,7 @@
obj-$(CONFIG_IBM_BSR) += bsr.o
obj-$(CONFIG_SGI_MBCS) += mbcs.o
@@ -75783,9 +54166,9 @@ diff -Nur linux-3.10.36/drivers/char/Makefile linux-linaro-stable-mx6/drivers/ch
obj-$(CONFIG_PRINTER) += lp.o
-diff -Nur linux-3.10.36/drivers/char/raw.c linux-linaro-stable-mx6/drivers/char/raw.c
+diff -Nur linux-3.10.36/drivers/char/raw.c linux-solidrun/drivers/char/raw.c
--- linux-3.10.36/drivers/char/raw.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/char/raw.c 2014-04-21 13:50:40.406719334 +0200
++++ linux-solidrun/drivers/char/raw.c 2014-04-24 07:58:18.668189203 +0200
@@ -190,7 +190,7 @@
struct raw_device_data *rawdev;
struct block_device *bdev;
@@ -75795,9 +54178,9 @@ diff -Nur linux-3.10.36/drivers/char/raw.c linux-linaro-stable-mx6/drivers/char/
return -EINVAL;
rawdev = &raw_devices[number];
-diff -Nur linux-3.10.36/drivers/clk/clk-divider.c linux-linaro-stable-mx6/drivers/clk/clk-divider.c
+diff -Nur linux-3.10.36/drivers/clk/clk-divider.c linux-solidrun/drivers/clk/clk-divider.c
--- linux-3.10.36/drivers/clk/clk-divider.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/clk/clk-divider.c 2014-04-21 13:50:40.410719351 +0200
++++ linux-solidrun/drivers/clk/clk-divider.c 2014-04-24 07:58:18.676189231 +0200
@@ -150,6 +150,7 @@
struct clk_divider *divider = to_clk_divider(hw);
int i, bestdiv = 0;
@@ -75822,9 +54205,9 @@ diff -Nur linux-3.10.36/drivers/clk/clk-divider.c linux-linaro-stable-mx6/driver
parent_rate = __clk_round_rate(__clk_get_parent(hw->clk),
MULT_ROUND_UP(rate, i));
now = parent_rate / i;
-diff -Nur linux-3.10.36/drivers/clk/Kconfig linux-linaro-stable-mx6/drivers/clk/Kconfig
+diff -Nur linux-3.10.36/drivers/clk/Kconfig linux-solidrun/drivers/clk/Kconfig
--- linux-3.10.36/drivers/clk/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/clk/Kconfig 2014-04-21 13:50:40.410719351 +0200
++++ linux-solidrun/drivers/clk/Kconfig 2014-04-24 07:58:18.676189231 +0200
@@ -42,7 +42,7 @@
config COMMON_CLK_VERSATILE
@@ -75834,9 +54217,9 @@ diff -Nur linux-3.10.36/drivers/clk/Kconfig linux-linaro-stable-mx6/drivers/clk/
---help---
Supports clocking on ARM Reference designs:
- Integrator/AP and Integrator/CP
-diff -Nur linux-3.10.36/drivers/clk/versatile/clk-vexpress-osc.c linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-osc.c
+diff -Nur linux-3.10.36/drivers/clk/versatile/clk-vexpress-osc.c linux-solidrun/drivers/clk/versatile/clk-vexpress-osc.c
--- linux-3.10.36/drivers/clk/versatile/clk-vexpress-osc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-osc.c 2014-04-21 13:50:40.418719385 +0200
++++ linux-solidrun/drivers/clk/versatile/clk-vexpress-osc.c 2014-04-24 07:58:18.720189385 +0200
@@ -107,7 +107,7 @@
osc->func = vexpress_config_func_get_by_node(node);
if (!osc->func) {
@@ -75855,9 +54238,9 @@ diff -Nur linux-3.10.36/drivers/clk/versatile/clk-vexpress-osc.c linux-linaro-st
init.ops = &vexpress_osc_ops;
init.flags = CLK_IS_ROOT;
-diff -Nur linux-3.10.36/drivers/clk/versatile/clk-vexpress-spc.c linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-spc.c
+diff -Nur linux-3.10.36/drivers/clk/versatile/clk-vexpress-spc.c linux-solidrun/drivers/clk/versatile/clk-vexpress-spc.c
--- linux-3.10.36/drivers/clk/versatile/clk-vexpress-spc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-spc.c 2014-04-21 13:50:40.418719385 +0200
++++ linux-solidrun/drivers/clk/versatile/clk-vexpress-spc.c 2014-04-24 07:58:18.720189385 +0200
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2012 ARM Limited
@@ -75990,18 +54373,18 @@ diff -Nur linux-3.10.36/drivers/clk/versatile/clk-vexpress-spc.c linux-linaro-st
+}
+CLK_OF_DECLARE(spc, "arm,vexpress-spc", vexpress_clk_of_register_spc);
+#endif
-diff -Nur linux-3.10.36/drivers/clk/versatile/Makefile linux-linaro-stable-mx6/drivers/clk/versatile/Makefile
+diff -Nur linux-3.10.36/drivers/clk/versatile/Makefile linux-solidrun/drivers/clk/versatile/Makefile
--- linux-3.10.36/drivers/clk/versatile/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/clk/versatile/Makefile 2014-04-21 13:50:40.418719385 +0200
++++ linux-solidrun/drivers/clk/versatile/Makefile 2014-04-24 07:58:18.704189330 +0200
@@ -4,4 +4,4 @@
obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o
obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o
obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o clk-sp810.o
-obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o
+obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o clk-vexpress-spc.o
-diff -Nur linux-3.10.36/drivers/clocksource/Kconfig linux-linaro-stable-mx6/drivers/clocksource/Kconfig
+diff -Nur linux-3.10.36/drivers/clocksource/Kconfig linux-solidrun/drivers/clocksource/Kconfig
--- linux-3.10.36/drivers/clocksource/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/clocksource/Kconfig 2014-04-21 13:50:40.418719385 +0200
++++ linux-solidrun/drivers/clocksource/Kconfig 2014-04-24 07:58:18.720189385 +0200
@@ -85,3 +85,8 @@
Samsung S3C, S5P and Exynos SoCs, replacing an earlier driver
for all devicetree enabled platforms. This driver will be
@@ -76011,9 +54394,9 @@ diff -Nur linux-3.10.36/drivers/clocksource/Kconfig linux-linaro-stable-mx6/driv
+ bool
+ help
+ Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
-diff -Nur linux-3.10.36/drivers/clocksource/Makefile linux-linaro-stable-mx6/drivers/clocksource/Makefile
+diff -Nur linux-3.10.36/drivers/clocksource/Makefile linux-solidrun/drivers/clocksource/Makefile
--- linux-3.10.36/drivers/clocksource/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/clocksource/Makefile 2014-04-21 13:50:40.418719385 +0200
++++ linux-solidrun/drivers/clocksource/Makefile 2014-04-24 07:58:18.720189385 +0200
@@ -26,6 +26,7 @@
obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o
obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o
@@ -76022,9 +54405,9 @@ diff -Nur linux-3.10.36/drivers/clocksource/Makefile linux-linaro-stable-mx6/dri
obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o
obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o
-diff -Nur linux-3.10.36/drivers/clocksource/vf_pit_timer.c linux-linaro-stable-mx6/drivers/clocksource/vf_pit_timer.c
+diff -Nur linux-3.10.36/drivers/clocksource/vf_pit_timer.c linux-solidrun/drivers/clocksource/vf_pit_timer.c
--- linux-3.10.36/drivers/clocksource/vf_pit_timer.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/clocksource/vf_pit_timer.c 2014-04-21 13:50:40.422719402 +0200
++++ linux-solidrun/drivers/clocksource/vf_pit_timer.c 2014-04-24 07:58:18.724189400 +0200
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -76220,9 +54603,9 @@ diff -Nur linux-3.10.36/drivers/clocksource/vf_pit_timer.c linux-linaro-stable-m
+ pit_clockevent_init(clk_rate, irq);
+}
+CLOCKSOURCE_OF_DECLARE(vf610, "fsl,vf610-pit", pit_timer_init);
-diff -Nur linux-3.10.36/drivers/cpufreq/arm_big_little.c linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.c
+diff -Nur linux-3.10.36/drivers/cpufreq/arm_big_little.c linux-solidrun/drivers/cpufreq/arm_big_little.c
--- linux-3.10.36/drivers/cpufreq/arm_big_little.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.c 2014-04-21 13:50:40.422719402 +0200
++++ linux-solidrun/drivers/cpufreq/arm_big_little.c 2014-04-24 07:58:18.724189400 +0200
@@ -24,27 +24,148 @@
#include <linux/cpufreq.h>
#include <linux/cpumask.h>
@@ -76764,9 +55147,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/arm_big_little.c linux-linaro-stable-mx6
arm_bL_ops = NULL;
}
EXPORT_SYMBOL_GPL(bL_cpufreq_unregister);
-diff -Nur linux-3.10.36/drivers/cpufreq/arm_big_little.h linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.h
+diff -Nur linux-3.10.36/drivers/cpufreq/arm_big_little.h linux-solidrun/drivers/cpufreq/arm_big_little.h
--- linux-3.10.36/drivers/cpufreq/arm_big_little.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.h 2014-04-21 13:50:40.422719402 +0200
++++ linux-solidrun/drivers/cpufreq/arm_big_little.h 2014-04-24 07:58:18.724189400 +0200
@@ -23,6 +23,20 @@
#include <linux/device.h>
#include <linux/types.h>
@@ -76798,9 +55181,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/arm_big_little.h linux-linaro-stable-mx6
}
int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops);
-diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq-imx6.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq-imx6.c
+diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq-imx6.c linux-solidrun/drivers/cpufreq/cpufreq-imx6.c
--- linux-3.10.36/drivers/cpufreq/cpufreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq-imx6.c 2014-04-21 13:50:40.426719419 +0200
++++ linux-solidrun/drivers/cpufreq/cpufreq-imx6.c 2014-04-24 07:58:18.724189400 +0200
@@ -0,0 +1,483 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -77285,9 +55668,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq-imx6.c linux-linaro-stable-mx6/d
+MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
+MODULE_DESCRIPTION("Freescale i.MX6 cpufreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_interactive.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c
+diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_interactive.c linux-solidrun/drivers/cpufreq/cpufreq_interactive.c
--- linux-3.10.36/drivers/cpufreq/cpufreq_interactive.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c 2014-04-21 13:50:40.426719419 +0200
++++ linux-solidrun/drivers/cpufreq/cpufreq_interactive.c 2014-04-24 07:58:18.728189414 +0200
@@ -0,0 +1,705 @@
+/*
+ * drivers/cpufreq/cpufreq_interactive.c
@@ -77994,9 +56377,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_interactive.c linux-linaro-stabl
+MODULE_DESCRIPTION("'cpufreq_interactive' - A cpufreq governor for "
+ "Latency sensitive workloads");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_ondemand.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_ondemand.c
+diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_ondemand.c linux-solidrun/drivers/cpufreq/cpufreq_ondemand.c
--- linux-3.10.36/drivers/cpufreq/cpufreq_ondemand.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_ondemand.c 2014-04-21 13:50:40.426719419 +0200
++++ linux-solidrun/drivers/cpufreq/cpufreq_ondemand.c 2014-04-24 07:58:18.728189414 +0200
@@ -76,6 +76,8 @@
boot_cpu_data.x86 == 6 &&
boot_cpu_data.x86_model >= 15)
@@ -78006,9 +56389,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_ondemand.c linux-linaro-stable-m
#endif
return 0;
}
-diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_stats.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_stats.c
+diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_stats.c linux-solidrun/drivers/cpufreq/cpufreq_stats.c
--- linux-3.10.36/drivers/cpufreq/cpufreq_stats.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_stats.c 2014-04-21 13:50:40.426719419 +0200
++++ linux-solidrun/drivers/cpufreq/cpufreq_stats.c 2014-04-24 07:58:18.728189414 +0200
@@ -21,6 +21,9 @@
#include <linux/spinlock.h>
#include <linux/notifier.h>
@@ -78093,9 +56476,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/cpufreq_stats.c linux-linaro-stable-mx6/
MODULE_AUTHOR("Zou Nan hai <nanhai.zou@intel.com>");
MODULE_DESCRIPTION("'cpufreq_stats' - A driver to export cpufreq stats "
"through sysfs filesystem");
-diff -Nur linux-3.10.36/drivers/cpufreq/imx6q-cpufreq.c linux-linaro-stable-mx6/drivers/cpufreq/imx6q-cpufreq.c
+diff -Nur linux-3.10.36/drivers/cpufreq/imx6q-cpufreq.c linux-solidrun/drivers/cpufreq/imx6q-cpufreq.c
--- linux-3.10.36/drivers/cpufreq/imx6q-cpufreq.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/imx6q-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/cpufreq/imx6q-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,330 +0,0 @@
-/*
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -78427,9 +56810,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/imx6q-cpufreq.c linux-linaro-stable-mx6/
-MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
-MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/drivers/cpufreq/Kconfig
+diff -Nur linux-3.10.36/drivers/cpufreq/Kconfig linux-solidrun/drivers/cpufreq/Kconfig
--- linux-3.10.36/drivers/cpufreq/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig 2014-04-21 13:50:40.422719402 +0200
++++ linux-solidrun/drivers/cpufreq/Kconfig 2014-04-24 07:58:18.724189400 +0200
@@ -102,6 +102,18 @@
Be aware that not all cpufreq drivers support the conservative
governor. If unsure have a look at the help section of the
@@ -78482,9 +56865,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/drivers/
source "drivers/cpufreq/Kconfig.arm"
endmenu
-diff -Nur linux-3.10.36/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm
+diff -Nur linux-3.10.36/drivers/cpufreq/Kconfig.arm linux-solidrun/drivers/cpufreq/Kconfig.arm
--- linux-3.10.36/drivers/cpufreq/Kconfig.arm 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm 2014-04-21 13:50:40.422719402 +0200
++++ linux-solidrun/drivers/cpufreq/Kconfig.arm 2014-04-24 07:58:18.724189400 +0200
@@ -4,7 +4,7 @@
config ARM_BIG_LITTLE_CPUFREQ
@@ -78526,9 +56909,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6/driv
If in doubt, say N.
-diff -Nur linux-3.10.36/drivers/cpufreq/Makefile linux-linaro-stable-mx6/drivers/cpufreq/Makefile
+diff -Nur linux-3.10.36/drivers/cpufreq/Makefile linux-solidrun/drivers/cpufreq/Makefile
--- linux-3.10.36/drivers/cpufreq/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/Makefile 2014-04-21 13:50:40.422719402 +0200
++++ linux-solidrun/drivers/cpufreq/Makefile 2014-04-24 07:58:18.724189400 +0200
@@ -9,6 +9,7 @@
obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o
obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o
@@ -78554,9 +56937,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_ARM_INTEGRATOR) += integrator-cpufreq.o
obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o
obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o
-diff -Nur linux-3.10.36/drivers/cpufreq/powernow-k8.c linux-linaro-stable-mx6/drivers/cpufreq/powernow-k8.c
+diff -Nur linux-3.10.36/drivers/cpufreq/powernow-k8.c linux-solidrun/drivers/cpufreq/powernow-k8.c
--- linux-3.10.36/drivers/cpufreq/powernow-k8.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/powernow-k8.c 2014-04-21 13:50:40.430719436 +0200
++++ linux-solidrun/drivers/cpufreq/powernow-k8.c 2014-04-24 07:58:18.740189455 +0200
@@ -1100,7 +1100,7 @@
{
struct powernow_k8_data *data;
@@ -78595,9 +56978,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/powernow-k8.c linux-linaro-stable-mx6/dr
return 0;
}
-diff -Nur linux-3.10.36/drivers/cpufreq/vexpress_big_little.c linux-linaro-stable-mx6/drivers/cpufreq/vexpress_big_little.c
+diff -Nur linux-3.10.36/drivers/cpufreq/vexpress_big_little.c linux-solidrun/drivers/cpufreq/vexpress_big_little.c
--- linux-3.10.36/drivers/cpufreq/vexpress_big_little.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/cpufreq/vexpress_big_little.c 2014-04-21 13:50:40.430719436 +0200
++++ linux-solidrun/drivers/cpufreq/vexpress_big_little.c 2014-04-24 07:58:18.740189455 +0200
@@ -0,0 +1,86 @@
+/*
+ * Vexpress big.LITTLE CPUFreq Interface driver
@@ -78685,9 +57068,9 @@ diff -Nur linux-3.10.36/drivers/cpufreq/vexpress_big_little.c linux-linaro-stabl
+MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>");
+MODULE_DESCRIPTION("ARM Vexpress big LITTLE cpufreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/cpuidle/arm_big_little.c linux-linaro-stable-mx6/drivers/cpuidle/arm_big_little.c
+diff -Nur linux-3.10.36/drivers/cpuidle/arm_big_little.c linux-solidrun/drivers/cpuidle/arm_big_little.c
--- linux-3.10.36/drivers/cpuidle/arm_big_little.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/cpuidle/arm_big_little.c 2014-04-21 13:50:40.430719436 +0200
++++ linux-solidrun/drivers/cpuidle/arm_big_little.c 2014-04-24 07:58:18.740189455 +0200
@@ -0,0 +1,183 @@
+/*
+ * big.LITTLE CPU idle driver.
@@ -78872,9 +57255,9 @@ diff -Nur linux-3.10.36/drivers/cpuidle/arm_big_little.c linux-linaro-stable-mx6
+}
+
+device_initcall(bl_idle_init);
-diff -Nur linux-3.10.36/drivers/cpuidle/cpuidle-calxeda.c linux-linaro-stable-mx6/drivers/cpuidle/cpuidle-calxeda.c
+diff -Nur linux-3.10.36/drivers/cpuidle/cpuidle-calxeda.c linux-solidrun/drivers/cpuidle/cpuidle-calxeda.c
--- linux-3.10.36/drivers/cpuidle/cpuidle-calxeda.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpuidle/cpuidle-calxeda.c 2014-04-21 13:50:40.430719436 +0200
++++ linux-solidrun/drivers/cpuidle/cpuidle-calxeda.c 2014-04-24 07:58:18.740189455 +0200
@@ -37,20 +37,6 @@
extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
extern void *scu_base_addr;
@@ -78896,9 +57279,9 @@ diff -Nur linux-3.10.36/drivers/cpuidle/cpuidle-calxeda.c linux-linaro-stable-mx
static noinline void calxeda_idle_restore(void)
{
set_cr(get_cr() | CR_C);
-diff -Nur linux-3.10.36/drivers/cpuidle/Kconfig linux-linaro-stable-mx6/drivers/cpuidle/Kconfig
+diff -Nur linux-3.10.36/drivers/cpuidle/Kconfig linux-solidrun/drivers/cpuidle/Kconfig
--- linux-3.10.36/drivers/cpuidle/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpuidle/Kconfig 2014-04-21 13:50:40.430719436 +0200
++++ linux-solidrun/drivers/cpuidle/Kconfig 2014-04-24 07:58:18.740189455 +0200
@@ -20,7 +20,7 @@
config CPU_IDLE_GOV_LADDER
@@ -78908,9 +57291,9 @@ diff -Nur linux-3.10.36/drivers/cpuidle/Kconfig linux-linaro-stable-mx6/drivers/
default y
config CPU_IDLE_GOV_MENU
-diff -Nur linux-3.10.36/drivers/cpuidle/Makefile linux-linaro-stable-mx6/drivers/cpuidle/Makefile
+diff -Nur linux-3.10.36/drivers/cpuidle/Makefile linux-solidrun/drivers/cpuidle/Makefile
--- linux-3.10.36/drivers/cpuidle/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpuidle/Makefile 2014-04-21 13:50:40.430719436 +0200
++++ linux-solidrun/drivers/cpuidle/Makefile 2014-04-24 07:58:18.740189455 +0200
@@ -4,6 +4,6 @@
obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
@@ -78919,9 +57302,9 @@ diff -Nur linux-3.10.36/drivers/cpuidle/Makefile linux-linaro-stable-mx6/drivers
+obj-$(CONFIG_BIG_LITTLE) += arm_big_little.o
obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
-diff -Nur linux-3.10.36/drivers/crypto/caam/caamalg.c linux-linaro-stable-mx6/drivers/crypto/caam/caamalg.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/caamalg.c linux-solidrun/drivers/crypto/caam/caamalg.c
--- linux-3.10.36/drivers/crypto/caam/caamalg.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/caamalg.c 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/caamalg.c 2014-04-24 07:58:18.748189485 +0200
@@ -1,7 +1,7 @@
/*
* caam - Freescale FSL CAAM support for crypto API
@@ -79435,9 +57818,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/caamalg.c linux-linaro-stable-mx6/dr
return err;
}
-diff -Nur linux-3.10.36/drivers/crypto/caam/caamhash.c linux-linaro-stable-mx6/drivers/crypto/caam/caamhash.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/caamhash.c linux-solidrun/drivers/crypto/caam/caamhash.c
--- linux-3.10.36/drivers/crypto/caam/caamhash.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/caamhash.c 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/caamhash.c 2014-04-24 07:58:18.748189485 +0200
@@ -1,7 +1,7 @@
/*
* caam - Freescale FSL CAAM support for ahash functions of crypto API
@@ -80169,9 +58552,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/caamhash.c linux-linaro-stable-mx6/d
return err;
}
-diff -Nur linux-3.10.36/drivers/crypto/caam/caamrng.c linux-linaro-stable-mx6/drivers/crypto/caam/caamrng.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/caamrng.c linux-solidrun/drivers/crypto/caam/caamrng.c
--- linux-3.10.36/drivers/crypto/caam/caamrng.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/caamrng.c 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/caamrng.c 2014-04-24 07:58:18.748189485 +0200
@@ -1,7 +1,7 @@
/*
* caam - Freescale FSL CAAM support for hw_random
@@ -80297,9 +58680,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/caamrng.c linux-linaro-stable-mx6/dr
dev_info(priv->jrdev[0], "registering rng-caam\n");
return hwrng_register(&caam_rng);
-diff -Nur linux-3.10.36/drivers/crypto/caam/compat.h linux-linaro-stable-mx6/drivers/crypto/caam/compat.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/compat.h linux-solidrun/drivers/crypto/caam/compat.h
--- linux-3.10.36/drivers/crypto/caam/compat.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/compat.h 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/compat.h 2014-04-24 07:58:18.748189485 +0200
@@ -14,6 +14,8 @@
#include <linux/hash.h>
#include <linux/hw_random.h>
@@ -80320,9 +58703,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/compat.h linux-linaro-stable-mx6/dri
#include <net/xfrm.h>
#include <crypto/algapi.h>
-diff -Nur linux-3.10.36/drivers/crypto/caam/ctrl.c linux-linaro-stable-mx6/drivers/crypto/caam/ctrl.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/ctrl.c linux-solidrun/drivers/crypto/caam/ctrl.c
--- linux-3.10.36/drivers/crypto/caam/ctrl.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/ctrl.c 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/ctrl.c 2014-04-24 07:58:18.748189485 +0200
@@ -2,7 +2,7 @@
* CAAM control-plane driver backend
* Controller-level driver, kernel property detection, initialization
@@ -80673,9 +59056,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/ctrl.c linux-linaro-stable-mx6/drive
}
/* NOTE: RTIC detection ought to go here, around Si time */
-diff -Nur linux-3.10.36/drivers/crypto/caam/desc.h linux-linaro-stable-mx6/drivers/crypto/caam/desc.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/desc.h linux-solidrun/drivers/crypto/caam/desc.h
--- linux-3.10.36/drivers/crypto/caam/desc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/desc.h 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/desc.h 2014-04-24 07:58:18.748189485 +0200
@@ -2,19 +2,35 @@
* CAAM descriptor composition header
* Definitions to support CAAM descriptor instruction generation
@@ -80770,9 +59153,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/desc.h linux-linaro-stable-mx6/drive
+
+
#endif /* DESC_H */
-diff -Nur linux-3.10.36/drivers/crypto/caam/intern.h linux-linaro-stable-mx6/drivers/crypto/caam/intern.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/intern.h linux-solidrun/drivers/crypto/caam/intern.h
--- linux-3.10.36/drivers/crypto/caam/intern.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/intern.h 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/intern.h 2014-04-24 07:58:18.748189485 +0200
@@ -2,7 +2,7 @@
* CAAM/SEC 4.x driver backend
* Private/internal definitions between modules
@@ -80834,9 +59217,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/intern.h linux-linaro-stable-mx6/dri
/*
* debugfs entries for developer view into driver/device
* variables at runtime.
-diff -Nur linux-3.10.36/drivers/crypto/caam/jr.c linux-linaro-stable-mx6/drivers/crypto/caam/jr.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/jr.c linux-solidrun/drivers/crypto/caam/jr.c
--- linux-3.10.36/drivers/crypto/caam/jr.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/jr.c 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/jr.c 2014-04-24 07:58:18.748189485 +0200
@@ -2,7 +2,7 @@
* CAAM/SEC 4.x transport/backend driver
* JobR backend functionality
@@ -80962,9 +59345,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/jr.c linux-linaro-stable-mx6/drivers
/* Now do the platform independent part */
error = caam_jr_init(jrdev); /* now turn on hardware */
-diff -Nur linux-3.10.36/drivers/crypto/caam/jr.h linux-linaro-stable-mx6/drivers/crypto/caam/jr.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/jr.h linux-solidrun/drivers/crypto/caam/jr.h
--- linux-3.10.36/drivers/crypto/caam/jr.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/jr.h 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/jr.h 2014-04-24 07:58:18.748189485 +0200
@@ -1,7 +1,7 @@
/*
* CAAM public-level include definitions for the JobR backend
@@ -80980,9 +59363,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/jr.h linux-linaro-stable-mx6/drivers
extern int caam_jr_shutdown(struct device *dev);
+extern struct device *caam_get_jrdev(void);
#endif /* JR_H */
-diff -Nur linux-3.10.36/drivers/crypto/caam/Kconfig linux-linaro-stable-mx6/drivers/crypto/caam/Kconfig
+diff -Nur linux-3.10.36/drivers/crypto/caam/Kconfig linux-solidrun/drivers/crypto/caam/Kconfig
--- linux-3.10.36/drivers/crypto/caam/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/Kconfig 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/Kconfig 2014-04-24 07:58:18.744189470 +0200
@@ -1,6 +1,6 @@
config CRYPTO_DEV_FSL_CAAM
tristate "Freescale CAAM-Multicore driver backend"
@@ -81043,9 +59426,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/Kconfig linux-linaro-stable-mx6/driv
+ Enables installation of an interrupt handler with registrable
+ handler functions which can be specified to act on the consequences
+ of a security violation.
-diff -Nur linux-3.10.36/drivers/crypto/caam/key_gen.c linux-linaro-stable-mx6/drivers/crypto/caam/key_gen.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/key_gen.c linux-solidrun/drivers/crypto/caam/key_gen.c
--- linux-3.10.36/drivers/crypto/caam/key_gen.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/key_gen.c 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/key_gen.c 2014-04-24 07:58:18.748189485 +0200
@@ -1,7 +1,7 @@
/*
* CAAM/SEC 4.x functions for handling key-generation jobs
@@ -81073,9 +59456,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/key_gen.c linux-linaro-stable-mx6/dr
dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len,
DMA_FROM_DEVICE);
dma_unmap_single(jrdev, dma_addr_in, keylen, DMA_TO_DEVICE);
-diff -Nur linux-3.10.36/drivers/crypto/caam/Makefile linux-linaro-stable-mx6/drivers/crypto/caam/Makefile
+diff -Nur linux-3.10.36/drivers/crypto/caam/Makefile linux-solidrun/drivers/crypto/caam/Makefile
--- linux-3.10.36/drivers/crypto/caam/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/Makefile 2014-04-21 13:50:40.434719452 +0200
++++ linux-solidrun/drivers/crypto/caam/Makefile 2014-04-24 07:58:18.744189470 +0200
@@ -6,5 +6,8 @@
obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API) += caamalg.o
obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API) += caamhash.o
@@ -81085,9 +59468,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/Makefile linux-linaro-stable-mx6/dri
+obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO) += secvio.o
caam-objs := ctrl.o jr.o error.o key_gen.o
-diff -Nur linux-3.10.36/drivers/crypto/caam/regs.h linux-linaro-stable-mx6/drivers/crypto/caam/regs.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/regs.h linux-solidrun/drivers/crypto/caam/regs.h
--- linux-3.10.36/drivers/crypto/caam/regs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/regs.h 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/regs.h 2014-04-24 07:58:18.748189485 +0200
@@ -1,7 +1,7 @@
/*
* CAAM hardware register-level view
@@ -81419,9 +59802,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/regs.h linux-linaro-stable-mx6/drive
/*
* caam_assurance - Assurance Controller View
* base + 0x6000 padded out to 0x1000
-diff -Nur linux-3.10.36/drivers/crypto/caam/secvio.c linux-linaro-stable-mx6/drivers/crypto/caam/secvio.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/secvio.c linux-solidrun/drivers/crypto/caam/secvio.c
--- linux-3.10.36/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.c 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/secvio.c 2014-04-24 07:58:18.748189485 +0200
@@ -0,0 +1,333 @@
+
+/*
@@ -81756,9 +60139,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/secvio.c linux-linaro-stable-mx6/dri
+MODULE_DESCRIPTION("FSL CAAM/SNVS Security Violation Handler");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.10.36/drivers/crypto/caam/secvio.h linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/secvio.h linux-solidrun/drivers/crypto/caam/secvio.h
--- linux-3.10.36/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/secvio.h 2014-04-24 07:58:18.748189485 +0200
@@ -0,0 +1,64 @@
+
+/*
@@ -81824,9 +60207,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/secvio.h linux-linaro-stable-mx6/dri
+};
+
+#endif /* SECVIO_H */
-diff -Nur linux-3.10.36/drivers/crypto/caam/sg_sw_sec4.h linux-linaro-stable-mx6/drivers/crypto/caam/sg_sw_sec4.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/sg_sw_sec4.h linux-solidrun/drivers/crypto/caam/sg_sw_sec4.h
--- linux-3.10.36/drivers/crypto/caam/sg_sw_sec4.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/sg_sw_sec4.h 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/sg_sw_sec4.h 2014-04-24 07:58:18.748189485 +0200
@@ -1,7 +1,7 @@
/*
* CAAM/SEC 4.x functions for using scatterlists in caam driver
@@ -81871,9 +60254,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/sg_sw_sec4.h linux-linaro-stable-mx6
if (unlikely(chained)) {
int i;
for (i = 0; i < nents; i++) {
-diff -Nur linux-3.10.36/drivers/crypto/caam/sm.h linux-linaro-stable-mx6/drivers/crypto/caam/sm.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/sm.h linux-solidrun/drivers/crypto/caam/sm.h
--- linux-3.10.36/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm.h 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/sm.h 2014-04-24 07:58:18.748189485 +0200
@@ -0,0 +1,88 @@
+
+/*
@@ -81963,9 +60346,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/sm.h linux-linaro-stable-mx6/drivers
+};
+
+#endif /* SM_H */
-diff -Nur linux-3.10.36/drivers/crypto/caam/sm_store.c linux-linaro-stable-mx6/drivers/crypto/caam/sm_store.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/sm_store.c linux-solidrun/drivers/crypto/caam/sm_store.c
--- linux-3.10.36/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_store.c 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/sm_store.c 2014-04-24 07:58:18.748189485 +0200
@@ -0,0 +1,896 @@
+
+/*
@@ -82863,9 +61246,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/sm_store.c linux-linaro-stable-mx6/d
+MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.10.36/drivers/crypto/caam/sm_test.c linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c
+diff -Nur linux-3.10.36/drivers/crypto/caam/sm_test.c linux-solidrun/drivers/crypto/caam/sm_test.c
--- linux-3.10.36/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/sm_test.c 2014-04-24 07:58:18.748189485 +0200
@@ -0,0 +1,844 @@
+/*
+ * Secure Memory / Keystore Exemplification Module
@@ -83711,9 +62094,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/sm_test.c linux-linaro-stable-mx6/dr
+MODULE_DESCRIPTION("FSL CAAM Keystore Usage Example");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.10.36/drivers/crypto/caam/snvsregs.h linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h
+diff -Nur linux-3.10.36/drivers/crypto/caam/snvsregs.h linux-solidrun/drivers/crypto/caam/snvsregs.h
--- linux-3.10.36/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h 2014-04-21 13:50:40.438719469 +0200
++++ linux-solidrun/drivers/crypto/caam/snvsregs.h 2014-04-24 07:58:18.748189485 +0200
@@ -0,0 +1,237 @@
+/*
+ * SNVS hardware register-level view
@@ -83952,9 +62335,9 @@ diff -Nur linux-3.10.36/drivers/crypto/caam/snvsregs.h linux-linaro-stable-mx6/d
+};
+
+#endif /* SNVSREGS_H */
-diff -Nur linux-3.10.36/drivers/dma/imx-sdma.c linux-linaro-stable-mx6/drivers/dma/imx-sdma.c
+diff -Nur linux-3.10.36/drivers/dma/imx-sdma.c linux-solidrun/drivers/dma/imx-sdma.c
--- linux-3.10.36/drivers/dma/imx-sdma.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/imx-sdma.c 2014-04-21 13:50:40.450719520 +0200
++++ linux-solidrun/drivers/dma/imx-sdma.c 2014-04-24 07:58:18.764189540 +0200
@@ -7,7 +7,7 @@
*
* Based on code from Freescale:
@@ -84562,9 +62945,9 @@ diff -Nur linux-3.10.36/drivers/dma/imx-sdma.c linux-linaro-stable-mx6/drivers/d
err_init:
kfree(sdma->script_addrs);
err_alloc:
-diff -Nur linux-3.10.36/drivers/dma/ioat/dma.c linux-linaro-stable-mx6/drivers/dma/ioat/dma.c
+diff -Nur linux-3.10.36/drivers/dma/ioat/dma.c linux-solidrun/drivers/dma/ioat/dma.c
--- linux-3.10.36/drivers/dma/ioat/dma.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/ioat/dma.c 2014-04-21 13:50:40.450719520 +0200
++++ linux-solidrun/drivers/dma/ioat/dma.c 2014-04-24 07:58:18.780189597 +0200
@@ -77,8 +77,7 @@
attnstatus = readl(instance->reg_base + IOAT_ATTNSTATUS_OFFSET);
for_each_set_bit(bit, &attnstatus, BITS_PER_LONG) {
@@ -84667,9 +63050,9 @@ diff -Nur linux-3.10.36/drivers/dma/ioat/dma.c linux-linaro-stable-mx6/drivers/d
writew(IOAT_CHANCTRL_RUN, ioat->base.reg_base + IOAT_CHANCTRL_OFFSET);
}
-diff -Nur linux-3.10.36/drivers/dma/ioat/dma.h linux-linaro-stable-mx6/drivers/dma/ioat/dma.h
+diff -Nur linux-3.10.36/drivers/dma/ioat/dma.h linux-solidrun/drivers/dma/ioat/dma.h
--- linux-3.10.36/drivers/dma/ioat/dma.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/ioat/dma.h 2014-04-21 13:50:40.450719520 +0200
++++ linux-solidrun/drivers/dma/ioat/dma.h 2014-04-24 07:58:18.780189597 +0200
@@ -370,7 +370,6 @@
void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
void ioat_kobject_del(struct ioatdma_device *device);
@@ -84678,9 +63061,9 @@ diff -Nur linux-3.10.36/drivers/dma/ioat/dma.h linux-linaro-stable-mx6/drivers/d
extern const struct sysfs_ops ioat_sysfs_ops;
extern struct ioat_sysfs_entry ioat_version_attr;
extern struct ioat_sysfs_entry ioat_cap_attr;
-diff -Nur linux-3.10.36/drivers/dma/ioat/dma_v2.c linux-linaro-stable-mx6/drivers/dma/ioat/dma_v2.c
+diff -Nur linux-3.10.36/drivers/dma/ioat/dma_v2.c linux-solidrun/drivers/dma/ioat/dma_v2.c
--- linux-3.10.36/drivers/dma/ioat/dma_v2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/ioat/dma_v2.c 2014-04-21 13:50:40.450719520 +0200
++++ linux-solidrun/drivers/dma/ioat/dma_v2.c 2014-04-24 07:58:18.780189597 +0200
@@ -190,11 +190,8 @@
void ioat2_cleanup_event(unsigned long data)
{
@@ -84726,9 +63109,9 @@ diff -Nur linux-3.10.36/drivers/dma/ioat/dma_v2.c linux-linaro-stable-mx6/driver
spin_lock_bh(&chan->cleanup_lock);
spin_lock_bh(&ioat->prep_lock);
-diff -Nur linux-3.10.36/drivers/dma/ioat/dma_v3.c linux-linaro-stable-mx6/drivers/dma/ioat/dma_v3.c
+diff -Nur linux-3.10.36/drivers/dma/ioat/dma_v3.c linux-solidrun/drivers/dma/ioat/dma_v3.c
--- linux-3.10.36/drivers/dma/ioat/dma_v3.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/ioat/dma_v3.c 2014-04-21 13:50:40.450719520 +0200
++++ linux-solidrun/drivers/dma/ioat/dma_v3.c 2014-04-24 07:58:18.784189610 +0200
@@ -635,11 +635,8 @@
static void ioat3_cleanup_event(unsigned long data)
{
@@ -84741,9 +63124,9 @@ diff -Nur linux-3.10.36/drivers/dma/ioat/dma_v3.c linux-linaro-stable-mx6/driver
writew(IOAT_CHANCTRL_RUN, ioat->base.reg_base + IOAT_CHANCTRL_OFFSET);
}
-diff -Nur linux-3.10.36/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers/dma/Kconfig
+diff -Nur linux-3.10.36/drivers/dma/Kconfig linux-solidrun/drivers/dma/Kconfig
--- linux-3.10.36/drivers/dma/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/Kconfig 2014-04-21 13:50:40.446719503 +0200
++++ linux-solidrun/drivers/dma/Kconfig 2014-04-24 07:58:18.760189525 +0200
@@ -152,6 +152,19 @@
To avoid bloating the irq_desc[] array we allocate a sufficient
number of IRQ slots and map them dynamically to specific sources.
@@ -84764,9 +63147,9 @@ diff -Nur linux-3.10.36/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers/dma/
config TXX9_DMAC
tristate "Toshiba TXx9 SoC DMA support"
depends on MACH_TX49XX || MACH_TX39XX
-diff -Nur linux-3.10.36/drivers/dma/Makefile linux-linaro-stable-mx6/drivers/dma/Makefile
+diff -Nur linux-3.10.36/drivers/dma/Makefile linux-solidrun/drivers/dma/Makefile
--- linux-3.10.36/drivers/dma/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/Makefile 2014-04-21 13:50:40.446719503 +0200
++++ linux-solidrun/drivers/dma/Makefile 2014-04-24 07:58:18.760189525 +0200
@@ -18,6 +18,7 @@
obj-$(CONFIG_DW_DMAC) += dw_dmac.o
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
@@ -84775,15 +63158,15 @@ diff -Nur linux-3.10.36/drivers/dma/Makefile linux-linaro-stable-mx6/drivers/dma
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
obj-$(CONFIG_SH_DMAE_BASE) += sh/
obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
-diff -Nur linux-3.10.36/drivers/dma/pxp/Makefile linux-linaro-stable-mx6/drivers/dma/pxp/Makefile
+diff -Nur linux-3.10.36/drivers/dma/pxp/Makefile linux-solidrun/drivers/dma/pxp/Makefile
--- linux-3.10.36/drivers/dma/pxp/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/Makefile 2014-04-21 13:50:40.454719537 +0200
++++ linux-solidrun/drivers/dma/pxp/Makefile 2014-04-24 07:58:18.788189624 +0200
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MXC_PXP_V2) += pxp_dma_v2.o
+obj-$(CONFIG_MXC_PXP_CLIENT_DEVICE) += pxp_device.o
-diff -Nur linux-3.10.36/drivers/dma/pxp/pxp_device.c linux-linaro-stable-mx6/drivers/dma/pxp/pxp_device.c
+diff -Nur linux-3.10.36/drivers/dma/pxp/pxp_device.c linux-solidrun/drivers/dma/pxp/pxp_device.c
--- linux-3.10.36/drivers/dma/pxp/pxp_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_device.c 2014-04-21 13:50:40.454719537 +0200
++++ linux-solidrun/drivers/dma/pxp/pxp_device.c 2014-04-24 07:58:18.788189624 +0200
@@ -0,0 +1,489 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -85274,9 +63657,9 @@ diff -Nur linux-3.10.36/drivers/dma/pxp/pxp_device.c linux-linaro-stable-mx6/dri
+{
+ misc_deregister(&pxp_device_miscdev);
+}
-diff -Nur linux-3.10.36/drivers/dma/pxp/pxp_dma_v2.c linux-linaro-stable-mx6/drivers/dma/pxp/pxp_dma_v2.c
+diff -Nur linux-3.10.36/drivers/dma/pxp/pxp_dma_v2.c linux-solidrun/drivers/dma/pxp/pxp_dma_v2.c
--- linux-3.10.36/drivers/dma/pxp/pxp_dma_v2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_dma_v2.c 2014-04-21 13:50:40.454719537 +0200
++++ linux-solidrun/drivers/dma/pxp/pxp_dma_v2.c 2014-04-24 07:58:18.788189624 +0200
@@ -0,0 +1,1936 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -87214,9 +65597,9 @@ diff -Nur linux-3.10.36/drivers/dma/pxp/pxp_dma_v2.c linux-linaro-stable-mx6/dri
+MODULE_DESCRIPTION("i.MX PxP driver");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/dma/pxp/regs-pxp_v2.h linux-linaro-stable-mx6/drivers/dma/pxp/regs-pxp_v2.h
+diff -Nur linux-3.10.36/drivers/dma/pxp/regs-pxp_v2.h linux-solidrun/drivers/dma/pxp/regs-pxp_v2.h
--- linux-3.10.36/drivers/dma/pxp/regs-pxp_v2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/regs-pxp_v2.h 2014-04-21 13:50:40.454719537 +0200
++++ linux-solidrun/drivers/dma/pxp/regs-pxp_v2.h 2014-04-24 07:58:18.788189624 +0200
@@ -0,0 +1,1152 @@
+/*
+ * Freescale PXP Register Definitions
@@ -88370,9 +66753,9 @@ diff -Nur linux-3.10.36/drivers/dma/pxp/regs-pxp_v2.h linux-linaro-stable-mx6/dr
+#define BF_PXP_VERSION_STEP(v) \
+ (((v) << 0) & BM_PXP_VERSION_STEP)
+#endif /* __ARCH_ARM___PXP_H */
-diff -Nur linux-3.10.36/drivers/dma/ste_dma40.c linux-linaro-stable-mx6/drivers/dma/ste_dma40.c
+diff -Nur linux-3.10.36/drivers/dma/ste_dma40.c linux-solidrun/drivers/dma/ste_dma40.c
--- linux-3.10.36/drivers/dma/ste_dma40.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/ste_dma40.c 2014-04-21 13:50:40.458719554 +0200
++++ linux-solidrun/drivers/dma/ste_dma40.c 2014-04-24 07:58:18.792189640 +0200
@@ -1587,7 +1587,6 @@
struct d40_chan *d40c = (struct d40_chan *) data;
struct d40_desc *d40d;
@@ -88398,9 +66781,9 @@ diff -Nur linux-3.10.36/drivers/dma/ste_dma40.c linux-linaro-stable-mx6/drivers/
callback(callback_param);
return;
-diff -Nur linux-3.10.36/drivers/edac/edac_mc.c linux-linaro-stable-mx6/drivers/edac/edac_mc.c
+diff -Nur linux-3.10.36/drivers/edac/edac_mc.c linux-solidrun/drivers/edac/edac_mc.c
--- linux-3.10.36/drivers/edac/edac_mc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/edac/edac_mc.c 2014-04-21 13:50:40.462719571 +0200
++++ linux-solidrun/drivers/edac/edac_mc.c 2014-04-24 07:58:18.808189694 +0200
@@ -559,8 +559,7 @@
*
* called with the mem_ctls_mutex held
@@ -88449,9 +66832,9 @@ diff -Nur linux-3.10.36/drivers/edac/edac_mc.c linux-linaro-stable-mx6/drivers/e
} else {
mci->op_state = OP_RUNNING_INTERRUPT;
}
-diff -Nur linux-3.10.36/drivers/edac/edac_mc_sysfs.c linux-linaro-stable-mx6/drivers/edac/edac_mc_sysfs.c
+diff -Nur linux-3.10.36/drivers/edac/edac_mc_sysfs.c linux-solidrun/drivers/edac/edac_mc_sysfs.c
--- linux-3.10.36/drivers/edac/edac_mc_sysfs.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/edac/edac_mc_sysfs.c 2014-04-21 13:50:40.462719571 +0200
++++ linux-solidrun/drivers/edac/edac_mc_sysfs.c 2014-04-24 07:58:18.808189694 +0200
@@ -52,20 +52,16 @@
static int edac_set_poll_msec(const char *val, struct kernel_param *kp)
@@ -88477,9 +66860,9 @@ diff -Nur linux-3.10.36/drivers/edac/edac_mc_sysfs.c linux-linaro-stable-mx6/dri
/* notify edac_mc engine to reset the poll period */
edac_mc_reset_delay_period(l);
-diff -Nur linux-3.10.36/drivers/edac/edac_module.h linux-linaro-stable-mx6/drivers/edac/edac_module.h
+diff -Nur linux-3.10.36/drivers/edac/edac_module.h linux-solidrun/drivers/edac/edac_module.h
--- linux-3.10.36/drivers/edac/edac_module.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/edac/edac_module.h 2014-04-21 13:50:40.462719571 +0200
++++ linux-solidrun/drivers/edac/edac_module.h 2014-04-24 07:58:18.808189694 +0200
@@ -52,7 +52,7 @@
extern void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev);
extern void edac_device_reset_delay_period(struct edac_device_ctl_info
@@ -88489,9 +66872,9 @@ diff -Nur linux-3.10.36/drivers/edac/edac_module.h linux-linaro-stable-mx6/drive
extern void *edac_align_ptr(void **p, unsigned size, int n_elems);
-diff -Nur linux-3.10.36/drivers/edac/i7300_edac.c linux-linaro-stable-mx6/drivers/edac/i7300_edac.c
+diff -Nur linux-3.10.36/drivers/edac/i7300_edac.c linux-solidrun/drivers/edac/i7300_edac.c
--- linux-3.10.36/drivers/edac/i7300_edac.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/edac/i7300_edac.c 2014-04-21 13:50:40.462719571 +0200
++++ linux-solidrun/drivers/edac/i7300_edac.c 2014-04-24 07:58:18.812189709 +0200
@@ -943,35 +943,33 @@
/* Attempt to 'get' the MCH register we want */
@@ -88546,9 +66929,9 @@ diff -Nur linux-3.10.36/drivers/edac/i7300_edac.c linux-linaro-stable-mx6/driver
edac_dbg(1, "System Address, processor bus- PCI Bus ID: %s %x:%x\n",
pci_name(pvt->pci_dev_16_0_fsb_ctlr),
pvt->pci_dev_16_0_fsb_ctlr->vendor,
-diff -Nur linux-3.10.36/drivers/edac/i7core_edac.c linux-linaro-stable-mx6/drivers/edac/i7core_edac.c
+diff -Nur linux-3.10.36/drivers/edac/i7core_edac.c linux-solidrun/drivers/edac/i7core_edac.c
--- linux-3.10.36/drivers/edac/i7core_edac.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/edac/i7core_edac.c 2014-04-21 13:50:40.466719587 +0200
++++ linux-solidrun/drivers/edac/i7core_edac.c 2014-04-24 07:58:18.812189709 +0200
@@ -1334,19 +1334,14 @@
* is at addr 8086:2c40, instead of 8086:2c41. So, we need
* to probe for the alternate address in case of failure
@@ -88571,9 +66954,9 @@ diff -Nur linux-3.10.36/drivers/edac/i7core_edac.c linux-linaro-stable-mx6/drive
if (!pdev) {
if (*prev) {
-diff -Nur linux-3.10.36/drivers/extcon/extcon-adc-jack.c linux-linaro-stable-mx6/drivers/extcon/extcon-adc-jack.c
+diff -Nur linux-3.10.36/drivers/extcon/extcon-adc-jack.c linux-solidrun/drivers/extcon/extcon-adc-jack.c
--- linux-3.10.36/drivers/extcon/extcon-adc-jack.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/extcon/extcon-adc-jack.c 2014-04-21 13:50:40.466719587 +0200
++++ linux-solidrun/drivers/extcon/extcon-adc-jack.c 2014-04-24 07:58:18.816189724 +0200
@@ -87,7 +87,8 @@
{
struct adc_jack_data *data = _data;
@@ -88584,9 +66967,9 @@ diff -Nur linux-3.10.36/drivers/extcon/extcon-adc-jack.c linux-linaro-stable-mx6
return IRQ_HANDLED;
}
-diff -Nur linux-3.10.36/drivers/extcon/extcon-gpio.c linux-linaro-stable-mx6/drivers/extcon/extcon-gpio.c
+diff -Nur linux-3.10.36/drivers/extcon/extcon-gpio.c linux-solidrun/drivers/extcon/extcon-gpio.c
--- linux-3.10.36/drivers/extcon/extcon-gpio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/extcon/extcon-gpio.c 2014-04-21 13:50:40.470719604 +0200
++++ linux-solidrun/drivers/extcon/extcon-gpio.c 2014-04-24 07:58:18.816189724 +0200
@@ -56,7 +56,7 @@
{
struct gpio_extcon_data *extcon_data = dev_id;
@@ -88596,9 +66979,9 @@ diff -Nur linux-3.10.36/drivers/extcon/extcon-gpio.c linux-linaro-stable-mx6/dri
extcon_data->debounce_jiffies);
return IRQ_HANDLED;
}
-diff -Nur linux-3.10.36/drivers/firewire/core-device.c linux-linaro-stable-mx6/drivers/firewire/core-device.c
+diff -Nur linux-3.10.36/drivers/firewire/core-device.c linux-solidrun/drivers/firewire/core-device.c
--- linux-3.10.36/drivers/firewire/core-device.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/firewire/core-device.c 2014-04-21 13:50:40.470719604 +0200
++++ linux-solidrun/drivers/firewire/core-device.c 2014-04-24 07:58:18.836189794 +0200
@@ -895,7 +895,7 @@
old->config_rom_retries = 0;
fw_notice(card, "rediscovered device %s\n", dev_name(dev));
@@ -88676,9 +67059,9 @@ diff -Nur linux-3.10.36/drivers/firewire/core-device.c linux-linaro-stable-mx6/d
fw_schedule_device_work(device,
list_empty(&card->link) ? 0 : SHUTDOWN_DELAY);
}
-diff -Nur linux-3.10.36/drivers/firewire/net.c linux-linaro-stable-mx6/drivers/firewire/net.c
+diff -Nur linux-3.10.36/drivers/firewire/net.c linux-solidrun/drivers/firewire/net.c
--- linux-3.10.36/drivers/firewire/net.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/firewire/net.c 2014-04-21 13:50:40.470719604 +0200
++++ linux-solidrun/drivers/firewire/net.c 2014-04-24 07:58:18.840189808 +0200
@@ -929,6 +929,8 @@
if (rcode == RCODE_COMPLETE) {
fwnet_transmit_packet_done(ptask);
@@ -88700,9 +67083,9 @@ diff -Nur linux-3.10.36/drivers/firewire/net.c linux-linaro-stable-mx6/drivers/f
}
}
-diff -Nur linux-3.10.36/drivers/firewire/sbp2.c linux-linaro-stable-mx6/drivers/firewire/sbp2.c
+diff -Nur linux-3.10.36/drivers/firewire/sbp2.c linux-solidrun/drivers/firewire/sbp2.c
--- linux-3.10.36/drivers/firewire/sbp2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/firewire/sbp2.c 2014-04-21 13:50:40.470719604 +0200
++++ linux-solidrun/drivers/firewire/sbp2.c 2014-04-24 07:58:18.848189836 +0200
@@ -146,7 +146,6 @@
*/
int generation;
@@ -88762,9 +67145,9 @@ diff -Nur linux-3.10.36/drivers/firewire/sbp2.c linux-linaro-stable-mx6/drivers/
list_add_tail(&lu->link, &tgt->lu_list);
return 0;
-diff -Nur linux-3.10.36/drivers/gator/gator_annotate.c linux-linaro-stable-mx6/drivers/gator/gator_annotate.c
+diff -Nur linux-3.10.36/drivers/gator/gator_annotate.c linux-solidrun/drivers/gator/gator_annotate.c
--- linux-3.10.36/drivers/gator/gator_annotate.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_annotate.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_annotate.c 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,186 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -88952,9 +67335,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_annotate.c linux-linaro-stable-mx6/d
+ wake_up(&gator_annotate_wait);
+ spin_unlock(&annotate_lock);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_annotate_kernel.c linux-linaro-stable-mx6/drivers/gator/gator_annotate_kernel.c
+diff -Nur linux-3.10.36/drivers/gator/gator_annotate_kernel.c linux-solidrun/drivers/gator/gator_annotate_kernel.c
--- linux-3.10.36/drivers/gator/gator_annotate_kernel.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_annotate_kernel.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_annotate_kernel.c 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,200 @@
+/**
+ * Copyright (C) ARM Limited 2012-2013. All rights reserved.
@@ -89156,9 +67539,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_annotate_kernel.c linux-linaro-stabl
+}
+
+EXPORT_SYMBOL(gator_annotate_marker_color_str);
-diff -Nur linux-3.10.36/drivers/gator/gator_backtrace.c linux-linaro-stable-mx6/drivers/gator/gator_backtrace.c
+diff -Nur linux-3.10.36/drivers/gator/gator_backtrace.c linux-solidrun/drivers/gator/gator_backtrace.c
--- linux-3.10.36/drivers/gator/gator_backtrace.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_backtrace.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_backtrace.c 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,168 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -89328,9 +67711,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_backtrace.c linux-linaro-stable-mx6/
+ marshal_backtrace(PC_REG & ~1, NO_COOKIE);
+#endif
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_cookies.c linux-linaro-stable-mx6/drivers/gator/gator_cookies.c
+diff -Nur linux-3.10.36/drivers/gator/gator_cookies.c linux-solidrun/drivers/gator/gator_cookies.c
--- linux-3.10.36/drivers/gator/gator_cookies.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_cookies.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_cookies.c 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,433 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -89765,9 +68148,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_cookies.c linux-linaro-stable-mx6/dr
+ kfree(gator_crc32_table);
+ gator_crc32_table = NULL;
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_armv6.c linux-linaro-stable-mx6/drivers/gator/gator_events_armv6.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_armv6.c linux-solidrun/drivers/gator/gator_events_armv6.c
--- linux-3.10.36/drivers/gator/gator_events_armv6.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_armv6.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_armv6.c 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,237 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -90006,9 +68389,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_armv6.c linux-linaro-stable-m
+}
+
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_events_armv7.c linux-linaro-stable-mx6/drivers/gator/gator_events_armv7.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_armv7.c linux-solidrun/drivers/gator/gator_events_armv7.c
--- linux-3.10.36/drivers/gator/gator_events_armv7.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_armv7.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_armv7.c 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,312 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -90322,9 +68705,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_armv7.c linux-linaro-stable-m
+}
+
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_events_block.c linux-linaro-stable-mx6/drivers/gator/gator_events_block.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_block.c linux-solidrun/drivers/gator/gator_events_block.c
--- linux-3.10.36/drivers/gator/gator_events_block.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_block.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_block.c 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,153 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -90479,9 +68862,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_block.c linux-linaro-stable-m
+
+ return gator_events_install(&gator_events_block_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_ccn-504.c linux-linaro-stable-mx6/drivers/gator/gator_events_ccn-504.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_ccn-504.c linux-solidrun/drivers/gator/gator_events_ccn-504.c
--- linux-3.10.36/drivers/gator/gator_events_ccn-504.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_ccn-504.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_ccn-504.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,346 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -90829,9 +69212,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_ccn-504.c linux-linaro-stable
+
+ return gator_events_install(&gator_events_ccn504_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_irq.c linux-linaro-stable-mx6/drivers/gator/gator_events_irq.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_irq.c linux-solidrun/drivers/gator/gator_events_irq.c
--- linux-3.10.36/drivers/gator/gator_events_irq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_irq.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_irq.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,165 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -90998,9 +69381,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_irq.c linux-linaro-stable-mx6
+
+ return gator_events_install(&gator_events_irq_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_l2c-310.c linux-linaro-stable-mx6/drivers/gator/gator_events_l2c-310.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_l2c-310.c linux-solidrun/drivers/gator/gator_events_l2c-310.c
--- linux-3.10.36/drivers/gator/gator_events_l2c-310.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_l2c-310.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_l2c-310.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,208 @@
+/**
+ * l2c310 (L2 Cache Controller) event counters for gator
@@ -91210,9 +69593,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_l2c-310.c linux-linaro-stable
+
+ return gator_events_install(&gator_events_l2c310_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_4xx.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_4xx.c linux-solidrun/drivers/gator/gator_events_mali_4xx.c
--- linux-3.10.36/drivers/gator/gator_events_mali_4xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_mali_4xx.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,723 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -91937,9 +70320,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_4xx.c linux-linaro-stabl
+
+ return gator_events_install(&gator_events_mali_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_4xx.h linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.h
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_4xx.h linux-solidrun/drivers/gator/gator_events_mali_4xx.h
--- linux-3.10.36/drivers/gator/gator_events_mali_4xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.h 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_mali_4xx.h 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,18 @@
+/**
+ * Copyright (C) ARM Limited 2011-2013. All rights reserved.
@@ -91959,9 +70342,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_4xx.h linux-linaro-stabl
+extern void gator_events_mali_log_dvfs_event(unsigned int d0, unsigned int d1);
+
+#endif /* GATOR_EVENTS_MALI_4xx_H */
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_common.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_common.c linux-solidrun/drivers/gator/gator_events_mali_common.c
--- linux-3.10.36/drivers/gator/gator_events_mali_common.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_mali_common.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,81 @@
+/**
+ * Copyright (C) ARM Limited 2012-2013. All rights reserved.
@@ -92044,9 +70427,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_common.c linux-linaro-st
+ counter->enabled = 0;
+ }
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_common.h linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.h
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_common.h linux-solidrun/drivers/gator/gator_events_mali_common.h
--- linux-3.10.36/drivers/gator/gator_events_mali_common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.h 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_mali_common.h 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,86 @@
+/**
+ * Copyright (C) ARM Limited 2012-2013. All rights reserved.
@@ -92134,9 +70517,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_common.h linux-linaro-st
+extern void gator_mali_initialise_counters(mali_counter counters[], unsigned int n_counters);
+
+#endif /* GATOR_EVENTS_MALI_COMMON_H */
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx.c linux-solidrun/drivers/gator/gator_events_mali_t6xx.c
--- linux-3.10.36/drivers/gator/gator_events_mali_t6xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx.c 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator_events_mali_t6xx.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,560 @@
+/**
+ * Copyright (C) ARM Limited 2011-2013. All rights reserved.
@@ -92698,9 +71081,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx.c linux-linaro-stab
+
+ return gator_events_install(&gator_events_mali_t6xx_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw.c linux-solidrun/drivers/gator/gator_events_mali_t6xx_hw.c
--- linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_mali_t6xx_hw.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,784 @@
+/**
+ * Copyright (C) ARM Limited 2012-2013. All rights reserved.
@@ -93486,9 +71869,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw.c linux-linaro-s
+
+ return gator_events_install(&gator_events_mali_t6xx_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw_test.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw_test.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw_test.c linux-solidrun/drivers/gator/gator_events_mali_t6xx_hw_test.c
--- linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw_test.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw_test.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_mali_t6xx_hw_test.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,55 @@
+/**
+ * Copyright (C) ARM Limited 2012-2013. All rights reserved.
@@ -93545,9 +71928,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mali_t6xx_hw_test.c linux-lin
+
+ printk("gator: %d tests passed\n", n_tests_passed);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_meminfo.c linux-linaro-stable-mx6/drivers/gator/gator_events_meminfo.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_meminfo.c linux-solidrun/drivers/gator/gator_events_meminfo.c
--- linux-3.10.36/drivers/gator/gator_events_meminfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_meminfo.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_meminfo.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,387 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -93936,9 +72319,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_meminfo.c linux-linaro-stable
+
+ return gator_events_install(&gator_events_meminfo_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_mmapped.c linux-linaro-stable-mx6/drivers/gator/gator_events_mmapped.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_mmapped.c linux-solidrun/drivers/gator/gator_events_mmapped.c
--- linux-3.10.36/drivers/gator/gator_events_mmapped.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mmapped.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_mmapped.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,209 @@
+/*
+ * Example events provider
@@ -94149,9 +72532,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_mmapped.c linux-linaro-stable
+
+ return gator_events_install(&gator_events_mmapped_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_net.c linux-linaro-stable-mx6/drivers/gator/gator_events_net.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_net.c linux-solidrun/drivers/gator/gator_events_net.c
--- linux-3.10.36/drivers/gator/gator_events_net.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_net.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_net.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,172 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -94325,9 +72708,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_net.c linux-linaro-stable-mx6
+
+ return gator_events_install(&gator_events_net_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_perf_pmu.c linux-linaro-stable-mx6/drivers/gator/gator_events_perf_pmu.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_perf_pmu.c linux-solidrun/drivers/gator/gator_events_perf_pmu.c
--- linux-3.10.36/drivers/gator/gator_events_perf_pmu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_perf_pmu.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_perf_pmu.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,587 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -94916,9 +73299,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_perf_pmu.c linux-linaro-stabl
+}
+
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_events_sched.c linux-linaro-stable-mx6/drivers/gator/gator_events_sched.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_sched.c linux-solidrun/drivers/gator/gator_events_sched.c
--- linux-3.10.36/drivers/gator/gator_events_sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_sched.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_sched.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,113 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -95033,9 +73416,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_sched.c linux-linaro-stable-m
+
+ return gator_events_install(&gator_events_sched_interface);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_events_scorpion.c linux-linaro-stable-mx6/drivers/gator/gator_events_scorpion.c
+diff -Nur linux-3.10.36/drivers/gator/gator_events_scorpion.c linux-solidrun/drivers/gator/gator_events_scorpion.c
--- linux-3.10.36/drivers/gator/gator_events_scorpion.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_events_scorpion.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_events_scorpion.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,669 @@
+/**
+ * Copyright (C) ARM Limited 2011-2013. All rights reserved.
@@ -95706,9 +74089,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_events_scorpion.c linux-linaro-stabl
+}
+
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_fs.c linux-linaro-stable-mx6/drivers/gator/gator_fs.c
+diff -Nur linux-3.10.36/drivers/gator/gator_fs.c linux-solidrun/drivers/gator/gator_fs.c
--- linux-3.10.36/drivers/gator/gator_fs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_fs.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_fs.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,382 @@
+/**
+ * @file gatorfs.c
@@ -96092,9 +74475,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_fs.c linux-linaro-stable-mx6/drivers
+{
+ unregister_filesystem(&gatorfs_type);
+}
-diff -Nur linux-3.10.36/drivers/gator/gator.h linux-linaro-stable-mx6/drivers/gator/gator.h
+diff -Nur linux-3.10.36/drivers/gator/gator.h linux-solidrun/drivers/gator/gator.h
--- linux-3.10.36/drivers/gator/gator.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator.h 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/gator.h 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,142 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -96238,9 +74621,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator.h linux-linaro-stable-mx6/drivers/ga
+#define on_primary_core() (get_logical_cpu() == 0)
+
+#endif // GATOR_H_
-diff -Nur linux-3.10.36/drivers/gator/gator_hrtimer_gator.c linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_gator.c
+diff -Nur linux-3.10.36/drivers/gator/gator_hrtimer_gator.c linux-solidrun/drivers/gator/gator_hrtimer_gator.c
--- linux-3.10.36/drivers/gator/gator_hrtimer_gator.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_gator.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_hrtimer_gator.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,86 @@
+/**
+ * Copyright (C) ARM Limited 2011-2013. All rights reserved.
@@ -96328,9 +74711,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_hrtimer_gator.c linux-linaro-stable-
+}
+
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_hrtimer_perf.c linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_perf.c
+diff -Nur linux-3.10.36/drivers/gator/gator_hrtimer_perf.c linux-solidrun/drivers/gator/gator_hrtimer_perf.c
--- linux-3.10.36/drivers/gator/gator_hrtimer_perf.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_perf.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_hrtimer_perf.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,113 @@
+/**
+ * Copyright (C) ARM Limited 2011-2013. All rights reserved.
@@ -96445,9 +74828,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_hrtimer_perf.c linux-linaro-stable-m
+}
+
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_iks.c linux-linaro-stable-mx6/drivers/gator/gator_iks.c
+diff -Nur linux-3.10.36/drivers/gator/gator_iks.c linux-solidrun/drivers/gator/gator_iks.c
--- linux-3.10.36/drivers/gator/gator_iks.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_iks.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_iks.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,197 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -96646,9 +75029,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_iks.c linux-linaro-stable-mx6/driver
+#define gator_migrate_stop()
+
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_main.c linux-linaro-stable-mx6/drivers/gator/gator_main.c
+diff -Nur linux-3.10.36/drivers/gator/gator_main.c linux-solidrun/drivers/gator/gator_main.c
--- linux-3.10.36/drivers/gator/gator_main.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_main.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_main.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,1532 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -98182,9 +76565,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_main.c linux-linaro-stable-mx6/drive
+#define STRIFY2(ARG) #ARG
+#define STRIFY(ARG) STRIFY2(ARG)
+MODULE_VERSION(STRIFY(PROTOCOL_VERSION));
-diff -Nur linux-3.10.36/drivers/gator/gator_marshaling.c linux-linaro-stable-mx6/drivers/gator/gator_marshaling.c
+diff -Nur linux-3.10.36/drivers/gator/gator_marshaling.c linux-solidrun/drivers/gator/gator_marshaling.c
--- linux-3.10.36/drivers/gator/gator_marshaling.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_marshaling.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_marshaling.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,432 @@
+/**
+ * Copyright (C) ARM Limited 2012-2013. All rights reserved.
@@ -98618,9 +77001,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_marshaling.c linux-linaro-stable-mx6
+ local_irq_restore(flags);
+}
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_pack.c linux-linaro-stable-mx6/drivers/gator/gator_pack.c
+diff -Nur linux-3.10.36/drivers/gator/gator_pack.c linux-solidrun/drivers/gator/gator_pack.c
--- linux-3.10.36/drivers/gator/gator_pack.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_pack.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_pack.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,58 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -98680,9 +77063,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_pack.c linux-linaro-stable-mx6/drive
+
+ per_cpu(gator_buffer_write, cpu)[buftype] = (write + packedBytes) & mask;
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_trace_gpu.c linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.c
+diff -Nur linux-3.10.36/drivers/gator/gator_trace_gpu.c linux-solidrun/drivers/gator/gator_trace_gpu.c
--- linux-3.10.36/drivers/gator/gator_trace_gpu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_trace_gpu.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,294 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -98978,9 +77361,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_trace_gpu.c linux-linaro-stable-mx6/
+
+ gpu_trace_registered = mali_timeline_trace_registered = mali_job_slots_trace_registered = 0;
+}
-diff -Nur linux-3.10.36/drivers/gator/gator_trace_gpu.h linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.h
+diff -Nur linux-3.10.36/drivers/gator/gator_trace_gpu.h linux-solidrun/drivers/gator/gator_trace_gpu.h
--- linux-3.10.36/drivers/gator/gator_trace_gpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.h 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_trace_gpu.h 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,79 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -99061,9 +77444,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_trace_gpu.h linux-linaro-stable-mx6/
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-3.10.36/drivers/gator/gator_trace_power.c linux-linaro-stable-mx6/drivers/gator/gator_trace_power.c
+diff -Nur linux-3.10.36/drivers/gator/gator_trace_power.c linux-solidrun/drivers/gator/gator_trace_power.c
--- linux-3.10.36/drivers/gator/gator_trace_power.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_power.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_trace_power.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,203 @@
+/**
+ * Copyright (C) ARM Limited 2011-2013. All rights reserved.
@@ -99268,9 +77651,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_trace_power.c linux-linaro-stable-mx
+{
+}
+#endif
-diff -Nur linux-3.10.36/drivers/gator/gator_trace_sched.c linux-linaro-stable-mx6/drivers/gator/gator_trace_sched.c
+diff -Nur linux-3.10.36/drivers/gator/gator_trace_sched.c linux-solidrun/drivers/gator/gator_trace_sched.c
--- linux-3.10.36/drivers/gator/gator_trace_sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_sched.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/gator_trace_sched.c 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,270 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -99542,9 +77925,9 @@ diff -Nur linux-3.10.36/drivers/gator/gator_trace_sched.c linux-linaro-stable-mx
+ sched_cpu_key[i] = gator_events_get_key();
+ }
+}
-diff -Nur linux-3.10.36/drivers/gator/Kconfig linux-linaro-stable-mx6/drivers/gator/Kconfig
+diff -Nur linux-3.10.36/drivers/gator/Kconfig linux-solidrun/drivers/gator/Kconfig
--- linux-3.10.36/drivers/gator/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/Kconfig 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/Kconfig 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,33 @@
+config GATOR
+ tristate "Gator module for ARM's Streamline Performance Analyzer"
@@ -99579,9 +77962,9 @@ diff -Nur linux-3.10.36/drivers/gator/Kconfig linux-linaro-stable-mx6/drivers/ga
+ help
+ The gator code adds this to its include path so it can get the Mali
+ trace headers with: #include "linux/mali_linux_trace.h"
-diff -Nur linux-3.10.36/drivers/gator/LICENSE linux-linaro-stable-mx6/drivers/gator/LICENSE
+diff -Nur linux-3.10.36/drivers/gator/LICENSE linux-solidrun/drivers/gator/LICENSE
--- linux-3.10.36/drivers/gator/LICENSE 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/LICENSE 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/LICENSE 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
@@ -99922,9 +78305,9 @@ diff -Nur linux-3.10.36/drivers/gator/LICENSE linux-linaro-stable-mx6/drivers/ga
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
-diff -Nur linux-3.10.36/drivers/gator/Makefile linux-linaro-stable-mx6/drivers/gator/Makefile
+diff -Nur linux-3.10.36/drivers/gator/Makefile linux-solidrun/drivers/gator/Makefile
--- linux-3.10.36/drivers/gator/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/Makefile 2014-04-21 13:50:40.474719621 +0200
++++ linux-solidrun/drivers/gator/Makefile 2014-04-24 07:58:18.852189849 +0200
@@ -0,0 +1,76 @@
+ifneq ($(KERNELRELEASE),)
+
@@ -100002,9 +78385,9 @@ diff -Nur linux-3.10.36/drivers/gator/Makefile linux-linaro-stable-mx6/drivers/g
+ rm -rf .tmp_versions
+
+endif
-diff -Nur linux-3.10.36/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h linux-linaro-stable-mx6/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h
+diff -Nur linux-3.10.36/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h linux-solidrun/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h
--- linux-3.10.36/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,163 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -100169,9 +78552,9 @@ diff -Nur linux-3.10.36/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h l
+#endif
+
+#endif /* __MALI_MJOLLNIR_PROFILING_GATOR_API_H__ */
-diff -Nur linux-3.10.36/drivers/gator/mali/mali_utgard_profiling_gator_api.h linux-linaro-stable-mx6/drivers/gator/mali/mali_utgard_profiling_gator_api.h
+diff -Nur linux-3.10.36/drivers/gator/mali/mali_utgard_profiling_gator_api.h linux-solidrun/drivers/gator/mali/mali_utgard_profiling_gator_api.h
--- linux-3.10.36/drivers/gator/mali/mali_utgard_profiling_gator_api.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/mali/mali_utgard_profiling_gator_api.h 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/mali/mali_utgard_profiling_gator_api.h 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,201 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -100374,9 +78757,9 @@ diff -Nur linux-3.10.36/drivers/gator/mali/mali_utgard_profiling_gator_api.h lin
+#endif
+
+#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */
-diff -Nur linux-3.10.36/drivers/gator/mali_t6xx.mk linux-linaro-stable-mx6/drivers/gator/mali_t6xx.mk
+diff -Nur linux-3.10.36/drivers/gator/mali_t6xx.mk linux-solidrun/drivers/gator/mali_t6xx.mk
--- linux-3.10.36/drivers/gator/mali_t6xx.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gator/mali_t6xx.mk 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gator/mali_t6xx.mk 2014-04-24 07:58:18.856189864 +0200
@@ -0,0 +1,26 @@
+# Defines for Mali-T6xx driver
+EXTRA_CFLAGS += -DMALI_USE_UMP=1 \
@@ -100404,9 +78787,9 @@ diff -Nur linux-3.10.36/drivers/gator/mali_t6xx.mk linux-linaro-stable-mx6/drive
+ -I$(KBASE_DIR)/platform_dummy \
+ -I$(KBASE_DIR)/src
+
-diff -Nur linux-3.10.36/drivers/gpio/devres.c linux-linaro-stable-mx6/drivers/gpio/devres.c
+diff -Nur linux-3.10.36/drivers/gpio/devres.c linux-solidrun/drivers/gpio/devres.c
--- linux-3.10.36/drivers/gpio/devres.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpio/devres.c 2014-04-21 13:50:40.478719638 +0200
++++ linux-solidrun/drivers/gpio/devres.c 2014-04-24 07:58:18.856189864 +0200
@@ -19,6 +19,89 @@
#include <linux/device.h>
#include <linux/gfp.h>
@@ -100497,9 +78880,9 @@ diff -Nur linux-3.10.36/drivers/gpio/devres.c linux-linaro-stable-mx6/drivers/gp
static void devm_gpio_release(struct device *dev, void *res)
{
unsigned *gpio = res;
-diff -Nur linux-3.10.36/drivers/gpio/gpiolib.c linux-linaro-stable-mx6/drivers/gpio/gpiolib.c
+diff -Nur linux-3.10.36/drivers/gpio/gpiolib.c linux-solidrun/drivers/gpio/gpiolib.c
--- linux-3.10.36/drivers/gpio/gpiolib.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpio/gpiolib.c 2014-04-21 13:50:40.486719671 +0200
++++ linux-solidrun/drivers/gpio/gpiolib.c 2014-04-24 07:58:18.868189906 +0200
@@ -12,20 +12,16 @@
#include <linux/of_gpio.h>
#include <linux/idr.h>
@@ -101817,9 +80200,9 @@ diff -Nur linux-3.10.36/drivers/gpio/gpiolib.c linux-linaro-stable-mx6/drivers/g
seq_printf(s, "\n");
}
}
-diff -Nur linux-3.10.36/drivers/gpio/gpiolib-of.c linux-linaro-stable-mx6/drivers/gpio/gpiolib-of.c
+diff -Nur linux-3.10.36/drivers/gpio/gpiolib-of.c linux-solidrun/drivers/gpio/gpiolib-of.c
--- linux-3.10.36/drivers/gpio/gpiolib-of.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpio/gpiolib-of.c 2014-04-21 13:50:40.486719671 +0200
++++ linux-solidrun/drivers/gpio/gpiolib-of.c 2014-04-24 07:58:18.868189906 +0200
@@ -15,19 +15,21 @@
#include <linux/errno.h>
#include <linux/module.h>
@@ -101917,9 +80300,9 @@ diff -Nur linux-3.10.36/drivers/gpio/gpiolib-of.c linux-linaro-stable-mx6/driver
if (ret)
break;
-diff -Nur linux-3.10.36/drivers/gpio/gpio-mxc.c linux-linaro-stable-mx6/drivers/gpio/gpio-mxc.c
+diff -Nur linux-3.10.36/drivers/gpio/gpio-mxc.c linux-solidrun/drivers/gpio/gpio-mxc.c
--- linux-3.10.36/drivers/gpio/gpio-mxc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpio/gpio-mxc.c 2014-04-21 13:50:40.482719655 +0200
++++ linux-solidrun/drivers/gpio/gpio-mxc.c 2014-04-24 07:58:18.860189879 +0200
@@ -405,34 +405,19 @@
mxc_gpio_get_hw(pdev);
@@ -101984,9 +80367,9 @@ diff -Nur linux-3.10.36/drivers/gpio/gpio-mxc.c linux-linaro-stable-mx6/drivers/
dev_info(&pdev->dev, "%s failed with errno %d\n", __func__, err);
return err;
}
-diff -Nur linux-3.10.36/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c
+diff -Nur linux-3.10.36/drivers/gpio/gpio-pca953x.c linux-solidrun/drivers/gpio/gpio-pca953x.c
--- linux-3.10.36/drivers/gpio/gpio-pca953x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c 2014-04-21 13:50:40.482719655 +0200
++++ linux-solidrun/drivers/gpio/gpio-pca953x.c 2014-04-24 07:58:18.864189893 +0200
@@ -19,6 +19,7 @@
#include <linux/irqdomain.h>
#include <linux/i2c.h>
@@ -102006,9 +80389,9 @@ diff -Nur linux-3.10.36/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6/driv
/* initialize cached registers from their original values.
* we can't share this chip with another i2c master.
*/
-diff -Nur linux-3.10.36/drivers/gpu/drm/drm_crtc_helper.c linux-linaro-stable-mx6/drivers/gpu/drm/drm_crtc_helper.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/drm_crtc_helper.c linux-solidrun/drivers/gpu/drm/drm_crtc_helper.c
--- linux-3.10.36/drivers/gpu/drm/drm_crtc_helper.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/drm_crtc_helper.c 2014-04-21 13:50:40.490719689 +0200
++++ linux-solidrun/drivers/gpu/drm/drm_crtc_helper.c 2014-04-24 07:58:18.884189963 +0200
@@ -308,6 +308,29 @@
EXPORT_SYMBOL(drm_helper_disable_unused_functions);
@@ -102066,9 +80449,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/drm_crtc_helper.c linux-linaro-stable-mx
}
/*
-diff -Nur linux-3.10.36/drivers/gpu/drm/Kconfig linux-linaro-stable-mx6/drivers/gpu/drm/Kconfig
+diff -Nur linux-3.10.36/drivers/gpu/drm/Kconfig linux-solidrun/drivers/gpu/drm/Kconfig
--- linux-3.10.36/drivers/gpu/drm/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/Kconfig 2014-04-21 13:50:40.486719671 +0200
++++ linux-solidrun/drivers/gpu/drm/Kconfig 2014-04-24 07:58:18.868189906 +0200
@@ -199,6 +199,13 @@
Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
chipset. If M is selected the module will be called savage.
@@ -102083,9 +80466,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/Kconfig linux-linaro-stable-mx6/drivers/
source "drivers/gpu/drm/exynos/Kconfig"
source "drivers/gpu/drm/vmwgfx/Kconfig"
-diff -Nur linux-3.10.36/drivers/gpu/drm/Makefile linux-linaro-stable-mx6/drivers/gpu/drm/Makefile
+diff -Nur linux-3.10.36/drivers/gpu/drm/Makefile linux-solidrun/drivers/gpu/drm/Makefile
--- linux-3.10.36/drivers/gpu/drm/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/Makefile 2014-04-21 13:50:40.486719671 +0200
++++ linux-solidrun/drivers/gpu/drm/Makefile 2014-04-24 07:58:18.868189906 +0200
@@ -1,3 +1,24 @@
+##############################################################################
+#
@@ -102121,9 +80504,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_DRM_TDFX) += tdfx/
obj-$(CONFIG_DRM_R128) += r128/
obj-$(CONFIG_DRM_RADEON)+= radeon/
-diff -Nur linux-3.10.36/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c linux-linaro-stable-mx6/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c linux-solidrun/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
--- linux-3.10.36/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c 2014-04-21 13:50:40.530719857 +0200
++++ linux-solidrun/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c 2014-04-24 07:58:19.004190385 +0200
@@ -1112,7 +1112,7 @@
if (conf != ~0) {
if (outp.location == 0 && outp.type == DCB_OUTPUT_DP) {
@@ -102133,9 +80516,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c linux-li
u32 datarate;
switch ((ctrl & 0x000f0000) >> 16) {
-diff -Nur linux-3.10.36/drivers/gpu/drm/nouveau/nouveau_drm.c linux-linaro-stable-mx6/drivers/gpu/drm/nouveau/nouveau_drm.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/nouveau/nouveau_drm.c linux-solidrun/drivers/gpu/drm/nouveau/nouveau_drm.c
--- linux-3.10.36/drivers/gpu/drm/nouveau/nouveau_drm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/nouveau/nouveau_drm.c 2014-04-21 13:50:40.554719959 +0200
++++ linux-solidrun/drivers/gpu/drm/nouveau/nouveau_drm.c 2014-04-24 07:58:19.116190779 +0200
@@ -339,8 +339,6 @@
if (ret)
goto fail_device;
@@ -102153,9 +80536,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/nouveau/nouveau_drm.c linux-linaro-stabl
device = drm->client.base.device;
drm_put_dev(dev);
-diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/atombios_crtc.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/atombios_crtc.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/atombios_crtc.c linux-solidrun/drivers/gpu/drm/radeon/atombios_crtc.c
--- linux-3.10.36/drivers/gpu/drm/radeon/atombios_crtc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/atombios_crtc.c 2014-04-21 13:50:40.566720009 +0200
++++ linux-solidrun/drivers/gpu/drm/radeon/atombios_crtc.c 2014-04-24 07:58:19.136190850 +0200
@@ -1661,20 +1661,6 @@
return ATOM_PPLL1;
DRM_ERROR("unable to allocate a PPLL\n");
@@ -102186,9 +80569,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/atombios_crtc.c linux-linaro-stab
/* use the same PPLL for all monitors with the same clock */
pll = radeon_get_shared_nondp_ppll(crtc);
if (pll != ATOM_PPLL_INVALID)
-diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/atombios_encoders.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/atombios_encoders.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/atombios_encoders.c linux-solidrun/drivers/gpu/drm/radeon/atombios_encoders.c
--- linux-3.10.36/drivers/gpu/drm/radeon/atombios_encoders.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/atombios_encoders.c 2014-04-21 13:50:40.566720009 +0200
++++ linux-solidrun/drivers/gpu/drm/radeon/atombios_encoders.c 2014-04-24 07:58:19.136190850 +0200
@@ -1281,7 +1281,7 @@
}
if (is_dp)
@@ -102198,9 +80581,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/atombios_encoders.c linux-linaro-
args.v5.ucLaneNum = 8;
else
args.v5.ucLaneNum = 4;
-diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/r600.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/r600.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/r600.c linux-solidrun/drivers/gpu/drm/radeon/r600.c
--- linux-3.10.36/drivers/gpu/drm/radeon/r600.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/r600.c 2014-04-21 13:50:40.574720043 +0200
++++ linux-solidrun/drivers/gpu/drm/radeon/r600.c 2014-04-24 07:58:19.144190877 +0200
@@ -4509,10 +4509,6 @@
break;
}
@@ -102212,9 +80595,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/r600.c linux-linaro-stable-mx6/dr
case 176: /* CP_INT in ring buffer */
case 177: /* CP_INT in IB1 */
case 178: /* CP_INT in IB2 */
-diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/radeon_atpx_handler.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/radeon_atpx_handler.c linux-solidrun/drivers/gpu/drm/radeon/radeon_atpx_handler.c
--- linux-3.10.36/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2014-04-21 13:50:40.578720060 +0200
++++ linux-solidrun/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2014-04-24 07:58:19.148190891 +0200
@@ -215,8 +215,7 @@
memcpy(&output, info->buffer.pointer, size);
@@ -102225,9 +80608,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/radeon_atpx_handler.c linux-linar
radeon_atpx_parse_functions(&atpx->functions, output.function_bits);
-diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/radeon_kms.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/radeon_kms.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/radeon_kms.c linux-solidrun/drivers/gpu/drm/radeon/radeon_kms.c
--- linux-3.10.36/drivers/gpu/drm/radeon/radeon_kms.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/radeon_kms.c 2014-04-21 13:50:40.582720076 +0200
++++ linux-solidrun/drivers/gpu/drm/radeon/radeon_kms.c 2014-04-24 07:58:19.156190920 +0200
@@ -485,10 +485,6 @@
radeon_vm_init(rdev, &fpriv->vm);
@@ -102248,9 +80631,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/radeon_kms.c linux-linaro-stable-
if (r) {
radeon_vm_fini(rdev, &fpriv->vm);
kfree(fpriv);
-diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/si.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/si.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/si.c linux-solidrun/drivers/gpu/drm/radeon/si.c
--- linux-3.10.36/drivers/gpu/drm/radeon/si.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/si.c 2014-04-21 13:50:40.590720111 +0200
++++ linux-solidrun/drivers/gpu/drm/radeon/si.c 2014-04-24 07:58:19.164190947 +0200
@@ -5159,10 +5159,6 @@
break;
}
@@ -102262,9 +80645,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/radeon/si.c linux-linaro-stable-mx6/driv
case 146:
case 147:
dev_err(rdev->dev, "GPU fault detected: %d 0x%08x\n", src_id, src_data);
-diff -Nur linux-3.10.36/drivers/gpu/drm/ttm/ttm_bo.c linux-linaro-stable-mx6/drivers/gpu/drm/ttm/ttm_bo.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/ttm/ttm_bo.c linux-solidrun/drivers/gpu/drm/ttm/ttm_bo.c
--- linux-3.10.36/drivers/gpu/drm/ttm/ttm_bo.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/ttm/ttm_bo.c 2014-04-21 13:50:40.594720127 +0200
++++ linux-solidrun/drivers/gpu/drm/ttm/ttm_bo.c 2014-04-24 07:58:19.188191032 +0200
@@ -498,11 +498,9 @@
moved:
@@ -102280,9 +80663,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/ttm/ttm_bo.c linux-linaro-stable-mx6/dri
bo->evicted = false;
}
-diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/Makefile linux-linaro-stable-mx6/drivers/gpu/drm/vivante/Makefile
+diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/Makefile linux-solidrun/drivers/gpu/drm/vivante/Makefile
--- linux-3.10.36/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/Makefile 2014-04-21 13:50:40.598720144 +0200
++++ linux-solidrun/drivers/gpu/drm/vivante/Makefile 2014-04-24 07:58:19.192191045 +0200
@@ -0,0 +1,29 @@
+##############################################################################
+#
@@ -102313,9 +80696,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/Makefile linux-linaro-stable-mx6
+vivante-y := vivante_drv.o
+
+obj-$(CONFIG_DRM_VIVANTE) += vivante.o
-diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.c linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.c
+diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.c linux-solidrun/drivers/gpu/drm/vivante/vivante_drv.c
--- linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.c 2014-04-21 13:50:40.598720144 +0200
++++ linux-solidrun/drivers/gpu/drm/vivante/vivante_drv.c 2014-04-24 07:58:19.192191045 +0200
@@ -0,0 +1,111 @@
+/****************************************************************************
+*
@@ -102428,9 +80811,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.c linux-linaro-stabl
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL and additional rights");
-diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.h linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.h
+diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.h linux-solidrun/drivers/gpu/drm/vivante/vivante_drv.h
--- linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.h 2014-04-21 13:50:40.598720144 +0200
++++ linux-solidrun/drivers/gpu/drm/vivante/vivante_drv.h 2014-04-24 07:58:19.192191045 +0200
@@ -0,0 +1,66 @@
+/****************************************************************************
+*
@@ -102498,9 +80881,9 @@ diff -Nur linux-3.10.36/drivers/gpu/drm/vivante/vivante_drv.h linux-linaro-stabl
+#define DRIVER_PATCHLEVEL 0
+
+#endif
-diff -Nur linux-3.10.36/drivers/hv/connection.c linux-linaro-stable-mx6/drivers/hv/connection.c
+diff -Nur linux-3.10.36/drivers/hv/connection.c linux-solidrun/drivers/hv/connection.c
--- linux-3.10.36/drivers/hv/connection.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hv/connection.c 2014-04-21 13:50:40.622720246 +0200
++++ linux-solidrun/drivers/hv/connection.c 2014-04-24 07:58:19.220191144 +0200
@@ -67,6 +67,7 @@
int ret = 0;
struct vmbus_channel_initiate_contact *msg;
@@ -102526,9 +80909,9 @@ diff -Nur linux-3.10.36/drivers/hv/connection.c linux-linaro-stable-mx6/drivers/
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
list_del(&msginfo->msglistentry);
-diff -Nur linux-3.10.36/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drivers/hwmon/Kconfig
+diff -Nur linux-3.10.36/drivers/hwmon/Kconfig linux-solidrun/drivers/hwmon/Kconfig
--- linux-3.10.36/drivers/hwmon/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hwmon/Kconfig 2014-04-21 13:50:40.622720246 +0200
++++ linux-solidrun/drivers/hwmon/Kconfig 2014-04-24 07:58:19.220191144 +0200
@@ -867,6 +867,15 @@
This driver can also be built as a module. If so, the module
will be called max1668.
@@ -102564,9 +80947,9 @@ diff -Nur linux-3.10.36/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drivers/hw
+ default y
+
endif # HWMON
-diff -Nur linux-3.10.36/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/drivers/hwmon/mag3110.c
+diff -Nur linux-3.10.36/drivers/hwmon/mag3110.c linux-solidrun/drivers/hwmon/mag3110.c
--- linux-3.10.36/drivers/hwmon/mag3110.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/hwmon/mag3110.c 2014-04-21 13:50:40.638720313 +0200
++++ linux-solidrun/drivers/hwmon/mag3110.c 2014-04-24 07:58:19.260191285 +0200
@@ -0,0 +1,611 @@
+/*
+ *
@@ -103179,9 +81562,9 @@ diff -Nur linux-3.10.36/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Freescale mag3110 3-axis magnetometer driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/hwmon/Makefile linux-linaro-stable-mx6/drivers/hwmon/Makefile
+diff -Nur linux-3.10.36/drivers/hwmon/Makefile linux-solidrun/drivers/hwmon/Makefile
--- linux-3.10.36/drivers/hwmon/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hwmon/Makefile 2014-04-21 13:50:40.622720246 +0200
++++ linux-solidrun/drivers/hwmon/Makefile 2014-04-24 07:58:19.220191144 +0200
@@ -101,6 +101,7 @@
obj-$(CONFIG_SENSORS_MAX16065) += max16065.o
obj-$(CONFIG_SENSORS_MAX1619) += max1619.o
@@ -103199,9 +81582,9 @@ diff -Nur linux-3.10.36/drivers/hwmon/Makefile linux-linaro-stable-mx6/drivers/h
obj-$(CONFIG_PMBUS) += pmbus/
-diff -Nur linux-3.10.36/drivers/hwmon/max1668.c linux-linaro-stable-mx6/drivers/hwmon/max1668.c
+diff -Nur linux-3.10.36/drivers/hwmon/max1668.c linux-solidrun/drivers/hwmon/max1668.c
--- linux-3.10.36/drivers/hwmon/max1668.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hwmon/max1668.c 2014-04-21 13:50:40.638720313 +0200
++++ linux-solidrun/drivers/hwmon/max1668.c 2014-04-24 07:58:19.260191285 +0200
@@ -243,7 +243,7 @@
data->temp_min[index] = clamp_val(temp/1000, -128, 127);
if (i2c_smbus_write_byte_data(client,
@@ -103211,9 +81594,9 @@ diff -Nur linux-3.10.36/drivers/hwmon/max1668.c linux-linaro-stable-mx6/drivers/
count = -EIO;
mutex_unlock(&data->update_lock);
-diff -Nur linux-3.10.36/drivers/hwmon/max17135-hwmon.c linux-linaro-stable-mx6/drivers/hwmon/max17135-hwmon.c
+diff -Nur linux-3.10.36/drivers/hwmon/max17135-hwmon.c linux-solidrun/drivers/hwmon/max17135-hwmon.c
--- linux-3.10.36/drivers/hwmon/max17135-hwmon.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/hwmon/max17135-hwmon.c 2014-04-21 13:50:40.638720313 +0200
++++ linux-solidrun/drivers/hwmon/max17135-hwmon.c 2014-04-24 07:58:19.260191285 +0200
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -103391,9 +81774,9 @@ diff -Nur linux-3.10.36/drivers/hwmon/max17135-hwmon.c linux-linaro-stable-mx6/d
+MODULE_DESCRIPTION("MAX17135 sensor driver");
+MODULE_LICENSE("GPL");
+
-diff -Nur linux-3.10.36/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c
+diff -Nur linux-3.10.36/drivers/hwmon/mxc_mma8451.c linux-solidrun/drivers/hwmon/mxc_mma8451.c
--- linux-3.10.36/drivers/hwmon/mxc_mma8451.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c 2014-04-21 13:50:40.638720313 +0200
++++ linux-solidrun/drivers/hwmon/mxc_mma8451.c 2014-04-24 07:58:19.260191285 +0200
@@ -0,0 +1,538 @@
+/*
+ * mma8451.c - Linux kernel modules for 3-Axis Orientation/Motion
@@ -103933,9 +82316,9 @@ diff -Nur linux-3.10.36/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6/driv
+
+module_init(mma8451_init);
+module_exit(mma8451_exit);
-diff -Nur linux-3.10.36/drivers/hwmon/ntc_thermistor.c linux-linaro-stable-mx6/drivers/hwmon/ntc_thermistor.c
+diff -Nur linux-3.10.36/drivers/hwmon/ntc_thermistor.c linux-solidrun/drivers/hwmon/ntc_thermistor.c
--- linux-3.10.36/drivers/hwmon/ntc_thermistor.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hwmon/ntc_thermistor.c 2014-04-21 13:50:40.638720313 +0200
++++ linux-solidrun/drivers/hwmon/ntc_thermistor.c 2014-04-24 07:58:19.264191300 +0200
@@ -145,7 +145,7 @@
static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
{
@@ -103958,9 +82341,9 @@ diff -Nur linux-3.10.36/drivers/hwmon/ntc_thermistor.c linux-linaro-stable-mx6/d
}
static const struct of_device_id ntc_match[] = {
-diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-davinci.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-davinci.c
+diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-davinci.c linux-solidrun/drivers/i2c/busses/i2c-davinci.c
--- linux-3.10.36/drivers/i2c/busses/i2c-davinci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-davinci.c 2014-04-21 13:50:40.650720363 +0200
++++ linux-solidrun/drivers/i2c/busses/i2c-davinci.c 2014-04-24 07:58:19.288191384 +0200
@@ -646,13 +646,6 @@
struct resource *mem, *irq;
int r;
@@ -103983,9 +82366,9 @@ diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-davinci.c linux-linaro-stable-mx6
dev->base = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(dev->base)) {
r = PTR_ERR(dev->base);
-diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-designware-platdrv.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-designware-platdrv.c
+diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-designware-platdrv.c linux-solidrun/drivers/i2c/busses/i2c-designware-platdrv.c
--- linux-3.10.36/drivers/i2c/busses/i2c-designware-platdrv.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-designware-platdrv.c 2014-04-21 13:50:40.650720363 +0200
++++ linux-solidrun/drivers/i2c/busses/i2c-designware-platdrv.c 2014-04-24 07:58:19.288191384 +0200
@@ -87,13 +87,6 @@
struct resource *mem;
int irq, r;
@@ -104008,9 +82391,9 @@ diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-designware-platdrv.c linux-linaro
dev->base = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(dev->base))
return PTR_ERR(dev->base);
-diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-imx.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-imx.c
+diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-imx.c linux-solidrun/drivers/i2c/busses/i2c-imx.c
--- linux-3.10.36/drivers/i2c/busses/i2c-imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-imx.c 2014-04-21 13:50:40.654720381 +0200
++++ linux-solidrun/drivers/i2c/busses/i2c-imx.c 2014-04-24 07:58:19.288191384 +0200
@@ -51,7 +51,6 @@
#include <linux/of.h>
#include <linux/of_device.h>
@@ -104225,9 +82608,9 @@ diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-imx.c linux-linaro-stable-mx6/dri
dev_dbg(&i2c_imx->adapter.dev, "claimed irq %d\n", irq);
dev_dbg(&i2c_imx->adapter.dev, "device resources from 0x%x to 0x%x\n",
-diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-omap.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-omap.c
+diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-omap.c linux-solidrun/drivers/i2c/busses/i2c-omap.c
--- linux-3.10.36/drivers/i2c/busses/i2c-omap.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-omap.c 2014-04-21 13:50:40.654720381 +0200
++++ linux-solidrun/drivers/i2c/busses/i2c-omap.c 2014-04-24 07:58:19.292191398 +0200
@@ -1087,13 +1087,6 @@
u32 rev;
u16 minor, major, scheme;
@@ -104250,9 +82633,9 @@ diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-omap.c linux-linaro-stable-mx6/dr
dev->base = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(dev->base))
return PTR_ERR(dev->base);
-diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-rcar.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-rcar.c
+diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-rcar.c linux-solidrun/drivers/i2c/busses/i2c-rcar.c
--- linux-3.10.36/drivers/i2c/busses/i2c-rcar.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-rcar.c 2014-04-21 13:50:40.658720397 +0200
++++ linux-solidrun/drivers/i2c/busses/i2c-rcar.c 2014-04-24 07:58:19.292191398 +0200
@@ -623,12 +623,6 @@
u32 bus_speed;
int ret;
@@ -104274,9 +82657,9 @@ diff -Nur linux-3.10.36/drivers/i2c/busses/i2c-rcar.c linux-linaro-stable-mx6/dr
priv->io = devm_ioremap_resource(dev, res);
if (IS_ERR(priv->io))
return PTR_ERR(priv->io);
-diff -Nur linux-3.10.36/drivers/iio/gyro/Kconfig linux-linaro-stable-mx6/drivers/iio/gyro/Kconfig
+diff -Nur linux-3.10.36/drivers/iio/gyro/Kconfig linux-solidrun/drivers/iio/gyro/Kconfig
--- linux-3.10.36/drivers/iio/gyro/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/iio/gyro/Kconfig 2014-04-21 13:50:40.682720498 +0200
++++ linux-solidrun/drivers/iio/gyro/Kconfig 2014-04-24 07:58:19.344191580 +0200
@@ -50,7 +50,7 @@
select IIO_ST_GYRO_BUFFER if (IIO_TRIGGERED_BUFFER)
help
@@ -104286,9 +82669,9 @@ diff -Nur linux-3.10.36/drivers/iio/gyro/Kconfig linux-linaro-stable-mx6/drivers
This driver can also be built as a module. If so, will be created
these modules:
-diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_core.c linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro_core.c
+diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_core.c linux-solidrun/drivers/iio/gyro/st_gyro_core.c
--- linux-3.10.36/drivers/iio/gyro/st_gyro_core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro_core.c 2014-04-21 13:50:40.682720498 +0200
++++ linux-solidrun/drivers/iio/gyro/st_gyro_core.c 2014-04-24 07:58:19.344191580 +0200
@@ -162,10 +162,11 @@
.wai = ST_GYRO_2_WAI_EXP,
.sensors_supported = {
@@ -104305,9 +82688,9 @@ diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_core.c linux-linaro-stable-mx6/
},
.ch = (struct iio_chan_spec *)st_gyro_16bit_channels,
.odr = {
-diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro.h linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro.h
+diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro.h linux-solidrun/drivers/iio/gyro/st_gyro.h
--- linux-3.10.36/drivers/iio/gyro/st_gyro.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro.h 2014-04-21 13:50:40.682720498 +0200
++++ linux-solidrun/drivers/iio/gyro/st_gyro.h 2014-04-24 07:58:19.344191580 +0200
@@ -19,6 +19,7 @@
#define LSM330DL_GYRO_DEV_NAME "lsm330dl_gyro"
#define LSM330DLC_GYRO_DEV_NAME "lsm330dlc_gyro"
@@ -104316,9 +82699,9 @@ diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro.h linux-linaro-stable-mx6/drive
#define L3G4IS_GYRO_DEV_NAME "l3g4is_ui"
#define LSM330_GYRO_DEV_NAME "lsm330_gyro"
-diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_i2c.c linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro_i2c.c
+diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_i2c.c linux-solidrun/drivers/iio/gyro/st_gyro_i2c.c
--- linux-3.10.36/drivers/iio/gyro/st_gyro_i2c.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro_i2c.c 2014-04-21 13:50:40.682720498 +0200
++++ linux-solidrun/drivers/iio/gyro/st_gyro_i2c.c 2014-04-24 07:58:19.344191580 +0200
@@ -61,6 +61,7 @@
{ LSM330DL_GYRO_DEV_NAME },
{ LSM330DLC_GYRO_DEV_NAME },
@@ -104327,9 +82710,9 @@ diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_i2c.c linux-linaro-stable-mx6/d
{ L3G4IS_GYRO_DEV_NAME },
{ LSM330_GYRO_DEV_NAME },
{},
-diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_spi.c linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro_spi.c
+diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_spi.c linux-solidrun/drivers/iio/gyro/st_gyro_spi.c
--- linux-3.10.36/drivers/iio/gyro/st_gyro_spi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/iio/gyro/st_gyro_spi.c 2014-04-21 13:50:40.682720498 +0200
++++ linux-solidrun/drivers/iio/gyro/st_gyro_spi.c 2014-04-24 07:58:19.344191580 +0200
@@ -60,6 +60,7 @@
{ LSM330DL_GYRO_DEV_NAME },
{ LSM330DLC_GYRO_DEV_NAME },
@@ -104338,9 +82721,9 @@ diff -Nur linux-3.10.36/drivers/iio/gyro/st_gyro_spi.c linux-linaro-stable-mx6/d
{ L3G4IS_GYRO_DEV_NAME },
{ LSM330_GYRO_DEV_NAME },
{},
-diff -Nur linux-3.10.36/drivers/iio/imu/adis16400_core.c linux-linaro-stable-mx6/drivers/iio/imu/adis16400_core.c
+diff -Nur linux-3.10.36/drivers/iio/imu/adis16400_core.c linux-solidrun/drivers/iio/imu/adis16400_core.c
--- linux-3.10.36/drivers/iio/imu/adis16400_core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/iio/imu/adis16400_core.c 2014-04-21 13:50:40.682720498 +0200
++++ linux-solidrun/drivers/iio/imu/adis16400_core.c 2014-04-24 07:58:19.344191580 +0200
@@ -632,7 +632,7 @@
ADIS16400_MAGN_CHAN(Z, ADIS16400_ZMAGN_OUT, 14),
ADIS16400_TEMP_CHAN(ADIS16400_TEMP_OUT, 12),
@@ -104386,9 +82769,9 @@ diff -Nur linux-3.10.36/drivers/iio/imu/adis16400_core.c linux-linaro-stable-mx6
};
static struct attribute *adis16400_attributes[] = {
-diff -Nur linux-3.10.36/drivers/iio/imu/adis16400.h linux-linaro-stable-mx6/drivers/iio/imu/adis16400.h
+diff -Nur linux-3.10.36/drivers/iio/imu/adis16400.h linux-solidrun/drivers/iio/imu/adis16400.h
--- linux-3.10.36/drivers/iio/imu/adis16400.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/iio/imu/adis16400.h 2014-04-21 13:50:40.682720498 +0200
++++ linux-solidrun/drivers/iio/imu/adis16400.h 2014-04-24 07:58:19.344191580 +0200
@@ -189,7 +189,6 @@
ADIS16300_SCAN_INCLI_X,
ADIS16300_SCAN_INCLI_Y,
@@ -104397,9 +82780,9 @@ diff -Nur linux-3.10.36/drivers/iio/imu/adis16400.h linux-linaro-stable-mx6/driv
};
#ifdef CONFIG_IIO_BUFFER
-diff -Nur linux-3.10.36/drivers/infiniband/hw/qib/qib_iba7322.c linux-linaro-stable-mx6/drivers/infiniband/hw/qib/qib_iba7322.c
+diff -Nur linux-3.10.36/drivers/infiniband/hw/qib/qib_iba7322.c linux-solidrun/drivers/infiniband/hw/qib/qib_iba7322.c
--- linux-3.10.36/drivers/infiniband/hw/qib/qib_iba7322.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/infiniband/hw/qib/qib_iba7322.c 2014-04-21 13:50:40.726720684 +0200
++++ linux-solidrun/drivers/infiniband/hw/qib/qib_iba7322.c 2014-04-24 07:58:19.440191918 +0200
@@ -2287,11 +2287,6 @@
qib_write_kreg_port(ppd, krp_ibcctrl_a, ppd->cpspec->ibcctrl_a);
qib_write_kreg(dd, kr_scratch, 0ULL);
@@ -104412,9 +82795,9 @@ diff -Nur linux-3.10.36/drivers/infiniband/hw/qib/qib_iba7322.c linux-linaro-sta
if (qib_compat_ddr_negotiate) {
ppd->cpspec->ibdeltainprog = 1;
ppd->cpspec->ibsymsnap = read_7322_creg32_port(ppd,
-diff -Nur linux-3.10.36/drivers/infiniband/hw/qib/qib_user_sdma.c linux-linaro-stable-mx6/drivers/infiniband/hw/qib/qib_user_sdma.c
+diff -Nur linux-3.10.36/drivers/infiniband/hw/qib/qib_user_sdma.c linux-solidrun/drivers/infiniband/hw/qib/qib_user_sdma.c
--- linux-3.10.36/drivers/infiniband/hw/qib/qib_user_sdma.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/infiniband/hw/qib/qib_user_sdma.c 2014-04-21 13:50:40.730720701 +0200
++++ linux-solidrun/drivers/infiniband/hw/qib/qib_user_sdma.c 2014-04-24 07:58:19.452191961 +0200
@@ -284,7 +284,8 @@
int j;
int ret;
@@ -104436,9 +82819,9 @@ diff -Nur linux-3.10.36/drivers/infiniband/hw/qib/qib_user_sdma.c linux-linaro-s
if (ret <= 0)
goto done_unlock;
else {
-diff -Nur linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.c linux-linaro-stable-mx6/drivers/infiniband/ulp/isert/ib_isert.c
+diff -Nur linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.c linux-solidrun/drivers/infiniband/ulp/isert/ib_isert.c
--- linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/infiniband/ulp/isert/ib_isert.c 2014-04-21 13:50:40.734720718 +0200
++++ linux-solidrun/drivers/infiniband/ulp/isert/ib_isert.c 2014-04-24 07:58:19.472192032 +0200
@@ -392,8 +392,8 @@
isert_conn->state = ISER_CONN_INIT;
INIT_LIST_HEAD(&isert_conn->conn_accept_node);
@@ -104730,9 +83113,9 @@ diff -Nur linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.c linux-linaro-sta
.iscsit_free_conn = isert_free_conn,
.iscsit_alloc_cmd = isert_alloc_cmd,
.iscsit_get_login_rx = isert_get_login_rx,
-diff -Nur linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.h linux-linaro-stable-mx6/drivers/infiniband/ulp/isert/ib_isert.h
+diff -Nur linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.h linux-solidrun/drivers/infiniband/ulp/isert/ib_isert.h
--- linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/infiniband/ulp/isert/ib_isert.h 2014-04-21 13:50:40.734720718 +0200
++++ linux-solidrun/drivers/infiniband/ulp/isert/ib_isert.h 2014-04-24 07:58:19.472192032 +0200
@@ -103,8 +103,8 @@
struct isert_device *conn_device;
struct work_struct conn_logout_work;
@@ -104744,9 +83127,9 @@ diff -Nur linux-3.10.36/drivers/infiniband/ulp/isert/ib_isert.h linux-linaro-sta
struct kref conn_kref;
};
-diff -Nur linux-3.10.36/drivers/input/keyboard/gpio_keys.c linux-linaro-stable-mx6/drivers/input/keyboard/gpio_keys.c
+diff -Nur linux-3.10.36/drivers/input/keyboard/gpio_keys.c linux-solidrun/drivers/input/keyboard/gpio_keys.c
--- linux-3.10.36/drivers/input/keyboard/gpio_keys.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/keyboard/gpio_keys.c 2014-04-21 13:50:40.746720768 +0200
++++ linux-solidrun/drivers/input/keyboard/gpio_keys.c 2014-04-24 07:58:19.512192173 +0200
@@ -3,6 +3,7 @@
*
* Copyright 2005 Phil Blundell
@@ -104764,9 +83147,9 @@ diff -Nur linux-3.10.36/drivers/input/keyboard/gpio_keys.c linux-linaro-stable-m
} else {
if (!button->irq) {
-diff -Nur linux-3.10.36/drivers/input/keyboard/imx_keypad.c linux-linaro-stable-mx6/drivers/input/keyboard/imx_keypad.c
+diff -Nur linux-3.10.36/drivers/input/keyboard/imx_keypad.c linux-solidrun/drivers/input/keyboard/imx_keypad.c
--- linux-3.10.36/drivers/input/keyboard/imx_keypad.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/keyboard/imx_keypad.c 2014-04-21 13:50:40.746720768 +0200
++++ linux-solidrun/drivers/input/keyboard/imx_keypad.c 2014-04-24 07:58:19.512192173 +0200
@@ -1,6 +1,7 @@
/*
* Driver for the IMX keypad port.
@@ -104793,9 +83176,9 @@ diff -Nur linux-3.10.36/drivers/input/keyboard/imx_keypad.c linux-linaro-stable-
mutex_lock(&input_dev->mutex);
-diff -Nur linux-3.10.36/drivers/input/misc/arizona-haptics.c linux-linaro-stable-mx6/drivers/input/misc/arizona-haptics.c
+diff -Nur linux-3.10.36/drivers/input/misc/arizona-haptics.c linux-solidrun/drivers/input/misc/arizona-haptics.c
--- linux-3.10.36/drivers/input/misc/arizona-haptics.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/misc/arizona-haptics.c 2014-04-21 13:50:40.750720785 +0200
++++ linux-solidrun/drivers/input/misc/arizona-haptics.c 2014-04-24 07:58:19.524192214 +0200
@@ -77,14 +77,16 @@
return;
}
@@ -104834,9 +83217,9 @@ diff -Nur linux-3.10.36/drivers/input/misc/arizona-haptics.c linux-linaro-stable
ret = regmap_update_bits(arizona->regmap,
ARIZONA_HAPTICS_CONTROL_1,
ARIZONA_HAP_CTRL_MASK,
-diff -Nur linux-3.10.36/drivers/input/misc/isl29023.c linux-linaro-stable-mx6/drivers/input/misc/isl29023.c
+diff -Nur linux-3.10.36/drivers/input/misc/isl29023.c linux-solidrun/drivers/input/misc/isl29023.c
--- linux-3.10.36/drivers/input/misc/isl29023.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/input/misc/isl29023.c 2014-04-21 13:50:40.754720802 +0200
++++ linux-solidrun/drivers/input/misc/isl29023.c 2014-04-24 07:58:19.528192227 +0200
@@ -0,0 +1,1029 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -105867,9 +84250,9 @@ diff -Nur linux-3.10.36/drivers/input/misc/isl29023.c linux-linaro-stable-mx6/dr
+
+module_init(isl29023_init);
+module_exit(isl29023_exit);
-diff -Nur linux-3.10.36/drivers/input/misc/Kconfig linux-linaro-stable-mx6/drivers/input/misc/Kconfig
+diff -Nur linux-3.10.36/drivers/input/misc/Kconfig linux-solidrun/drivers/input/misc/Kconfig
--- linux-3.10.36/drivers/input/misc/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/misc/Kconfig 2014-04-21 13:50:40.750720785 +0200
++++ linux-solidrun/drivers/input/misc/Kconfig 2014-04-24 07:58:19.524192214 +0200
@@ -637,4 +637,14 @@
To compile this driver as a module, choose M here: the
module will be called xen-kbdfront.
@@ -105885,17 +84268,17 @@ diff -Nur linux-3.10.36/drivers/input/misc/Kconfig linux-linaro-stable-mx6/drive
+ will be called isl29023.
+
endif
-diff -Nur linux-3.10.36/drivers/input/misc/Makefile linux-linaro-stable-mx6/drivers/input/misc/Makefile
+diff -Nur linux-3.10.36/drivers/input/misc/Makefile linux-solidrun/drivers/input/misc/Makefile
--- linux-3.10.36/drivers/input/misc/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/misc/Makefile 2014-04-21 13:50:40.750720785 +0200
++++ linux-solidrun/drivers/input/misc/Makefile 2014-04-24 07:58:19.524192214 +0200
@@ -60,3 +60,4 @@
obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
+obj-$(CONFIG_INPUT_ISL29023) += isl29023.o
-diff -Nur linux-3.10.36/drivers/input/misc/mma8450.c linux-linaro-stable-mx6/drivers/input/misc/mma8450.c
+diff -Nur linux-3.10.36/drivers/input/misc/mma8450.c linux-solidrun/drivers/input/misc/mma8450.c
--- linux-3.10.36/drivers/input/misc/mma8450.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/misc/mma8450.c 2014-04-21 13:50:40.754720802 +0200
++++ linux-solidrun/drivers/input/misc/mma8450.c 2014-04-24 07:58:19.560192341 +0200
@@ -1,7 +1,7 @@
/*
* Driver for Freescale's 3-Axis Accelerometer MMA8450
@@ -105949,9 +84332,9 @@ diff -Nur linux-3.10.36/drivers/input/misc/mma8450.c linux-linaro-stable-mx6/dri
return err;
}
-diff -Nur linux-3.10.36/drivers/input/mouse/cypress_ps2.c linux-linaro-stable-mx6/drivers/input/mouse/cypress_ps2.c
+diff -Nur linux-3.10.36/drivers/input/mouse/cypress_ps2.c linux-solidrun/drivers/input/mouse/cypress_ps2.c
--- linux-3.10.36/drivers/input/mouse/cypress_ps2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/mouse/cypress_ps2.c 2014-04-21 13:50:40.758720819 +0200
++++ linux-solidrun/drivers/input/mouse/cypress_ps2.c 2014-04-24 07:58:19.576192398 +0200
@@ -410,6 +410,7 @@
__clear_bit(REL_X, input->relbit);
__clear_bit(REL_Y, input->relbit);
@@ -105960,9 +84343,9 @@ diff -Nur linux-3.10.36/drivers/input/mouse/cypress_ps2.c linux-linaro-stable-mx
__set_bit(EV_KEY, input->evbit);
__set_bit(BTN_LEFT, input->keybit);
__set_bit(BTN_RIGHT, input->keybit);
-diff -Nur linux-3.10.36/drivers/input/mouse/elantech.c linux-linaro-stable-mx6/drivers/input/mouse/elantech.c
+diff -Nur linux-3.10.36/drivers/input/mouse/elantech.c linux-solidrun/drivers/input/mouse/elantech.c
--- linux-3.10.36/drivers/input/mouse/elantech.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/mouse/elantech.c 2014-04-21 13:50:40.758720819 +0200
++++ linux-solidrun/drivers/input/mouse/elantech.c 2014-04-24 07:58:19.576192398 +0200
@@ -486,7 +486,6 @@
unsigned char *packet = psmouse->packet;
@@ -106036,9 +84419,9 @@ diff -Nur linux-3.10.36/drivers/input/mouse/elantech.c linux-linaro-stable-mx6/d
__set_bit(BTN_TOOL_QUADTAP, dev->keybit);
/* For X to recognize me as touchpad. */
input_set_abs_params(dev, ABS_X, x_min, x_max, 0, 0);
-diff -Nur linux-3.10.36/drivers/input/mouse/synaptics.c linux-linaro-stable-mx6/drivers/input/mouse/synaptics.c
+diff -Nur linux-3.10.36/drivers/input/mouse/synaptics.c linux-solidrun/drivers/input/mouse/synaptics.c
--- linux-3.10.36/drivers/input/mouse/synaptics.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/mouse/synaptics.c 2014-04-21 13:50:40.758720819 +0200
++++ linux-solidrun/drivers/input/mouse/synaptics.c 2014-04-24 07:58:19.596192468 +0200
@@ -265,22 +265,11 @@
* Read touchpad resolution and maximum reported coordinates
* Resolution is left zero if touchpad does not support the query
@@ -106117,9 +84500,9 @@ diff -Nur linux-3.10.36/drivers/input/mouse/synaptics.c linux-linaro-stable-mx6/
}
static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)
-diff -Nur linux-3.10.36/drivers/input/mousedev.c linux-linaro-stable-mx6/drivers/input/mousedev.c
+diff -Nur linux-3.10.36/drivers/input/mousedev.c linux-solidrun/drivers/input/mousedev.c
--- linux-3.10.36/drivers/input/mousedev.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/mousedev.c 2014-04-21 13:50:40.762720836 +0200
++++ linux-solidrun/drivers/input/mousedev.c 2014-04-24 07:58:19.600192482 +0200
@@ -67,6 +67,7 @@
struct device dev;
struct cdev cdev;
@@ -106290,9 +84673,9 @@ diff -Nur linux-3.10.36/drivers/input/mousedev.c linux-linaro-stable-mx6/drivers
input_unregister_handle(&mousedev->handle);
put_device(&mousedev->dev);
}
-diff -Nur linux-3.10.36/drivers/input/tablet/wacom_sys.c linux-linaro-stable-mx6/drivers/input/tablet/wacom_sys.c
+diff -Nur linux-3.10.36/drivers/input/tablet/wacom_sys.c linux-solidrun/drivers/input/tablet/wacom_sys.c
--- linux-3.10.36/drivers/input/tablet/wacom_sys.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/tablet/wacom_sys.c 2014-04-21 13:50:40.766720853 +0200
++++ linux-solidrun/drivers/input/tablet/wacom_sys.c 2014-04-24 07:58:19.604192496 +0200
@@ -339,7 +339,7 @@
struct usb_device *dev = interface_to_usbdev(intf);
char limit = 0;
@@ -106321,9 +84704,9 @@ diff -Nur linux-3.10.36/drivers/input/tablet/wacom_sys.c linux-linaro-stable-mx6
result = 0;
kfree(report);
return result;
-diff -Nur linux-3.10.36/drivers/input/touchscreen/egalax_ts.c linux-linaro-stable-mx6/drivers/input/touchscreen/egalax_ts.c
+diff -Nur linux-3.10.36/drivers/input/touchscreen/egalax_ts.c linux-solidrun/drivers/input/touchscreen/egalax_ts.c
--- linux-3.10.36/drivers/input/touchscreen/egalax_ts.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/touchscreen/egalax_ts.c 2014-04-21 13:50:40.770720869 +0200
++++ linux-solidrun/drivers/input/touchscreen/egalax_ts.c 2014-04-24 07:58:19.612192523 +0200
@@ -1,7 +1,7 @@
/*
* Driver for EETI eGalax Multiple Touch Controller
@@ -106531,9 +84914,9 @@ diff -Nur linux-3.10.36/drivers/input/touchscreen/egalax_ts.c linux-linaro-stabl
input_set_drvdata(input_dev, ts);
error = request_threaded_irq(client->irq, NULL, egalax_ts_interrupt,
-diff -Nur linux-3.10.36/drivers/input/touchscreen/elan_ts.c linux-linaro-stable-mx6/drivers/input/touchscreen/elan_ts.c
+diff -Nur linux-3.10.36/drivers/input/touchscreen/elan_ts.c linux-solidrun/drivers/input/touchscreen/elan_ts.c
--- linux-3.10.36/drivers/input/touchscreen/elan_ts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/input/touchscreen/elan_ts.c 2014-04-21 13:50:40.770720869 +0200
++++ linux-solidrun/drivers/input/touchscreen/elan_ts.c 2014-04-24 07:58:19.612192523 +0200
@@ -0,0 +1,472 @@
+/*
+ * Copyright (C) 2007-2008 HTC Corporation.
@@ -107007,9 +85390,9 @@ diff -Nur linux-3.10.36/drivers/input/touchscreen/elan_ts.c linux-linaro-stable-
+MODULE_AUTHOR("Stanley Zeng <stanley.zeng@emc.com.tw>");
+MODULE_DESCRIPTION("ELAN Touch Screen driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/input/touchscreen/Kconfig linux-linaro-stable-mx6/drivers/input/touchscreen/Kconfig
+diff -Nur linux-3.10.36/drivers/input/touchscreen/Kconfig linux-solidrun/drivers/input/touchscreen/Kconfig
--- linux-3.10.36/drivers/input/touchscreen/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/touchscreen/Kconfig 2014-04-21 13:50:40.766720853 +0200
++++ linux-solidrun/drivers/input/touchscreen/Kconfig 2014-04-24 07:58:19.608192510 +0200
@@ -235,6 +235,27 @@
To compile this driver as a module, choose M here: the
module will be called egalax_ts.
@@ -107038,9 +85421,9 @@ diff -Nur linux-3.10.36/drivers/input/touchscreen/Kconfig linux-linaro-stable-mx
config TOUCHSCREEN_FUJITSU
tristate "Fujitsu serial touchscreen"
select SERIO
-diff -Nur linux-3.10.36/drivers/input/touchscreen/Makefile linux-linaro-stable-mx6/drivers/input/touchscreen/Makefile
+diff -Nur linux-3.10.36/drivers/input/touchscreen/Makefile linux-solidrun/drivers/input/touchscreen/Makefile
--- linux-3.10.36/drivers/input/touchscreen/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/touchscreen/Makefile 2014-04-21 13:50:40.766720853 +0200
++++ linux-solidrun/drivers/input/touchscreen/Makefile 2014-04-24 07:58:19.608192510 +0200
@@ -27,6 +27,7 @@
obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE) += hampshire.o
obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o
@@ -107049,9 +85432,9 @@ diff -Nur linux-3.10.36/drivers/input/touchscreen/Makefile linux-linaro-stable-m
obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o
obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o
obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o
-diff -Nur linux-3.10.36/drivers/input/touchscreen/max11801_ts.c linux-linaro-stable-mx6/drivers/input/touchscreen/max11801_ts.c
+diff -Nur linux-3.10.36/drivers/input/touchscreen/max11801_ts.c linux-solidrun/drivers/input/touchscreen/max11801_ts.c
--- linux-3.10.36/drivers/input/touchscreen/max11801_ts.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/touchscreen/max11801_ts.c 2014-04-21 13:50:40.770720869 +0200
++++ linux-solidrun/drivers/input/touchscreen/max11801_ts.c 2014-04-24 07:58:19.612192523 +0200
@@ -2,7 +2,7 @@
* Driver for MAXI MAX11801 - A Resistive touch screen controller with
* i2c interface
@@ -107353,9 +85736,9 @@ diff -Nur linux-3.10.36/drivers/input/touchscreen/max11801_ts.c linux-linaro-sta
},
.id_table = max11801_ts_id,
.probe = max11801_ts_probe,
-diff -Nur linux-3.10.36/drivers/irqchip/irq-armada-370-xp.c linux-linaro-stable-mx6/drivers/irqchip/irq-armada-370-xp.c
+diff -Nur linux-3.10.36/drivers/irqchip/irq-armada-370-xp.c linux-solidrun/drivers/irqchip/irq-armada-370-xp.c
--- linux-3.10.36/drivers/irqchip/irq-armada-370-xp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/irqchip/irq-armada-370-xp.c 2014-04-21 13:50:40.778720903 +0200
++++ linux-solidrun/drivers/irqchip/irq-armada-370-xp.c 2014-04-24 07:58:19.644192637 +0200
@@ -229,7 +229,7 @@
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS)
& IPI_DOORBELL_MASK;
@@ -107365,9 +85748,9 @@ diff -Nur linux-3.10.36/drivers/irqchip/irq-armada-370-xp.c linux-linaro-stable-
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS);
/* Handle all pending doorbells */
-diff -Nur linux-3.10.36/drivers/irqchip/irq-gic.c linux-linaro-stable-mx6/drivers/irqchip/irq-gic.c
+diff -Nur linux-3.10.36/drivers/irqchip/irq-gic.c linux-solidrun/drivers/irqchip/irq-gic.c
--- linux-3.10.36/drivers/irqchip/irq-gic.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/irqchip/irq-gic.c 2014-04-21 13:50:40.778720903 +0200
++++ linux-solidrun/drivers/irqchip/irq-gic.c 2014-04-24 07:58:19.644192637 +0200
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/irqchip/chained_irq.h>
@@ -107572,9 +85955,9 @@ diff -Nur linux-3.10.36/drivers/irqchip/irq-gic.c linux-linaro-stable-mx6/driver
if (parent) {
irq = irq_of_parse_and_map(node, 0);
-diff -Nur linux-3.10.36/drivers/irqchip/irq-metag.c linux-linaro-stable-mx6/drivers/irqchip/irq-metag.c
+diff -Nur linux-3.10.36/drivers/irqchip/irq-metag.c linux-solidrun/drivers/irqchip/irq-metag.c
--- linux-3.10.36/drivers/irqchip/irq-metag.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/irqchip/irq-metag.c 2014-04-21 13:50:40.782720920 +0200
++++ linux-solidrun/drivers/irqchip/irq-metag.c 2014-04-24 07:58:19.644192637 +0200
@@ -201,7 +201,7 @@
* one cpu (the interrupt code doesn't support it), so we just
* pick the first cpu we find in 'cpumask'.
@@ -107584,9 +85967,9 @@ diff -Nur linux-3.10.36/drivers/irqchip/irq-metag.c linux-linaro-stable-mx6/driv
thread = cpu_2_hwthread_id[cpu];
metag_out32(TBI_TRIG_VEC(TBID_SIGNUM_TR1(thread)),
-diff -Nur linux-3.10.36/drivers/irqchip/irq-metag-ext.c linux-linaro-stable-mx6/drivers/irqchip/irq-metag-ext.c
+diff -Nur linux-3.10.36/drivers/irqchip/irq-metag-ext.c linux-solidrun/drivers/irqchip/irq-metag-ext.c
--- linux-3.10.36/drivers/irqchip/irq-metag-ext.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/irqchip/irq-metag-ext.c 2014-04-21 13:50:40.778720903 +0200
++++ linux-solidrun/drivers/irqchip/irq-metag-ext.c 2014-04-24 07:58:19.644192637 +0200
@@ -515,7 +515,7 @@
* one cpu (the interrupt code doesn't support it), so we just
* pick the first cpu we find in 'cpumask'.
@@ -107596,9 +85979,9 @@ diff -Nur linux-3.10.36/drivers/irqchip/irq-metag-ext.c linux-linaro-stable-mx6/
thread = cpu_2_hwthread_id[cpu];
metag_out32(TBI_TRIG_VEC(TBID_SIGNUM_TR2(thread)), vec_addr);
-diff -Nur linux-3.10.36/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kconfig
+diff -Nur linux-3.10.36/drivers/Kconfig linux-solidrun/drivers/Kconfig
--- linux-3.10.36/drivers/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/Kconfig 2014-04-21 13:50:40.286718828 +0200
++++ linux-solidrun/drivers/Kconfig 2014-04-24 07:58:18.476188528 +0200
@@ -98,6 +98,8 @@
source "drivers/memstick/Kconfig"
@@ -107615,9 +85998,9 @@ diff -Nur linux-3.10.36/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kconfig
+source "drivers/gator/Kconfig"
+
endmenu
-diff -Nur linux-3.10.36/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/drivers/leds/leds-pwm.c
+diff -Nur linux-3.10.36/drivers/leds/leds-pwm.c linux-solidrun/drivers/leds/leds-pwm.c
--- linux-3.10.36/drivers/leds/leds-pwm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/leds/leds-pwm.c 2014-04-21 13:50:40.834721139 +0200
++++ linux-solidrun/drivers/leds/leds-pwm.c 2014-04-24 07:58:19.728192931 +0200
@@ -67,8 +67,13 @@
container_of(led_cdev, struct led_pwm_data, cdev);
unsigned int max = led_dat->cdev.max_brightness;
@@ -107658,9 +86041,9 @@ diff -Nur linux-3.10.36/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/drivers/
led_dat->can_sleep = pwm_can_sleep(led_dat->pwm);
if (led_dat->can_sleep)
-diff -Nur linux-3.10.36/drivers/Makefile linux-linaro-stable-mx6/drivers/Makefile
+diff -Nur linux-3.10.36/drivers/Makefile linux-solidrun/drivers/Makefile
--- linux-3.10.36/drivers/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/Makefile 2014-04-21 13:50:40.286718828 +0200
++++ linux-solidrun/drivers/Makefile 2014-04-24 07:58:18.476188528 +0200
@@ -109,6 +109,7 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
@@ -107675,9 +86058,9 @@ diff -Nur linux-3.10.36/drivers/Makefile linux-linaro-stable-mx6/drivers/Makefil
obj-$(CONFIG_NTB) += ntb/
+
+obj-$(CONFIG_GATOR) += gator/
-diff -Nur linux-3.10.36/drivers/md/dm-cache-target.c linux-linaro-stable-mx6/drivers/md/dm-cache-target.c
+diff -Nur linux-3.10.36/drivers/md/dm-cache-target.c linux-solidrun/drivers/md/dm-cache-target.c
--- linux-3.10.36/drivers/md/dm-cache-target.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/md/dm-cache-target.c 2014-04-21 13:50:40.850721207 +0200
++++ linux-solidrun/drivers/md/dm-cache-target.c 2014-04-24 07:58:19.752193016 +0200
@@ -861,13 +861,12 @@
int r;
struct dm_io_region o_region, c_region;
@@ -107717,9 +86100,9 @@ diff -Nur linux-3.10.36/drivers/md/dm-cache-target.c linux-linaro-stable-mx6/dri
if (bio->bi_rw & (REQ_FLUSH | REQ_FUA | REQ_DISCARD)) {
defer_bio(cache, bio);
return DM_MAPIO_SUBMITTED;
-diff -Nur linux-3.10.36/drivers/md/dm-mpath.c linux-linaro-stable-mx6/drivers/md/dm-mpath.c
+diff -Nur linux-3.10.36/drivers/md/dm-mpath.c linux-solidrun/drivers/md/dm-mpath.c
--- linux-3.10.36/drivers/md/dm-mpath.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/md/dm-mpath.c 2014-04-21 13:50:40.854721224 +0200
++++ linux-solidrun/drivers/md/dm-mpath.c 2014-04-24 07:58:19.752193016 +0200
@@ -1608,11 +1608,8 @@
/*
* Only pass ioctls through if the device sizes match exactly.
@@ -107734,9 +86117,9 @@ diff -Nur linux-3.10.36/drivers/md/dm-mpath.c linux-linaro-stable-mx6/drivers/md
if (r == -ENOTCONN && !fatal_signal_pending(current))
queue_work(kmultipathd, &m->process_queued_ios);
-diff -Nur linux-3.10.36/drivers/md/dm-thin.c linux-linaro-stable-mx6/drivers/md/dm-thin.c
+diff -Nur linux-3.10.36/drivers/md/dm-thin.c linux-solidrun/drivers/md/dm-thin.c
--- linux-3.10.36/drivers/md/dm-thin.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/md/dm-thin.c 2014-04-21 13:50:40.858721241 +0200
++++ linux-solidrun/drivers/md/dm-thin.c 2014-04-24 07:58:19.756193031 +0200
@@ -1344,8 +1344,7 @@
bio_list_init(&pool->deferred_flush_bios);
spin_unlock_irqrestore(&pool->lock, flags);
@@ -107773,9 +86156,9 @@ diff -Nur linux-3.10.36/drivers/md/dm-thin.c linux-linaro-stable-mx6/drivers/md/
bad_thin_open:
__pool_dec(tc->pool);
bad_pool_lookup:
-diff -Nur linux-3.10.36/drivers/md/dm-thin-metadata.c linux-linaro-stable-mx6/drivers/md/dm-thin-metadata.c
+diff -Nur linux-3.10.36/drivers/md/dm-thin-metadata.c linux-solidrun/drivers/md/dm-thin-metadata.c
--- linux-3.10.36/drivers/md/dm-thin-metadata.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/md/dm-thin-metadata.c 2014-04-21 13:50:40.858721241 +0200
++++ linux-solidrun/drivers/md/dm-thin-metadata.c 2014-04-24 07:58:19.756193031 +0200
@@ -1489,23 +1489,6 @@
return r;
}
@@ -107800,9 +86183,9 @@ diff -Nur linux-3.10.36/drivers/md/dm-thin-metadata.c linux-linaro-stable-mx6/dr
bool dm_thin_aborted_changes(struct dm_thin_device *td)
{
bool r;
-diff -Nur linux-3.10.36/drivers/md/dm-thin-metadata.h linux-linaro-stable-mx6/drivers/md/dm-thin-metadata.h
+diff -Nur linux-3.10.36/drivers/md/dm-thin-metadata.h linux-solidrun/drivers/md/dm-thin-metadata.h
--- linux-3.10.36/drivers/md/dm-thin-metadata.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/md/dm-thin-metadata.h 2014-04-21 13:50:40.858721241 +0200
++++ linux-solidrun/drivers/md/dm-thin-metadata.h 2014-04-24 07:58:19.756193031 +0200
@@ -161,8 +161,6 @@
*/
bool dm_thin_changed_this_transaction(struct dm_thin_device *td);
@@ -107812,9 +86195,9 @@ diff -Nur linux-3.10.36/drivers/md/dm-thin-metadata.h linux-linaro-stable-mx6/dr
bool dm_thin_aborted_changes(struct dm_thin_device *td);
int dm_thin_get_highest_mapped_block(struct dm_thin_device *td,
-diff -Nur linux-3.10.36/drivers/md/raid1.c linux-linaro-stable-mx6/drivers/md/raid1.c
+diff -Nur linux-3.10.36/drivers/md/raid1.c linux-solidrun/drivers/md/raid1.c
--- linux-3.10.36/drivers/md/raid1.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/md/raid1.c 2014-04-21 13:50:40.862721258 +0200
++++ linux-solidrun/drivers/md/raid1.c 2014-04-24 07:58:19.764193059 +0200
@@ -1854,15 +1854,11 @@
for (i = 0; i < conf->raid_disks * 2; i++) {
int j;
@@ -107857,9 +86240,9 @@ diff -Nur linux-3.10.36/drivers/md/raid1.c linux-linaro-stable-mx6/drivers/md/ra
/* No need to write to this device. */
sbio->bi_end_io = NULL;
rdev_dec_pending(conf->mirrors[i].rdev, mddev);
-diff -Nur linux-3.10.36/drivers/md/raid5.c linux-linaro-stable-mx6/drivers/md/raid5.c
+diff -Nur linux-3.10.36/drivers/md/raid5.c linux-solidrun/drivers/md/raid5.c
--- linux-3.10.36/drivers/md/raid5.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/md/raid5.c 2014-04-21 13:50:40.866721274 +0200
++++ linux-solidrun/drivers/md/raid5.c 2014-04-24 07:58:19.764193059 +0200
@@ -5037,43 +5037,23 @@
return sectors * (raid_disks - conf->max_degraded);
}
@@ -107996,9 +86379,9 @@ diff -Nur linux-3.10.36/drivers/md/raid5.c linux-linaro-stable-mx6/drivers/md/ra
put_online_cpus();
return err;
-diff -Nur linux-3.10.36/drivers/media/pci/cx18/cx18-driver.c linux-linaro-stable-mx6/drivers/media/pci/cx18/cx18-driver.c
+diff -Nur linux-3.10.36/drivers/media/pci/cx18/cx18-driver.c linux-solidrun/drivers/media/pci/cx18/cx18-driver.c
--- linux-3.10.36/drivers/media/pci/cx18/cx18-driver.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/pci/cx18/cx18-driver.c 2014-04-21 13:50:40.938721578 +0200
++++ linux-solidrun/drivers/media/pci/cx18/cx18-driver.c 2014-04-24 07:58:19.900193536 +0200
@@ -327,16 +327,13 @@
struct i2c_client *c;
u8 eedata[256];
@@ -108017,9 +86400,9 @@ diff -Nur linux-3.10.36/drivers/media/pci/cx18/cx18-driver.c linux-linaro-stable
if (tveeprom_read(c, eedata, sizeof(eedata)))
goto ret;
-diff -Nur linux-3.10.36/drivers/media/platform/Kconfig linux-linaro-stable-mx6/drivers/media/platform/Kconfig
+diff -Nur linux-3.10.36/drivers/media/platform/Kconfig linux-solidrun/drivers/media/platform/Kconfig
--- linux-3.10.36/drivers/media/platform/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/platform/Kconfig 2014-04-21 13:50:40.978721746 +0200
++++ linux-solidrun/drivers/media/platform/Kconfig 2014-04-24 07:58:20.000193889 +0200
@@ -121,6 +121,21 @@
To compile this driver as a module, choose M here: the module
will be called s3c-camif.
@@ -108042,9 +86425,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/Kconfig linux-linaro-stable-mx6/d
source "drivers/media/platform/soc_camera/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/s5p-tv/Kconfig"
-diff -Nur linux-3.10.36/drivers/media/platform/Makefile linux-linaro-stable-mx6/drivers/media/platform/Makefile
+diff -Nur linux-3.10.36/drivers/media/platform/Makefile linux-solidrun/drivers/media/platform/Makefile
--- linux-3.10.36/drivers/media/platform/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/platform/Makefile 2014-04-21 13:50:40.978721746 +0200
++++ linux-solidrun/drivers/media/platform/Makefile 2014-04-24 07:58:20.000193889 +0200
@@ -50,4 +50,7 @@
obj-$(CONFIG_ARCH_OMAP) += omap/
@@ -108053,9 +86436,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/Makefile linux-linaro-stable-mx6/
+obj-$(CONFIG_VIDEO_MXC_OUTPUT) += mxc/output/
+
ccflags-y += -I$(srctree)/drivers/media/i2c
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/adv7180.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/adv7180.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/adv7180.c linux-solidrun/drivers/media/platform/mxc/capture/adv7180.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/adv7180.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/adv7180.c 2014-04-21 13:50:40.986721781 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/adv7180.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,1344 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -109401,9 +87784,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/adv7180.c linux-linar
+MODULE_AUTHOR("Freescale Semiconductor");
+MODULE_DESCRIPTION("Anolog Device ADV7180 video decoder driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-solidrun/drivers/media/platform/mxc/capture/csi_v4l2_capture.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,2047 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -111452,9 +89835,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/csi_v4l2_capture.c li
+MODULE_DESCRIPTION("V4L2 capture driver for Mx25 based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.c linux-solidrun/drivers/media/platform/mxc/capture/fsl_csi.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/fsl_csi.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -111758,9 +90141,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.c linux-linar
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("fsl CSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.h linux-solidrun/drivers/media/platform/mxc/capture/fsl_csi.h
--- linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/fsl_csi.h 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -111960,9 +90343,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/fsl_csi.h linux-linar
+void csi_mclk_disable(void);
+void csi_dmareq_rff_enable(void);
+void csi_dmareq_rff_disable(void);
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-solidrun/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,554 @@
+
+/*
@@ -112518,9 +90901,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_csi_enc.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-solidrun/drivers/media/platform/mxc/capture/ipu_csi_enc.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,426 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -112948,9 +91331,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-l
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("CSI ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-solidrun/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,642 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -113594,9 +91977,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_enc.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_enc.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,603 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -114201,9 +92584,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-l
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_sw.h
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_sw.h
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -114248,9 +92631,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-li
+int prp_still_deselect(void *private);
+
+#endif
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,529 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -114781,9 +93164,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c l
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,590 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -115375,9 +93758,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linu
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_still.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_still.c linux-solidrun/drivers/media/platform/mxc/capture/ipu_still.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ipu_still.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ipu_still.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -115647,9 +94030,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ipu_still.c linux-lin
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP STILL IMAGE Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/Kconfig linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/Kconfig linux-solidrun/drivers/media/platform/mxc/capture/Kconfig
--- linux-3.10.36/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig 2014-04-21 13:50:40.986721781 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/Kconfig 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,86 @@
+if VIDEO_MXC_CAPTURE
+
@@ -115737,9 +94120,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/Kconfig linux-linaro-
+endmenu
+
+endif
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/Makefile linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/Makefile linux-solidrun/drivers/media/platform/mxc/capture/Makefile
--- linux-3.10.36/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile 2014-04-21 13:50:40.986721781 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/Makefile 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,21 @@
+obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o
+
@@ -115762,9 +94145,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/Makefile linux-linaro
+
+adv7180_tvin-objs := adv7180.o
+obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-solidrun/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,3109 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -118875,9 +97258,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c li
+MODULE_DESCRIPTION("V4L2 capture driver for Mxc based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-solidrun/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h
--- linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -119139,9 +97522,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h li
+
+void set_mclk_rate(uint32_t *p_mclk_freq, uint32_t csi);
+#endif /* __MXC_V4L2_CAPTURE_H__ */
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5640.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5640.c linux-solidrun/drivers/media/platform/mxc/capture/ov5640.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ov5640.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ov5640.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,1951 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -121094,9 +99477,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5640.c linux-linaro
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640_mipi.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-solidrun/drivers/media/platform/mxc/capture/ov5640_mipi.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ov5640_mipi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,2104 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -123202,9 +101585,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-l
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5642.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5642.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5642.c linux-solidrun/drivers/media/platform/mxc/capture/ov5642.c
--- linux-3.10.36/drivers/media/platform/mxc/capture/ov5642.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5642.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/capture/ov5642.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,4252 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -127458,9 +105841,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/capture/ov5642.c linux-linaro
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/Kconfig linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Kconfig
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/Kconfig linux-solidrun/drivers/media/platform/mxc/output/Kconfig
--- linux-3.10.36/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Kconfig 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/output/Kconfig 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,16 @@
+config VIDEO_MXC_IPU_OUTPUT
+ tristate "IPU v4l2 output support"
@@ -127478,15 +105861,15 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/Kconfig linux-linaro-s
+ the MXC framebuffer on a video stream.
+
+ To compile this driver as a module, choose M here.
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/Makefile linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Makefile
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/Makefile linux-solidrun/drivers/media/platform/mxc/output/Makefile
--- linux-3.10.36/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Makefile 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/output/Makefile 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,2 @@
+obj-$(CONFIG_VIDEO_MXC_IPU_OUTPUT) += mxc_vout.o
+obj-$(CONFIG_VIDEO_MXC_PXP_V4L2) += mxc_pxp_v4l2.o
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c linux-solidrun/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c
--- linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,1263 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -128751,9 +107134,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c linux-l
+MODULE_DESCRIPTION("MXC PxP V4L2 driver");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h linux-solidrun/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h
--- linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -128838,9 +107221,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h linux-l
+};
+
+#endif
-diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_vout.c linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_vout.c
+diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_vout.c linux-solidrun/drivers/media/platform/mxc/output/mxc_vout.c
--- linux-3.10.36/drivers/media/platform/mxc/output/mxc_vout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_vout.c 2014-04-21 13:50:40.990721798 +0200
++++ linux-solidrun/drivers/media/platform/mxc/output/mxc_vout.c 2014-04-24 07:58:20.016193944 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -131107,9 +109490,9 @@ diff -Nur linux-3.10.36/drivers/media/platform/mxc/output/mxc_vout.c linux-linar
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("V4L2-driver for MXC video output");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb/cxusb.c linux-linaro-stable-mx6/drivers/media/usb/dvb-usb/cxusb.c
+diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb/cxusb.c linux-solidrun/drivers/media/usb/dvb-usb/cxusb.c
--- linux-3.10.36/drivers/media/usb/dvb-usb/cxusb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/usb/dvb-usb/cxusb.c 2014-04-21 13:50:41.050722051 +0200
++++ linux-solidrun/drivers/media/usb/dvb-usb/cxusb.c 2014-04-24 07:58:20.236194718 +0200
@@ -149,7 +149,6 @@
int num)
{
@@ -131171,9 +109554,9 @@ diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb/cxusb.c linux-linaro-stable-mx
}
static u32 cxusb_i2c_func(struct i2c_adapter *adapter)
-diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb/dw2102.c linux-linaro-stable-mx6/drivers/media/usb/dvb-usb/dw2102.c
+diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb/dw2102.c linux-solidrun/drivers/media/usb/dvb-usb/dw2102.c
--- linux-3.10.36/drivers/media/usb/dvb-usb/dw2102.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/usb/dvb-usb/dw2102.c 2014-04-21 13:50:41.050722051 +0200
++++ linux-solidrun/drivers/media/usb/dvb-usb/dw2102.c 2014-04-24 07:58:20.240194733 +0200
@@ -301,7 +301,6 @@
static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
{
@@ -131357,9 +109740,9 @@ diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb/dw2102.c linux-linaro-stable-m
}
static int su3000_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
-diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb-v2/af9035.c linux-linaro-stable-mx6/drivers/media/usb/dvb-usb-v2/af9035.c
+diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb-v2/af9035.c linux-solidrun/drivers/media/usb/dvb-usb-v2/af9035.c
--- linux-3.10.36/drivers/media/usb/dvb-usb-v2/af9035.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/usb/dvb-usb-v2/af9035.c 2014-04-21 13:50:41.042722016 +0200
++++ linux-solidrun/drivers/media/usb/dvb-usb-v2/af9035.c 2014-04-24 07:58:20.228194691 +0200
@@ -1517,8 +1517,6 @@
&af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) },
{ DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a05,
@@ -131369,9 +109752,9 @@ diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb-v2/af9035.c linux-linaro-stabl
{ }
};
MODULE_DEVICE_TABLE(usb, af9035_id_table);
-diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h linux-linaro-stable-mx6/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
+diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h linux-solidrun/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
--- linux-3.10.36/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h 2014-04-21 13:50:41.046722033 +0200
++++ linux-solidrun/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h 2014-04-24 07:58:20.232194705 +0200
@@ -68,7 +68,7 @@
#else
static inline
@@ -131381,9 +109764,9 @@ diff -Nur linux-3.10.36/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h linux-lina
struct mxl111sf_tuner_config *cfg)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
-diff -Nur linux-3.10.36/drivers/media/v4l2-core/videobuf-dma-contig.c linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c
+diff -Nur linux-3.10.36/drivers/media/v4l2-core/videobuf-dma-contig.c linux-solidrun/drivers/media/v4l2-core/videobuf-dma-contig.c
--- linux-3.10.36/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-04-21 13:50:41.098722253 +0200
++++ linux-solidrun/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-04-24 07:58:20.312194988 +0200
@@ -307,7 +307,7 @@
size = vma->vm_end - vma->vm_start;
size = (size < mem->size) ? size : mem->size;
@@ -131393,9 +109776,9 @@ diff -Nur linux-3.10.36/drivers/media/v4l2-core/videobuf-dma-contig.c linux-lina
retval = remap_pfn_range(vma, vma->vm_start,
mem->dma_handle >> PAGE_SHIFT,
size, vma->vm_page_prot);
-diff -Nur linux-3.10.36/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers/mfd/Kconfig
+diff -Nur linux-3.10.36/drivers/mfd/Kconfig linux-solidrun/drivers/mfd/Kconfig
--- linux-3.10.36/drivers/mfd/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/Kconfig 2014-04-21 13:50:41.110722303 +0200
++++ linux-solidrun/drivers/mfd/Kconfig 2014-04-24 07:58:20.364195169 +0200
@@ -139,6 +139,13 @@
This driver can be built as a module. If built as a module it will be
called "da9055"
@@ -131442,9 +109825,9 @@ diff -Nur linux-3.10.36/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers/mfd/
+ help
+ Serial Power Controller driver for ARM Ltd. test chips.
+
-diff -Nur linux-3.10.36/drivers/mfd/Makefile linux-linaro-stable-mx6/drivers/mfd/Makefile
+diff -Nur linux-3.10.36/drivers/mfd/Makefile linux-solidrun/drivers/mfd/Makefile
--- linux-3.10.36/drivers/mfd/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/Makefile 2014-04-21 13:50:41.110722303 +0200
++++ linux-solidrun/drivers/mfd/Makefile 2014-04-24 07:58:20.364195169 +0200
@@ -104,6 +104,7 @@
da9055-objs := da9055-core.o da9055-i2c.o
obj-$(CONFIG_MFD_DA9055) += da9055.o
@@ -131461,9 +109844,9 @@ diff -Nur linux-3.10.36/drivers/mfd/Makefile linux-linaro-stable-mx6/drivers/mfd
obj-$(CONFIG_MFD_RETU) += retu-mfd.o
obj-$(CONFIG_MFD_AS3711) += as3711.o
+obj-$(CONFIG_MFD_MXC_HDMI) += mxc-hdmi-core.o
-diff -Nur linux-3.10.36/drivers/mfd/max17135-core.c linux-linaro-stable-mx6/drivers/mfd/max17135-core.c
+diff -Nur linux-3.10.36/drivers/mfd/max17135-core.c linux-solidrun/drivers/mfd/max17135-core.c
--- linux-3.10.36/drivers/mfd/max17135-core.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mfd/max17135-core.c 2014-04-21 13:50:41.118722338 +0200
++++ linux-solidrun/drivers/mfd/max17135-core.c 2014-04-24 07:58:20.372195197 +0200
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -131760,9 +110143,9 @@ diff -Nur linux-3.10.36/drivers/mfd/max17135-core.c linux-linaro-stable-mx6/driv
+ */
+subsys_initcall(max17135_init);
+module_exit(max17135_exit);
-diff -Nur linux-3.10.36/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/drivers/mfd/mxc-hdmi-core.c
+diff -Nur linux-3.10.36/drivers/mfd/mxc-hdmi-core.c linux-solidrun/drivers/mfd/mxc-hdmi-core.c
--- linux-3.10.36/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mfd/mxc-hdmi-core.c 2014-04-21 13:50:41.118722338 +0200
++++ linux-solidrun/drivers/mfd/mxc-hdmi-core.c 2014-04-24 07:58:20.372195197 +0200
@@ -0,0 +1,775 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -132539,9 +110922,9 @@ diff -Nur linux-3.10.36/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/driv
+MODULE_DESCRIPTION("Core driver for Freescale i.Mx on-chip HDMI");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mfd/si476x-cmd.c linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c
+diff -Nur linux-3.10.36/drivers/mfd/si476x-cmd.c linux-solidrun/drivers/mfd/si476x-cmd.c
--- linux-3.10.36/drivers/mfd/si476x-cmd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c 2014-04-21 13:50:41.122722354 +0200
++++ linux-solidrun/drivers/mfd/si476x-cmd.c 2014-04-24 07:58:20.376195213 +0200
@@ -303,13 +303,13 @@
* possible racing conditions when working in polling mode */
atomic_set(&core->cts, 0);
@@ -132563,9 +110946,9 @@ diff -Nur linux-3.10.36/drivers/mfd/si476x-cmd.c linux-linaro-stable-mx6/drivers
/*
When working in polling mode, for some reason the tuner will
-diff -Nur linux-3.10.36/drivers/mfd/si476x-i2c.c linux-linaro-stable-mx6/drivers/mfd/si476x-i2c.c
+diff -Nur linux-3.10.36/drivers/mfd/si476x-i2c.c linux-solidrun/drivers/mfd/si476x-i2c.c
--- linux-3.10.36/drivers/mfd/si476x-i2c.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/si476x-i2c.c 2014-04-21 13:50:41.122722354 +0200
++++ linux-solidrun/drivers/mfd/si476x-i2c.c 2014-04-24 07:58:20.376195213 +0200
@@ -303,7 +303,7 @@
*/
udelay(100);
@@ -132613,9 +110996,9 @@ diff -Nur linux-3.10.36/drivers/mfd/si476x-i2c.c linux-linaro-stable-mx6/drivers
rval = si476x_core_get_revision_info(core);
if (rval < 0) {
rval = -ENODEV;
-diff -Nur linux-3.10.36/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c
+diff -Nur linux-3.10.36/drivers/mfd/si476x-prop.c linux-solidrun/drivers/mfd/si476x-prop.c
--- linux-3.10.36/drivers/mfd/si476x-prop.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c 2014-04-21 13:50:41.122722354 +0200
++++ linux-solidrun/drivers/mfd/si476x-prop.c 2014-04-24 07:58:20.376195213 +0200
@@ -217,15 +217,36 @@
return 0;
}
@@ -132653,9 +111036,9 @@ diff -Nur linux-3.10.36/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/driver
.reg_read = si476x_core_regmap_read,
.reg_write = si476x_core_regmap_write,
-diff -Nur linux-3.10.36/drivers/mfd/vexpress-config.c linux-linaro-stable-mx6/drivers/mfd/vexpress-config.c
+diff -Nur linux-3.10.36/drivers/mfd/vexpress-config.c linux-solidrun/drivers/mfd/vexpress-config.c
--- linux-3.10.36/drivers/mfd/vexpress-config.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/vexpress-config.c 2014-04-21 13:50:41.126722371 +0200
++++ linux-solidrun/drivers/mfd/vexpress-config.c 2014-04-24 07:58:20.380195227 +0200
@@ -86,29 +86,13 @@
}
EXPORT_SYMBOL(vexpress_config_bridge_unregister);
@@ -132739,9 +111122,9 @@ diff -Nur linux-3.10.36/drivers/mfd/vexpress-config.c linux-linaro-stable-mx6/dr
if (!func->func) {
of_node_put(node);
kfree(func);
-diff -Nur linux-3.10.36/drivers/mfd/vexpress-spc.c linux-linaro-stable-mx6/drivers/mfd/vexpress-spc.c
+diff -Nur linux-3.10.36/drivers/mfd/vexpress-spc.c linux-solidrun/drivers/mfd/vexpress-spc.c
--- linux-3.10.36/drivers/mfd/vexpress-spc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mfd/vexpress-spc.c 2014-04-21 13:50:41.126722371 +0200
++++ linux-solidrun/drivers/mfd/vexpress-spc.c 2014-04-24 07:58:20.380195227 +0200
@@ -0,0 +1,633 @@
+/*
+ * Versatile Express Serial Power Controller (SPC) support
@@ -133376,9 +111759,9 @@ diff -Nur linux-3.10.36/drivers/mfd/vexpress-spc.c linux-linaro-stable-mx6/drive
+early_initcall(vexpress_spc_early_init);
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Serial Power Controller (SPC) support");
-diff -Nur linux-3.10.36/drivers/mfd/vexpress-sysreg.c linux-linaro-stable-mx6/drivers/mfd/vexpress-sysreg.c
+diff -Nur linux-3.10.36/drivers/mfd/vexpress-sysreg.c linux-solidrun/drivers/mfd/vexpress-sysreg.c
--- linux-3.10.36/drivers/mfd/vexpress-sysreg.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/vexpress-sysreg.c 2014-04-21 13:50:41.126722371 +0200
++++ linux-solidrun/drivers/mfd/vexpress-sysreg.c 2014-04-24 07:58:20.380195227 +0200
@@ -165,7 +165,7 @@
static int vexpress_sysreg_config_tries;
@@ -133429,9 +111812,9 @@ diff -Nur linux-3.10.36/drivers/mfd/vexpress-sysreg.c linux-linaro-stable-mx6/dr
device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id);
-diff -Nur linux-3.10.36/drivers/misc/mei/client.c linux-linaro-stable-mx6/drivers/misc/mei/client.c
+diff -Nur linux-3.10.36/drivers/misc/mei/client.c linux-solidrun/drivers/misc/mei/client.c
--- linux-3.10.36/drivers/misc/mei/client.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/misc/mei/client.c 2014-04-21 13:50:41.138722421 +0200
++++ linux-solidrun/drivers/misc/mei/client.c 2014-04-24 07:58:20.396195283 +0200
@@ -664,6 +664,7 @@
goto err;
@@ -133476,9 +111859,9 @@ diff -Nur linux-3.10.36/drivers/misc/mei/client.c linux-linaro-stable-mx6/driver
list_del(&cb->list);
mei_io_cb_free(cb);
}
-diff -Nur linux-3.10.36/drivers/misc/sram.c linux-linaro-stable-mx6/drivers/misc/sram.c
+diff -Nur linux-3.10.36/drivers/misc/sram.c linux-solidrun/drivers/misc/sram.c
--- linux-3.10.36/drivers/misc/sram.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/misc/sram.c 2014-04-21 13:50:41.146722455 +0200
++++ linux-solidrun/drivers/misc/sram.c 2014-04-24 07:58:20.404195310 +0200
@@ -29,7 +29,7 @@
#include <linux/spinlock.h>
#include <linux/genalloc.h>
@@ -133488,9 +111871,9 @@ diff -Nur linux-3.10.36/drivers/misc/sram.c linux-linaro-stable-mx6/drivers/misc
struct sram_dev {
struct gen_pool *pool;
-diff -Nur linux-3.10.36/drivers/mmc/card/block.c linux-linaro-stable-mx6/drivers/mmc/card/block.c
+diff -Nur linux-3.10.36/drivers/mmc/card/block.c linux-solidrun/drivers/mmc/card/block.c
--- linux-3.10.36/drivers/mmc/card/block.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/card/block.c 2014-04-21 13:50:41.150722472 +0200
++++ linux-solidrun/drivers/mmc/card/block.c 2014-04-24 07:58:20.408195324 +0200
@@ -58,6 +58,8 @@
#define INAND_CMD38_ARG_SECTRIM1 0x81
#define INAND_CMD38_ARG_SECTRIM2 0x88
@@ -133604,9 +111987,9 @@ diff -Nur linux-3.10.36/drivers/mmc/card/block.c linux-linaro-stable-mx6/drivers
out_retry:
if (err && !mmc_blk_reset(md, card->host, type))
goto retry;
-diff -Nur linux-3.10.36/drivers/mmc/card/queue.c linux-linaro-stable-mx6/drivers/mmc/card/queue.c
+diff -Nur linux-3.10.36/drivers/mmc/card/queue.c linux-solidrun/drivers/mmc/card/queue.c
--- linux-3.10.36/drivers/mmc/card/queue.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/card/queue.c 2014-04-21 13:50:41.150722472 +0200
++++ linux-solidrun/drivers/mmc/card/queue.c 2014-04-24 07:58:20.412195338 +0200
@@ -173,7 +173,7 @@
/* granularity must not be greater than max. discard */
if (card->pref_erase > max_discard)
@@ -133616,9 +111999,9 @@ diff -Nur linux-3.10.36/drivers/mmc/card/queue.c linux-linaro-stable-mx6/drivers
queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD, q);
}
-diff -Nur linux-3.10.36/drivers/mmc/core/core.c linux-linaro-stable-mx6/drivers/mmc/core/core.c
+diff -Nur linux-3.10.36/drivers/mmc/core/core.c linux-solidrun/drivers/mmc/core/core.c
--- linux-3.10.36/drivers/mmc/core/core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/core.c 2014-04-21 13:50:41.150722472 +0200
++++ linux-solidrun/drivers/mmc/core/core.c 2014-04-24 07:58:20.412195338 +0200
@@ -13,11 +13,13 @@
#include <linux/module.h>
#include <linux/init.h>
@@ -133720,9 +112103,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/core.c linux-linaro-stable-mx6/drivers/
mmc_host_clk_hold(host);
/* If ocr is set, we use it */
-diff -Nur linux-3.10.36/drivers/mmc/core/host.c linux-linaro-stable-mx6/drivers/mmc/core/host.c
+diff -Nur linux-3.10.36/drivers/mmc/core/host.c linux-solidrun/drivers/mmc/core/host.c
--- linux-3.10.36/drivers/mmc/core/host.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/host.c 2014-04-21 13:50:41.150722472 +0200
++++ linux-solidrun/drivers/mmc/core/host.c 2014-04-24 07:58:20.412195338 +0200
@@ -12,14 +12,18 @@
* MMC host class device management
*/
@@ -133907,9 +112290,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/host.c linux-linaro-stable-mx6/drivers/
WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) &&
!host->ops->enable_sdio_irq);
-diff -Nur linux-3.10.36/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/drivers/mmc/core/mmc.c
+diff -Nur linux-3.10.36/drivers/mmc/core/mmc.c linux-solidrun/drivers/mmc/core/mmc.c
--- linux-3.10.36/drivers/mmc/core/mmc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/mmc.c 2014-04-21 13:50:41.150722472 +0200
++++ linux-solidrun/drivers/mmc/core/mmc.c 2014-04-24 07:58:20.412195338 +0200
@@ -316,6 +316,11 @@
mmc_card_set_blockaddr(card);
}
@@ -134332,9 +112715,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/drivers/m
ddr = MMC_1_2V_DDR_MODE;
}
-diff -Nur linux-3.10.36/drivers/mmc/core/mmc_ops.c linux-linaro-stable-mx6/drivers/mmc/core/mmc_ops.c
+diff -Nur linux-3.10.36/drivers/mmc/core/mmc_ops.c linux-solidrun/drivers/mmc/core/mmc_ops.c
--- linux-3.10.36/drivers/mmc/core/mmc_ops.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/mmc_ops.c 2014-04-21 13:50:41.150722472 +0200
++++ linux-solidrun/drivers/mmc/core/mmc_ops.c 2014-04-24 07:58:20.412195338 +0200
@@ -431,6 +431,8 @@
@@ -134357,9 +112740,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/mmc_ops.c linux-linaro-stable-mx6/drive
/* Must check status to be sure of no errors */
timeout = jiffies + msecs_to_jiffies(MMC_OPS_TIMEOUT_MS);
do {
-diff -Nur linux-3.10.36/drivers/mmc/core/sd.c linux-linaro-stable-mx6/drivers/mmc/core/sd.c
+diff -Nur linux-3.10.36/drivers/mmc/core/sd.c linux-solidrun/drivers/mmc/core/sd.c
--- linux-3.10.36/drivers/mmc/core/sd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/sd.c 2014-04-21 13:50:41.154722489 +0200
++++ linux-solidrun/drivers/mmc/core/sd.c 2014-04-24 07:58:20.412195338 +0200
@@ -215,7 +215,7 @@
static int mmc_read_ssr(struct mmc_card *card)
{
@@ -134402,9 +112785,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/sd.c linux-linaro-stable-mx6/drivers/mm
mmc_host_clk_hold(card->host);
err = card->host->ops->execute_tuning(card->host,
MMC_SEND_TUNING_BLOCK);
-diff -Nur linux-3.10.36/drivers/mmc/core/sdio.c linux-linaro-stable-mx6/drivers/mmc/core/sdio.c
+diff -Nur linux-3.10.36/drivers/mmc/core/sdio.c linux-solidrun/drivers/mmc/core/sdio.c
--- linux-3.10.36/drivers/mmc/core/sdio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/sdio.c 2014-04-21 13:50:41.154722489 +0200
++++ linux-solidrun/drivers/mmc/core/sdio.c 2014-04-24 07:58:20.412195338 +0200
@@ -563,10 +563,18 @@
if (err)
goto out;
@@ -134426,9 +112809,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/sdio.c linux-linaro-stable-mx6/drivers/
out:
-diff -Nur linux-3.10.36/drivers/mmc/core/sdio_irq.c linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c
+diff -Nur linux-3.10.36/drivers/mmc/core/sdio_irq.c linux-solidrun/drivers/mmc/core/sdio_irq.c
--- linux-3.10.36/drivers/mmc/core/sdio_irq.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c 2014-04-21 13:50:41.154722489 +0200
++++ linux-solidrun/drivers/mmc/core/sdio_irq.c 2014-04-24 07:58:20.412195338 +0200
@@ -79,6 +79,15 @@
return ret;
}
@@ -134491,9 +112874,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/sdio_irq.c linux-linaro-stable-mx6/driv
}
return 0;
-diff -Nur linux-3.10.36/drivers/mmc/core/slot-gpio.c linux-linaro-stable-mx6/drivers/mmc/core/slot-gpio.c
+diff -Nur linux-3.10.36/drivers/mmc/core/slot-gpio.c linux-solidrun/drivers/mmc/core/slot-gpio.c
--- linux-3.10.36/drivers/mmc/core/slot-gpio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/slot-gpio.c 2014-04-21 13:50:41.154722489 +0200
++++ linux-solidrun/drivers/mmc/core/slot-gpio.c 2014-04-24 07:58:20.412195338 +0200
@@ -135,6 +135,7 @@
* mmc_gpio_request_cd - request a gpio for card-detection
* @host: mmc host
@@ -134531,9 +112914,9 @@ diff -Nur linux-3.10.36/drivers/mmc/core/slot-gpio.c linux-linaro-stable-mx6/dri
/*
* Even if gpio_to_irq() returns a valid IRQ number, the platform might
* still prefer to poll, e.g., because that IRQ number is already used
-diff -Nur linux-3.10.36/drivers/mmc/host/dw_mmc.c linux-linaro-stable-mx6/drivers/mmc/host/dw_mmc.c
+diff -Nur linux-3.10.36/drivers/mmc/host/dw_mmc.c linux-solidrun/drivers/mmc/host/dw_mmc.c
--- linux-3.10.36/drivers/mmc/host/dw_mmc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/dw_mmc.c 2014-04-21 13:50:41.154722489 +0200
++++ linux-solidrun/drivers/mmc/host/dw_mmc.c 2014-04-24 07:58:20.416195353 +0200
@@ -1902,6 +1902,8 @@
if (!mmc)
return -ENOMEM;
@@ -134543,9 +112926,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/dw_mmc.c linux-linaro-stable-mx6/driver
slot = mmc_priv(mmc);
slot->id = id;
slot->mmc = mmc;
-diff -Nur linux-3.10.36/drivers/mmc/host/jz4740_mmc.c linux-linaro-stable-mx6/drivers/mmc/host/jz4740_mmc.c
+diff -Nur linux-3.10.36/drivers/mmc/host/jz4740_mmc.c linux-solidrun/drivers/mmc/host/jz4740_mmc.c
--- linux-3.10.36/drivers/mmc/host/jz4740_mmc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/jz4740_mmc.c 2014-04-21 13:50:41.158722506 +0200
++++ linux-solidrun/drivers/mmc/host/jz4740_mmc.c 2014-04-24 07:58:20.416195353 +0200
@@ -14,6 +14,7 @@
*/
@@ -134736,9 +113119,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/jz4740_mmc.c linux-linaro-stable-mx6/dr
jz4740_mmc_free_gpios(pdev);
jz_gpio_bulk_free(jz4740_mmc_pins, jz4740_mmc_num_pins(host));
-diff -Nur linux-3.10.36/drivers/mmc/host/mvsdio.c linux-linaro-stable-mx6/drivers/mmc/host/mvsdio.c
+diff -Nur linux-3.10.36/drivers/mmc/host/mvsdio.c linux-solidrun/drivers/mmc/host/mvsdio.c
--- linux-3.10.36/drivers/mmc/host/mvsdio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/mvsdio.c 2014-04-21 13:50:41.158722506 +0200
++++ linux-solidrun/drivers/mmc/host/mvsdio.c 2014-04-24 07:58:20.416195353 +0200
@@ -35,7 +35,7 @@
#define DRIVER_NAME "mvsdio"
@@ -134866,9 +113249,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/mvsdio.c linux-linaro-stable-mx6/driver
return 0;
out:
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-bcm2835.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-bcm2835.c linux-solidrun/drivers/mmc/host/sdhci-bcm2835.c
--- linux-3.10.36/drivers/mmc/host/sdhci-bcm2835.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c 2014-04-21 13:50:41.158722506 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-bcm2835.c 2014-04-24 07:58:20.420195368 +0200
@@ -131,8 +131,12 @@
.read_l = bcm2835_sdhci_readl,
.read_w = bcm2835_sdhci_readw,
@@ -134882,9 +113265,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-bcm2835.c linux-linaro-stable-mx6
};
static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = {
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci.c linux-solidrun/drivers/mmc/host/sdhci.c
--- linux-3.10.36/drivers/mmc/host/sdhci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci.c 2014-04-24 07:58:20.420195368 +0200
@@ -44,12 +44,13 @@
#define MAX_TUNING_LOOP 40
@@ -136141,9 +114524,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci.c linux-linaro-stable-mx6/drivers
kfree(host->align_buffer);
host->adma_desc = NULL;
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-cns3xxx.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-cns3xxx.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-cns3xxx.c linux-solidrun/drivers/mmc/host/sdhci-cns3xxx.c
--- linux-3.10.36/drivers/mmc/host/sdhci-cns3xxx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-cns3xxx.c 2014-04-21 13:50:41.158722506 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-cns3xxx.c 2014-04-24 07:58:20.420195368 +0200
@@ -30,13 +30,12 @@
u16 clk;
unsigned long timeout;
@@ -136187,9 +114570,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-cns3xxx.c linux-linaro-stable-mx6
};
static int sdhci_cns3xxx_probe(struct platform_device *pdev)
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-dove.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-dove.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-dove.c linux-solidrun/drivers/mmc/host/sdhci-dove.c
--- linux-3.10.36/drivers/mmc/host/sdhci-dove.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-dove.c 2014-04-21 13:50:41.158722506 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-dove.c 2014-04-24 07:58:20.420195368 +0200
@@ -86,6 +86,10 @@
static const struct sdhci_ops sdhci_dove_ops = {
.read_w = sdhci_dove_readw,
@@ -136201,9 +114584,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-dove.c linux-linaro-stable-mx6/dr
};
static const struct sdhci_pltfm_data sdhci_dove_pdata = {
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-esdhc.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc.h
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-esdhc.h linux-solidrun/drivers/mmc/host/sdhci-esdhc.h
--- linux-3.10.36/drivers/mmc/host/sdhci-esdhc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc.h 2014-04-21 13:50:41.158722506 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-esdhc.h 2014-04-24 07:58:20.420195368 +0200
@@ -1,7 +1,7 @@
/*
* Freescale eSDHC controller driver generics for OF and pltfm.
@@ -136263,9 +114646,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-esdhc.h linux-linaro-stable-mx6/d
}
#endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-esdhc-imx.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc-imx.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-esdhc-imx.c linux-solidrun/drivers/mmc/host/sdhci-esdhc-imx.c
--- linux-3.10.36/drivers/mmc/host/sdhci-esdhc-imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc-imx.c 2014-04-21 13:50:41.158722506 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-esdhc-imx.c 2014-04-24 07:58:20.420195368 +0200
@@ -11,6 +11,7 @@
* the Free Software Foundation; either version 2 of the License.
*/
@@ -137258,9 +115641,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-esdhc-imx.c linux-linaro-stable-m
},
.id_table = imx_esdhc_devtype,
.probe = sdhci_esdhc_imx_probe,
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci.h
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci.h linux-solidrun/drivers/mmc/host/sdhci.h
--- linux-3.10.36/drivers/mmc/host/sdhci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.h 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci.h 2014-04-24 07:58:20.420195368 +0200
@@ -281,17 +281,15 @@
unsigned int (*get_max_clock)(struct sdhci_host *host);
unsigned int (*get_min_clock)(struct sdhci_host *host);
@@ -137302,9 +115685,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci.h linux-linaro-stable-mx6/drivers
#ifdef CONFIG_PM
extern int sdhci_suspend_host(struct sdhci_host *host);
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-of-esdhc.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-esdhc.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-of-esdhc.c linux-solidrun/drivers/mmc/host/sdhci-of-esdhc.c
--- linux-3.10.36/drivers/mmc/host/sdhci-of-esdhc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-esdhc.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-of-esdhc.c 2014-04-24 07:58:20.420195368 +0200
@@ -13,6 +13,7 @@
* your option) any later version.
*/
@@ -137449,9 +115832,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-of-esdhc.c linux-linaro-stable-mx
},
.probe = sdhci_esdhc_probe,
.remove = sdhci_esdhc_remove,
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-of-hlwd.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-hlwd.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-of-hlwd.c linux-solidrun/drivers/mmc/host/sdhci-of-hlwd.c
--- linux-3.10.36/drivers/mmc/host/sdhci-of-hlwd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-hlwd.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-of-hlwd.c 2014-04-24 07:58:20.420195368 +0200
@@ -58,6 +58,10 @@
.write_l = sdhci_hlwd_writel,
.write_w = sdhci_hlwd_writew,
@@ -137463,9 +115846,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-of-hlwd.c linux-linaro-stable-mx6
};
static const struct sdhci_pltfm_data sdhci_hlwd_pdata = {
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pci.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pci.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pci.c linux-solidrun/drivers/mmc/host/sdhci-pci.c
--- linux-3.10.36/drivers/mmc/host/sdhci-pci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pci.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-pci.c 2014-04-24 07:58:20.420195368 +0200
@@ -989,7 +989,7 @@
return 0;
}
@@ -137497,9 +115880,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pci.c linux-linaro-stable-mx6/dri
.hw_reset = sdhci_pci_hw_reset,
};
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pltfm.c linux-solidrun/drivers/mmc/host/sdhci-pltfm.c
--- linux-3.10.36/drivers/mmc/host/sdhci-pltfm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-pltfm.c 2014-04-24 07:58:20.420195368 +0200
@@ -45,6 +45,10 @@
EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock);
@@ -137535,9 +115918,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable-mx6/d
const struct dev_pm_ops sdhci_pltfm_pmops = {
.suspend = sdhci_pltfm_suspend,
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pltfm.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.h
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pltfm.h linux-solidrun/drivers/mmc/host/sdhci-pltfm.h
--- linux-3.10.36/drivers/mmc/host/sdhci-pltfm.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.h 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-pltfm.h 2014-04-24 07:58:20.420195368 +0200
@@ -101,6 +101,8 @@
extern unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host);
@@ -137547,9 +115930,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pltfm.h linux-linaro-stable-mx6/d
extern const struct dev_pm_ops sdhci_pltfm_pmops;
#define SDHCI_PLTFM_PMOPS (&sdhci_pltfm_pmops)
#else
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pxav2.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pxav2.c linux-solidrun/drivers/mmc/host/sdhci-pxav2.c
--- linux-3.10.36/drivers/mmc/host/sdhci-pxav2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-pxav2.c 2014-04-24 07:58:20.420195368 +0200
@@ -51,11 +51,13 @@
#define MMC_CARD 0x1000
#define MMC_WIDTH 0x0100
@@ -137593,9 +115976,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pxav2.c linux-linaro-stable-mx6/d
};
#ifdef CONFIG_OF
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pxav3.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav3.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pxav3.c linux-solidrun/drivers/mmc/host/sdhci-pxav3.c
--- linux-3.10.36/drivers/mmc/host/sdhci-pxav3.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav3.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-pxav3.c 2014-04-24 07:58:20.420195368 +0200
@@ -57,11 +57,13 @@
#define SDCE_MISC_INT (1<<2)
#define SDCE_MISC_INT_EN (1<<1)
@@ -137636,9 +116019,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-pxav3.c linux-linaro-stable-mx6/d
if (ret) {
dev_err(mmc_dev(host->mmc),
"failed to allocate card detect gpio\n");
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-s3c.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-s3c.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-s3c.c linux-solidrun/drivers/mmc/host/sdhci-s3c.c
--- linux-3.10.36/drivers/mmc/host/sdhci-s3c.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-s3c.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-s3c.c 2014-04-24 07:58:20.420195368 +0200
@@ -57,6 +57,8 @@
struct clk *clk_io;
@@ -137773,9 +116156,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-s3c.c linux-linaro-stable-mx6/dri
};
#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
#else
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-sirf.c linux-solidrun/drivers/mmc/host/sdhci-sirf.c
--- linux-3.10.36/drivers/mmc/host/sdhci-sirf.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-sirf.c 2014-04-24 07:58:20.420195368 +0200
@@ -29,7 +29,11 @@
}
@@ -137797,9 +116180,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-mx6/dr
if (ret) {
dev_err(&pdev->dev, "card detect irq request failed: %d\n",
ret);
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-spear.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-spear.c linux-solidrun/drivers/mmc/host/sdhci-spear.c
--- linux-3.10.36/drivers/mmc/host/sdhci-spear.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-spear.c 2014-04-24 07:58:20.420195368 +0200
@@ -37,7 +37,10 @@
/* sdhci ops */
@@ -137812,9 +116195,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-spear.c linux-linaro-stable-mx6/d
};
/* gpio card detection interrupt handler */
-diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-tegra.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-tegra.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-tegra.c linux-solidrun/drivers/mmc/host/sdhci-tegra.c
--- linux-3.10.36/drivers/mmc/host/sdhci-tegra.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-tegra.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sdhci-tegra.c 2014-04-24 07:58:20.420195368 +0200
@@ -48,19 +48,6 @@
int power_gpio;
};
@@ -137881,9 +116264,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sdhci-tegra.c linux-linaro-stable-mx6/d
};
static const struct sdhci_pltfm_data sdhci_tegra20_pdata = {
-diff -Nur linux-3.10.36/drivers/mmc/host/sh_mmcif.c linux-linaro-stable-mx6/drivers/mmc/host/sh_mmcif.c
+diff -Nur linux-3.10.36/drivers/mmc/host/sh_mmcif.c linux-solidrun/drivers/mmc/host/sh_mmcif.c
--- linux-3.10.36/drivers/mmc/host/sh_mmcif.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sh_mmcif.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/sh_mmcif.c 2014-04-24 07:58:20.424195380 +0200
@@ -1431,7 +1431,7 @@
}
@@ -137893,9 +116276,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/sh_mmcif.c linux-linaro-stable-mx6/driv
if (ret < 0)
goto erqcd;
}
-diff -Nur linux-3.10.36/drivers/mmc/host/tmio_mmc_pio.c linux-linaro-stable-mx6/drivers/mmc/host/tmio_mmc_pio.c
+diff -Nur linux-3.10.36/drivers/mmc/host/tmio_mmc_pio.c linux-solidrun/drivers/mmc/host/tmio_mmc_pio.c
--- linux-3.10.36/drivers/mmc/host/tmio_mmc_pio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/tmio_mmc_pio.c 2014-04-21 13:50:41.162722523 +0200
++++ linux-solidrun/drivers/mmc/host/tmio_mmc_pio.c 2014-04-24 07:58:20.424195380 +0200
@@ -1091,7 +1091,7 @@
dev_pm_qos_expose_latency_limit(&pdev->dev, 100);
@@ -137905,9 +116288,9 @@ diff -Nur linux-3.10.36/drivers/mmc/host/tmio_mmc_pio.c linux-linaro-stable-mx6/
if (ret < 0) {
tmio_mmc_host_remove(_host);
return ret;
-diff -Nur linux-3.10.36/drivers/mtd/chips/cfi_cmdset_0002.c linux-linaro-stable-mx6/drivers/mtd/chips/cfi_cmdset_0002.c
+diff -Nur linux-3.10.36/drivers/mtd/chips/cfi_cmdset_0002.c linux-solidrun/drivers/mtd/chips/cfi_cmdset_0002.c
--- linux-3.10.36/drivers/mtd/chips/cfi_cmdset_0002.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/chips/cfi_cmdset_0002.c 2014-04-21 13:50:41.166722540 +0200
++++ linux-solidrun/drivers/mtd/chips/cfi_cmdset_0002.c 2014-04-24 07:58:20.428195394 +0200
@@ -1058,17 +1058,13 @@
#define UDELAY(map, chip, adr, usec) \
@@ -137926,9 +116309,9 @@ diff -Nur linux-3.10.36/drivers/mtd/chips/cfi_cmdset_0002.c linux-linaro-stable-
} while (0)
#endif
-diff -Nur linux-3.10.36/drivers/mtd/inftlcore.c linux-linaro-stable-mx6/drivers/mtd/inftlcore.c
+diff -Nur linux-3.10.36/drivers/mtd/inftlcore.c linux-solidrun/drivers/mtd/inftlcore.c
--- linux-3.10.36/drivers/mtd/inftlcore.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/inftlcore.c 2014-04-21 13:50:41.170722556 +0200
++++ linux-solidrun/drivers/mtd/inftlcore.c 2014-04-24 07:58:20.432195408 +0200
@@ -50,7 +50,7 @@
struct INFTLrecord *inftl;
unsigned long temp;
@@ -137938,9 +116321,9 @@ diff -Nur linux-3.10.36/drivers/mtd/inftlcore.c linux-linaro-stable-mx6/drivers/
return;
/* OK, this is moderately ugly. But probably safe. Alternatives? */
if (memcmp(mtd->name, "DiskOnChip", 10))
-diff -Nur linux-3.10.36/drivers/mtd/mtdcore.c linux-linaro-stable-mx6/drivers/mtd/mtdcore.c
+diff -Nur linux-3.10.36/drivers/mtd/mtdcore.c linux-solidrun/drivers/mtd/mtdcore.c
--- linux-3.10.36/drivers/mtd/mtdcore.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/mtdcore.c 2014-04-21 13:50:41.174722573 +0200
++++ linux-solidrun/drivers/mtd/mtdcore.c 2014-04-24 07:58:20.448195465 +0200
@@ -157,6 +157,9 @@
case MTD_UBIVOLUME:
type = "ubi";
@@ -137976,9 +116359,9 @@ diff -Nur linux-3.10.36/drivers/mtd/mtdcore.c linux-linaro-stable-mx6/drivers/mt
&dev_attr_bitflip_threshold.attr,
NULL,
};
-diff -Nur linux-3.10.36/drivers/mtd/mtdpart.c linux-linaro-stable-mx6/drivers/mtd/mtdpart.c
+diff -Nur linux-3.10.36/drivers/mtd/mtdpart.c linux-solidrun/drivers/mtd/mtdpart.c
--- linux-3.10.36/drivers/mtd/mtdpart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/mtdpart.c 2014-04-21 13:50:41.178722590 +0200
++++ linux-solidrun/drivers/mtd/mtdpart.c 2014-04-24 07:58:20.448195465 +0200
@@ -516,6 +516,7 @@
}
@@ -137987,9 +116370,9 @@ diff -Nur linux-3.10.36/drivers/mtd/mtdpart.c linux-linaro-stable-mx6/drivers/mt
slave->mtd.ecc_strength = master->ecc_strength;
slave->mtd.bitflip_threshold = master->bitflip_threshold;
-diff -Nur linux-3.10.36/drivers/mtd/nand/denali.c linux-linaro-stable-mx6/drivers/mtd/nand/denali.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/denali.c linux-solidrun/drivers/mtd/nand/denali.c
--- linux-3.10.36/drivers/mtd/nand/denali.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/denali.c 2014-04-21 13:50:41.178722590 +0200
++++ linux-solidrun/drivers/mtd/nand/denali.c 2014-04-24 07:58:20.452195478 +0200
@@ -1520,7 +1520,7 @@
* so just let controller do 15bit ECC for MLC and 8bit ECC for
* SLC if possible.
@@ -137999,9 +116382,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/denali.c linux-linaro-stable-mx6/driver
(denali->mtd.oobsize > (denali->bbtskipbytes +
ECC_15BITS * (denali->mtd.writesize /
ECC_SECTOR_SIZE)))) {
-diff -Nur linux-3.10.36/drivers/mtd/nand/docg4.c linux-linaro-stable-mx6/drivers/mtd/nand/docg4.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/docg4.c linux-solidrun/drivers/mtd/nand/docg4.c
--- linux-3.10.36/drivers/mtd/nand/docg4.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/docg4.c 2014-04-21 13:50:41.178722590 +0200
++++ linux-solidrun/drivers/mtd/nand/docg4.c 2014-04-24 07:58:20.452195478 +0200
@@ -1093,7 +1093,6 @@
struct nand_chip *nand = mtd->priv;
struct docg4_priv *doc = nand->priv;
@@ -138029,9 +116412,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/docg4.c linux-linaro-stable-mx6/drivers
kfree(buf);
-diff -Nur linux-3.10.36/drivers/mtd/nand/fsl_elbc_nand.c linux-linaro-stable-mx6/drivers/mtd/nand/fsl_elbc_nand.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/fsl_elbc_nand.c linux-solidrun/drivers/mtd/nand/fsl_elbc_nand.c
--- linux-3.10.36/drivers/mtd/nand/fsl_elbc_nand.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/fsl_elbc_nand.c 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/fsl_elbc_nand.c 2014-04-24 07:58:20.452195478 +0200
@@ -650,8 +650,6 @@
chip->page_shift);
dev_dbg(priv->dev, "fsl_elbc_init: nand->phys_erase_shift = %d\n",
@@ -138041,9 +116424,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/fsl_elbc_nand.c linux-linaro-stable-mx6
dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.mode = %d\n",
chip->ecc.mode);
dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.steps = %d\n",
-diff -Nur linux-3.10.36/drivers/mtd/nand/fsl_ifc_nand.c linux-linaro-stable-mx6/drivers/mtd/nand/fsl_ifc_nand.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/fsl_ifc_nand.c linux-solidrun/drivers/mtd/nand/fsl_ifc_nand.c
--- linux-3.10.36/drivers/mtd/nand/fsl_ifc_nand.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/fsl_ifc_nand.c 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/fsl_ifc_nand.c 2014-04-24 07:58:20.452195478 +0200
@@ -718,8 +718,6 @@
chip->page_shift);
dev_dbg(priv->dev, "%s: nand->phys_erase_shift = %d\n", __func__,
@@ -138053,9 +116436,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/fsl_ifc_nand.c linux-linaro-stable-mx6/
dev_dbg(priv->dev, "%s: nand->ecc.mode = %d\n", __func__,
chip->ecc.mode);
dev_dbg(priv->dev, "%s: nand->ecc.steps = %d\n", __func__,
-diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-lib.c linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-lib.c linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
--- linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 2014-04-24 07:58:20.452195478 +0200
@@ -20,6 +20,7 @@
*/
#include <linux/delay.h>
@@ -138354,9 +116737,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-lib.c linux-linaro-stabl
/* [4] submit the DMA */
set_dma_type(this, DMA_FOR_READ_ECC_PAGE);
-diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.c linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.c linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
--- linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 2014-04-24 07:58:20.456195493 +0200
@@ -18,15 +18,11 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -139226,9 +117609,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.c linux-linaro-stab
return 0;
}
-diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.h linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.h linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
--- linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.h 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-nand.h 2014-04-24 07:58:20.456195493 +0200
@@ -26,8 +26,6 @@
struct resources {
void __iomem *gpmi_regs;
@@ -139238,9 +117621,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-nand.h linux-linaro-stab
unsigned int dma_low_channel;
unsigned int dma_high_channel;
struct clk *clock[GPMI_CLK_MAX];
-diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-regs.h linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-regs.h
+diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-regs.h linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-regs.h
--- linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-regs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-regs.h 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/gpmi-nand/gpmi-regs.h 2014-04-24 07:58:20.456195493 +0200
@@ -108,6 +108,9 @@
#define HW_GPMI_CTRL1_CLR 0x00000068
#define HW_GPMI_CTRL1_TOG 0x0000006c
@@ -139251,9 +117634,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/gpmi-nand/gpmi-regs.h linux-linaro-stab
#define BP_GPMI_CTRL1_WRN_DLY_SEL 22
#define BM_GPMI_CTRL1_WRN_DLY_SEL (0x3 << BP_GPMI_CTRL1_WRN_DLY_SEL)
#define BF_GPMI_CTRL1_WRN_DLY_SEL(v) \
-diff -Nur linux-3.10.36/drivers/mtd/nand/nand_base.c linux-linaro-stable-mx6/drivers/mtd/nand/nand_base.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/nand_base.c linux-solidrun/drivers/mtd/nand/nand_base.c
--- linux-3.10.36/drivers/mtd/nand/nand_base.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_base.c 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/nand_base.c 2014-04-24 07:58:20.456195493 +0200
@@ -108,13 +108,13 @@
int ret = 0;
@@ -140195,9 +118578,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/nand_base.c linux-linaro-stable-mx6/dri
/*
* Initialize bitflip_threshold to its default prior scan_bbt() call.
* scan_bbt() might invoke mtd_read(), thus bitflip_threshold must be
-diff -Nur linux-3.10.36/drivers/mtd/nand/nand_bbt.c linux-linaro-stable-mx6/drivers/mtd/nand/nand_bbt.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/nand_bbt.c linux-solidrun/drivers/mtd/nand/nand_bbt.c
--- linux-3.10.36/drivers/mtd/nand/nand_bbt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_bbt.c 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/nand_bbt.c 2014-04-24 07:58:20.456195493 +0200
@@ -71,6 +71,30 @@
#include <linux/export.h>
#include <linux/string.h>
@@ -140629,9 +119012,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/nand_bbt.c linux-linaro-stable-mx6/driv
EXPORT_SYMBOL(nand_scan_bbt);
-EXPORT_SYMBOL(nand_default_bbt);
-EXPORT_SYMBOL_GPL(nand_update_bbt);
-diff -Nur linux-3.10.36/drivers/mtd/nand/nand_ids.c linux-linaro-stable-mx6/drivers/mtd/nand/nand_ids.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/nand_ids.c linux-solidrun/drivers/mtd/nand/nand_ids.c
--- linux-3.10.36/drivers/mtd/nand/nand_ids.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_ids.c 2014-04-21 13:50:41.182722607 +0200
++++ linux-solidrun/drivers/mtd/nand/nand_ids.c 2014-04-24 07:58:20.456195493 +0200
@@ -33,16 +33,16 @@
*/
{"TC58NVG2S0F 4G 3.3V 8-bit",
@@ -140653,9 +119036,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/nand_ids.c linux-linaro-stable-mx6/driv
LEGACY_ID_NAND("NAND 4MiB 5V 8-bit", 0x6B, 4, SZ_8K, SP_OPTIONS),
LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 0xE3, 4, SZ_8K, SP_OPTIONS),
-diff -Nur linux-3.10.36/drivers/mtd/nand/omap2.c linux-linaro-stable-mx6/drivers/mtd/nand/omap2.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/omap2.c linux-solidrun/drivers/mtd/nand/omap2.c
--- linux-3.10.36/drivers/mtd/nand/omap2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/omap2.c 2014-04-21 13:50:41.186722624 +0200
++++ linux-solidrun/drivers/mtd/nand/omap2.c 2014-04-24 07:58:20.460195508 +0200
@@ -154,7 +154,7 @@
*/
static uint8_t scan_ff_pattern[] = { 0xff };
@@ -140665,9 +119048,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/omap2.c linux-linaro-stable-mx6/drivers
.offs = 0,
.len = 1,
.pattern = scan_ff_pattern,
-diff -Nur linux-3.10.36/drivers/mtd/nand/sm_common.c linux-linaro-stable-mx6/drivers/mtd/nand/sm_common.c
+diff -Nur linux-3.10.36/drivers/mtd/nand/sm_common.c linux-solidrun/drivers/mtd/nand/sm_common.c
--- linux-3.10.36/drivers/mtd/nand/sm_common.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nand/sm_common.c 2014-04-21 13:50:41.186722624 +0200
++++ linux-solidrun/drivers/mtd/nand/sm_common.c 2014-04-24 07:58:20.460195508 +0200
@@ -42,7 +42,7 @@
{
struct mtd_oob_ops ops;
@@ -140692,9 +119075,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nand/sm_common.c linux-linaro-stable-mx6/dri
}
static struct nand_flash_dev nand_smartmedia_flash_ids[] = {
-diff -Nur linux-3.10.36/drivers/mtd/nftlcore.c linux-linaro-stable-mx6/drivers/mtd/nftlcore.c
+diff -Nur linux-3.10.36/drivers/mtd/nftlcore.c linux-solidrun/drivers/mtd/nftlcore.c
--- linux-3.10.36/drivers/mtd/nftlcore.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/nftlcore.c 2014-04-21 13:50:41.186722624 +0200
++++ linux-solidrun/drivers/mtd/nftlcore.c 2014-04-24 07:58:20.460195508 +0200
@@ -50,7 +50,7 @@
struct NFTLrecord *nftl;
unsigned long temp;
@@ -140704,9 +119087,9 @@ diff -Nur linux-3.10.36/drivers/mtd/nftlcore.c linux-linaro-stable-mx6/drivers/m
return;
/* OK, this is moderately ugly. But probably safe. Alternatives? */
if (memcmp(mtd->name, "DiskOnChip", 10))
-diff -Nur linux-3.10.36/drivers/mtd/onenand/onenand_bbt.c linux-linaro-stable-mx6/drivers/mtd/onenand/onenand_bbt.c
+diff -Nur linux-3.10.36/drivers/mtd/onenand/onenand_bbt.c linux-solidrun/drivers/mtd/onenand/onenand_bbt.c
--- linux-3.10.36/drivers/mtd/onenand/onenand_bbt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/onenand/onenand_bbt.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/onenand/onenand_bbt.c 2014-04-24 07:58:20.464195522 +0200
@@ -133,7 +133,6 @@
{
struct onenand_chip *this = mtd->priv;
@@ -140715,9 +119098,9 @@ diff -Nur linux-3.10.36/drivers/mtd/onenand/onenand_bbt.c linux-linaro-stable-mx
return create_bbt(mtd, this->page_buf, bd, -1);
}
-diff -Nur linux-3.10.36/drivers/mtd/ssfdc.c linux-linaro-stable-mx6/drivers/mtd/ssfdc.c
+diff -Nur linux-3.10.36/drivers/mtd/ssfdc.c linux-solidrun/drivers/mtd/ssfdc.c
--- linux-3.10.36/drivers/mtd/ssfdc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/ssfdc.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/ssfdc.c 2014-04-24 07:58:20.476195563 +0200
@@ -290,7 +290,7 @@
int cis_sector;
@@ -140727,9 +119110,9 @@ diff -Nur linux-3.10.36/drivers/mtd/ssfdc.c linux-linaro-stable-mx6/drivers/mtd/
mtd->size > UINT_MAX)
return;
-diff -Nur linux-3.10.36/drivers/mtd/tests/Makefile linux-linaro-stable-mx6/drivers/mtd/tests/Makefile
+diff -Nur linux-3.10.36/drivers/mtd/tests/Makefile linux-solidrun/drivers/mtd/tests/Makefile
--- linux-3.10.36/drivers/mtd/tests/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/Makefile 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/Makefile 2014-04-24 07:58:20.476195563 +0200
@@ -7,3 +7,12 @@
obj-$(CONFIG_MTD_TESTS) += mtd_torturetest.o
obj-$(CONFIG_MTD_TESTS) += mtd_nandecctest.o
@@ -140743,9 +119126,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/Makefile linux-linaro-stable-mx6/drive
+mtd_subpagetest-objs := subpagetest.o mtd_test.o
+mtd_torturetest-objs := torturetest.o mtd_test.o
+mtd_nandbiterrs-objs := nandbiterrs.o mtd_test.o
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_nandbiterrs.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_nandbiterrs.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_nandbiterrs.c linux-solidrun/drivers/mtd/tests/mtd_nandbiterrs.c
--- linux-3.10.36/drivers/mtd/tests/mtd_nandbiterrs.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_nandbiterrs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_nandbiterrs.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,461 +0,0 @@
-/*
- * Copyright © 2012 NetCommWireless
@@ -141208,9 +119591,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_nandbiterrs.c linux-linaro-stable-
-MODULE_DESCRIPTION("NAND bit error recovery test");
-MODULE_AUTHOR("Iwo Mergler");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_oobtest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_oobtest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_oobtest.c linux-solidrun/drivers/mtd/tests/mtd_oobtest.c
--- linux-3.10.36/drivers/mtd/tests/mtd_oobtest.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_oobtest.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_oobtest.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,720 +0,0 @@
-/*
- * Copyright (C) 2006-2008 Nokia Corporation
@@ -141932,9 +120315,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_oobtest.c linux-linaro-stable-mx6/
-MODULE_DESCRIPTION("Out-of-band test module");
-MODULE_AUTHOR("Adrian Hunter");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_pagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_pagetest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_pagetest.c linux-solidrun/drivers/mtd/tests/mtd_pagetest.c
--- linux-3.10.36/drivers/mtd/tests/mtd_pagetest.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_pagetest.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_pagetest.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,615 +0,0 @@
-/*
- * Copyright (C) 2006-2008 Nokia Corporation
@@ -142551,9 +120934,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_pagetest.c linux-linaro-stable-mx6
-MODULE_DESCRIPTION("NAND page test");
-MODULE_AUTHOR("Adrian Hunter");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_readtest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_readtest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_readtest.c linux-solidrun/drivers/mtd/tests/mtd_readtest.c
--- linux-3.10.36/drivers/mtd/tests/mtd_readtest.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_readtest.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_readtest.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,263 +0,0 @@
-/*
- * Copyright (C) 2006-2008 Nokia Corporation
@@ -142818,9 +121201,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_readtest.c linux-linaro-stable-mx6
-MODULE_DESCRIPTION("Read test module");
-MODULE_AUTHOR("Adrian Hunter");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_speedtest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_speedtest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_speedtest.c linux-solidrun/drivers/mtd/tests/mtd_speedtest.c
--- linux-3.10.36/drivers/mtd/tests/mtd_speedtest.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_speedtest.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_speedtest.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,560 +0,0 @@
-/*
- * Copyright (C) 2007 Nokia Corporation
@@ -143382,9 +121765,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_speedtest.c linux-linaro-stable-mx
-MODULE_DESCRIPTION("Speed test module");
-MODULE_AUTHOR("Adrian Hunter");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_stresstest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_stresstest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_stresstest.c linux-solidrun/drivers/mtd/tests/mtd_stresstest.c
--- linux-3.10.36/drivers/mtd/tests/mtd_stresstest.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_stresstest.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_stresstest.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,325 +0,0 @@
-/*
- * Copyright (C) 2006-2008 Nokia Corporation
@@ -143711,9 +122094,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_stresstest.c linux-linaro-stable-m
-MODULE_DESCRIPTION("Stress test module");
-MODULE_AUTHOR("Adrian Hunter");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_subpagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_subpagetest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_subpagetest.c linux-solidrun/drivers/mtd/tests/mtd_subpagetest.c
--- linux-3.10.36/drivers/mtd/tests/mtd_subpagetest.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_subpagetest.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_subpagetest.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,510 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Nokia Corporation
@@ -144225,9 +122608,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_subpagetest.c linux-linaro-stable-
-MODULE_DESCRIPTION("Subpage test module");
-MODULE_AUTHOR("Adrian Hunter");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_test.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_test.c linux-solidrun/drivers/mtd/tests/mtd_test.c
--- linux-3.10.36/drivers/mtd/tests/mtd_test.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/mtd_test.c 2014-04-24 07:58:20.476195563 +0200
@@ -0,0 +1,110 @@
+#define pr_fmt(fmt) "mtd_test: " fmt
+
@@ -144339,9 +122722,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_test.c linux-linaro-stable-mx6/dri
+
+ return err;
+}
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_test.h linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.h
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_test.h linux-solidrun/drivers/mtd/tests/mtd_test.h
--- linux-3.10.36/drivers/mtd/tests/mtd_test.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.h 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/mtd_test.h 2014-04-24 07:58:20.476195563 +0200
@@ -0,0 +1,11 @@
+#include <linux/mtd/mtd.h>
+
@@ -144354,9 +122737,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_test.h linux-linaro-stable-mx6/dri
+int mtdtest_read(struct mtd_info *mtd, loff_t addr, size_t size, void *buf);
+int mtdtest_write(struct mtd_info *mtd, loff_t addr, size_t size,
+ const void *buf);
-diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_torturetest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_torturetest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_torturetest.c linux-solidrun/drivers/mtd/tests/mtd_torturetest.c
--- linux-3.10.36/drivers/mtd/tests/mtd_torturetest.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_torturetest.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/mtd/tests/mtd_torturetest.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,535 +0,0 @@
-/*
- * Copyright (C) 2006-2008 Artem Bityutskiy
@@ -144893,9 +123276,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/mtd_torturetest.c linux-linaro-stable-
-MODULE_DESCRIPTION("Eraseblock torturing module");
-MODULE_AUTHOR("Artem Bityutskiy, Jarkko Lavinen, Adrian Hunter");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/nandbiterrs.c linux-linaro-stable-mx6/drivers/mtd/tests/nandbiterrs.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/nandbiterrs.c linux-solidrun/drivers/mtd/tests/nandbiterrs.c
--- linux-3.10.36/drivers/mtd/tests/nandbiterrs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/nandbiterrs.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/nandbiterrs.c 2014-04-24 07:58:20.476195563 +0200
@@ -0,0 +1,461 @@
+/*
+ * Copyright © 2012 NetCommWireless
@@ -145358,9 +123741,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/nandbiterrs.c linux-linaro-stable-mx6/
+MODULE_DESCRIPTION("NAND bit error recovery test");
+MODULE_AUTHOR("Iwo Mergler");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/oobtest.c linux-linaro-stable-mx6/drivers/mtd/tests/oobtest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/oobtest.c linux-solidrun/drivers/mtd/tests/oobtest.c
--- linux-3.10.36/drivers/mtd/tests/oobtest.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/oobtest.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/oobtest.c 2014-04-24 07:58:20.476195563 +0200
@@ -0,0 +1,714 @@
+/*
+ * Copyright (C) 2006-2008 Nokia Corporation
@@ -146076,9 +124459,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/oobtest.c linux-linaro-stable-mx6/driv
+MODULE_DESCRIPTION("Out-of-band test module");
+MODULE_AUTHOR("Adrian Hunter");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/pagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/pagetest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/pagetest.c linux-solidrun/drivers/mtd/tests/pagetest.c
--- linux-3.10.36/drivers/mtd/tests/pagetest.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/pagetest.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/pagetest.c 2014-04-24 07:58:20.476195563 +0200
@@ -0,0 +1,605 @@
+/*
+ * Copyright (C) 2006-2008 Nokia Corporation
@@ -146685,9 +125068,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/pagetest.c linux-linaro-stable-mx6/dri
+MODULE_DESCRIPTION("NAND page test");
+MODULE_AUTHOR("Adrian Hunter");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/readtest.c linux-linaro-stable-mx6/drivers/mtd/tests/readtest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/readtest.c linux-solidrun/drivers/mtd/tests/readtest.c
--- linux-3.10.36/drivers/mtd/tests/readtest.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/readtest.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/readtest.c 2014-04-24 07:58:20.476195563 +0200
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2006-2008 Nokia Corporation
@@ -146946,9 +125329,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/readtest.c linux-linaro-stable-mx6/dri
+MODULE_DESCRIPTION("Read test module");
+MODULE_AUTHOR("Adrian Hunter");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/speedtest.c linux-linaro-stable-mx6/drivers/mtd/tests/speedtest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/speedtest.c linux-solidrun/drivers/mtd/tests/speedtest.c
--- linux-3.10.36/drivers/mtd/tests/speedtest.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/speedtest.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/speedtest.c 2014-04-24 07:58:20.476195563 +0200
@@ -0,0 +1,556 @@
+/*
+ * Copyright (C) 2007 Nokia Corporation
@@ -147506,9 +125889,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/speedtest.c linux-linaro-stable-mx6/dr
+MODULE_DESCRIPTION("Speed test module");
+MODULE_AUTHOR("Adrian Hunter");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/stresstest.c linux-linaro-stable-mx6/drivers/mtd/tests/stresstest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/stresstest.c linux-solidrun/drivers/mtd/tests/stresstest.c
--- linux-3.10.36/drivers/mtd/tests/stresstest.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/stresstest.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/stresstest.c 2014-04-24 07:58:20.480195577 +0200
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2006-2008 Nokia Corporation
@@ -147831,9 +126214,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/stresstest.c linux-linaro-stable-mx6/d
+MODULE_DESCRIPTION("Stress test module");
+MODULE_AUTHOR("Adrian Hunter");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/subpagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/subpagetest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/subpagetest.c linux-solidrun/drivers/mtd/tests/subpagetest.c
--- linux-3.10.36/drivers/mtd/tests/subpagetest.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/subpagetest.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/subpagetest.c 2014-04-24 07:58:20.480195577 +0200
@@ -0,0 +1,504 @@
+/*
+ * Copyright (C) 2006-2007 Nokia Corporation
@@ -148339,9 +126722,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/subpagetest.c linux-linaro-stable-mx6/
+MODULE_DESCRIPTION("Subpage test module");
+MODULE_AUTHOR("Adrian Hunter");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/tests/torturetest.c linux-linaro-stable-mx6/drivers/mtd/tests/torturetest.c
+diff -Nur linux-3.10.36/drivers/mtd/tests/torturetest.c linux-solidrun/drivers/mtd/tests/torturetest.c
--- linux-3.10.36/drivers/mtd/tests/torturetest.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mtd/tests/torturetest.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/tests/torturetest.c 2014-04-24 07:58:20.480195577 +0200
@@ -0,0 +1,535 @@
+/*
+ * Copyright (C) 2006-2008 Artem Bityutskiy
@@ -148878,9 +127261,9 @@ diff -Nur linux-3.10.36/drivers/mtd/tests/torturetest.c linux-linaro-stable-mx6/
+MODULE_DESCRIPTION("Eraseblock torturing module");
+MODULE_AUTHOR("Artem Bityutskiy, Jarkko Lavinen, Adrian Hunter");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/drivers/mtd/ubi/build.c
+diff -Nur linux-3.10.36/drivers/mtd/ubi/build.c linux-solidrun/drivers/mtd/ubi/build.c
--- linux-3.10.36/drivers/mtd/ubi/build.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/ubi/build.c 2014-04-21 13:50:41.190722641 +0200
++++ linux-solidrun/drivers/mtd/ubi/build.c 2014-04-24 07:58:20.480195577 +0200
@@ -638,7 +638,7 @@
dbg_gen("sizeof(struct ubi_ainf_peb) %zu", sizeof(struct ubi_ainf_peb));
dbg_gen("sizeof(struct ubi_wl_entry) %zu", sizeof(struct ubi_wl_entry));
@@ -148890,9 +127273,9 @@ diff -Nur linux-3.10.36/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/drivers/
/*
* Some flashes have several erase regions. Different regions
* may have different eraseblock size and other
-diff -Nur linux-3.10.36/drivers/mxc/asrc/Kconfig linux-linaro-stable-mx6/drivers/mxc/asrc/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/asrc/Kconfig linux-solidrun/drivers/mxc/asrc/Kconfig
--- linux-3.10.36/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/asrc/Kconfig 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/asrc/Kconfig 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,14 @@
+#
+# ASRC configuration
@@ -148908,17 +127291,17 @@ diff -Nur linux-3.10.36/drivers/mxc/asrc/Kconfig linux-linaro-stable-mx6/drivers
+ Say Y to get the ASRC service.
+
+endmenu
-diff -Nur linux-3.10.36/drivers/mxc/asrc/Makefile linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile
+diff -Nur linux-3.10.36/drivers/mxc/asrc/Makefile linux-solidrun/drivers/mxc/asrc/Makefile
--- linux-3.10.36/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/asrc/Makefile 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,4 @@
+#
+# Makefile for the kernel Asynchronous Sample Rate Converter driver
+#
+obj-$(CONFIG_MXC_ASRC) += mxc_asrc.o
-diff -Nur linux-3.10.36/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c
+diff -Nur linux-3.10.36/drivers/mxc/asrc/mxc_asrc.c linux-solidrun/drivers/mxc/asrc/mxc_asrc.c
--- linux-3.10.36/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/asrc/mxc_asrc.c 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,1957 @@
+/*
+ * Freescale Asynchronous Sample Rate Converter (ASRC) driver
@@ -150877,9 +129260,9 @@ diff -Nur linux-3.10.36/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6/driv
+MODULE_DESCRIPTION("Asynchronous Sample Rate Converter");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_asrc");
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,932 @@
+/****************************************************************************
+*
@@ -151813,9 +130196,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,319 @@
+/****************************************************************************
+*
@@ -152136,9 +130519,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
+#endif /* __gc_hal_kernel_hardware_command_h_ */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,2110 @@
+/****************************************************************************
+*
@@ -154250,9 +132633,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+}
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,75 @@
+/****************************************************************************
+*
@@ -154329,9 +132712,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,1735 @@
+/****************************************************************************
+*
@@ -156068,9 +134451,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_c
+#endif
+}
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,157 @@
+/****************************************************************************
+*
@@ -156229,9 +134612,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_c
+
+#endif /* __gc_hal_kernel_context_h_ */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,7247 @@
+/****************************************************************************
+*
@@ -163480,9 +141863,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_h
+#endif
+
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h
--- linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,136 @@
+/****************************************************************************
+*
@@ -163620,9 +142003,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_h
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/config linux-solidrun/drivers/mxc/gpu-viv/config
--- linux-3.10.36/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/config 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,38 @@
+##############################################################################
+#
@@ -163662,9 +142045,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/drive
+BANK_CHANNEL_BIT ?= 12
+ENABLE_GPU_CLOCK_BY_DRIVER = 1
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,3881 @@
+/****************************************************************************
+*
@@ -167547,9 +145930,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-lin
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,3042 @@
+/****************************************************************************
+*
@@ -170593,9 +148976,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c l
+#endif
+}
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,3677 @@
+/****************************************************************************
+*
@@ -174274,9 +152657,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,1548 @@
+/****************************************************************************
+*
@@ -175826,9 +154209,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-
+ gcmkFOOTER_NO();
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,2559 @@
+/****************************************************************************
+*
@@ -178389,9 +156772,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c lin
+ return "nil";
+ }
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,2888 @@
+/****************************************************************************
+*
@@ -181281,9 +159664,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c lin
+
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-04-24 07:58:20.488195607 +0200
@@ -0,0 +1,999 @@
+/****************************************************************************
+*
@@ -182284,9 +160667,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-lin
+#endif
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,859 @@
+/****************************************************************************
+*
@@ -183147,9 +161530,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linu
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,877 @@
+/****************************************************************************
+*
@@ -184028,9 +162411,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_v
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,1870 @@
+/****************************************************************************
+*
@@ -185902,9 +164285,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux
+****************************** T E S T C O D E ******************************
+******************************************************************************/
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,522 @@
+/****************************************************************************
+*
@@ -186428,9 +164811,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c li
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,347 @@
+/****************************************************************************
+*
@@ -186779,9 +165162,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c lin
+ return gcvSTATUS_OK;
+}
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,29 @@
+/****************************************************************************
+*
@@ -186812,9 +165195,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h l
+#include "gc_hal_kernel.h"
+
+#endif /* __gc_hal_kernel_precomp_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,893 @@
+/****************************************************************************
+*
@@ -187709,9 +166092,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-04-21 13:50:41.198722675 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,85 @@
+/****************************************************************************
+*
@@ -187798,9 +166181,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-
+};
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,2249 @@
+/****************************************************************************
+*
@@ -190051,9 +168434,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memor
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,3896 @@
+/****************************************************************************
+*
@@ -193951,9 +172334,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-l
+#endif
+
+#endif /* __gc_hal_base_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,4278 @@
+/****************************************************************************
+*
@@ -198233,9 +176616,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h lin
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_compiler_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,1028 @@
+/****************************************************************************
+*
@@ -199265,9 +177648,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,270 @@
+/****************************************************************************
+*
@@ -199539,9 +177922,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h li
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,88 @@
+/****************************************************************************
+*
@@ -199631,9 +178014,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-l
+
+#endif /* __gc_hal_dump_h_ */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,617 @@
+/****************************************************************************
+*
@@ -200252,9 +178635,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
+#endif
+
+#endif /* __gc_hal_eglplatform_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,286 @@
+/****************************************************************************
+*
@@ -200542,9 +178925,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_ty
+#endif
+
+#endif /* __gc_hal_eglplatform_type_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,2053 @@
+/****************************************************************************
+*
@@ -202599,9 +180982,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_engine_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,904 @@
+/****************************************************************************
+*
@@ -203507,9 +181890,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h li
+#endif
+
+#endif /* __gc_hal_vg_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,962 @@
+/****************************************************************************
+*
@@ -204473,9 +182856,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-l
+#endif
+
+#endif /* __gc_hal_enum_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,2652 @@
+/****************************************************************************
+*
@@ -207129,9 +185512,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-linaro
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,185 @@
+/****************************************************************************
+*
@@ -207318,9 +185701,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.
+#endif
+
+#endif /* __gc_hal_kernel_buffer_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-04-24 07:58:20.492195619 +0200
@@ -0,0 +1,530 @@
+/****************************************************************************
+*
@@ -207852,9 +186235,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-li
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_mem_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,947 @@
+/****************************************************************************
+*
@@ -208803,9 +187186,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linu
+#endif
+
+#endif /* __gc_hal_options_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,584 @@
+/****************************************************************************
+*
@@ -209391,9 +187774,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h lin
+#endif
+
+#endif /* __gc_hal_profiler_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,1010 @@
+/****************************************************************************
+*
@@ -210405,9 +188788,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux
+#endif
+
+#endif /* __gc_hal_raster_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,248 @@
+/****************************************************************************
+*
@@ -210657,9 +189040,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux
+#endif
+
+#endif /* __gc_hal_rename_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,115 @@
+/****************************************************************************
+*
@@ -210776,9 +189159,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h l
+
+#endif /*__gc_hal_statistics_h_ */
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,1079 @@
+/****************************************************************************
+*
@@ -211859,9 +190242,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-
+#endif
+
+#endif /* __gc_hal_types_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,37 @@
+/****************************************************************************
+*
@@ -211900,9 +190283,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linu
+#define gcvVERSION_TIME __TIME__
+
+#endif /* __gc_hal_version_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,913 @@
+/****************************************************************************
+*
@@ -212817,9 +191200,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-lin
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,795 @@
+/****************************************************************************
+*
@@ -213616,9 +191999,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+{
+ gcmkDBGFSPRINT ( _GetArgumentSize ( Message ) , Message ) ;
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,84 @@
+/****************************************************************************
+*
@@ -213704,9 +192087,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+#endif
+
+
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-04-21 13:50:41.202722691 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,102 @@
+/****************************************************************************
+*
@@ -213810,9 +192193,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+#endif
+
+#endif /* __gc_hal_kernel_debug_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,1652 @@
+/****************************************************************************
+*
@@ -215466,9 +193849,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,172 @@
+/****************************************************************************
+*
@@ -215642,9 +194025,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+ );
+
+#endif /* __gc_hal_kernel_device_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,1472 @@
+/****************************************************************************
+*
@@ -217118,9 +195501,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_dr
+module_exit(gpu_exit);
+
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,481 @@
+/****************************************************************************
+*
@@ -217603,9 +195986,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_li
+ gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal);
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,94 @@
+/****************************************************************************
+*
@@ -217701,9 +196084,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_li
+}
+
+#endif /* __gc_hal_kernel_linux_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-04-24 07:58:20.496195633 +0200
@@ -0,0 +1,32 @@
+/****************************************************************************
+*
@@ -217737,9 +196120,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_ma
+ if(Y ==0) {return 0;}
+ else {return X % Y;}
+}
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,9022 @@
+/****************************************************************************
+*
@@ -226763,9 +205146,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os
+ return status;
+}
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,83 @@
+/****************************************************************************
+*
@@ -226850,9 +205233,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os
+DRIVER_ARGS;
+
+#endif /* __gc_hal_kernel_os_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,174 @@
+/****************************************************************************
+*
@@ -227028,9 +205411,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sy
+}
+
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h
--- linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,71 @@
+/****************************************************************************
+*
@@ -227103,9 +205486,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sy
+ );
+
+#endif /* __gc_hal_kernel_sync_h_ */
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/Kbuild linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kbuild
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/Kbuild linux-solidrun/drivers/mxc/gpu-viv/Kbuild
--- linux-3.10.36/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kbuild 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/Kbuild 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,236 @@
+##############################################################################
+#
@@ -227343,9 +205726,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/Kbuild linux-linaro-stable-mx6/drive
+galcore-objs := $(OBJS)
+
+endif
-diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/Kconfig linux-solidrun/drivers/mxc/gpu-viv/Kconfig
--- linux-3.10.36/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/gpu-viv/Kconfig 2014-04-24 07:58:20.484195593 +0200
@@ -0,0 +1,9 @@
+menu "MXC Vivante GPU support"
+ depends on SOC_IMX6Q
@@ -227356,9 +205739,9 @@ diff -Nur linux-3.10.36/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6/driv
+ Say Y to get the GPU driver support.
+
+endmenu
-diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/Kconfig linux-solidrun/drivers/mxc/hdmi-cec/Kconfig
--- linux-3.10.36/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/hdmi-cec/Kconfig 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,11 @@
+
+menu "MXC HDMI CEC (Consumer Electronics Control) support"
@@ -227371,14 +205754,14 @@ diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx6/dri
+ The HDMI CEC device implement low level protocol on i.MX6x platforms.
+
+endmenu
-diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/Makefile linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile
+diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/Makefile linux-solidrun/drivers/mxc/hdmi-cec/Makefile
--- linux-3.10.36/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/hdmi-cec/Makefile 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o
-diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
+diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-solidrun/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
--- linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,664 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -228044,9 +206427,9 @@ diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_hdmi_cec");
+
-diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
+diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-solidrun/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
--- linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -228086,9 +206469,9 @@ diff -Nur linux-3.10.36/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-linaro-stable-
+ _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4])
+
+#endif /* !_HDMICEC_H_ */
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-solidrun/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
--- linux-3.10.36/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-04-24 07:58:20.504195663 +0200
@@ -0,0 +1,491 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -228581,9 +206964,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-linaro-s
+ return status;
+}
+EXPORT_SYMBOL(ipu_calc_stripes_sizes);
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_capture.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_capture.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_capture.c linux-solidrun/drivers/mxc/ipu3/ipu_capture.c
--- linux-3.10.36/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_capture.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_capture.c 2014-04-24 07:58:20.504195663 +0200
@@ -0,0 +1,819 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -229404,9 +207787,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_capture.c linux-linaro-stable-mx6/d
+ ipu_free_irq(ipu, irq, ipu);
+ dev_dbg(ipu->dev, "CSI stop timeout - %d * 10ms\n", 5 - ret);
+}
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_common.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_common.c linux-solidrun/drivers/mxc/ipu3/ipu_common.c
--- linux-3.10.36/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_common.c 2014-04-24 07:58:20.504195663 +0200
@@ -0,0 +1,3134 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -232542,9 +210925,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_common.c linux-linaro-stable-mx6/dr
+}
+
+module_exit(ipu_gen_uninit);
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_device.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_device.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_device.c linux-solidrun/drivers/mxc/ipu3/ipu_device.c
--- linux-3.10.36/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_device.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_device.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,3690 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -236236,9 +214619,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_device.c linux-linaro-stable-mx6/dr
+ major = 0;
+ }
+}
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_disp.c linux-solidrun/drivers/mxc/ipu3/ipu_disp.c
--- linux-3.10.36/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_disp.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,1962 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -238202,9 +216585,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6/driv
+ _ipu_init_dc_mappings(ipu);
+ _ipu_dmfc_init(ipu, DMFC_NORMAL, 1);
+}
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_ic.c linux-solidrun/drivers/mxc/ipu3/ipu_ic.c
--- linux-3.10.36/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_ic.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,924 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -239130,9 +217513,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/driver
+
+ ipu_vdi_write(ipu, reg, VDI_C);
+}
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_param_mem.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_param_mem.h
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_param_mem.h linux-solidrun/drivers/mxc/ipu3/ipu_param_mem.h
--- linux-3.10.36/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_param_mem.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_param_mem.h 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,921 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -240055,9 +218438,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_param_mem.h linux-linaro-stable-mx6
+ return false;
+}
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_pixel_clk.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_pixel_clk.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_pixel_clk.c linux-solidrun/drivers/mxc/ipu3/ipu_pixel_clk.c
--- linux-3.10.36/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -240376,9 +218759,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_pixel_clk.c linux-linaro-stable-mx6
+
+ return clk;
+}
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_prv.h linux-solidrun/drivers/mxc/ipu3/ipu_prv.h
--- linux-3.10.36/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_prv.h 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -240736,9 +219119,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/drive
+ const char *parent_name, unsigned long flags,
+ u8 ipu_id, u8 di_id, u8 clk_gate_flags);
+#endif /* __INCLUDE_IPU_PRV_H__ */
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_regs.h linux-solidrun/drivers/mxc/ipu3/ipu_regs.h
--- linux-3.10.36/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/ipu_regs.h 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,719 @@
+/*
+ * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -241459,23 +219842,23 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6/driv
+#define WRG (0x01)
+
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/Kconfig linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/Kconfig linux-solidrun/drivers/mxc/ipu3/Kconfig
--- linux-3.10.36/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/Kconfig 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,2 @@
+config MXC_IPU_V3
+ bool
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/Makefile linux-linaro-stable-mx6/drivers/mxc/ipu3/Makefile
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/Makefile linux-solidrun/drivers/mxc/ipu3/Makefile
--- linux-3.10.36/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Makefile 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/Makefile 2014-04-24 07:58:20.500195647 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_MXC_IPU_V3) = mxc_ipu.o
+
+mxc_ipu-objs := ipu_common.o ipu_ic.o ipu_disp.o ipu_capture.o ipu_device.o \
+ ipu_calc_stripes_sizes.o vdoa.o ipu_pixel_clk.o
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/vdoa.c linux-solidrun/drivers/mxc/ipu3/vdoa.c
--- linux-3.10.36/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c 2014-04-21 13:50:41.206722708 +0200
++++ linux-solidrun/drivers/mxc/ipu3/vdoa.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,543 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -242020,9 +220403,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX Video Data Order Adapter(VDOA) driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h
+diff -Nur linux-3.10.36/drivers/mxc/ipu3/vdoa.h linux-solidrun/drivers/mxc/ipu3/vdoa.h
--- linux-3.10.36/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/ipu3/vdoa.h 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -242093,9 +220476,9 @@ diff -Nur linux-3.10.36/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/drivers/
+void vdoa_get_handle(vdoa_handle_t *handle);
+void vdoa_put_handle(vdoa_handle_t *handle);
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers/mxc/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/Kconfig linux-solidrun/drivers/mxc/Kconfig
--- linux-3.10.36/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/Kconfig 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/Kconfig 2014-04-24 07:58:20.480195577 +0200
@@ -0,0 +1,24 @@
+# drivers/mxc/Kconfig
+
@@ -242121,9 +220504,9 @@ diff -Nur linux-3.10.36/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers/mxc/
+endmenu
+
+endif
-diff -Nur linux-3.10.36/drivers/mxc/Makefile linux-linaro-stable-mx6/drivers/mxc/Makefile
+diff -Nur linux-3.10.36/drivers/mxc/Makefile linux-solidrun/drivers/mxc/Makefile
--- linux-3.10.36/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/Makefile 2014-04-21 13:50:41.194722658 +0200
++++ linux-solidrun/drivers/mxc/Makefile 2014-04-24 07:58:20.480195577 +0200
@@ -0,0 +1,7 @@
+obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/
+obj-$(CONFIG_MXC_IPU_V3) += ipu3/
@@ -242132,9 +220515,9 @@ diff -Nur linux-3.10.36/drivers/mxc/Makefile linux-linaro-stable-mx6/drivers/mxc
+obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/
+obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/
+obj-$(CONFIG_MXC_MLB) += mlb/
-diff -Nur linux-3.10.36/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/mipi/Kconfig linux-solidrun/drivers/mxc/mipi/Kconfig
--- linux-3.10.36/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/mipi/Kconfig 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,14 @@
+#
+# MIPI configuration
@@ -242150,17 +220533,17 @@ diff -Nur linux-3.10.36/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/drivers
+ Say Y to get the MIPI CSI2 support.
+
+endmenu
-diff -Nur linux-3.10.36/drivers/mxc/mipi/Makefile linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile
+diff -Nur linux-3.10.36/drivers/mxc/mipi/Makefile linux-solidrun/drivers/mxc/mipi/Makefile
--- linux-3.10.36/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/mipi/Makefile 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,4 @@
+#
+# Makefile for the mipi interface driver
+#
+obj-$(CONFIG_MXC_MIPI_CSI2) += mxc_mipi_csi2.o
-diff -Nur linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.c linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.c
+diff -Nur linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.c linux-solidrun/drivers/mxc/mipi/mxc_mipi_csi2.c
--- linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,531 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -242693,9 +221076,9 @@ diff -Nur linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.c linux-linaro-stable-mx6
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI CSI2 driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.h linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.h
+diff -Nur linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.h linux-solidrun/drivers/mxc/mipi/mxc_mipi_csi2.h
--- linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -242742,9 +221125,9 @@ diff -Nur linux-3.10.36/drivers/mxc/mipi/mxc_mipi_csi2.h linux-linaro-stable-mx6
+};
+
+#endif
-diff -Nur linux-3.10.36/drivers/mxc/mlb/Kconfig linux-linaro-stable-mx6/drivers/mxc/mlb/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/mlb/Kconfig linux-solidrun/drivers/mxc/mlb/Kconfig
--- linux-3.10.36/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mlb/Kconfig 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/mlb/Kconfig 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,17 @@
+#
+# MLB150 configuration
@@ -242763,18 +221146,18 @@ diff -Nur linux-3.10.36/drivers/mxc/mlb/Kconfig linux-linaro-stable-mx6/drivers/
+ Say Y to get the MLB150 support.
+
+endmenu
-diff -Nur linux-3.10.36/drivers/mxc/mlb/Makefile linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile
+diff -Nur linux-3.10.36/drivers/mxc/mlb/Makefile linux-solidrun/drivers/mxc/mlb/Makefile
--- linux-3.10.36/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/mlb/Makefile 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,5 @@
+#
+# Makefile for the i.MX6Q/DL MLB150 driver
+#
+
+obj-$(CONFIG_MXC_MLB150) += mxc_mlb150.o
-diff -Nur linux-3.10.36/drivers/mxc/mlb/mxc_mlb150.c linux-linaro-stable-mx6/drivers/mxc/mlb/mxc_mlb150.c
+diff -Nur linux-3.10.36/drivers/mxc/mlb/mxc_mlb150.c linux-solidrun/drivers/mxc/mlb/mxc_mlb150.c
--- linux-3.10.36/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mlb/mxc_mlb150.c 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/mlb/mxc_mlb150.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,2778 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -245554,9 +223937,9 @@ diff -Nur linux-3.10.36/drivers/mxc/mlb/mxc_mlb150.c linux-linaro-stable-mx6/dri
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MLB150 low level driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig
+diff -Nur linux-3.10.36/drivers/mxc/vpu/Kconfig linux-solidrun/drivers/mxc/vpu/Kconfig
--- linux-3.10.36/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/vpu/Kconfig 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,31 @@
+#
+# Codec configuration
@@ -245589,9 +223972,9 @@ diff -Nur linux-3.10.36/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/drivers/
+ This config is used for special VPU use case.
+
+endmenu
-diff -Nur linux-3.10.36/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile
+diff -Nur linux-3.10.36/drivers/mxc/vpu/Makefile linux-solidrun/drivers/mxc/vpu/Makefile
--- linux-3.10.36/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/vpu/Makefile 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,9 @@
+#
+# Makefile for the VPU drivers.
@@ -245602,9 +223985,9 @@ diff -Nur linux-3.10.36/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/drivers
+ifeq ($(CONFIG_MXC_VPU_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
-diff -Nur linux-3.10.36/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c
+diff -Nur linux-3.10.36/drivers/mxc/vpu/mxc_vpu.c linux-solidrun/drivers/mxc/vpu/mxc_vpu.c
--- linux-3.10.36/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c 2014-04-21 13:50:41.210722725 +0200
++++ linux-solidrun/drivers/mxc/vpu/mxc_vpu.c 2014-04-24 07:58:20.508195676 +0200
@@ -0,0 +1,1342 @@
+/*
+ * Copyright 2006-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -246948,9 +225331,9 @@ diff -Nur linux-3.10.36/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/driver
+
+module_init(vpu_init);
+module_exit(vpu_exit);
-diff -Nur linux-3.10.36/drivers/net/bonding/bond_3ad.c linux-linaro-stable-mx6/drivers/net/bonding/bond_3ad.c
+diff -Nur linux-3.10.36/drivers/net/bonding/bond_3ad.c linux-solidrun/drivers/net/bonding/bond_3ad.c
--- linux-3.10.36/drivers/net/bonding/bond_3ad.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/bonding/bond_3ad.c 2014-04-21 13:50:41.214722742 +0200
++++ linux-solidrun/drivers/net/bonding/bond_3ad.c 2014-04-24 07:58:20.532195761 +0200
@@ -1854,6 +1854,8 @@
BOND_AD_INFO(bond).agg_select_timer = timeout;
}
@@ -246978,9 +225361,9 @@ diff -Nur linux-3.10.36/drivers/net/bonding/bond_3ad.c linux-linaro-stable-mx6/d
aggregator->slave = slave;
aggregator->is_active = 0;
aggregator->num_of_ports = 0;
-diff -Nur linux-3.10.36/drivers/net/bonding/bond_3ad.h linux-linaro-stable-mx6/drivers/net/bonding/bond_3ad.h
+diff -Nur linux-3.10.36/drivers/net/bonding/bond_3ad.h linux-solidrun/drivers/net/bonding/bond_3ad.h
--- linux-3.10.36/drivers/net/bonding/bond_3ad.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/bonding/bond_3ad.h 2014-04-21 13:50:41.214722742 +0200
++++ linux-solidrun/drivers/net/bonding/bond_3ad.h 2014-04-24 07:58:20.532195761 +0200
@@ -253,7 +253,6 @@
struct ad_bond_info {
struct ad_system system; /* 802.3ad system structure */
@@ -246989,9 +225372,9 @@ diff -Nur linux-3.10.36/drivers/net/bonding/bond_3ad.h linux-linaro-stable-mx6/d
};
struct ad_slave_info {
-diff -Nur linux-3.10.36/drivers/net/can/dev.c linux-linaro-stable-mx6/drivers/net/can/dev.c
+diff -Nur linux-3.10.36/drivers/net/can/dev.c linux-solidrun/drivers/net/can/dev.c
--- linux-3.10.36/drivers/net/can/dev.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/can/dev.c 2014-04-21 13:50:41.218722758 +0200
++++ linux-solidrun/drivers/net/can/dev.c 2014-04-24 07:58:20.564195872 +0200
@@ -324,10 +324,19 @@
}
@@ -247015,9 +225398,9 @@ diff -Nur linux-3.10.36/drivers/net/can/dev.c linux-linaro-stable-mx6/drivers/ne
/* make settings for echo to reduce code in irq context */
skb->protocol = htons(ETH_P_CAN);
-diff -Nur linux-3.10.36/drivers/net/can/flexcan.c linux-linaro-stable-mx6/drivers/net/can/flexcan.c
+diff -Nur linux-3.10.36/drivers/net/can/flexcan.c linux-solidrun/drivers/net/can/flexcan.c
--- linux-3.10.36/drivers/net/can/flexcan.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/can/flexcan.c 2014-04-21 13:50:41.218722758 +0200
++++ linux-solidrun/drivers/net/can/flexcan.c 2014-04-24 07:58:20.564195872 +0200
@@ -33,11 +33,14 @@
#include <linux/io.h>
#include <linux/kernel.h>
@@ -247254,9 +225637,9 @@ diff -Nur linux-3.10.36/drivers/net/can/flexcan.c linux-linaro-stable-mx6/driver
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/can/janz-ican3.c linux-linaro-stable-mx6/drivers/net/can/janz-ican3.c
+diff -Nur linux-3.10.36/drivers/net/can/janz-ican3.c linux-solidrun/drivers/net/can/janz-ican3.c
--- linux-3.10.36/drivers/net/can/janz-ican3.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/can/janz-ican3.c 2014-04-21 13:50:41.218722758 +0200
++++ linux-solidrun/drivers/net/can/janz-ican3.c 2014-04-24 07:58:20.564195872 +0200
@@ -19,7 +19,6 @@
#include <linux/netdevice.h>
#include <linux/can.h>
@@ -247289,9 +225672,9 @@ diff -Nur linux-3.10.36/drivers/net/can/janz-ican3.c linux-linaro-stable-mx6/dri
/* save this skb for tx interrupt echo handling */
skb_queue_tail(&mod->echoq, skb);
-diff -Nur linux-3.10.36/drivers/net/can/usb/kvaser_usb.c linux-linaro-stable-mx6/drivers/net/can/usb/kvaser_usb.c
+diff -Nur linux-3.10.36/drivers/net/can/usb/kvaser_usb.c linux-solidrun/drivers/net/can/usb/kvaser_usb.c
--- linux-3.10.36/drivers/net/can/usb/kvaser_usb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/can/usb/kvaser_usb.c 2014-04-21 13:50:41.222722776 +0200
++++ linux-solidrun/drivers/net/can/usb/kvaser_usb.c 2014-04-24 07:58:20.572195902 +0200
@@ -474,8 +474,6 @@
return err;
@@ -247301,9 +225684,9 @@ diff -Nur linux-3.10.36/drivers/net/can/usb/kvaser_usb.c linux-linaro-stable-mx6
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/can/vcan.c linux-linaro-stable-mx6/drivers/net/can/vcan.c
+diff -Nur linux-3.10.36/drivers/net/can/vcan.c linux-solidrun/drivers/net/can/vcan.c
--- linux-3.10.36/drivers/net/can/vcan.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/can/vcan.c 2014-04-21 13:50:41.222722776 +0200
++++ linux-solidrun/drivers/net/can/vcan.c 2014-04-24 07:58:20.576195916 +0200
@@ -46,7 +46,6 @@
#include <linux/if_ether.h>
#include <linux/can.h>
@@ -247341,9 +225724,9 @@ diff -Nur linux-3.10.36/drivers/net/can/vcan.c linux-linaro-stable-mx6/drivers/n
}
return NETDEV_TX_OK;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/8390/ne.c linux-linaro-stable-mx6/drivers/net/ethernet/8390/ne.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/8390/ne.c linux-solidrun/drivers/net/ethernet/8390/ne.c
--- linux-3.10.36/drivers/net/ethernet/8390/ne.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/8390/ne.c 2014-04-21 13:50:41.230722810 +0200
++++ linux-solidrun/drivers/net/ethernet/8390/ne.c 2014-04-24 07:58:20.616196056 +0200
@@ -849,7 +849,6 @@
free_irq(dev->irq, dev);
release_region(dev->base_addr, NE_IO_EXTENT);
@@ -247352,9 +225735,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/8390/ne.c linux-linaro-stable-mx6/d
}
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/adi/bfin_mac.c linux-linaro-stable-mx6/drivers/net/ethernet/adi/bfin_mac.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/adi/bfin_mac.c linux-solidrun/drivers/net/ethernet/adi/bfin_mac.c
--- linux-3.10.36/drivers/net/ethernet/adi/bfin_mac.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/adi/bfin_mac.c 2014-04-21 13:50:41.234722826 +0200
++++ linux-solidrun/drivers/net/ethernet/adi/bfin_mac.c 2014-04-24 07:58:20.616196056 +0200
@@ -1719,7 +1719,6 @@
mdiobus_unregister(lp->mii_bus);
mdiobus_free(lp->mii_bus);
@@ -247380,9 +225763,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/adi/bfin_mac.c linux-linaro-stable-
mdiobus_unregister(miibus);
kfree(miibus->irq);
mdiobus_free(miibus);
-diff -Nur linux-3.10.36/drivers/net/ethernet/amd/au1000_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/amd/au1000_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/amd/au1000_eth.c linux-solidrun/drivers/net/ethernet/amd/au1000_eth.c
--- linux-3.10.36/drivers/net/ethernet/amd/au1000_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/amd/au1000_eth.c 2014-04-21 13:50:41.234722826 +0200
++++ linux-solidrun/drivers/net/ethernet/amd/au1000_eth.c 2014-04-24 07:58:20.620196070 +0200
@@ -1301,8 +1301,6 @@
int i;
struct resource *base, *macen;
@@ -247392,9 +225775,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/amd/au1000_eth.c linux-linaro-stabl
unregister_netdev(dev);
mdiobus_unregister(aup->mii_bus);
mdiobus_free(aup->mii_bus);
-diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/bcm63xx_enet.c linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/bcm63xx_enet.c linux-solidrun/drivers/net/ethernet/broadcom/bcm63xx_enet.c
--- linux-3.10.36/drivers/net/ethernet/broadcom/bcm63xx_enet.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/bcm63xx_enet.c 2014-04-21 13:50:41.246722877 +0200
++++ linux-solidrun/drivers/net/ethernet/broadcom/bcm63xx_enet.c 2014-04-24 07:58:20.652196182 +0200
@@ -1847,7 +1847,6 @@
clk_disable_unprepare(priv->mac_clk);
clk_put(priv->mac_clk);
@@ -247403,9 +225786,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/bcm63xx_enet.c linux-linar
free_netdev(dev);
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/tg3.c linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/tg3.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/tg3.c linux-solidrun/drivers/net/ethernet/broadcom/tg3.c
--- linux-3.10.36/drivers/net/ethernet/broadcom/tg3.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/tg3.c 2014-04-21 13:50:41.266722961 +0200
++++ linux-solidrun/drivers/net/ethernet/broadcom/tg3.c 2014-04-24 07:58:20.672196252 +0200
@@ -6687,7 +6687,8 @@
work_mask |= opaque_key;
@@ -247431,9 +225814,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/tg3.c linux-linaro-stable-
/* Reset PHY, otherwise the read DMA engine will be in a mode that
* breaks all requests to 256 bytes.
*/
-diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/tg3.h linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/tg3.h
+diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/tg3.h linux-solidrun/drivers/net/ethernet/broadcom/tg3.h
--- linux-3.10.36/drivers/net/ethernet/broadcom/tg3.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/tg3.h 2014-04-21 13:50:41.266722961 +0200
++++ linux-solidrun/drivers/net/ethernet/broadcom/tg3.h 2014-04-24 07:58:20.676196267 +0200
@@ -2587,11 +2587,7 @@
#define RXD_ERR_TOO_SMALL 0x00400000
#define RXD_ERR_NO_RESOURCES 0x00800000
@@ -247447,9 +225830,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/broadcom/tg3.h linux-linaro-stable-
u32 reserved;
u32 opaque;
-diff -Nur linux-3.10.36/drivers/net/ethernet/cadence/at91_ether.c linux-linaro-stable-mx6/drivers/net/ethernet/cadence/at91_ether.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/cadence/at91_ether.c linux-solidrun/drivers/net/ethernet/cadence/at91_ether.c
--- linux-3.10.36/drivers/net/ethernet/cadence/at91_ether.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/cadence/at91_ether.c 2014-04-21 13:50:41.270722978 +0200
++++ linux-solidrun/drivers/net/ethernet/cadence/at91_ether.c 2014-04-24 07:58:20.700196351 +0200
@@ -435,7 +435,6 @@
unregister_netdev(dev);
clk_disable(lp->pclk);
@@ -247458,9 +225841,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/cadence/at91_ether.c linux-linaro-s
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/cadence/macb.c linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/cadence/macb.c linux-solidrun/drivers/net/ethernet/cadence/macb.c
--- linux-3.10.36/drivers/net/ethernet/cadence/macb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c 2014-04-21 13:50:41.270722978 +0200
++++ linux-solidrun/drivers/net/ethernet/cadence/macb.c 2014-04-24 07:58:20.704196366 +0200
@@ -1649,7 +1649,6 @@
err_out_free_dev:
free_netdev(dev);
@@ -247477,9 +225860,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/cadence/macb.c linux-linaro-stable-
}
return 0;
-diff -Nur linux-3.10.36/drivers/net/ethernet/calxeda/xgmac.c linux-linaro-stable-mx6/drivers/net/ethernet/calxeda/xgmac.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/calxeda/xgmac.c linux-solidrun/drivers/net/ethernet/calxeda/xgmac.c
--- linux-3.10.36/drivers/net/ethernet/calxeda/xgmac.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/calxeda/xgmac.c 2014-04-21 13:50:41.274722995 +0200
++++ linux-solidrun/drivers/net/ethernet/calxeda/xgmac.c 2014-04-24 07:58:20.704196366 +0200
@@ -1790,7 +1790,6 @@
free_netdev(ndev);
err_alloc:
@@ -247496,9 +225879,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/calxeda/xgmac.c linux-linaro-stable
unregister_netdev(ndev);
netif_napi_del(&priv->napi);
-diff -Nur linux-3.10.36/drivers/net/ethernet/cirrus/ep93xx_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/cirrus/ep93xx_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/cirrus/ep93xx_eth.c linux-solidrun/drivers/net/ethernet/cirrus/ep93xx_eth.c
--- linux-3.10.36/drivers/net/ethernet/cirrus/ep93xx_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/cirrus/ep93xx_eth.c 2014-04-21 13:50:41.286723045 +0200
++++ linux-solidrun/drivers/net/ethernet/cirrus/ep93xx_eth.c 2014-04-24 07:58:20.776196619 +0200
@@ -783,7 +783,6 @@
dev = platform_get_drvdata(pdev);
if (dev == NULL)
@@ -247507,9 +225890,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/cirrus/ep93xx_eth.c linux-linaro-st
ep = netdev_priv(dev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/davicom/dm9000.c linux-linaro-stable-mx6/drivers/net/ethernet/davicom/dm9000.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/davicom/dm9000.c linux-solidrun/drivers/net/ethernet/davicom/dm9000.c
--- linux-3.10.36/drivers/net/ethernet/davicom/dm9000.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/davicom/dm9000.c 2014-04-21 13:50:41.290723063 +0200
++++ linux-solidrun/drivers/net/ethernet/davicom/dm9000.c 2014-04-24 07:58:20.780196632 +0200
@@ -1673,8 +1673,6 @@
{
struct net_device *ndev = platform_get_drvdata(pdev);
@@ -247519,9 +225902,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/davicom/dm9000.c linux-linaro-stabl
unregister_netdev(ndev);
dm9000_release_board(pdev, netdev_priv(ndev));
free_netdev(ndev); /* free device structure */
-diff -Nur linux-3.10.36/drivers/net/ethernet/ethoc.c linux-linaro-stable-mx6/drivers/net/ethernet/ethoc.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/ethoc.c linux-solidrun/drivers/net/ethernet/ethoc.c
--- linux-3.10.36/drivers/net/ethernet/ethoc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/ethoc.c 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/ethoc.c 2014-04-24 07:58:20.864196929 +0200
@@ -1147,8 +1147,6 @@
struct net_device *netdev = platform_get_drvdata(pdev);
struct ethoc *priv = netdev_priv(netdev);
@@ -247531,9 +225914,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/ethoc.c linux-linaro-stable-mx6/dri
if (netdev) {
netif_napi_del(&priv->napi);
phy_disconnect(priv->phy);
-diff -Nur linux-3.10.36/drivers/net/ethernet/faraday/ftgmac100.c linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftgmac100.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/faraday/ftgmac100.c linux-solidrun/drivers/net/ethernet/faraday/ftgmac100.c
--- linux-3.10.36/drivers/net/ethernet/faraday/ftgmac100.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftgmac100.c 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/faraday/ftgmac100.c 2014-04-24 07:58:20.864196929 +0200
@@ -1311,7 +1311,6 @@
release_resource(priv->res);
err_req_mem:
@@ -247550,9 +225933,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/faraday/ftgmac100.c linux-linaro-st
free_netdev(netdev);
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/faraday/ftmac100.c linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftmac100.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/faraday/ftmac100.c linux-solidrun/drivers/net/ethernet/faraday/ftmac100.c
--- linux-3.10.36/drivers/net/ethernet/faraday/ftmac100.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftmac100.c 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/faraday/ftmac100.c 2014-04-24 07:58:20.864196929 +0200
@@ -1149,7 +1149,6 @@
release_resource(priv->res);
err_req_mem:
@@ -247569,9 +225952,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/faraday/ftmac100.c linux-linaro-sta
free_netdev(netdev);
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec.h linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec.h linux-solidrun/drivers/net/ethernet/freescale/fec.h
--- linux-3.10.36/drivers/net/ethernet/freescale/fec.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fec.h 2014-04-24 07:58:20.868196943 +0200
@@ -16,6 +16,9 @@
#include <linux/clocksource.h>
#include <linux/net_tstamp.h>
@@ -247831,9 +226214,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec.h linux-linaro-stable
/****************************************************************************/
#endif /* FEC_H */
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_main.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_main.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_main.c linux-solidrun/drivers/net/ethernet/freescale/fec_main.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fec_main.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_main.c 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fec_main.c 2014-04-24 07:58:20.868196943 +0200
@@ -18,7 +18,7 @@
* Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be)
* Copyright (c) 2004-2006 Macq Electronique SA.
@@ -249273,9 +227656,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
+MODULE_ALIAS("platform:"DRIVER_NAME);
MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx.c linux-solidrun/drivers/net/ethernet/freescale/fec_mpc52xx.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx.c 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fec_mpc52xx.c 2014-04-24 07:58:20.868196943 +0200
@@ -981,7 +981,7 @@
goto err_node;
@@ -249319,9 +227702,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx.c linux-linar
mpc52xx_fec_hw_init(dev);
mpc52xx_fec_reset_stats(dev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c linux-solidrun/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c 2014-04-24 07:58:20.868196943 +0200
@@ -123,12 +123,10 @@
static int mpc52xx_fec_mdio_remove(struct platform_device *of)
@@ -249336,9 +227719,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c linux-l
iounmap(priv->regs);
kfree(priv);
mdiobus_free(bus);
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_ptp.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_ptp.c linux-solidrun/drivers/net/ethernet/freescale/fec_ptp.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fec_ptp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_ptp.c 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fec_ptp.c 2014-04-24 07:58:20.868196943 +0200
@@ -1,7 +1,7 @@
/*
* Fast Ethernet Controller (ENET) PTP driver for MX6x.
@@ -250080,9 +228463,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fec_ptp.c linux-linaro-st
+ vfree(priv->rx_timestamps.data_buf);
+}
+
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c linux-solidrun/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-04-24 07:58:20.868196943 +0200
@@ -583,7 +583,6 @@
struct sk_buff *skb)
{
@@ -250169,9 +228552,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c li
free_netdev(ndev);
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/Kconfig linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/Kconfig
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/Kconfig linux-solidrun/drivers/net/ethernet/freescale/fs_enet/Kconfig
--- linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/Kconfig 2014-04-21 13:50:41.298723096 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fs_enet/Kconfig 2014-04-24 07:58:20.868196943 +0200
@@ -1,7 +1,6 @@
config FS_ENET
tristate "Freescale Ethernet Driver"
@@ -250180,9 +228563,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/Kconfig linux-lin
select MII
select PHYLIB
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c 2014-04-24 07:58:20.868196943 +0200
@@ -32,7 +32,9 @@
#include <linux/fs.h>
#include <linux/platform_device.h>
@@ -250202,9 +228585,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c linux-l
if (fep->interrupt == NO_IRQ)
goto out;
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fec.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fec.c linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fec.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fec.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mac-fec.c 2014-04-24 07:58:20.868196943 +0200
@@ -31,7 +31,9 @@
#include <linux/bitops.h>
#include <linux/fs.h>
@@ -250224,9 +228607,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-fec.c linux-l
if (fep->interrupt == NO_IRQ)
return -EINVAL;
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-scc.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-scc.c linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-scc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-scc.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mac-scc.c 2014-04-24 07:58:20.868196943 +0200
@@ -31,6 +31,8 @@
#include <linux/bitops.h>
#include <linux/fs.h>
@@ -250245,9 +228628,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mac-scc.c linux-l
if (fep->interrupt == NO_IRQ)
return -EINVAL;
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c 2014-04-24 07:58:20.868196943 +0200
@@ -22,6 +22,7 @@
#include <linux/mii.h>
#include <linux/platform_device.h>
@@ -250286,9 +228669,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c lin
kfree(bus->irq);
free_mdio_bitbang(bus);
iounmap(bitbang->dir);
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-04-24 07:58:20.868196943 +0200
@@ -31,6 +31,7 @@
#include <linux/ethtool.h>
#include <linux/bitops.h>
@@ -250327,9 +228710,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-l
kfree(bus->irq);
iounmap(fec->fecp);
kfree(fec);
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fsl_pq_mdio.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fsl_pq_mdio.c linux-solidrun/drivers/net/ethernet/freescale/fsl_pq_mdio.c
--- linux-3.10.36/drivers/net/ethernet/freescale/fsl_pq_mdio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fsl_pq_mdio.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/fsl_pq_mdio.c 2014-04-24 07:58:20.868196943 +0200
@@ -409,7 +409,7 @@
priv->regs = priv->map + data->mii_offset;
@@ -250348,9 +228731,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/fsl_pq_mdio.c linux-linar
iounmap(priv->map);
mdiobus_free(bus);
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar.c linux-solidrun/drivers/net/ethernet/freescale/gianfar.c
--- linux-3.10.36/drivers/net/ethernet/freescale/gianfar.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/gianfar.c 2014-04-24 07:58:20.868196943 +0200
@@ -78,6 +78,8 @@
#include <linux/if_vlan.h>
#include <linux/spinlock.h>
@@ -250939,9 +229322,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar.c linux-linaro-st
gfar_write(&regs->maccfg2, tempval);
gfar_write(&regs->ecntrl, ecntrl);
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ethtool.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-solidrun/drivers/net/ethernet/freescale/gianfar_ethtool.c
--- linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-04-24 07:58:20.872196956 +0200
@@ -535,6 +535,78 @@
return err;
}
@@ -251030,9 +229413,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-l
.get_strings = gfar_gstrings,
.get_sset_count = gfar_sset_count,
.get_ethtool_stats = gfar_fill_stats,
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar.h linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.h
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar.h linux-solidrun/drivers/net/ethernet/freescale/gianfar.h
--- linux-3.10.36/drivers/net/ethernet/freescale/gianfar.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.h 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/gianfar.h 2014-04-24 07:58:20.868196943 +0200
@@ -146,6 +146,10 @@
| SUPPORTED_Autoneg \
| SUPPORTED_MII)
@@ -251122,9 +229505,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar.h linux-linaro-st
extern const struct ethtool_ops gfar_ethtool_ops;
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ptp.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ptp.c linux-solidrun/drivers/net/ethernet/freescale/gianfar_ptp.c
--- linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-04-24 07:58:20.872196956 +0200
@@ -452,7 +452,9 @@
err = -ENODEV;
@@ -251154,9 +229537,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/gianfar_ptp.c linux-linar
gfar_write(&etsects->regs->tmr_temask, 0);
gfar_write(&etsects->regs->tmr_ctrl, 0);
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/ucc_geth.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/ucc_geth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/ucc_geth.c linux-solidrun/drivers/net/ethernet/freescale/ucc_geth.c
--- linux-3.10.36/drivers/net/ethernet/freescale/ucc_geth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/ucc_geth.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/ucc_geth.c 2014-04-24 07:58:20.872196956 +0200
@@ -31,6 +31,8 @@
#include <linux/mii.h>
#include <linux/phy.h>
@@ -251209,9 +229592,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/ucc_geth.c linux-linaro-s
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/xgmac_mdio.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/xgmac_mdio.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/xgmac_mdio.c linux-solidrun/drivers/net/ethernet/freescale/xgmac_mdio.c
--- linux-3.10.36/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-04-21 13:50:41.302723113 +0200
++++ linux-solidrun/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-04-24 07:58:20.872196956 +0200
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/phy.h>
@@ -251238,9 +229621,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/freescale/xgmac_mdio.c linux-linaro
mdiobus_unregister(bus);
iounmap(bus->priv);
-diff -Nur linux-3.10.36/drivers/net/ethernet/intel/e100.c linux-linaro-stable-mx6/drivers/net/ethernet/intel/e100.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/intel/e100.c linux-solidrun/drivers/net/ethernet/intel/e100.c
--- linux-3.10.36/drivers/net/ethernet/intel/e100.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/intel/e100.c 2014-04-21 13:50:41.310723147 +0200
++++ linux-solidrun/drivers/net/ethernet/intel/e100.c 2014-04-24 07:58:20.948197225 +0200
@@ -3039,7 +3039,7 @@
*enable_wake = false;
}
@@ -251250,9 +229633,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/intel/e100.c linux-linaro-stable-mx
}
static int __e100_power_off(struct pci_dev *pdev, bool wake)
-diff -Nur linux-3.10.36/drivers/net/ethernet/korina.c linux-linaro-stable-mx6/drivers/net/ethernet/korina.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/korina.c linux-solidrun/drivers/net/ethernet/korina.c
--- linux-3.10.36/drivers/net/ethernet/korina.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/korina.c 2014-04-21 13:50:41.338723265 +0200
++++ linux-solidrun/drivers/net/ethernet/korina.c 2014-04-24 07:58:21.020197477 +0200
@@ -1214,7 +1214,6 @@
iounmap(lp->rx_dma_regs);
iounmap(lp->tx_dma_regs);
@@ -251261,9 +229644,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/korina.c linux-linaro-stable-mx6/dr
unregister_netdev(bif->dev);
free_netdev(bif->dev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/mv643xx_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mv643xx_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/mv643xx_eth.c linux-solidrun/drivers/net/ethernet/marvell/mv643xx_eth.c
--- linux-3.10.36/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-04-21 13:50:41.338723265 +0200
++++ linux-solidrun/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-04-24 07:58:21.024197490 +0200
@@ -2811,8 +2811,6 @@
free_netdev(mp->dev);
@@ -251273,9 +229656,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/mv643xx_eth.c linux-linaro-
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/mvneta.c linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mvneta.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/mvneta.c linux-solidrun/drivers/net/ethernet/marvell/mvneta.c
--- linux-3.10.36/drivers/net/ethernet/marvell/mvneta.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mvneta.c 2014-04-21 13:50:41.338723265 +0200
++++ linux-solidrun/drivers/net/ethernet/marvell/mvneta.c 2014-04-24 07:58:21.024197490 +0200
@@ -119,7 +119,7 @@
#define MVNETA_GMAC_MAX_RX_SIZE_MASK 0x7ffc
#define MVNETA_GMAC0_PORT_ENABLE BIT(0)
@@ -251303,9 +229686,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/mvneta.c linux-linaro-stabl
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/pxa168_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/marvell/pxa168_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/pxa168_eth.c linux-solidrun/drivers/net/ethernet/marvell/pxa168_eth.c
--- linux-3.10.36/drivers/net/ethernet/marvell/pxa168_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/pxa168_eth.c 2014-04-21 13:50:41.342723282 +0200
++++ linux-solidrun/drivers/net/ethernet/marvell/pxa168_eth.c 2014-04-24 07:58:21.024197490 +0200
@@ -1602,7 +1602,6 @@
unregister_netdev(dev);
cancel_work_sync(&pep->tx_timeout_task);
@@ -251314,9 +229697,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/marvell/pxa168_eth.c linux-linaro-s
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8695net.c linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8695net.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8695net.c linux-solidrun/drivers/net/ethernet/micrel/ks8695net.c
--- linux-3.10.36/drivers/net/ethernet/micrel/ks8695net.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8695net.c 2014-04-21 13:50:41.350723315 +0200
++++ linux-solidrun/drivers/net/ethernet/micrel/ks8695net.c 2014-04-24 07:58:21.036197534 +0200
@@ -1600,7 +1600,6 @@
struct net_device *ndev = platform_get_drvdata(pdev);
struct ks8695_priv *ksp = netdev_priv(ndev);
@@ -251325,9 +229708,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8695net.c linux-linaro-sta
netif_napi_del(&ksp->napi);
unregister_netdev(ndev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8842.c linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8842.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8842.c linux-solidrun/drivers/net/ethernet/micrel/ks8842.c
--- linux-3.10.36/drivers/net/ethernet/micrel/ks8842.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8842.c 2014-04-21 13:50:41.350723315 +0200
++++ linux-solidrun/drivers/net/ethernet/micrel/ks8842.c 2014-04-24 07:58:21.036197534 +0200
@@ -1250,7 +1250,6 @@
iounmap(adapter->hw_addr);
free_netdev(netdev);
@@ -251336,9 +229719,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8842.c linux-linaro-stable
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8851_mll.c linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8851_mll.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8851_mll.c linux-solidrun/drivers/net/ethernet/micrel/ks8851_mll.c
--- linux-3.10.36/drivers/net/ethernet/micrel/ks8851_mll.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8851_mll.c 2014-04-21 13:50:41.350723315 +0200
++++ linux-solidrun/drivers/net/ethernet/micrel/ks8851_mll.c 2014-04-24 07:58:21.036197534 +0200
@@ -1671,7 +1671,6 @@
iounmap(ks->hw_addr);
free_netdev(netdev);
@@ -251347,9 +229730,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/micrel/ks8851_mll.c linux-linaro-st
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/netx-eth.c linux-linaro-stable-mx6/drivers/net/ethernet/netx-eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/netx-eth.c linux-solidrun/drivers/net/ethernet/netx-eth.c
--- linux-3.10.36/drivers/net/ethernet/netx-eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/netx-eth.c 2014-04-21 13:50:41.362723366 +0200
++++ linux-solidrun/drivers/net/ethernet/netx-eth.c 2014-04-24 07:58:21.068197646 +0200
@@ -422,7 +422,6 @@
exit_free_xc:
free_xc(priv->xc);
@@ -251358,9 +229741,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/netx-eth.c linux-linaro-stable-mx6/
free_netdev(ndev);
exit:
return ret;
-diff -Nur linux-3.10.36/drivers/net/ethernet/nuvoton/w90p910_ether.c linux-linaro-stable-mx6/drivers/net/ethernet/nuvoton/w90p910_ether.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/nuvoton/w90p910_ether.c linux-solidrun/drivers/net/ethernet/nuvoton/w90p910_ether.c
--- linux-3.10.36/drivers/net/ethernet/nuvoton/w90p910_ether.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/nuvoton/w90p910_ether.c 2014-04-21 13:50:41.362723366 +0200
++++ linux-solidrun/drivers/net/ethernet/nuvoton/w90p910_ether.c 2014-04-24 07:58:21.072197660 +0200
@@ -1051,7 +1051,6 @@
clk_put(ether->clk);
failed_free_rxirq:
@@ -251377,9 +229760,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/nuvoton/w90p910_ether.c linux-linar
free_netdev(dev);
return 0;
-diff -Nur linux-3.10.36/drivers/net/ethernet/nxp/lpc_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/nxp/lpc_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/nxp/lpc_eth.c linux-solidrun/drivers/net/ethernet/nxp/lpc_eth.c
--- linux-3.10.36/drivers/net/ethernet/nxp/lpc_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/nxp/lpc_eth.c 2014-04-21 13:50:41.362723366 +0200
++++ linux-solidrun/drivers/net/ethernet/nxp/lpc_eth.c 2014-04-24 07:58:21.076197674 +0200
@@ -1483,7 +1483,6 @@
return 0;
@@ -251396,9 +229779,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/nxp/lpc_eth.c linux-linaro-stable-m
if (!use_iram_for_net(&pldat->pdev->dev) ||
pldat->dma_buff_size > lpc32xx_return_iram_size())
-diff -Nur linux-3.10.36/drivers/net/ethernet/renesas/sh_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/renesas/sh_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/renesas/sh_eth.c linux-solidrun/drivers/net/ethernet/renesas/sh_eth.c
--- linux-3.10.36/drivers/net/ethernet/renesas/sh_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/renesas/sh_eth.c 2014-04-21 13:50:41.378723433 +0200
++++ linux-solidrun/drivers/net/ethernet/renesas/sh_eth.c 2014-04-24 07:58:21.100197759 +0200
@@ -2814,7 +2814,6 @@
unregister_netdev(ndev);
pm_runtime_disable(&pdev->dev);
@@ -251407,9 +229790,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/renesas/sh_eth.c linux-linaro-stabl
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/s6gmac.c linux-linaro-stable-mx6/drivers/net/ethernet/s6gmac.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/s6gmac.c linux-solidrun/drivers/net/ethernet/s6gmac.c
--- linux-3.10.36/drivers/net/ethernet/s6gmac.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/s6gmac.c 2014-04-21 13:50:41.378723433 +0200
++++ linux-solidrun/drivers/net/ethernet/s6gmac.c 2014-04-24 07:58:21.100197759 +0200
@@ -1040,7 +1040,6 @@
unregister_netdev(dev);
free_irq(dev->irq, dev);
@@ -251418,9 +229801,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/s6gmac.c linux-linaro-stable-mx6/dr
}
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/seeq/sgiseeq.c linux-linaro-stable-mx6/drivers/net/ethernet/seeq/sgiseeq.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/seeq/sgiseeq.c linux-solidrun/drivers/net/ethernet/seeq/sgiseeq.c
--- linux-3.10.36/drivers/net/ethernet/seeq/sgiseeq.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/seeq/sgiseeq.c 2014-04-21 13:50:41.378723433 +0200
++++ linux-solidrun/drivers/net/ethernet/seeq/sgiseeq.c 2014-04-24 07:58:21.104197773 +0200
@@ -818,7 +818,6 @@
dma_free_noncoherent(&pdev->dev, sizeof(*sp->srings), sp->srings,
sp->srings_dma);
@@ -251429,9 +229812,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/seeq/sgiseeq.c linux-linaro-stable-
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/sfc/ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/sfc/ptp.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/sfc/ptp.c linux-solidrun/drivers/net/ethernet/sfc/ptp.c
--- linux-3.10.36/drivers/net/ethernet/sfc/ptp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/sfc/ptp.c 2014-04-21 13:50:41.382723450 +0200
++++ linux-solidrun/drivers/net/ethernet/sfc/ptp.c 2014-04-24 07:58:21.140197900 +0200
@@ -1319,13 +1319,6 @@
struct efx_ptp_data *ptp = efx->ptp_data;
int code = EFX_QWORD_FIELD(*ev, MCDI_EVENT_CODE);
@@ -251446,9 +229829,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/sfc/ptp.c linux-linaro-stable-mx6/d
if (!ptp->enabled)
return;
-diff -Nur linux-3.10.36/drivers/net/ethernet/sgi/meth.c linux-linaro-stable-mx6/drivers/net/ethernet/sgi/meth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/sgi/meth.c linux-solidrun/drivers/net/ethernet/sgi/meth.c
--- linux-3.10.36/drivers/net/ethernet/sgi/meth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/sgi/meth.c 2014-04-21 13:50:41.386723467 +0200
++++ linux-solidrun/drivers/net/ethernet/sgi/meth.c 2014-04-24 07:58:21.152197942 +0200
@@ -863,7 +863,6 @@
unregister_netdev(dev);
@@ -251457,9 +229840,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/sgi/meth.c linux-linaro-stable-mx6/
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smc911x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc911x.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smc911x.c linux-solidrun/drivers/net/ethernet/smsc/smc911x.c
--- linux-3.10.36/drivers/net/ethernet/smsc/smc911x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc911x.c 2014-04-21 13:50:41.390723485 +0200
++++ linux-solidrun/drivers/net/ethernet/smsc/smc911x.c 2014-04-24 07:58:21.156197955 +0200
@@ -2087,7 +2087,6 @@
ndev->base_addr = res->start;
ret = smc911x_probe(ndev);
@@ -251476,9 +229859,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smc911x.c linux-linaro-stable-
unregister_netdev(ndev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smc91x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc91x.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smc91x.c linux-solidrun/drivers/net/ethernet/smsc/smc91x.c
--- linux-3.10.36/drivers/net/ethernet/smsc/smc91x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc91x.c 2014-04-21 13:50:41.390723485 +0200
++++ linux-solidrun/drivers/net/ethernet/smsc/smc91x.c 2014-04-24 07:58:21.160197970 +0200
@@ -1896,7 +1896,7 @@
SMC_SELECT_BANK(lp, 1);
val = SMC_GET_BASE(lp);
@@ -251505,9 +229888,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smc91x.c linux-linaro-stable-m
unregister_netdev(ndev);
free_irq(ndev->irq, ndev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smsc911x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smsc911x.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smsc911x.c linux-solidrun/drivers/net/ethernet/smsc/smsc911x.c
--- linux-3.10.36/drivers/net/ethernet/smsc/smsc911x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smsc911x.c 2014-04-21 13:50:41.390723485 +0200
++++ linux-solidrun/drivers/net/ethernet/smsc/smsc911x.c 2014-04-24 07:58:21.180198040 +0200
@@ -2284,7 +2284,6 @@
mdiobus_unregister(pdata->mii_bus);
mdiobus_free(pdata->mii_bus);
@@ -251524,9 +229907,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/smsc/smsc911x.c linux-linaro-stable
iounmap(pdata->ioaddr);
free_netdev(dev);
out_release_io_1:
-diff -Nur linux-3.10.36/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c linux-linaro-stable-mx6/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c linux-solidrun/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
--- linux-3.10.36/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 2014-04-21 13:50:41.394723501 +0200
++++ linux-solidrun/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 2014-04-24 07:58:21.184198054 +0200
@@ -171,8 +171,6 @@
if (priv->plat->exit)
priv->plat->exit(pdev);
@@ -251536,9 +229919,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c li
return ret;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/ti/cpsw.c linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpsw.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/ti/cpsw.c linux-solidrun/drivers/net/ethernet/ti/cpsw.c
--- linux-3.10.36/drivers/net/ethernet/ti/cpsw.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpsw.c 2014-04-21 13:50:41.402723535 +0200
++++ linux-solidrun/drivers/net/ethernet/ti/cpsw.c 2014-04-24 07:58:21.196198096 +0200
@@ -1940,7 +1940,6 @@
struct cpsw_priv *priv = netdev_priv(ndev);
int i;
@@ -251547,9 +229930,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/ti/cpsw.c linux-linaro-stable-mx6/d
if (priv->data.dual_emac)
unregister_netdev(cpsw_get_slave_ndev(priv, 1));
unregister_netdev(ndev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/ti/davinci_emac.c linux-linaro-stable-mx6/drivers/net/ethernet/ti/davinci_emac.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/ti/davinci_emac.c linux-solidrun/drivers/net/ethernet/ti/davinci_emac.c
--- linux-3.10.36/drivers/net/ethernet/ti/davinci_emac.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/ti/davinci_emac.c 2014-04-21 13:50:41.402723535 +0200
++++ linux-solidrun/drivers/net/ethernet/ti/davinci_emac.c 2014-04-24 07:58:21.200198110 +0200
@@ -2036,8 +2036,6 @@
dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");
@@ -251559,9 +229942,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/ti/davinci_emac.c linux-linaro-stab
if (priv->txchan)
cpdma_chan_destroy(priv->txchan);
if (priv->rxchan)
-diff -Nur linux-3.10.36/drivers/net/ethernet/tundra/tsi108_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/tundra/tsi108_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/tundra/tsi108_eth.c linux-solidrun/drivers/net/ethernet/tundra/tsi108_eth.c
--- linux-3.10.36/drivers/net/ethernet/tundra/tsi108_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/tundra/tsi108_eth.c 2014-04-21 13:50:41.410723568 +0200
++++ linux-solidrun/drivers/net/ethernet/tundra/tsi108_eth.c 2014-04-24 07:58:21.248198280 +0200
@@ -1682,7 +1682,6 @@
unregister_netdev(dev);
@@ -251570,9 +229953,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/tundra/tsi108_eth.c linux-linaro-st
iounmap(priv->regs);
iounmap(priv->phyregs);
free_netdev(dev);
-diff -Nur linux-3.10.36/drivers/net/ethernet/wiznet/w5100.c linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5100.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/wiznet/w5100.c linux-solidrun/drivers/net/ethernet/wiznet/w5100.c
--- linux-3.10.36/drivers/net/ethernet/wiznet/w5100.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5100.c 2014-04-21 13:50:41.410723568 +0200
++++ linux-solidrun/drivers/net/ethernet/wiznet/w5100.c 2014-04-24 07:58:21.252198294 +0200
@@ -734,7 +734,6 @@
unregister_netdev(ndev);
err_register:
@@ -251589,9 +229972,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/wiznet/w5100.c linux-linaro-stable-
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/wiznet/w5300.c linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5300.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/wiznet/w5300.c linux-solidrun/drivers/net/ethernet/wiznet/w5300.c
--- linux-3.10.36/drivers/net/ethernet/wiznet/w5300.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5300.c 2014-04-21 13:50:41.410723568 +0200
++++ linux-solidrun/drivers/net/ethernet/wiznet/w5300.c 2014-04-24 07:58:21.252198294 +0200
@@ -646,7 +646,6 @@
unregister_netdev(ndev);
err_register:
@@ -251608,9 +229991,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/wiznet/w5300.c linux-linaro-stable-
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/ethernet/xscale/ixp4xx_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/xscale/ixp4xx_eth.c
+diff -Nur linux-3.10.36/drivers/net/ethernet/xscale/ixp4xx_eth.c linux-solidrun/drivers/net/ethernet/xscale/ixp4xx_eth.c
--- linux-3.10.36/drivers/net/ethernet/xscale/ixp4xx_eth.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/xscale/ixp4xx_eth.c 2014-04-21 13:50:41.414723585 +0200
++++ linux-solidrun/drivers/net/ethernet/xscale/ixp4xx_eth.c 2014-04-24 07:58:21.256198308 +0200
@@ -1472,7 +1472,6 @@
phy_disconnect(port->phydev);
err_free_mem:
@@ -251627,9 +230010,9 @@ diff -Nur linux-3.10.36/drivers/net/ethernet/xscale/ixp4xx_eth.c linux-linaro-st
npe_release(port->npe);
release_resource(port->mem_res);
free_netdev(dev);
-diff -Nur linux-3.10.36/drivers/net/phy/phy.c linux-linaro-stable-mx6/drivers/net/phy/phy.c
+diff -Nur linux-3.10.36/drivers/net/phy/phy.c linux-solidrun/drivers/net/phy/phy.c
--- linux-3.10.36/drivers/net/phy/phy.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/phy/phy.c 2014-04-21 13:50:41.434723670 +0200
++++ linux-solidrun/drivers/net/phy/phy.c 2014-04-24 07:58:21.424198899 +0200
@@ -439,7 +439,7 @@
{
phydev->adjust_state = handler;
@@ -251667,9 +230050,9 @@ diff -Nur linux-3.10.36/drivers/net/phy/phy.c linux-linaro-stable-mx6/drivers/ne
}
static inline void mmd_phy_indirect(struct mii_bus *bus, int prtad, int devad,
-diff -Nur linux-3.10.36/drivers/net/usb/asix_devices.c linux-linaro-stable-mx6/drivers/net/usb/asix_devices.c
+diff -Nur linux-3.10.36/drivers/net/usb/asix_devices.c linux-solidrun/drivers/net/usb/asix_devices.c
--- linux-3.10.36/drivers/net/usb/asix_devices.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/asix_devices.c 2014-04-21 13:50:41.442723703 +0200
++++ linux-solidrun/drivers/net/usb/asix_devices.c 2014-04-24 07:58:21.452198997 +0200
@@ -915,8 +915,7 @@
.status = asix_status,
.link_reset = ax88178_link_reset,
@@ -251680,9 +230063,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/asix_devices.c linux-linaro-stable-mx6/d
.rx_fixup = asix_rx_fixup_common,
.tx_fixup = asix_tx_fixup,
};
-diff -Nur linux-3.10.36/drivers/net/usb/ax88179_178a.c linux-linaro-stable-mx6/drivers/net/usb/ax88179_178a.c
+diff -Nur linux-3.10.36/drivers/net/usb/ax88179_178a.c linux-solidrun/drivers/net/usb/ax88179_178a.c
--- linux-3.10.36/drivers/net/usb/ax88179_178a.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/ax88179_178a.c 2014-04-21 13:50:41.442723703 +0200
++++ linux-solidrun/drivers/net/usb/ax88179_178a.c 2014-04-24 07:58:21.452198997 +0200
@@ -1109,10 +1109,6 @@
u16 hdr_off;
u32 *pkt_hdr;
@@ -251694,9 +230077,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/ax88179_178a.c linux-linaro-stable-mx6/d
skb_trim(skb, skb->len - 4);
memcpy(&rx_hdr, skb_tail_pointer(skb), 4);
le32_to_cpus(&rx_hdr);
-diff -Nur linux-3.10.36/drivers/net/usb/gl620a.c linux-linaro-stable-mx6/drivers/net/usb/gl620a.c
+diff -Nur linux-3.10.36/drivers/net/usb/gl620a.c linux-solidrun/drivers/net/usb/gl620a.c
--- linux-3.10.36/drivers/net/usb/gl620a.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/gl620a.c 2014-04-21 13:50:41.442723703 +0200
++++ linux-solidrun/drivers/net/usb/gl620a.c 2014-04-24 07:58:21.456199010 +0200
@@ -86,10 +86,6 @@
u32 size;
u32 count;
@@ -251708,9 +230091,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/gl620a.c linux-linaro-stable-mx6/drivers
header = (struct gl_header *) skb->data;
// get the packet count of the received skb
-diff -Nur linux-3.10.36/drivers/net/usb/mcs7830.c linux-linaro-stable-mx6/drivers/net/usb/mcs7830.c
+diff -Nur linux-3.10.36/drivers/net/usb/mcs7830.c linux-solidrun/drivers/net/usb/mcs7830.c
--- linux-3.10.36/drivers/net/usb/mcs7830.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/mcs7830.c 2014-04-21 13:50:41.442723703 +0200
++++ linux-solidrun/drivers/net/usb/mcs7830.c 2014-04-24 07:58:21.468199054 +0200
@@ -529,9 +529,8 @@
{
u8 status;
@@ -251723,9 +230106,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/mcs7830.c linux-linaro-stable-mx6/driver
return 0;
}
-diff -Nur linux-3.10.36/drivers/net/usb/net1080.c linux-linaro-stable-mx6/drivers/net/usb/net1080.c
+diff -Nur linux-3.10.36/drivers/net/usb/net1080.c linux-solidrun/drivers/net/usb/net1080.c
--- linux-3.10.36/drivers/net/usb/net1080.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/net1080.c 2014-04-21 13:50:41.446723720 +0200
++++ linux-solidrun/drivers/net/usb/net1080.c 2014-04-24 07:58:21.468199054 +0200
@@ -366,10 +366,6 @@
struct nc_trailer *trailer;
u16 hdr_len, packet_len;
@@ -251737,9 +230120,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/net1080.c linux-linaro-stable-mx6/driver
if (!(skb->len & 0x01)) {
netdev_dbg(dev->net, "rx framesize %d range %d..%d mtu %d\n",
skb->len, dev->net->hard_header_len, dev->hard_mtu,
-diff -Nur linux-3.10.36/drivers/net/usb/qmi_wwan.c linux-linaro-stable-mx6/drivers/net/usb/qmi_wwan.c
+diff -Nur linux-3.10.36/drivers/net/usb/qmi_wwan.c linux-solidrun/drivers/net/usb/qmi_wwan.c
--- linux-3.10.36/drivers/net/usb/qmi_wwan.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/qmi_wwan.c 2014-04-21 13:50:41.446723720 +0200
++++ linux-solidrun/drivers/net/usb/qmi_wwan.c 2014-04-24 07:58:21.468199054 +0200
@@ -80,10 +80,10 @@
{
__be16 proto;
@@ -251763,9 +230146,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/qmi_wwan.c linux-linaro-stable-mx6/drive
{QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
{QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */
{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */
-diff -Nur linux-3.10.36/drivers/net/usb/rndis_host.c linux-linaro-stable-mx6/drivers/net/usb/rndis_host.c
+diff -Nur linux-3.10.36/drivers/net/usb/rndis_host.c linux-solidrun/drivers/net/usb/rndis_host.c
--- linux-3.10.36/drivers/net/usb/rndis_host.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/rndis_host.c 2014-04-21 13:50:41.446723720 +0200
++++ linux-solidrun/drivers/net/usb/rndis_host.c 2014-04-24 07:58:21.468199054 +0200
@@ -494,10 +494,6 @@
*/
int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
@@ -251777,9 +230160,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/rndis_host.c linux-linaro-stable-mx6/dri
/* peripheral may have batched packets to us... */
while (likely(skb->len)) {
struct rndis_data_hdr *hdr = (void *)skb->data;
-diff -Nur linux-3.10.36/drivers/net/usb/smsc75xx.c linux-linaro-stable-mx6/drivers/net/usb/smsc75xx.c
+diff -Nur linux-3.10.36/drivers/net/usb/smsc75xx.c linux-solidrun/drivers/net/usb/smsc75xx.c
--- linux-3.10.36/drivers/net/usb/smsc75xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/smsc75xx.c 2014-04-21 13:50:41.446723720 +0200
++++ linux-solidrun/drivers/net/usb/smsc75xx.c 2014-04-24 07:58:21.472199068 +0200
@@ -2108,10 +2108,6 @@
static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
@@ -251791,9 +230174,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/smsc75xx.c linux-linaro-stable-mx6/drive
while (skb->len > 0) {
u32 rx_cmd_a, rx_cmd_b, align_count, size;
struct sk_buff *ax_skb;
-diff -Nur linux-3.10.36/drivers/net/usb/smsc95xx.c linux-linaro-stable-mx6/drivers/net/usb/smsc95xx.c
+diff -Nur linux-3.10.36/drivers/net/usb/smsc95xx.c linux-solidrun/drivers/net/usb/smsc95xx.c
--- linux-3.10.36/drivers/net/usb/smsc95xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/smsc95xx.c 2014-04-21 13:50:41.446723720 +0200
++++ linux-solidrun/drivers/net/usb/smsc95xx.c 2014-04-24 07:58:21.488199125 +0200
@@ -1725,10 +1725,6 @@
static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
@@ -251805,9 +230188,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/smsc95xx.c linux-linaro-stable-mx6/drive
while (skb->len > 0) {
u32 header, align_count;
struct sk_buff *ax_skb;
-diff -Nur linux-3.10.36/drivers/net/usb/usbnet.c linux-linaro-stable-mx6/drivers/net/usb/usbnet.c
+diff -Nur linux-3.10.36/drivers/net/usb/usbnet.c linux-solidrun/drivers/net/usb/usbnet.c
--- linux-3.10.36/drivers/net/usb/usbnet.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/usb/usbnet.c 2014-04-21 13:50:41.446723720 +0200
++++ linux-solidrun/drivers/net/usb/usbnet.c 2014-04-24 07:58:21.488199125 +0200
@@ -517,19 +517,17 @@
}
// else network stack removes extra byte if we forced a short packet
@@ -251850,9 +230233,9 @@ diff -Nur linux-3.10.36/drivers/net/usb/usbnet.c linux-linaro-stable-mx6/drivers
break;
/* stalls need manual reset. this is rare ... except that
-diff -Nur linux-3.10.36/drivers/net/virtio_net.c linux-linaro-stable-mx6/drivers/net/virtio_net.c
+diff -Nur linux-3.10.36/drivers/net/virtio_net.c linux-solidrun/drivers/net/virtio_net.c
--- linux-3.10.36/drivers/net/virtio_net.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/virtio_net.c 2014-04-21 13:50:41.446723720 +0200
++++ linux-solidrun/drivers/net/virtio_net.c 2014-04-24 07:58:21.492199139 +0200
@@ -1597,8 +1597,7 @@
/* If we can receive ANY GSO packets, we must allocate large ones. */
if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
@@ -251863,9 +230246,9 @@ diff -Nur linux-3.10.36/drivers/net/virtio_net.c linux-linaro-stable-mx6/drivers
vi->big_packets = true;
if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
-diff -Nur linux-3.10.36/drivers/net/vmxnet3/vmxnet3_drv.c linux-linaro-stable-mx6/drivers/net/vmxnet3/vmxnet3_drv.c
+diff -Nur linux-3.10.36/drivers/net/vmxnet3/vmxnet3_drv.c linux-solidrun/drivers/net/vmxnet3/vmxnet3_drv.c
--- linux-3.10.36/drivers/net/vmxnet3/vmxnet3_drv.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/vmxnet3/vmxnet3_drv.c 2014-04-21 13:50:41.450723737 +0200
++++ linux-solidrun/drivers/net/vmxnet3/vmxnet3_drv.c 2014-04-24 07:58:21.496199153 +0200
@@ -1741,20 +1741,11 @@
{
struct vmxnet3_adapter *adapter = netdev_priv(netdev);
@@ -251892,9 +230275,9 @@ diff -Nur linux-3.10.36/drivers/net/vmxnet3/vmxnet3_drv.c linux-linaro-stable-mx
}
#endif /* CONFIG_NET_POLL_CONTROLLER */
-diff -Nur linux-3.10.36/drivers/net/wireless/ath/ar5523/ar5523.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ar5523/ar5523.c
+diff -Nur linux-3.10.36/drivers/net/wireless/ath/ar5523/ar5523.c linux-solidrun/drivers/net/wireless/ath/ar5523/ar5523.c
--- linux-3.10.36/drivers/net/wireless/ath/ar5523/ar5523.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ar5523/ar5523.c 2014-04-21 13:50:41.462723788 +0200
++++ linux-solidrun/drivers/net/wireless/ath/ar5523/ar5523.c 2014-04-24 07:58:21.520199236 +0200
@@ -1764,7 +1764,7 @@
AR5523_DEVICE_UX(0x2001, 0x3a04), /* Dlink / DWLAG122 */
AR5523_DEVICE_UG(0x1690, 0x0712), /* Gigaset / AR5523 */
@@ -251904,9 +230287,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/ath/ar5523/ar5523.c linux-linaro-st
(CyberTAN Technology) */
AR5523_DEVICE_UG(0x16ab, 0x7801), /* Globalsun / AR5523_1 */
AR5523_DEVICE_UX(0x16ab, 0x7811), /* Globalsun / AR5523_2 */
-diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath6kl/hif.h linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/hif.h
+diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath6kl/hif.h linux-solidrun/drivers/net/wireless/ath/ath6kl/hif.h
--- linux-3.10.36/drivers/net/wireless/ath/ath6kl/hif.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/hif.h 2014-04-21 13:50:41.470723822 +0200
++++ linux-solidrun/drivers/net/wireless/ath/ath6kl/hif.h 2014-04-24 07:58:21.556199364 +0200
@@ -197,9 +197,9 @@
/* bounce buffer for upper layers to copy to/from */
u8 *virt_dma_buf;
@@ -251919,9 +230302,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath6kl/hif.h linux-linaro-stabl
};
struct ath6kl_irq_proc_registers {
-diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath6kl/sdio.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/sdio.c
+diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath6kl/sdio.c linux-solidrun/drivers/net/wireless/ath/ath6kl/sdio.c
--- linux-3.10.36/drivers/net/wireless/ath/ath6kl/sdio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/sdio.c 2014-04-21 13:50:41.474723838 +0200
++++ linux-solidrun/drivers/net/wireless/ath/ath6kl/sdio.c 2014-04-24 07:58:21.560199378 +0200
@@ -222,6 +222,7 @@
struct mmc_data *data)
{
@@ -251959,9 +230342,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath6kl/sdio.c linux-linaro-stab
scat_req_sz = sizeof(*s_req) + scat_list_sz;
if (!virt_scat)
-diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h linux-linaro-stable-mx6/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h linux-solidrun/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
--- linux-3.10.36/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h 2014-04-21 13:50:41.482723872 +0200
++++ linux-solidrun/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h 2014-04-24 07:58:21.568199406 +0200
@@ -56,7 +56,7 @@
{0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3236605e, 0x32365a5e},
{0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
@@ -251980,9 +230363,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h lin
{0x0000b284, 0x00000000, 0x00000000, 0x00000550, 0x00000550},
};
-diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-solidrun/drivers/net/wireless/ath/ath9k/htc_drv_main.c
--- linux-3.10.36/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2014-04-21 13:50:41.486723889 +0200
++++ linux-solidrun/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2014-04-24 07:58:21.572199419 +0200
@@ -1331,22 +1331,21 @@
struct ath_common *common = ath9k_hw_common(priv->ah);
struct ath9k_htc_target_rate trate;
@@ -252018,9 +230401,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-lina
ath9k_htc_ps_restore(priv);
mutex_unlock(&priv->mutex);
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c 2014-04-24 07:58:21.620199589 +0200
@@ -0,0 +1,375 @@
+/*
+ * Copyright (c) 2010 Broadcom Corporation
@@ -252397,9 +230780,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c linux-lin
+ kfree(drvr->proto->pd);
+ drvr->proto->pd = NULL;
+}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h 2014-04-24 07:58:21.620199589 +0200
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -252425,9 +230808,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h linux-lin
+
+
+#endif /* BRCMFMAC_BCDC_H */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-04-24 07:58:21.620199589 +0200
@@ -17,15 +17,23 @@
#include <linux/types.h>
@@ -253700,9 +232083,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-l
+ if (ret == -ENODEV)
+ brcmf_dbg(SDIO, "No platform data available.\n");
}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,635 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
@@ -254339,9 +232722,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c l
- if (ret == -ENODEV)
- brcmf_dbg(SDIO, "No platform data available.\n");
-}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-04-24 07:58:21.620199589 +0200
@@ -17,13 +17,23 @@
#ifndef _BRCMF_BUS_H_
#define _BRCMF_BUS_H_
@@ -254510,9 +232893,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-
#endif
#endif /* _BRCMF_BUS_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
@@ -254903,9 +233286,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c linux-
-{
- /* Nothing to do for CDC */
-}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-04-24 07:58:21.620199589 +0200
@@ -21,9 +21,9 @@
#include <brcmu_utils.h>
#include "dhd.h"
@@ -254977,9 +233360,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c lin
done:
return err;
}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c 2014-04-24 07:58:21.620199589 +0200
@@ -22,7 +22,6 @@
#include "dhd.h"
#include "dhd_bus.h"
@@ -255075,9 +233458,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c linux-
return simple_read_from_buffer(data, count, ppos, buf, res);
}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h 2014-04-24 07:58:21.620199589 +0200
@@ -33,7 +33,7 @@
#define BRCMF_USB_VAL 0x00002000
#define BRCMF_SCAN_VAL 0x00004000
@@ -255107,9 +233490,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h linux-
};
struct brcmf_pub;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-04-24 07:58:21.620199589 +0200
@@ -21,479 +21,33 @@
#ifndef _BRCMF_H_
#define _BRCMF_H_
@@ -255726,9 +234109,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-lina
+int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);
#endif /* _BRCMF_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-04-24 07:58:21.624199604 +0200
@@ -24,13 +24,13 @@
#include "dhd.h"
@@ -256496,9 +234879,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linu
static int brcmf_get_pend_8021x_cnt(struct brcmf_if *ifp)
{
return atomic_read(&ifp->pend_8021x_cnt);
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
@@ -256542,9 +234925,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h linu
-extern int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);
-
-#endif /* _BRCMF_PROTO_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-04-24 07:58:21.624199604 +0200
@@ -32,6 +32,7 @@
#include <linux/debugfs.h>
#include <linux/vmalloc.h>
@@ -260376,9 +238759,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux
return;
if (wdtick) {
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fweh.c 2014-04-24 07:58:21.624199604 +0200
@@ -185,6 +185,10 @@
ifevent->action, ifevent->ifidx, ifevent->bssidx,
ifevent->flags, ifevent->role);
@@ -260390,9 +238773,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.c linux-lin
if (ifevent->ifidx >= BRCMF_MAX_IFS) {
brcmf_err("invalid interface index: %u\n",
ifevent->ifidx);
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fweh.h 2014-04-24 07:58:21.624199604 +0200
@@ -101,7 +101,9 @@
BRCMF_ENUM_DEF(P2P_PROBEREQ_MSG, 72) \
BRCMF_ENUM_DEF(DCS_REQUEST, 73) \
@@ -260479,9 +238862,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fweh.h linux-lin
typedef int (*brcmf_fweh_handler_t)(struct brcmf_if *ifp,
const struct brcmf_event_msg *evtmsg,
void *data);
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-04-24 07:58:21.624199604 +0200
@@ -27,6 +27,7 @@
#include "dhd_dbg.h"
#include "tracepoint.h"
@@ -260558,9 +238941,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-lin
mutex_unlock(&drvr->proto_block);
return err;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-04-24 07:58:21.624199604 +0200
@@ -17,6 +17,67 @@
#ifndef _fwil_h_
#define _fwil_h_
@@ -260629,9 +239012,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-lin
s32 brcmf_fil_cmd_data_set(struct brcmf_if *ifp, u32 cmd, void *data, u32 len);
s32 brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len);
s32 brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data);
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-04-24 07:58:21.624199604 +0200
@@ -29,6 +29,24 @@
#define BRCMF_ARP_OL_HOST_AUTO_REPLY 0x00000004
#define BRCMF_ARP_OL_PEER_AUTO_REPLY 0x00000008
@@ -260969,9 +239352,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h lin
+};
+
#endif /* FWIL_TYPES_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-04-24 07:58:21.624199604 +0200
@@ -22,13 +22,11 @@
#include <linux/etherdevice.h>
#include <linux/err.h>
@@ -263146,9 +241529,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux
+ else
+ fws->stats.bus_flow_block++;
}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h 2014-04-24 07:58:21.624199604 +0200
@@ -29,5 +29,6 @@
void brcmf_fws_add_interface(struct brcmf_if *ifp);
void brcmf_fws_del_interface(struct brcmf_if *ifp);
@@ -263156,9 +241539,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h linux
+void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked);
#endif /* FWSIGNAL_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/Makefile
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-04-24 07:58:21.620199589 +0200
@@ -28,14 +28,15 @@
fweh.o \
fwsignal.o \
@@ -263177,9 +241560,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-l
sdio_chip.o
brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
usb.o
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/nvram.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-04-24 07:58:21.624199604 +0200
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -263275,9 +241658,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-li
+}
+
+
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/nvram.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-04-24 07:58:21.624199604 +0200
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -263303,9 +241686,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-li
+
+
+#endif /* BRCMFMAC_NVRAM_H */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-04-24 07:58:21.624199604 +0200
@@ -823,6 +823,7 @@
}
err = brcmf_p2p_escan(p2p, num_nodfs, chanspecs, search_state,
@@ -263456,9 +241839,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-lina
return 0;
default:
return -ENOTSUPP;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/proto.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/proto.c 2014-04-24 07:58:21.624199604 +0200
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -263522,9 +241905,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.c linux-li
+ drvr->proto = NULL;
+ }
+}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/proto.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/proto.h 2014-04-24 07:58:21.624199604 +0200
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -263583,9 +241966,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/proto.h linux-li
+
+
+#endif /* BRCMFMAC_PROTO_H */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-04-24 07:58:21.624199604 +0200
@@ -18,6 +18,8 @@
#include <linux/types.h>
#include <linux/netdevice.h>
@@ -264818,9 +243201,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linu
- return brcmf_sdio_chip_cr4_exitdl(sdiodev, ci, nvram_dat, nvram_sz);
+ return brcmf_sdio_chip_cr4_exitdl(sdiodev, ci, rstvec);
}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-04-24 07:58:21.624199604 +0200
@@ -54,7 +54,7 @@
#define BRCMF_MAX_CORENUM 6
@@ -264895,9 +243278,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linu
+ struct brcmf_chip *ci, u32 rstvec);
#endif /* _BRCMFMAC_SDIO_CHIP_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-04-24 07:58:21.624199604 +0200
@@ -164,13 +164,10 @@
struct brcmf_sdio_dev {
struct sdio_func *func[SDIO_MAX_FUNCS];
@@ -265054,9 +243437,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linu
-extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);
#endif /* _BRCM_SDH_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h 2014-04-24 07:58:21.624199604 +0200
@@ -78,13 +78,64 @@
TP_ARGS(data, len),
TP_STRUCT__entry(
@@ -265123,9 +243506,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h lin
);
#ifdef CONFIG_BRCM_TRACING
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/usb.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-04-21 13:50:41.518724024 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-04-24 07:58:21.632199630 +0200
@@ -82,6 +82,7 @@
int tx_high_watermark;
int tx_freecount;
@@ -265244,9 +243627,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-lina
return brcmf_bus_start(&usb->dev);
return 0;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-04-24 07:58:21.636199644 +0200
@@ -1093,9 +1093,12 @@
brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n ");
err = brcmf_fil_cmd_data_set(vif->ifp,
@@ -265726,9 +244109,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c li
}
wiphy = cfg_to_wiphy(cfg);
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-04-24 07:58:21.636199644 +0200
@@ -412,7 +412,6 @@
struct work_struct escan_timeout_work;
u8 *escan_ioctl_buf;
@@ -265754,9 +244137,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h li
+void brcmf_cfg80211_free_netdev(struct net_device *ndev);
#endif /* _wl_cfg80211_h_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2014-04-24 07:58:21.636199644 +0200
@@ -679,27 +679,6 @@
return mode == BCMA_CLKMODE_FAST;
}
@@ -265785,9 +244168,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c linux-
/* Enable BT-COEX & Ex-PA for 4313 */
void ai_epa_4313war(struct si_pub *sih)
{
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h 2014-04-24 07:58:21.636199644 +0200
@@ -172,22 +172,19 @@
@@ -265820,9 +244203,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h linux-
static inline u32 ai_get_cccaps(struct si_pub *sih)
{
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c 2014-04-24 07:58:21.636199644 +0200
@@ -900,7 +900,7 @@
if (supr_status) {
update_rate = false;
@@ -265845,9 +244228,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c linux-li
}
}
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h 2014-04-24 07:58:21.636199644 +0200
@@ -37,17 +37,17 @@
u16 dma_len;
};
@@ -265877,9 +244260,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h linux-li
+void brcms_c_ampdu_shm_upd(struct ampdu_info *ampdu);
#endif /* _BRCM_AMPDU_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/antsel.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/antsel.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/antsel.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/antsel.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/antsel.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/antsel.h 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/antsel.h 2014-04-24 07:58:21.636199644 +0200
@@ -17,13 +17,11 @@
#ifndef _BRCM_ANTSEL_H_
#define _BRCM_ANTSEL_H_
@@ -265900,9 +244283,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/antsel.h linux-l
+u8 brcms_c_antsel_antsel2id(struct antsel_info *asi, u16 antsel);
#endif /* _BRCM_ANTSEL_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/channel.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.c 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/channel.c 2014-04-24 07:58:21.640199659 +0200
@@ -684,7 +684,8 @@
continue;
@@ -265913,9 +244296,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.c linux-
if (IS_ERR(rule))
continue;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/channel.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.h 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/channel.h 2014-04-24 07:58:21.640199659 +0200
@@ -32,20 +32,16 @@
#define BRCMS_DFS_EU (BRCMS_DFS_TPC | BRCMS_RADAR_TYPE_EU) /* Flag for DFS EU */
@@ -265945,9 +244328,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/channel.h linux-
+void brcms_c_regd_init(struct brcms_c_info *wlc);
#endif /* _WLC_CHANNEL_H */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/debug.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/debug.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/debug.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/debug.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/debug.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/debug.c 2014-04-21 13:50:41.522724040 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/debug.c 2014-04-24 07:58:21.640199659 +0200
@@ -56,7 +56,7 @@
drvr->dbgfs_dir = debugfs_create_dir(
@@ -265957,9 +244340,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/debug.c linux-li
}
void brcms_debugfs_detach(struct brcms_pub *drvr)
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-04-21 13:50:41.526724058 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-04-24 07:58:21.640199659 +0200
@@ -457,6 +457,8 @@
if (err != 0)
brcms_err(wl->wlc->hw->d11core, "%s: brcms_up() returned %d\n",
@@ -265986,9 +244369,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c li
hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
BIT(NL80211_IFTYPE_AP) |
BIT(NL80211_IFTYPE_ADHOC);
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h 2014-04-21 13:50:41.526724058 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h 2014-04-24 07:58:21.640199659 +0200
@@ -88,26 +88,26 @@
};
@@ -266035,9 +244418,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h li
+void brcms_fatal_error(struct brcms_info *wl);
#endif /* _BRCM_MAC80211_IF_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/main.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-04-21 13:50:41.526724058 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-04-24 07:58:21.644199673 +0200
@@ -882,8 +882,8 @@
mcl = le16_to_cpu(txh->MacTxControlLow);
@@ -266136,9 +244519,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-lin
if (is_cck_rate(rspec)) {
if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
rx_status->flag |= RX_FLAG_SHORTPRE;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/main.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.h 2014-04-21 13:50:41.526724058 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/main.h 2014-04-24 07:58:21.644199673 +0200
@@ -616,66 +616,54 @@
struct brcms_bss_info *current_bss;
};
@@ -266254,9 +244637,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/main.h linux-lin
+void brcms_c_init_scb(struct scb *scb);
#endif /* _BRCM_MAIN_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h 2014-04-21 13:50:41.526724058 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h 2014-04-24 07:58:21.644199673 +0200
@@ -179,121 +179,106 @@
};
@@ -266481,9 +244864,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h li
+ u8 mcs_offset);
+s8 wlc_phy_get_tx_power_offset(struct brcms_phy_pub *ppi, u8 tbl_offset);
#endif /* _BRCM_PHY_HAL_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h 2014-04-21 13:50:41.526724058 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h 2014-04-24 07:58:21.644199673 +0200
@@ -910,113 +910,103 @@
u8 do_init_g;
};
@@ -266893,9 +245276,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h li
-extern bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pih);
+bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pih);
#endif /* _BRCM_PHY_INT_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c 2014-04-21 13:50:41.526724058 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c 2014-04-24 07:58:21.648199687 +0200
@@ -1137,8 +1137,9 @@
gain0_15 = ((biq1 & 0xf) << 12) |
((tia & 0xf) << 8) |
@@ -267509,9 +245892,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c li
if (pi_lcn->lcnphy_tempsense_option == 3) {
pi->hwpwrctrl = true;
pi->hwpwrctrl_capable = true;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c 2014-04-24 07:58:21.652199700 +0200
@@ -1507,117 +1507,103 @@
const struct phytbl_info dot11lcnphytbl_rx_gain_info_rev0[] = {
@@ -268086,9 +246469,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
};
const struct lcnphy_tx_gain_tbl_entry dot11lcnphy_5GHz_gaintable_rev0[128] = {
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h 2014-04-24 07:58:21.652199700 +0200
@@ -20,6 +20,7 @@
extern const struct phytbl_info dot11lcnphytbl_rx_gain_info_rev0[];
extern const u32 dot11lcnphytbl_rx_gain_info_sz_rev0;
@@ -268097,9 +246480,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_epa;
extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_epa_combo;
extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_bt_epa;
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h 2014-04-24 07:58:21.652199700 +0200
@@ -124,56 +124,49 @@
struct brcms_phy;
@@ -268199,9 +246582,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h linux
+u16 wlapi_bmac_get_txant(struct phy_shim_info *physhim);
#endif /* _BRCM_PHY_SHIM_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pmu.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pmu.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pmu.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pmu.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/pmu.h 2014-04-24 07:58:21.656199715 +0200
@@ -20,7 +20,7 @@
#include "types.h"
@@ -268212,9 +246595,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pmu.h linux-lina
+u32 si_pmu_measure_alpclk(struct si_pub *sih);
#endif /* _BRCM_PMU_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pub.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pub.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pub.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/pub.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pub.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pub.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/pub.h 2014-04-24 07:58:21.656199715 +0200
@@ -266,83 +266,76 @@
};
@@ -268366,9 +246749,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/pub.h linux-lina
+void brcms_c_set_ssid(struct brcms_c_info *wlc, u8 *ssid, size_t ssid_len);
#endif /* _BRCM_PUB_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/rate.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/rate.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/rate.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/rate.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/rate.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/rate.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/rate.h 2014-04-24 07:58:21.656199715 +0200
@@ -216,34 +216,30 @@
/* sanitize, and sort a rateset with the basic bit(s) preserved, validate
@@ -268425,9 +246808,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/rate.h linux-lin
+void brcms_c_rateset_bw_mcs_filter(struct brcms_c_rateset *rateset, u8 bw);
#endif /* _BRCM_RATE_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/stf.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/stf.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/stf.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/stf.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/stf.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/stf.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/stf.h 2014-04-24 07:58:21.656199715 +0200
@@ -19,24 +19,19 @@
#include "types.h"
@@ -268466,9 +246849,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/stf.h linux-lina
+u16 brcms_c_stf_d11hdrs_phyctl_txant(struct brcms_c_info *wlc, u32 rspec);
#endif /* _BRCM_STF_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h 2014-04-24 07:58:21.656199715 +0200
@@ -43,16 +43,14 @@
u32 *bcm43xx_bomminor;
};
@@ -268493,9 +246876,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h l
+int brcms_check_firmwares(struct brcms_info *wl);
#endif /* _BRCM_UCODE_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-solidrun/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-04-24 07:58:21.664199745 +0200
@@ -41,5 +41,7 @@
#define BCM4331_CHIP_ID 0x4331
#define BCM4334_CHIP_ID 0x4334
@@ -268504,9 +246887,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h lin
+#define BCM4339_CHIP_ID 0x4339
#endif /* _BRCM_HW_IDS_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_d11.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-solidrun/drivers/net/wireless/brcm80211/include/brcmu_d11.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-04-24 07:58:21.664199745 +0200
@@ -140,6 +140,6 @@
void (*decchspec)(struct brcmu_chan *ch);
};
@@ -268515,9 +246898,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux
+void brcmu_d11_attach(struct brcmu_d11inf *d11inf);
#endif /* _BRCMU_CHANNELS_H_ */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_utils.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_utils.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_utils.h linux-solidrun/drivers/net/wireless/brcm80211/include/brcmu_utils.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_utils.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_utils.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/include/brcmu_utils.h 2014-04-24 07:58:21.664199745 +0200
@@ -114,31 +114,29 @@
return skb_peek_tail(&pq->q[prec].skblist);
}
@@ -268597,9 +246980,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_utils.h lin
void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...);
#else
__printf(3, 4)
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-solidrun/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
--- linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-04-21 13:50:41.534724092 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-04-24 07:58:21.664199745 +0200
@@ -82,6 +82,20 @@
#define WLC_N_BW_40ALL 1
#define WLC_N_BW_20IN2G_40IN5G 2
@@ -268621,9 +247004,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linu
/* band types */
#define WLC_BAND_AUTO 0 /* auto-select */
#define WLC_BAND_5G 1 /* 5 Ghz */
-diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/Kconfig linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/Kconfig
+diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/Kconfig linux-solidrun/drivers/net/wireless/brcm80211/Kconfig
--- linux-3.10.36/drivers/net/wireless/brcm80211/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/Kconfig 2014-04-21 13:50:41.514724007 +0200
++++ linux-solidrun/drivers/net/wireless/brcm80211/Kconfig 2014-04-24 07:58:21.616199574 +0200
@@ -4,11 +4,12 @@
config BRCMSMAC
tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
@@ -268658,9 +247041,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/brcm80211/Kconfig linux-linaro-stab
depends on BRCMFMAC
select FW_LOADER
---help---
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-solidrun/drivers/net/wireless/iwlwifi/dvm/mac80211.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-04-21 13:50:41.554724176 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-04-24 07:58:21.692199842 +0200
@@ -739,24 +739,6 @@
return ret;
}
@@ -268704,9 +247087,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-linaro
break;
IWL_DEBUG_HT(priv, "start Tx\n");
ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/sta.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/sta.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/sta.c linux-solidrun/drivers/net/wireless/iwlwifi/dvm/sta.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/sta.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/sta.c 2014-04-21 13:50:41.558724192 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/dvm/sta.c 2014-04-24 07:58:21.696199855 +0200
@@ -590,7 +590,6 @@
sizeof(priv->tid_data[sta_id][tid]));
@@ -268715,9 +247098,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/sta.c linux-linaro-stab
priv->num_stations--;
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/tx.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/tx.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/tx.c linux-solidrun/drivers/net/wireless/iwlwifi/dvm/tx.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/tx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/tx.c 2014-04-21 13:50:41.558724192 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/dvm/tx.c 2014-04-24 07:58:21.696199855 +0200
@@ -1322,6 +1322,8 @@
struct iwl_compressed_ba_resp *ba_resp = (void *)pkt->data;
struct iwl_ht_agg *agg;
@@ -268759,9 +247142,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/dvm/tx.c linux-linaro-stabl
info->flags |= IEEE80211_TX_STAT_AMPDU;
info->status.ampdu_ack_len = ba_resp->txed_2_done;
info->status.ampdu_len = ba_resp->txed;
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-drv.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/iwl-drv.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-drv.c linux-solidrun/drivers/net/wireless/iwlwifi/iwl-drv.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-drv.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/iwl-drv.c 2014-04-21 13:50:41.558724192 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/iwl-drv.c 2014-04-24 07:58:21.700199870 +0200
@@ -1211,7 +1211,7 @@
MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");
module_param_named(11n_disable, iwlwifi_mod_params.disable_11n, uint, S_IRUGO);
@@ -268771,9 +247154,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-drv.c linux-linaro-stab
module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,
int, S_IRUGO);
MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size (default 0)");
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-modparams.h linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/iwl-modparams.h
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-modparams.h linux-solidrun/drivers/net/wireless/iwlwifi/iwl-modparams.h
--- linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-modparams.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/iwl-modparams.h 2014-04-21 13:50:41.562724210 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/iwl-modparams.h 2014-04-24 07:58:21.716199926 +0200
@@ -79,12 +79,9 @@
IWL_POWER_NUM
};
@@ -268799,9 +247182,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-modparams.h linux-linar
* @amsdu_size_8K: enable 8K amsdu size, default = 0
* @restart_fw: restart firmware, default = 1
* @plcp_check: enable plcp health check, default = true
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c linux-solidrun/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c 2014-04-21 13:50:41.562724210 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c 2014-04-24 07:58:21.716199926 +0200
@@ -180,11 +180,6 @@
for (ch_idx = 0; ch_idx < IWL_NUM_CHANNELS; ch_idx++) {
@@ -268814,9 +247197,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c linux-linar
if (!(ch_flags & NVM_CHANNEL_VALID)) {
IWL_DEBUG_EEPROM(dev,
"Ch. %d Flags %x [%sGHz] - No traffic\n",
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/bt-coex.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/bt-coex.c linux-solidrun/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/bt-coex.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/bt-coex.c 2014-04-21 13:50:41.562724210 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/mvm/bt-coex.c 2014-04-24 07:58:21.720199940 +0200
@@ -523,11 +523,8 @@
mutex_lock(&mvm->mutex);
@@ -268831,9 +247214,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/bt-coex.c linux-linaro-
goto out_unlock;
/* No open connection - reports should be disabled */
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/mac80211.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/mac80211.c linux-solidrun/drivers/net/wireless/iwlwifi/mvm/mac80211.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/mac80211.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/mac80211.c 2014-04-21 13:50:41.566724227 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/mvm/mac80211.c 2014-04-24 07:58:21.724199954 +0200
@@ -278,24 +278,6 @@
ieee80211_free_txskb(hw, skb);
}
@@ -268877,9 +247260,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/mac80211.c linux-linaro
ret = -EINVAL;
break;
}
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/scan.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/scan.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/scan.c linux-solidrun/drivers/net/wireless/iwlwifi/mvm/scan.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/scan.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/scan.c 2014-04-21 13:50:41.566724227 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/mvm/scan.c 2014-04-24 07:58:21.724199954 +0200
@@ -313,8 +313,7 @@
iwl_mvm_scan_fill_ssids(cmd, req);
@@ -268890,9 +247273,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/scan.c linux-linaro-sta
cmd->tx_cmd.sta_id = mvm->aux_sta.sta_id;
cmd->tx_cmd.life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
cmd->tx_cmd.rate_n_flags =
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/tx.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/tx.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/tx.c linux-solidrun/drivers/net/wireless/iwlwifi/mvm/tx.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/tx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/tx.c 2014-04-21 13:50:41.566724227 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/mvm/tx.c 2014-04-24 07:58:21.724199954 +0200
@@ -819,12 +819,16 @@
struct iwl_mvm_ba_notif *ba_notif = (void *)pkt->data;
struct sk_buff_head reclaimed_skbs;
@@ -268942,9 +247325,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/tx.c linux-linaro-stabl
info->flags |= IEEE80211_TX_STAT_AMPDU;
info->status.ampdu_ack_len = ba_notif->txed_2_done;
info->status.ampdu_len = ba_notif->txed;
-diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/utils.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/utils.c
+diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/utils.c linux-solidrun/drivers/net/wireless/iwlwifi/mvm/utils.c
--- linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/utils.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/mvm/utils.c 2014-04-21 13:50:41.566724227 +0200
++++ linux-solidrun/drivers/net/wireless/iwlwifi/mvm/utils.c 2014-04-24 07:58:21.724199954 +0200
@@ -401,8 +401,6 @@
mvm->status, table.valid);
}
@@ -268954,9 +247337,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/iwlwifi/mvm/utils.c linux-linaro-st
trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low,
table.data1, table.data2, table.data3,
table.blink1, table.blink2, table.ilink1,
-diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/11ac.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/11ac.c
+diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/11ac.c linux-solidrun/drivers/net/wireless/mwifiex/11ac.c
--- linux-3.10.36/drivers/net/wireless/mwifiex/11ac.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/11ac.c 2014-04-21 13:50:41.574724260 +0200
++++ linux-solidrun/drivers/net/wireless/mwifiex/11ac.c 2014-04-24 07:58:21.756200067 +0200
@@ -189,7 +189,8 @@
vht_cap->header.len =
cpu_to_le16(sizeof(struct ieee80211_vht_cap));
@@ -268967,9 +247350,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/11ac.c linux-linaro-stable-
le16_to_cpu(vht_cap->header.len));
mwifiex_fill_vht_cap_tlv(priv, vht_cap, bss_desc->bss_band);
-diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/11n.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/11n.c
+diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/11n.c linux-solidrun/drivers/net/wireless/mwifiex/11n.c
--- linux-3.10.36/drivers/net/wireless/mwifiex/11n.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/11n.c 2014-04-21 13:50:41.574724260 +0200
++++ linux-solidrun/drivers/net/wireless/mwifiex/11n.c 2014-04-24 07:58:21.756200067 +0200
@@ -307,7 +307,8 @@
ht_cap->header.len =
cpu_to_le16(sizeof(struct ieee80211_ht_cap));
@@ -268980,9 +247363,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/11n.c linux-linaro-stable-m
le16_to_cpu(ht_cap->header.len));
mwifiex_fill_cap_info(priv, radio_type, ht_cap);
-diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/pcie.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/pcie.c
+diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/pcie.c linux-solidrun/drivers/net/wireless/mwifiex/pcie.c
--- linux-3.10.36/drivers/net/wireless/mwifiex/pcie.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/pcie.c 2014-04-21 13:50:41.578724277 +0200
++++ linux-solidrun/drivers/net/wireless/mwifiex/pcie.c 2014-04-24 07:58:21.764200094 +0200
@@ -1195,12 +1195,6 @@
rd_index = card->rxbd_rdptr & reg->rx_mask;
skb_data = card->rx_buf_list[rd_index];
@@ -269038,9 +247421,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/pcie.c linux-linaro-stable-
/* Potentially for PCIe we could get other
* interrupts like shared. Don't change power
* state until cookie is set */
-diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/scan.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/scan.c
+diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/scan.c linux-solidrun/drivers/net/wireless/mwifiex/scan.c
--- linux-3.10.36/drivers/net/wireless/mwifiex/scan.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/scan.c 2014-04-21 13:50:41.578724277 +0200
++++ linux-solidrun/drivers/net/wireless/mwifiex/scan.c 2014-04-24 07:58:21.764200094 +0200
@@ -2040,12 +2040,12 @@
curr_bss->ht_info_offset);
@@ -269058,9 +247441,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/scan.c linux-linaro-stable-
if (curr_bss->bcn_bss_co_2040)
curr_bss->bcn_bss_co_2040 =
-diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/usb.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/usb.c
+diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/usb.c linux-solidrun/drivers/net/wireless/mwifiex/usb.c
--- linux-3.10.36/drivers/net/wireless/mwifiex/usb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/usb.c 2014-04-21 13:50:41.582724294 +0200
++++ linux-solidrun/drivers/net/wireless/mwifiex/usb.c 2014-04-24 07:58:21.764200094 +0200
@@ -511,6 +511,13 @@
MWIFIEX_BSS_ROLE_ANY),
MWIFIEX_ASYNC_CMD);
@@ -269083,9 +247466,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/usb.c linux-linaro-stable-m
};
static int mwifiex_usb_tx_init(struct mwifiex_adapter *adapter)
-diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/wmm.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/wmm.c
+diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/wmm.c linux-solidrun/drivers/net/wireless/mwifiex/wmm.c
--- linux-3.10.36/drivers/net/wireless/mwifiex/wmm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/wmm.c 2014-04-21 13:50:41.582724294 +0200
++++ linux-solidrun/drivers/net/wireless/mwifiex/wmm.c 2014-04-24 07:58:21.768200109 +0200
@@ -556,8 +556,7 @@
mwifiex_wmm_delete_all_ralist(priv);
memcpy(tos_to_tid, ac_to_tid, sizeof(tos_to_tid));
@@ -269096,9 +247479,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/mwifiex/wmm.c linux-linaro-stable-m
priv->adapter->if_ops.clean_pcie_ring(priv->adapter);
spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
}
-diff -Nur linux-3.10.36/drivers/net/wireless/p54/txrx.c linux-linaro-stable-mx6/drivers/net/wireless/p54/txrx.c
+diff -Nur linux-3.10.36/drivers/net/wireless/p54/txrx.c linux-solidrun/drivers/net/wireless/p54/txrx.c
--- linux-3.10.36/drivers/net/wireless/p54/txrx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/p54/txrx.c 2014-04-21 13:50:41.590724327 +0200
++++ linux-solidrun/drivers/net/wireless/p54/txrx.c 2014-04-24 07:58:21.788200179 +0200
@@ -587,7 +587,7 @@
chan = priv->curchan;
if (chan) {
@@ -269108,9 +247491,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/p54/txrx.c linux-linaro-stable-mx6/
survey->channel_time = priv->survey_raw.active;
survey->channel_time_tx = priv->survey_raw.tx;
survey->channel_time_busy = priv->survey_raw.tx +
-diff -Nur linux-3.10.36/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h linux-linaro-stable-mx6/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
+diff -Nur linux-3.10.36/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h linux-solidrun/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
--- linux-3.10.36/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h 2014-04-21 13:50:41.602724378 +0200
++++ linux-solidrun/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h 2014-04-24 07:58:21.804200236 +0200
@@ -15,8 +15,6 @@
#ifndef RTL8187_H
#define RTL8187_H
@@ -269142,9 +247525,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h linux-lin
bool rfkill_off;
u16 seqno;
};
-diff -Nur linux-3.10.36/drivers/net/wireless/rtlwifi/ps.c linux-linaro-stable-mx6/drivers/net/wireless/rtlwifi/ps.c
+diff -Nur linux-3.10.36/drivers/net/wireless/rtlwifi/ps.c linux-solidrun/drivers/net/wireless/rtlwifi/ps.c
--- linux-3.10.36/drivers/net/wireless/rtlwifi/ps.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rtlwifi/ps.c 2014-04-21 13:50:41.606724395 +0200
++++ linux-solidrun/drivers/net/wireless/rtlwifi/ps.c 2014-04-24 07:58:21.804200236 +0200
@@ -48,7 +48,7 @@
/*<2> Enable Adapter */
@@ -269154,9 +247537,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/rtlwifi/ps.c linux-linaro-stable-mx
RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
/*<3> Enable Interrupt */
-diff -Nur linux-3.10.36/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c linux-linaro-stable-mx6/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+diff -Nur linux-3.10.36/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c linux-solidrun/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
--- linux-3.10.36/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c 2014-04-21 13:50:41.610724412 +0200
++++ linux-solidrun/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c 2014-04-24 07:58:21.824200306 +0200
@@ -937,26 +937,14 @@
bool is92c;
int err;
@@ -269203,9 +247586,9 @@ diff -Nur linux-3.10.36/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c linux-linaro
rtlpci->being_init_adapter = false;
return err;
}
-diff -Nur linux-3.10.36/drivers/of/address.c linux-linaro-stable-mx6/drivers/of/address.c
+diff -Nur linux-3.10.36/drivers/of/address.c linux-solidrun/drivers/of/address.c
--- linux-3.10.36/drivers/of/address.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/of/address.c 2014-04-21 13:50:41.646724564 +0200
++++ linux-solidrun/drivers/of/address.c 2014-04-24 07:58:21.940200714 +0200
@@ -99,12 +99,11 @@
static int of_bus_pci_match(struct device_node *np)
{
@@ -269295,9 +247678,9 @@ diff -Nur linux-3.10.36/drivers/of/address.c linux-linaro-stable-mx6/drivers/of/
#endif /* CONFIG_PCI */
/*
-diff -Nur linux-3.10.36/drivers/of/base.c linux-linaro-stable-mx6/drivers/of/base.c
+diff -Nur linux-3.10.36/drivers/of/base.c linux-solidrun/drivers/of/base.c
--- linux-3.10.36/drivers/of/base.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/of/base.c 2014-04-21 13:50:41.646724564 +0200
++++ linux-solidrun/drivers/of/base.c 2014-04-24 07:58:21.940200714 +0200
@@ -18,6 +18,7 @@
* 2 of the License, or (at your option) any later version.
*/
@@ -269692,9 +248075,9 @@ diff -Nur linux-3.10.36/drivers/of/base.c linux-linaro-stable-mx6/drivers/of/bas
+ return of_stdout == dn;
+}
+EXPORT_SYMBOL_GPL(of_device_is_stdout_path);
-diff -Nur linux-3.10.36/drivers/of/fdt.c linux-linaro-stable-mx6/drivers/of/fdt.c
+diff -Nur linux-3.10.36/drivers/of/fdt.c linux-solidrun/drivers/of/fdt.c
--- linux-3.10.36/drivers/of/fdt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/of/fdt.c 2014-04-21 13:50:41.646724564 +0200
++++ linux-solidrun/drivers/of/fdt.c 2014-04-24 07:58:21.940200714 +0200
@@ -125,13 +125,13 @@
return score;
}
@@ -269846,9 +248229,9 @@ diff -Nur linux-3.10.36/drivers/of/fdt.c linux-linaro-stable-mx6/drivers/of/fdt.
*allnextp = NULL;
pr_debug(" <- unflatten_device_tree()\n");
-diff -Nur linux-3.10.36/drivers/of/of_pci.c linux-linaro-stable-mx6/drivers/of/of_pci.c
+diff -Nur linux-3.10.36/drivers/of/of_pci.c linux-solidrun/drivers/of/of_pci.c
--- linux-3.10.36/drivers/of/of_pci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/of/of_pci.c 2014-04-21 13:50:41.646724564 +0200
++++ linux-solidrun/drivers/of/of_pci.c 2014-04-24 07:58:21.940200714 +0200
@@ -5,14 +5,15 @@
#include <asm/prom.h>
@@ -269967,9 +248350,9 @@ diff -Nur linux-3.10.36/drivers/of/of_pci.c linux-linaro-stable-mx6/drivers/of/o
+EXPORT_SYMBOL_GPL(of_pci_find_msi_chip_by_node);
+
+#endif /* CONFIG_PCI_MSI */
-diff -Nur linux-3.10.36/drivers/pci/host/Kconfig linux-linaro-stable-mx6/drivers/pci/host/Kconfig
+diff -Nur linux-3.10.36/drivers/pci/host/Kconfig linux-solidrun/drivers/pci/host/Kconfig
--- linux-3.10.36/drivers/pci/host/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/Kconfig 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/host/Kconfig 2014-04-24 07:58:22.028201025 +0200
@@ -0,0 +1,39 @@
+menu "PCI host controller drivers"
+ depends on PCI
@@ -270010,17 +248393,17 @@ diff -Nur linux-3.10.36/drivers/pci/host/Kconfig linux-linaro-stable-mx6/drivers
+ depends on ARCH_TEGRA
+
+endmenu
-diff -Nur linux-3.10.36/drivers/pci/host/Makefile linux-linaro-stable-mx6/drivers/pci/host/Makefile
+diff -Nur linux-3.10.36/drivers/pci/host/Makefile linux-solidrun/drivers/pci/host/Makefile
--- linux-3.10.36/drivers/pci/host/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/Makefile 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/host/Makefile 2014-04-24 07:58:22.028201025 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_PCIE_DW) += pcie-designware.o
+obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
+obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
+obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
-diff -Nur linux-3.10.36/drivers/pci/host/pcie-designware.c linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.c
+diff -Nur linux-3.10.36/drivers/pci/host/pcie-designware.c linux-solidrun/drivers/pci/host/pcie-designware.c
--- linux-3.10.36/drivers/pci/host/pcie-designware.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.c 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/host/pcie-designware.c 2014-04-24 07:58:22.028201025 +0200
@@ -0,0 +1,773 @@
+/*
+ * Synopsys Designware PCIe host controller driver
@@ -270795,9 +249178,9 @@ diff -Nur linux-3.10.36/drivers/pci/host/pcie-designware.c linux-linaro-stable-m
+MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>");
+MODULE_DESCRIPTION("Designware PCIe host controller driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/pci/host/pcie-designware.h linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.h
+diff -Nur linux-3.10.36/drivers/pci/host/pcie-designware.h linux-solidrun/drivers/pci/host/pcie-designware.h
--- linux-3.10.36/drivers/pci/host/pcie-designware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.h 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/host/pcie-designware.h 2014-04-24 07:58:22.028201025 +0200
@@ -0,0 +1,124 @@
+/*
+ * Synopsys Designware PCIe host controller driver
@@ -270923,9 +249306,9 @@ diff -Nur linux-3.10.36/drivers/pci/host/pcie-designware.h linux-linaro-stable-m
+int dw_pcie_host_init(struct pcie_port *pp);
+
+#endif /* _PCIE_DESIGNWARE_H */
-diff -Nur linux-3.10.36/drivers/pci/host/pci-exynos.c linux-linaro-stable-mx6/drivers/pci/host/pci-exynos.c
+diff -Nur linux-3.10.36/drivers/pci/host/pci-exynos.c linux-solidrun/drivers/pci/host/pci-exynos.c
--- linux-3.10.36/drivers/pci/host/pci-exynos.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/pci-exynos.c 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/host/pci-exynos.c 2014-04-24 07:58:22.028201025 +0200
@@ -0,0 +1,648 @@
+/*
+ * PCIe host controller driver for Samsung EXYNOS SoCs
@@ -271575,9 +249958,9 @@ diff -Nur linux-3.10.36/drivers/pci/host/pci-exynos.c linux-linaro-stable-mx6/dr
+MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>");
+MODULE_DESCRIPTION("Samsung PCIe host controller driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/drivers/pci/host/pci-imx6.c
+diff -Nur linux-3.10.36/drivers/pci/host/pci-imx6.c linux-solidrun/drivers/pci/host/pci-imx6.c
--- linux-3.10.36/drivers/pci/host/pci-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/pci-imx6.c 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/host/pci-imx6.c 2014-04-24 07:58:22.028201025 +0200
@@ -0,0 +1,857 @@
+/*
+ * PCIe host controller driver for Freescale i.MX6 SoCs
@@ -272436,9 +250819,9 @@ diff -Nur linux-3.10.36/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
+MODULE_AUTHOR("Sean Cross <xobs@kosagi.com>");
+MODULE_DESCRIPTION("Freescale i.MX6 PCIe host controller driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/pci/host/pci-mvebu.c linux-linaro-stable-mx6/drivers/pci/host/pci-mvebu.c
+diff -Nur linux-3.10.36/drivers/pci/host/pci-mvebu.c linux-solidrun/drivers/pci/host/pci-mvebu.c
--- linux-3.10.36/drivers/pci/host/pci-mvebu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/pci-mvebu.c 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/host/pci-mvebu.c 2014-04-24 07:58:22.028201025 +0200
@@ -0,0 +1,881 @@
+/*
+ * PCIe driver for Marvell Armada 370 and Armada XP SoCs
@@ -273321,18 +251704,18 @@ diff -Nur linux-3.10.36/drivers/pci/host/pci-mvebu.c linux-linaro-stable-mx6/dri
+MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
+MODULE_DESCRIPTION("Marvell EBU PCIe driver");
+MODULE_LICENSE("GPLv2");
-diff -Nur linux-3.10.36/drivers/pci/Kconfig linux-linaro-stable-mx6/drivers/pci/Kconfig
+diff -Nur linux-3.10.36/drivers/pci/Kconfig linux-solidrun/drivers/pci/Kconfig
--- linux-3.10.36/drivers/pci/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/Kconfig 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/Kconfig 2014-04-24 07:58:22.028201025 +0200
@@ -119,3 +119,5 @@
config PCI_LABEL
def_bool y if (DMI || ACPI)
select NLS
+
+source "drivers/pci/host/Kconfig"
-diff -Nur linux-3.10.36/drivers/pci/Makefile linux-linaro-stable-mx6/drivers/pci/Makefile
+diff -Nur linux-3.10.36/drivers/pci/Makefile linux-solidrun/drivers/pci/Makefile
--- linux-3.10.36/drivers/pci/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/Makefile 2014-04-21 13:50:41.654724597 +0200
++++ linux-solidrun/drivers/pci/Makefile 2014-04-24 07:58:22.028201025 +0200
@@ -67,3 +67,6 @@
obj-$(CONFIG_OF) += of.o
@@ -273340,9 +251723,9 @@ diff -Nur linux-3.10.36/drivers/pci/Makefile linux-linaro-stable-mx6/drivers/pci
+
+# PCI host controller drivers
+obj-y += host/
-diff -Nur linux-3.10.36/drivers/pci/msi.c linux-linaro-stable-mx6/drivers/pci/msi.c
+diff -Nur linux-3.10.36/drivers/pci/msi.c linux-solidrun/drivers/pci/msi.c
--- linux-3.10.36/drivers/pci/msi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/msi.c 2014-04-21 13:50:41.662724632 +0200
++++ linux-solidrun/drivers/pci/msi.c 2014-04-24 07:58:22.056201124 +0200
@@ -30,20 +30,44 @@
/* Arch hooks */
@@ -273469,9 +251852,9 @@ diff -Nur linux-3.10.36/drivers/pci/msi.c linux-linaro-stable-mx6/drivers/pci/ms
#ifdef CONFIG_GENERIC_HARDIRQS
for (i = 0; i < nvec; i++)
BUG_ON(irq_has_action(entry->irq + i));
-diff -Nur linux-3.10.36/drivers/pci/pci.c linux-linaro-stable-mx6/drivers/pci/pci.c
+diff -Nur linux-3.10.36/drivers/pci/pci.c linux-solidrun/drivers/pci/pci.c
--- linux-3.10.36/drivers/pci/pci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/pci.c 2014-04-21 13:50:41.662724632 +0200
++++ linux-solidrun/drivers/pci/pci.c 2014-04-24 07:58:22.056201124 +0200
@@ -1119,8 +1119,6 @@
static int do_pci_enable_device(struct pci_dev *dev, int bars)
{
@@ -273499,9 +251882,9 @@ diff -Nur linux-3.10.36/drivers/pci/pci.c linux-linaro-stable-mx6/drivers/pci/pc
return 0;
}
-diff -Nur linux-3.10.36/drivers/pci/probe.c linux-linaro-stable-mx6/drivers/pci/probe.c
+diff -Nur linux-3.10.36/drivers/pci/probe.c linux-solidrun/drivers/pci/probe.c
--- linux-3.10.36/drivers/pci/probe.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/probe.c 2014-04-21 13:50:41.666724648 +0200
++++ linux-solidrun/drivers/pci/probe.c 2014-04-24 07:58:22.060201136 +0200
@@ -634,6 +634,7 @@
child->parent = parent;
@@ -273510,9 +251893,9 @@ diff -Nur linux-3.10.36/drivers/pci/probe.c linux-linaro-stable-mx6/drivers/pci/
child->sysdata = parent->sysdata;
child->bus_flags = parent->bus_flags;
-diff -Nur linux-3.10.36/drivers/pinctrl/core.c linux-linaro-stable-mx6/drivers/pinctrl/core.c
+diff -Nur linux-3.10.36/drivers/pinctrl/core.c linux-solidrun/drivers/pinctrl/core.c
--- linux-3.10.36/drivers/pinctrl/core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/core.c 2014-04-21 13:50:41.678724699 +0200
++++ linux-solidrun/drivers/pinctrl/core.c 2014-04-24 07:58:22.200201630 +0200
@@ -280,6 +280,29 @@
}
@@ -273692,9 +252075,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/core.c linux-linaro-stable-mx6/drivers/p
}
mutex_unlock(&pctldev->mutex);
-diff -Nur linux-3.10.36/drivers/pinctrl/devicetree.c linux-linaro-stable-mx6/drivers/pinctrl/devicetree.c
+diff -Nur linux-3.10.36/drivers/pinctrl/devicetree.c linux-solidrun/drivers/pinctrl/devicetree.c
--- linux-3.10.36/drivers/pinctrl/devicetree.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/devicetree.c 2014-04-21 13:50:41.678724699 +0200
++++ linux-solidrun/drivers/pinctrl/devicetree.c 2014-04-24 07:58:22.200201630 +0200
@@ -18,6 +18,7 @@
#include <linux/device.h>
@@ -273760,9 +252143,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/devicetree.c linux-linaro-stable-mx6/dri
/* We may store pointers to property names within the node */
of_node_get(np);
-diff -Nur linux-3.10.36/drivers/pinctrl/Kconfig linux-linaro-stable-mx6/drivers/pinctrl/Kconfig
+diff -Nur linux-3.10.36/drivers/pinctrl/Kconfig linux-solidrun/drivers/pinctrl/Kconfig
--- linux-3.10.36/drivers/pinctrl/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/Kconfig 2014-04-21 13:50:41.678724699 +0200
++++ linux-solidrun/drivers/pinctrl/Kconfig 2014-04-24 07:58:22.200201630 +0200
@@ -108,6 +108,14 @@
help
Say Y here to enable the imx6sl pinctrl driver
@@ -273778,9 +252161,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/Kconfig linux-linaro-stable-mx6/drivers/
config PINCTRL_LANTIQ
bool
depends on LANTIQ
-diff -Nur linux-3.10.36/drivers/pinctrl/Makefile linux-linaro-stable-mx6/drivers/pinctrl/Makefile
+diff -Nur linux-3.10.36/drivers/pinctrl/Makefile linux-solidrun/drivers/pinctrl/Makefile
--- linux-3.10.36/drivers/pinctrl/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/Makefile 2014-04-21 13:50:41.678724699 +0200
++++ linux-solidrun/drivers/pinctrl/Makefile 2014-04-24 07:58:22.200201630 +0200
@@ -22,6 +22,7 @@
obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o
obj-$(CONFIG_PINCTRL_IMX6Q) += pinctrl-imx6q.o
@@ -273797,9 +252180,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_PLAT_ORION) += mvebu/
obj-$(CONFIG_ARCH_SHMOBILE) += sh-pfc/
-diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx6sl.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx6sl.c
+diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx6sl.c linux-solidrun/drivers/pinctrl/pinctrl-imx6sl.c
--- linux-3.10.36/drivers/pinctrl/pinctrl-imx6sl.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx6sl.c 2014-04-21 13:50:41.682724715 +0200
++++ linux-solidrun/drivers/pinctrl/pinctrl-imx6sl.c 2014-04-24 07:58:22.224201714 +0200
@@ -384,6 +384,10 @@
},
.probe = imx6sl_pinctrl_probe,
@@ -273811,9 +252194,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx6sl.c linux-linaro-stable-mx6
};
static int __init imx6sl_pinctrl_init(void)
-diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.c
+diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx.c linux-solidrun/drivers/pinctrl/pinctrl-imx.c
--- linux-3.10.36/drivers/pinctrl/pinctrl-imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.c 2014-04-21 13:50:41.682724715 +0200
++++ linux-solidrun/drivers/pinctrl/pinctrl-imx.c 2014-04-24 07:58:22.204201645 +0200
@@ -1,7 +1,7 @@
/*
* Core driver for the imx pin controller
@@ -274017,9 +252400,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx.c linux-linaro-stable-mx6/dr
+ return pinctrl_force_default(ipctl->pctl);
+}
+#endif
-diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h
+diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx.h linux-solidrun/drivers/pinctrl/pinctrl-imx.h
--- linux-3.10.36/drivers/pinctrl/pinctrl-imx.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h 2014-04-21 13:50:41.682724715 +0200
++++ linux-solidrun/drivers/pinctrl/pinctrl-imx.h 2014-04-24 07:58:22.204201645 +0200
@@ -1,7 +1,7 @@
/*
* IMX pinmux core definitions
@@ -274051,9 +252434,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-mx6/dr
+int imx_pinctrl_resume(struct platform_device *pdev);
+#endif
#endif /* __DRIVERS_PINCTRL_IMX_H */
-diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-vf610.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-vf610.c
+diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-vf610.c linux-solidrun/drivers/pinctrl/pinctrl-vf610.c
--- linux-3.10.36/drivers/pinctrl/pinctrl-vf610.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-vf610.c 2014-04-21 13:50:41.686724732 +0200
++++ linux-solidrun/drivers/pinctrl/pinctrl-vf610.c 2014-04-24 07:58:22.240201771 +0200
@@ -0,0 +1,338 @@
+/*
+ * VF610 pinctrl driver based on imx pinmux and pinconf core
@@ -274393,9 +252776,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/pinctrl-vf610.c linux-linaro-stable-mx6/
+
+MODULE_DESCRIPTION("Freescale VF610 pinctrl driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/pinctrl/vt8500/pinctrl-wmt.c linux-linaro-stable-mx6/drivers/pinctrl/vt8500/pinctrl-wmt.c
+diff -Nur linux-3.10.36/drivers/pinctrl/vt8500/pinctrl-wmt.c linux-solidrun/drivers/pinctrl/vt8500/pinctrl-wmt.c
--- linux-3.10.36/drivers/pinctrl/vt8500/pinctrl-wmt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/vt8500/pinctrl-wmt.c 2014-04-21 13:50:41.698724783 +0200
++++ linux-solidrun/drivers/pinctrl/vt8500/pinctrl-wmt.c 2014-04-24 07:58:22.288201939 +0200
@@ -276,20 +276,7 @@
if (!configs)
return -ENOMEM;
@@ -274418,9 +252801,9 @@ diff -Nur linux-3.10.36/drivers/pinctrl/vt8500/pinctrl-wmt.c linux-linaro-stable
map->type = PIN_MAP_TYPE_CONFIGS_PIN;
map->data.configs.group_or_pin = data->groups[group];
-diff -Nur linux-3.10.36/drivers/pnp/pnpacpi/rsparser.c linux-linaro-stable-mx6/drivers/pnp/pnpacpi/rsparser.c
+diff -Nur linux-3.10.36/drivers/pnp/pnpacpi/rsparser.c linux-solidrun/drivers/pnp/pnpacpi/rsparser.c
--- linux-3.10.36/drivers/pnp/pnpacpi/rsparser.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pnp/pnpacpi/rsparser.c 2014-04-21 13:50:41.710724834 +0200
++++ linux-solidrun/drivers/pnp/pnpacpi/rsparser.c 2014-04-24 07:58:22.308202010 +0200
@@ -183,7 +183,9 @@
struct resource r;
int i, flags;
@@ -274450,9 +252833,9 @@ diff -Nur linux-3.10.36/drivers/pnp/pnpacpi/rsparser.c linux-linaro-stable-mx6/d
case ACPI_RESOURCE_TYPE_DMA:
dma = &res->data.dma;
if (dma->channel_count > 0 && dma->channels[0] != (u8) -1)
-diff -Nur linux-3.10.36/drivers/power/imx6_usb_charger.c linux-linaro-stable-mx6/drivers/power/imx6_usb_charger.c
+diff -Nur linux-3.10.36/drivers/power/imx6_usb_charger.c linux-solidrun/drivers/power/imx6_usb_charger.c
--- linux-3.10.36/drivers/power/imx6_usb_charger.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/power/imx6_usb_charger.c 2014-04-21 13:50:41.714724850 +0200
++++ linux-solidrun/drivers/power/imx6_usb_charger.c 2014-04-24 07:58:22.344202136 +0200
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -274748,9 +253131,9 @@ diff -Nur linux-3.10.36/drivers/power/imx6_usb_charger.c linux-linaro-stable-mx6
+ power_supply_unregister(&charger->psy);
+}
+EXPORT_SYMBOL(imx6_usb_remove_charger);
-diff -Nur linux-3.10.36/drivers/power/Kconfig linux-linaro-stable-mx6/drivers/power/Kconfig
+diff -Nur linux-3.10.36/drivers/power/Kconfig linux-solidrun/drivers/power/Kconfig
--- linux-3.10.36/drivers/power/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/power/Kconfig 2014-04-21 13:50:41.710724834 +0200
++++ linux-solidrun/drivers/power/Kconfig 2014-04-24 07:58:22.340202121 +0200
@@ -269,6 +269,14 @@
pins based on the status of charger connections with interrupt
handlers.
@@ -274779,9 +253162,9 @@ diff -Nur linux-3.10.36/drivers/power/Kconfig linux-linaro-stable-mx6/drivers/po
source "drivers/power/reset/Kconfig"
endif # POWER_SUPPLY
-diff -Nur linux-3.10.36/drivers/power/Makefile linux-linaro-stable-mx6/drivers/power/Makefile
+diff -Nur linux-3.10.36/drivers/power/Makefile linux-solidrun/drivers/power/Makefile
--- linux-3.10.36/drivers/power/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/power/Makefile 2014-04-21 13:50:41.710724834 +0200
++++ linux-solidrun/drivers/power/Makefile 2014-04-24 07:58:22.340202121 +0200
@@ -42,6 +42,7 @@
obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o
obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o
@@ -274795,9 +253178,9 @@ diff -Nur linux-3.10.36/drivers/power/Makefile linux-linaro-stable-mx6/drivers/p
obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
obj-$(CONFIG_POWER_RESET) += reset/
+obj-$(CONFIG_IMX6_USB_CHARGER) += imx6_usb_charger.o
-diff -Nur linux-3.10.36/drivers/power/max17040_battery.c linux-linaro-stable-mx6/drivers/power/max17040_battery.c
+diff -Nur linux-3.10.36/drivers/power/max17040_battery.c linux-solidrun/drivers/power/max17040_battery.c
--- linux-3.10.36/drivers/power/max17040_battery.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/power/max17040_battery.c 2014-04-21 13:50:41.714724850 +0200
++++ linux-solidrun/drivers/power/max17040_battery.c 2014-04-24 07:58:22.344202136 +0200
@@ -148,7 +148,7 @@
{
struct max17040_chip *chip = i2c_get_clientdata(client);
@@ -274817,9 +253200,9 @@ diff -Nur linux-3.10.36/drivers/power/max17040_battery.c linux-linaro-stable-mx6
chip->status = POWER_SUPPLY_STATUS_UNKNOWN;
return;
}
-diff -Nur linux-3.10.36/drivers/power/reset/Kconfig linux-linaro-stable-mx6/drivers/power/reset/Kconfig
+diff -Nur linux-3.10.36/drivers/power/reset/Kconfig linux-solidrun/drivers/power/reset/Kconfig
--- linux-3.10.36/drivers/power/reset/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/power/reset/Kconfig 2014-04-21 13:50:41.718724867 +0200
++++ linux-solidrun/drivers/power/reset/Kconfig 2014-04-24 07:58:22.348202151 +0200
@@ -32,7 +32,8 @@
user presses a key. u-boot then boots into Linux.
@@ -274830,9 +253213,9 @@ diff -Nur linux-3.10.36/drivers/power/reset/Kconfig linux-linaro-stable-mx6/driv
depends on POWER_RESET
help
Power off and reset support for the ARM Ltd. Versatile
-diff -Nur linux-3.10.36/drivers/power/sabresd_battery.c linux-linaro-stable-mx6/drivers/power/sabresd_battery.c
+diff -Nur linux-3.10.36/drivers/power/sabresd_battery.c linux-solidrun/drivers/power/sabresd_battery.c
--- linux-3.10.36/drivers/power/sabresd_battery.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/power/sabresd_battery.c 2014-04-21 13:50:41.718724867 +0200
++++ linux-solidrun/drivers/power/sabresd_battery.c 2014-04-24 07:58:22.348202151 +0200
@@ -0,0 +1,998 @@
+/*
+ * sabresd_battery.c - Maxim 8903 USB/Adapter Charger Driver
@@ -275832,9 +254215,9 @@ diff -Nur linux-3.10.36/drivers/power/sabresd_battery.c linux-linaro-stable-mx6/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Sabresd Battery Driver");
+MODULE_ALIAS("sabresd_battery");
-diff -Nur linux-3.10.36/drivers/pwm/pwm-imx.c linux-linaro-stable-mx6/drivers/pwm/pwm-imx.c
+diff -Nur linux-3.10.36/drivers/pwm/pwm-imx.c linux-solidrun/drivers/pwm/pwm-imx.c
--- linux-3.10.36/drivers/pwm/pwm-imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pwm/pwm-imx.c 2014-04-21 13:50:41.722724884 +0200
++++ linux-solidrun/drivers/pwm/pwm-imx.c 2014-04-24 07:58:22.352202165 +0200
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -275876,9 +254259,9 @@ diff -Nur linux-3.10.36/drivers/pwm/pwm-imx.c linux-linaro-stable-mx6/drivers/pw
},
.probe = imx_pwm_probe,
.remove = imx_pwm_remove,
-diff -Nur linux-3.10.36/drivers/rapidio/devices/tsi721_dma.c linux-linaro-stable-mx6/drivers/rapidio/devices/tsi721_dma.c
+diff -Nur linux-3.10.36/drivers/rapidio/devices/tsi721_dma.c linux-solidrun/drivers/rapidio/devices/tsi721_dma.c
--- linux-3.10.36/drivers/rapidio/devices/tsi721_dma.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rapidio/devices/tsi721_dma.c 2014-04-21 13:50:41.726724901 +0200
++++ linux-solidrun/drivers/rapidio/devices/tsi721_dma.c 2014-04-24 07:58:22.424202417 +0200
@@ -206,8 +206,8 @@
{
/* Disable BDMA channel interrupts */
@@ -275954,9 +254337,9 @@ diff -Nur linux-3.10.36/drivers/rapidio/devices/tsi721_dma.c linux-linaro-stable
list_add_tail(&bdma_chan->dchan.device_node,
&mport->dma.channels);
}
-diff -Nur linux-3.10.36/drivers/rapidio/devices/tsi721.h linux-linaro-stable-mx6/drivers/rapidio/devices/tsi721.h
+diff -Nur linux-3.10.36/drivers/rapidio/devices/tsi721.h linux-solidrun/drivers/rapidio/devices/tsi721.h
--- linux-3.10.36/drivers/rapidio/devices/tsi721.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rapidio/devices/tsi721.h 2014-04-21 13:50:41.726724901 +0200
++++ linux-solidrun/drivers/rapidio/devices/tsi721.h 2014-04-24 07:58:22.424202417 +0200
@@ -678,7 +678,6 @@
struct list_head free_list;
dma_cookie_t completed_cookie;
@@ -275965,9 +254348,9 @@ diff -Nur linux-3.10.36/drivers/rapidio/devices/tsi721.h linux-linaro-stable-mx6
};
#endif /* CONFIG_RAPIDIO_DMA_ENGINE */
-diff -Nur linux-3.10.36/drivers/regulator/anatop-regulator.c linux-linaro-stable-mx6/drivers/regulator/anatop-regulator.c
+diff -Nur linux-3.10.36/drivers/regulator/anatop-regulator.c linux-solidrun/drivers/regulator/anatop-regulator.c
--- linux-3.10.36/drivers/regulator/anatop-regulator.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/anatop-regulator.c 2014-04-21 13:50:41.726724901 +0200
++++ linux-solidrun/drivers/regulator/anatop-regulator.c 2014-04-24 07:58:22.432202445 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -276093,9 +254476,9 @@ diff -Nur linux-3.10.36/drivers/regulator/anatop-regulator.c linux-linaro-stable
/* register regulator */
rdev = regulator_register(rdesc, &config);
-diff -Nur linux-3.10.36/drivers/regulator/core.c linux-linaro-stable-mx6/drivers/regulator/core.c
+diff -Nur linux-3.10.36/drivers/regulator/core.c linux-solidrun/drivers/regulator/core.c
--- linux-3.10.36/drivers/regulator/core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/core.c 2014-04-21 13:50:41.726724901 +0200
++++ linux-solidrun/drivers/regulator/core.c 2014-04-24 07:58:22.436202460 +0200
@@ -3,6 +3,7 @@
*
* Copyright 2007, 2008 Wolfson Microelectronics PLC.
@@ -276256,9 +254639,9 @@ diff -Nur linux-3.10.36/drivers/regulator/core.c linux-linaro-stable-mx6/drivers
if (ret != 0) {
rdev_err(rdev, "couldn't disable: %d\n", ret);
}
-diff -Nur linux-3.10.36/drivers/regulator/dummy.c linux-linaro-stable-mx6/drivers/regulator/dummy.c
+diff -Nur linux-3.10.36/drivers/regulator/dummy.c linux-solidrun/drivers/regulator/dummy.c
--- linux-3.10.36/drivers/regulator/dummy.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/dummy.c 2014-04-21 13:50:41.730724918 +0200
++++ linux-solidrun/drivers/regulator/dummy.c 2014-04-24 07:58:22.436202460 +0200
@@ -44,6 +44,7 @@
config.dev = &pdev->dev;
@@ -276267,9 +254650,9 @@ diff -Nur linux-3.10.36/drivers/regulator/dummy.c linux-linaro-stable-mx6/driver
dummy_regulator_rdev = regulator_register(&dummy_desc, &config);
if (IS_ERR(dummy_regulator_rdev)) {
-diff -Nur linux-3.10.36/drivers/regulator/fixed.c linux-linaro-stable-mx6/drivers/regulator/fixed.c
+diff -Nur linux-3.10.36/drivers/regulator/fixed.c linux-solidrun/drivers/regulator/fixed.c
--- linux-3.10.36/drivers/regulator/fixed.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/fixed.c 2014-04-21 13:50:41.730724918 +0200
++++ linux-solidrun/drivers/regulator/fixed.c 2014-04-24 07:58:22.436202460 +0200
@@ -188,8 +188,7 @@
drvdata->microvolts = config->microvolts;
@@ -276280,9 +254663,9 @@ diff -Nur linux-3.10.36/drivers/regulator/fixed.c linux-linaro-stable-mx6/driver
cfg.ena_gpio_invert = !config->enable_high;
if (config->enabled_at_boot) {
if (config->enable_high) {
-diff -Nur linux-3.10.36/drivers/regulator/Kconfig linux-linaro-stable-mx6/drivers/regulator/Kconfig
+diff -Nur linux-3.10.36/drivers/regulator/Kconfig linux-solidrun/drivers/regulator/Kconfig
--- linux-3.10.36/drivers/regulator/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/Kconfig 2014-04-21 13:50:41.726724901 +0200
++++ linux-solidrun/drivers/regulator/Kconfig 2014-04-24 07:58:22.432202445 +0200
@@ -178,6 +178,10 @@
regulator via I2C bus. The provided regulator is suitable
for PXA27x chips to control VCC_CORE and VCC_USIM voltages.
@@ -276309,9 +254692,9 @@ diff -Nur linux-3.10.36/drivers/regulator/Kconfig linux-linaro-stable-mx6/driver
config REGULATOR_RC5T583
tristate "RICOH RC5T583 Power regulators"
depends on MFD_RC5T583
-diff -Nur linux-3.10.36/drivers/regulator/Makefile linux-linaro-stable-mx6/drivers/regulator/Makefile
+diff -Nur linux-3.10.36/drivers/regulator/Makefile linux-solidrun/drivers/regulator/Makefile
--- linux-3.10.36/drivers/regulator/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/Makefile 2014-04-21 13:50:41.726724901 +0200
++++ linux-solidrun/drivers/regulator/Makefile 2014-04-24 07:58:22.432202445 +0200
@@ -32,6 +32,7 @@
obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o
obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o
@@ -276328,9 +254711,9 @@ diff -Nur linux-3.10.36/drivers/regulator/Makefile linux-linaro-stable-mx6/drive
obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
-diff -Nur linux-3.10.36/drivers/regulator/max17135-regulator.c linux-linaro-stable-mx6/drivers/regulator/max17135-regulator.c
+diff -Nur linux-3.10.36/drivers/regulator/max17135-regulator.c linux-solidrun/drivers/regulator/max17135-regulator.c
--- linux-3.10.36/drivers/regulator/max17135-regulator.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/regulator/max17135-regulator.c 2014-04-21 13:50:41.730724918 +0200
++++ linux-solidrun/drivers/regulator/max17135-regulator.c 2014-04-24 07:58:22.436202460 +0200
@@ -0,0 +1,838 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -277170,9 +255553,9 @@ diff -Nur linux-3.10.36/drivers/regulator/max17135-regulator.c linux-linaro-stab
+/* Module information */
+MODULE_DESCRIPTION("MAX17135 regulator driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/regulator/pfuze100-regulator.c linux-linaro-stable-mx6/drivers/regulator/pfuze100-regulator.c
+diff -Nur linux-3.10.36/drivers/regulator/pfuze100-regulator.c linux-solidrun/drivers/regulator/pfuze100-regulator.c
--- linux-3.10.36/drivers/regulator/pfuze100-regulator.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/regulator/pfuze100-regulator.c 2014-04-21 13:50:41.734724935 +0200
++++ linux-solidrun/drivers/regulator/pfuze100-regulator.c 2014-04-24 07:58:22.440202474 +0200
@@ -0,0 +1,445 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -277619,9 +256002,9 @@ diff -Nur linux-3.10.36/drivers/regulator/pfuze100-regulator.c linux-linaro-stab
+MODULE_DESCRIPTION("Regulator Driver for Freescale PFUZE100 PMIC");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("i2c:pfuze100-regulator");
-diff -Nur linux-3.10.36/drivers/reset/gpio-reset.c linux-linaro-stable-mx6/drivers/reset/gpio-reset.c
+diff -Nur linux-3.10.36/drivers/reset/gpio-reset.c linux-solidrun/drivers/reset/gpio-reset.c
--- linux-3.10.36/drivers/reset/gpio-reset.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/reset/gpio-reset.c 2014-04-21 13:50:41.738724952 +0200
++++ linux-solidrun/drivers/reset/gpio-reset.c 2014-04-24 07:58:22.444202488 +0200
@@ -0,0 +1,187 @@
+/*
+ * GPIO Reset Controller driver
@@ -277810,9 +256193,9 @@ diff -Nur linux-3.10.36/drivers/reset/gpio-reset.c linux-linaro-stable-mx6/drive
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:gpio-reset");
+MODULE_DEVICE_TABLE(of, gpio_reset_dt_ids);
-diff -Nur linux-3.10.36/drivers/reset/Kconfig linux-linaro-stable-mx6/drivers/reset/Kconfig
+diff -Nur linux-3.10.36/drivers/reset/Kconfig linux-solidrun/drivers/reset/Kconfig
--- linux-3.10.36/drivers/reset/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/reset/Kconfig 2014-04-21 13:50:41.738724952 +0200
++++ linux-solidrun/drivers/reset/Kconfig 2014-04-24 07:58:22.444202488 +0200
@@ -11,3 +11,15 @@
via GPIOs or SoC-internal reset controller modules.
@@ -277829,15 +256212,15 @@ diff -Nur linux-3.10.36/drivers/reset/Kconfig linux-linaro-stable-mx6/drivers/re
+ directly by GPIOs.
+
+endif
-diff -Nur linux-3.10.36/drivers/reset/Makefile linux-linaro-stable-mx6/drivers/reset/Makefile
+diff -Nur linux-3.10.36/drivers/reset/Makefile linux-solidrun/drivers/reset/Makefile
--- linux-3.10.36/drivers/reset/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/reset/Makefile 2014-04-21 13:50:41.738724952 +0200
++++ linux-solidrun/drivers/reset/Makefile 2014-04-24 07:58:22.444202488 +0200
@@ -1 +1,2 @@
obj-$(CONFIG_RESET_CONTROLLER) += core.o
+obj-$(CONFIG_RESET_GPIO) += gpio-reset.o
-diff -Nur linux-3.10.36/drivers/rtc/class.c linux-linaro-stable-mx6/drivers/rtc/class.c
+diff -Nur linux-3.10.36/drivers/rtc/class.c linux-solidrun/drivers/rtc/class.c
--- linux-3.10.36/drivers/rtc/class.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rtc/class.c 2014-04-21 13:50:41.738724952 +0200
++++ linux-solidrun/drivers/rtc/class.c 2014-04-24 07:58:22.448202501 +0200
@@ -14,6 +14,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -277919,9 +256302,9 @@ diff -Nur linux-3.10.36/drivers/rtc/class.c linux-linaro-stable-mx6/drivers/rtc/
rtc_dev_init();
rtc_sysfs_init(rtc_class);
return 0;
-diff -Nur linux-3.10.36/drivers/rtc/interface.c linux-linaro-stable-mx6/drivers/rtc/interface.c
+diff -Nur linux-3.10.36/drivers/rtc/interface.c linux-solidrun/drivers/rtc/interface.c
--- linux-3.10.36/drivers/rtc/interface.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rtc/interface.c 2014-04-21 13:50:41.738724952 +0200
++++ linux-solidrun/drivers/rtc/interface.c 2014-04-24 07:58:22.448202501 +0200
@@ -109,9 +109,9 @@
err = rtc->ops->set_time(rtc->dev.parent,
&new);
@@ -278004,9 +256387,9 @@ diff -Nur linux-3.10.36/drivers/rtc/interface.c linux-linaro-stable-mx6/drivers/
{
int ret = 0;
mutex_lock(&rtc->ops_lock);
-diff -Nur linux-3.10.36/drivers/rtc/rtc-pcf8523.c linux-linaro-stable-mx6/drivers/rtc/rtc-pcf8523.c
+diff -Nur linux-3.10.36/drivers/rtc/rtc-pcf8523.c linux-solidrun/drivers/rtc/rtc-pcf8523.c
--- linux-3.10.36/drivers/rtc/rtc-pcf8523.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rtc/rtc-pcf8523.c 2014-04-21 13:50:41.746724985 +0200
++++ linux-solidrun/drivers/rtc/rtc-pcf8523.c 2014-04-24 07:58:22.456202531 +0200
@@ -7,6 +7,7 @@
*/
@@ -278158,9 +256541,9 @@ diff -Nur linux-3.10.36/drivers/rtc/rtc-pcf8523.c linux-linaro-stable-mx6/driver
.id_table = pcf8523_id,
};
module_i2c_driver(pcf8523_driver);
-diff -Nur linux-3.10.36/drivers/rtc/rtc-snvs.c linux-linaro-stable-mx6/drivers/rtc/rtc-snvs.c
+diff -Nur linux-3.10.36/drivers/rtc/rtc-snvs.c linux-solidrun/drivers/rtc/rtc-snvs.c
--- linux-3.10.36/drivers/rtc/rtc-snvs.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rtc/rtc-snvs.c 2014-04-21 13:50:41.750725002 +0200
++++ linux-solidrun/drivers/rtc/rtc-snvs.c 2014-04-24 07:58:22.456202531 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
@@ -278223,9 +256606,9 @@ diff -Nur linux-3.10.36/drivers/rtc/rtc-snvs.c linux-linaro-stable-mx6/drivers/r
return 0;
}
-diff -Nur linux-3.10.36/drivers/s390/block/dasd.c linux-linaro-stable-mx6/drivers/s390/block/dasd.c
+diff -Nur linux-3.10.36/drivers/s390/block/dasd.c linux-solidrun/drivers/s390/block/dasd.c
--- linux-3.10.36/drivers/s390/block/dasd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/s390/block/dasd.c 2014-04-21 13:50:41.750725002 +0200
++++ linux-solidrun/drivers/s390/block/dasd.c 2014-04-24 07:58:22.460202545 +0200
@@ -2879,12 +2879,12 @@
elevator_exit(block->request_queue->elevator);
@@ -278243,9 +256626,9 @@ diff -Nur linux-3.10.36/drivers/s390/block/dasd.c linux-linaro-stable-mx6/driver
}
/*
-diff -Nur linux-3.10.36/drivers/scsi/isci/host.h linux-linaro-stable-mx6/drivers/scsi/isci/host.h
+diff -Nur linux-3.10.36/drivers/scsi/isci/host.h linux-solidrun/drivers/scsi/isci/host.h
--- linux-3.10.36/drivers/scsi/isci/host.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/scsi/isci/host.h 2014-04-21 13:50:41.858725458 +0200
++++ linux-solidrun/drivers/scsi/isci/host.h 2014-04-24 07:58:22.688203347 +0200
@@ -311,8 +311,9 @@
}
@@ -278258,9 +256641,9 @@ diff -Nur linux-3.10.36/drivers/scsi/isci/host.h linux-linaro-stable-mx6/drivers
static inline void wait_for_start(struct isci_host *ihost)
{
-diff -Nur linux-3.10.36/drivers/scsi/isci/port_config.c linux-linaro-stable-mx6/drivers/scsi/isci/port_config.c
+diff -Nur linux-3.10.36/drivers/scsi/isci/port_config.c linux-solidrun/drivers/scsi/isci/port_config.c
--- linux-3.10.36/drivers/scsi/isci/port_config.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/scsi/isci/port_config.c 2014-04-21 13:50:41.862725474 +0200
++++ linux-solidrun/drivers/scsi/isci/port_config.c 2014-04-24 07:58:22.688203347 +0200
@@ -615,6 +615,13 @@
SCIC_SDS_APC_WAIT_LINK_UP_NOTIFICATION);
} else {
@@ -278275,9 +256658,9 @@ diff -Nur linux-3.10.36/drivers/scsi/isci/port_config.c linux-linaro-stable-mx6/
port_agent->phy_ready_mask |= 1 << phy_index;
sci_port_link_up(iport, iphy);
}
-diff -Nur linux-3.10.36/drivers/scsi/isci/task.c linux-linaro-stable-mx6/drivers/scsi/isci/task.c
+diff -Nur linux-3.10.36/drivers/scsi/isci/task.c linux-solidrun/drivers/scsi/isci/task.c
--- linux-3.10.36/drivers/scsi/isci/task.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/scsi/isci/task.c 2014-04-21 13:50:41.866725492 +0200
++++ linux-solidrun/drivers/scsi/isci/task.c 2014-04-24 07:58:22.696203375 +0200
@@ -801,7 +801,7 @@
/* XXX: need to cleanup any ireqs targeting this
* domain_device
@@ -278287,9 +256670,9 @@ diff -Nur linux-3.10.36/drivers/scsi/isci/task.c linux-linaro-stable-mx6/drivers
goto out;
}
-diff -Nur linux-3.10.36/drivers/scsi/qla2xxx/qla_def.h linux-linaro-stable-mx6/drivers/scsi/qla2xxx/qla_def.h
+diff -Nur linux-3.10.36/drivers/scsi/qla2xxx/qla_def.h linux-solidrun/drivers/scsi/qla2xxx/qla_def.h
--- linux-3.10.36/drivers/scsi/qla2xxx/qla_def.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/scsi/qla2xxx/qla_def.h 2014-04-21 13:50:41.914725694 +0200
++++ linux-solidrun/drivers/scsi/qla2xxx/qla_def.h 2014-04-24 07:58:23.312205541 +0200
@@ -2980,7 +2980,8 @@
IS_QLA25XX(ha) || IS_QLA81XX(ha) || \
IS_QLA82XX(ha) || IS_QLA83XX(ha))
@@ -278300,9 +256683,9 @@ diff -Nur linux-3.10.36/drivers/scsi/qla2xxx/qla_def.h linux-linaro-stable-mx6/d
#define IS_FAC_REQUIRED(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))
#define IS_NOCACHE_VPD_TYPE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))
#define IS_ALOGIO_CAPABLE(ha) (IS_QLA23XX(ha) || IS_FWI2_CAPABLE(ha))
-diff -Nur linux-3.10.36/drivers/scsi/qla2xxx/qla_target.c linux-linaro-stable-mx6/drivers/scsi/qla2xxx/qla_target.c
+diff -Nur linux-3.10.36/drivers/scsi/qla2xxx/qla_target.c linux-solidrun/drivers/scsi/qla2xxx/qla_target.c
--- linux-3.10.36/drivers/scsi/qla2xxx/qla_target.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/scsi/qla2xxx/qla_target.c 2014-04-21 13:50:41.922725727 +0200
++++ linux-solidrun/drivers/scsi/qla2xxx/qla_target.c 2014-04-24 07:58:23.324205585 +0200
@@ -3339,8 +3339,7 @@
ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02c,
"SRR cmd %p (se_cmd %p, tag %d, op %x), "
@@ -278313,9 +256696,9 @@ diff -Nur linux-3.10.36/drivers/scsi/qla2xxx/qla_target.c linux-linaro-stable-mx
qlt_handle_srr(vha, sctio, imm);
-diff -Nur linux-3.10.36/drivers/scsi/storvsc_drv.c linux-linaro-stable-mx6/drivers/scsi/storvsc_drv.c
+diff -Nur linux-3.10.36/drivers/scsi/storvsc_drv.c linux-solidrun/drivers/scsi/storvsc_drv.c
--- linux-3.10.36/drivers/scsi/storvsc_drv.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/scsi/storvsc_drv.c 2014-04-21 13:50:41.938725795 +0200
++++ linux-solidrun/drivers/scsi/storvsc_drv.c 2014-04-24 07:58:23.372205753 +0200
@@ -1189,9 +1189,6 @@
{
struct stor_mem_pools *memp = sdevice->hostdata;
@@ -278326,9 +256709,9 @@ diff -Nur linux-3.10.36/drivers/scsi/storvsc_drv.c linux-linaro-stable-mx6/drive
mempool_destroy(memp->request_mempool);
kmem_cache_destroy(memp->request_pool);
kfree(memp);
-diff -Nur linux-3.10.36/drivers/spi/spi-altera.c linux-linaro-stable-mx6/drivers/spi/spi-altera.c
+diff -Nur linux-3.10.36/drivers/spi/spi-altera.c linux-solidrun/drivers/spi/spi-altera.c
--- linux-3.10.36/drivers/spi/spi-altera.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-altera.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-altera.c 2014-04-24 07:58:23.448206021 +0200
@@ -103,16 +103,6 @@
}
}
@@ -278380,9 +256763,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-altera.c linux-linaro-stable-mx6/drivers
spi_master_put(master);
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-ath79.c linux-linaro-stable-mx6/drivers/spi/spi-ath79.c
+diff -Nur linux-3.10.36/drivers/spi/spi-ath79.c linux-solidrun/drivers/spi/spi-ath79.c
--- linux-3.10.36/drivers/spi/spi-ath79.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-ath79.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-ath79.c 2014-04-24 07:58:23.448206021 +0200
@@ -132,9 +132,9 @@
flags = GPIOF_DIR_OUT;
@@ -278438,9 +256821,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-ath79.c linux-linaro-stable-mx6/drivers/
spi_master_put(sp->bitbang.master);
return 0;
-diff -Nur linux-3.10.36/drivers/spi/spi-atmel.c linux-linaro-stable-mx6/drivers/spi/spi-atmel.c
+diff -Nur linux-3.10.36/drivers/spi/spi-atmel.c linux-solidrun/drivers/spi/spi-atmel.c
--- linux-3.10.36/drivers/spi/spi-atmel.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-atmel.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-atmel.c 2014-04-24 07:58:23.448206021 +0200
@@ -1268,13 +1268,6 @@
return -EINVAL;
}
@@ -278464,9 +256847,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-atmel.c linux-linaro-stable-mx6/drivers/
master->dev.of_node = pdev->dev.of_node;
master->bus_num = pdev->id;
master->num_chipselect = master->dev.of_node ? 0 : 4;
-diff -Nur linux-3.10.36/drivers/spi/spi-au1550.c linux-linaro-stable-mx6/drivers/spi/spi-au1550.c
+diff -Nur linux-3.10.36/drivers/spi/spi-au1550.c linux-solidrun/drivers/spi/spi-au1550.c
--- linux-3.10.36/drivers/spi/spi-au1550.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-au1550.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-au1550.c 2014-04-24 07:58:23.448206021 +0200
@@ -248,11 +248,6 @@
hz = t->speed_hz;
}
@@ -278509,9 +256892,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-au1550.c linux-linaro-stable-mx6/drivers
spi_master_put(hw->master);
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-bcm63xx.c linux-linaro-stable-mx6/drivers/spi/spi-bcm63xx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-bcm63xx.c linux-solidrun/drivers/spi/spi-bcm63xx.c
--- linux-3.10.36/drivers/spi/spi-bcm63xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-bcm63xx.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-bcm63xx.c 2014-04-24 07:58:23.448206021 +0200
@@ -124,17 +124,6 @@
/* the spi->mode bits understood by this driver: */
#define MODEBITS (SPI_CPOL | SPI_CPHA)
@@ -278574,9 +256957,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-bcm63xx.c linux-linaro-stable-mx6/driver
spi_master_put(master);
return 0;
-diff -Nur linux-3.10.36/drivers/spi/spi-bfin5xx.c linux-linaro-stable-mx6/drivers/spi/spi-bfin5xx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-bfin5xx.c linux-solidrun/drivers/spi/spi-bfin5xx.c
--- linux-3.10.36/drivers/spi/spi-bfin5xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-bfin5xx.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-bfin5xx.c 2014-04-24 07:58:23.448206021 +0200
@@ -643,21 +643,16 @@
/* Bits per word setup */
@@ -278649,9 +257032,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-bfin5xx.c linux-linaro-stable-mx6/driver
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-bfin-sport.c linux-linaro-stable-mx6/drivers/spi/spi-bfin-sport.c
+diff -Nur linux-3.10.36/drivers/spi/spi-bfin-sport.c linux-solidrun/drivers/spi/spi-bfin-sport.c
--- linux-3.10.36/drivers/spi/spi-bfin-sport.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-bfin-sport.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-bfin-sport.c 2014-04-24 07:58:23.448206021 +0200
@@ -417,7 +417,7 @@
/* Bits per word setup */
@@ -278693,9 +257076,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-bfin-sport.c linux-linaro-stable-mx6/dri
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-bitbang.c linux-linaro-stable-mx6/drivers/spi/spi-bitbang.c
+diff -Nur linux-3.10.36/drivers/spi/spi-bitbang.c linux-solidrun/drivers/spi/spi-bitbang.c
--- linux-3.10.36/drivers/spi/spi-bitbang.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-bitbang.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-bitbang.c 2014-04-24 07:58:23.448206021 +0200
@@ -40,7 +40,7 @@
* to glue code. These bitbang setup() and cleanup() routines are always
* used, though maybe they're called from controller-aware code.
@@ -279057,9 +257440,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-bitbang.c linux-linaro-stable-mx6/driver
return 0;
}
EXPORT_SYMBOL_GPL(spi_bitbang_stop);
-diff -Nur linux-3.10.36/drivers/spi/spi-butterfly.c linux-linaro-stable-mx6/drivers/spi/spi-butterfly.c
+diff -Nur linux-3.10.36/drivers/spi/spi-butterfly.c linux-solidrun/drivers/spi/spi-butterfly.c
--- linux-3.10.36/drivers/spi/spi-butterfly.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-butterfly.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-butterfly.c 2014-04-24 07:58:23.448206021 +0200
@@ -225,7 +225,7 @@
master->bus_num = 42;
master->num_chipselect = 2;
@@ -279069,9 +257452,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-butterfly.c linux-linaro-stable-mx6/driv
pp->bitbang.chipselect = butterfly_chipselect;
pp->bitbang.txrx_word[SPI_MODE_0] = butterfly_txrx_word_mode0;
-diff -Nur linux-3.10.36/drivers/spi/spi.c linux-linaro-stable-mx6/drivers/spi/spi.c
+diff -Nur linux-3.10.36/drivers/spi/spi.c linux-solidrun/drivers/spi/spi.c
--- linux-3.10.36/drivers/spi/spi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi.c 2014-04-24 07:58:23.456206049 +0200
@@ -39,6 +39,9 @@
#include <linux/ioport.h>
#include <linux/acpi.h>
@@ -279690,9 +258073,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi.c linux-linaro-stable-mx6/drivers/spi/sp
if (n_tx) {
x[0].len = n_tx;
spi_message_add_tail(&x[0], &message);
-diff -Nur linux-3.10.36/drivers/spi/spi-clps711x.c linux-linaro-stable-mx6/drivers/spi/spi-clps711x.c
+diff -Nur linux-3.10.36/drivers/spi/spi-clps711x.c linux-solidrun/drivers/spi/spi-clps711x.c
--- linux-3.10.36/drivers/spi/spi-clps711x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-clps711x.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-clps711x.c 2014-04-24 07:58:23.448206021 +0200
@@ -42,12 +42,6 @@
{
struct spi_clps711x_data *hw = spi_master_get_devdata(spi->master);
@@ -279730,9 +258113,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-clps711x.c linux-linaro-stable-mx6/drive
spi_unregister_master(master);
kfree(master);
-diff -Nur linux-3.10.36/drivers/spi/spi-coldfire-qspi.c linux-linaro-stable-mx6/drivers/spi/spi-coldfire-qspi.c
+diff -Nur linux-3.10.36/drivers/spi/spi-coldfire-qspi.c linux-solidrun/drivers/spi/spi-coldfire-qspi.c
--- linux-3.10.36/drivers/spi/spi-coldfire-qspi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-coldfire-qspi.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-coldfire-qspi.c 2014-04-24 07:58:23.448206021 +0200
@@ -312,10 +312,7 @@
bool cs_high = spi->mode & SPI_CS_HIGH;
u16 qmr = MCFQSPI_QMR_MSTR;
@@ -279773,9 +258156,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-coldfire-qspi.c linux-linaro-stable-mx6/
mcfqspi_cs_teardown(mcfqspi);
clk_disable(mcfqspi->clk);
clk_put(mcfqspi->clk);
-diff -Nur linux-3.10.36/drivers/spi/spi-davinci.c linux-linaro-stable-mx6/drivers/spi/spi-davinci.c
+diff -Nur linux-3.10.36/drivers/spi/spi-davinci.c linux-solidrun/drivers/spi/spi-davinci.c
--- linux-3.10.36/drivers/spi/spi-davinci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-davinci.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-davinci.c 2014-04-24 07:58:23.448206021 +0200
@@ -299,16 +299,15 @@
* Assign function pointer to appropriate transfer method
* 8bit, 16bit or 32bit transfer
@@ -279852,9 +258235,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-davinci.c linux-linaro-stable-mx6/driver
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-dw.c linux-linaro-stable-mx6/drivers/spi/spi-dw.c
+diff -Nur linux-3.10.36/drivers/spi/spi-dw.c linux-solidrun/drivers/spi/spi-dw.c
--- linux-3.10.36/drivers/spi/spi-dw.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-dw.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-dw.c 2014-04-24 07:58:23.448206021 +0200
@@ -457,19 +457,7 @@
}
if (transfer->bits_per_word) {
@@ -279913,9 +258296,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-dw.c linux-linaro-stable-mx6/drivers/spi
master->bus_num = dws->bus_num;
master->num_chipselect = dws->num_cs;
master->cleanup = dw_spi_cleanup;
-diff -Nur linux-3.10.36/drivers/spi/spi-dw-mmio.c linux-linaro-stable-mx6/drivers/spi/spi-dw-mmio.c
+diff -Nur linux-3.10.36/drivers/spi/spi-dw-mmio.c linux-solidrun/drivers/spi/spi-dw-mmio.c
--- linux-3.10.36/drivers/spi/spi-dw-mmio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-dw-mmio.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-dw-mmio.c 2014-04-24 07:58:23.448206021 +0200
@@ -111,8 +111,6 @@
struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
struct resource *mem;
@@ -279925,9 +258308,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-dw-mmio.c linux-linaro-stable-mx6/driver
clk_disable(dwsmmio->clk);
clk_put(dwsmmio->clk);
dwsmmio->clk = NULL;
-diff -Nur linux-3.10.36/drivers/spi/spi-ep93xx.c linux-linaro-stable-mx6/drivers/spi/spi-ep93xx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-ep93xx.c linux-solidrun/drivers/spi/spi-ep93xx.c
--- linux-3.10.36/drivers/spi/spi-ep93xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-ep93xx.c 2014-04-21 13:50:41.950725846 +0200
++++ linux-solidrun/drivers/spi/spi-ep93xx.c 2014-04-24 07:58:23.452206035 +0200
@@ -296,12 +296,6 @@
struct ep93xx_spi *espi = spi_master_get_devdata(spi->master);
struct ep93xx_spi_chip *chip;
@@ -279976,9 +258359,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-ep93xx.c linux-linaro-stable-mx6/drivers
spi_unregister_master(master);
return 0;
-diff -Nur linux-3.10.36/drivers/spi/spi-fsl-espi.c linux-linaro-stable-mx6/drivers/spi/spi-fsl-espi.c
+diff -Nur linux-3.10.36/drivers/spi/spi-fsl-espi.c linux-solidrun/drivers/spi/spi-fsl-espi.c
--- linux-3.10.36/drivers/spi/spi-fsl-espi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-fsl-espi.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-fsl-espi.c 2014-04-24 07:58:23.452206035 +0200
@@ -144,10 +144,6 @@
if (!bits_per_word)
bits_per_word = spi->bits_per_word;
@@ -280012,9 +258395,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-fsl-espi.c linux-linaro-stable-mx6/drive
master->setup = fsl_espi_setup;
mpc8xxx_spi = spi_master_get_devdata(master);
-diff -Nur linux-3.10.36/drivers/spi/spi-gpio.c linux-linaro-stable-mx6/drivers/spi/spi-gpio.c
+diff -Nur linux-3.10.36/drivers/spi/spi-gpio.c linux-solidrun/drivers/spi/spi-gpio.c
--- linux-3.10.36/drivers/spi/spi-gpio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-gpio.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-gpio.c 2014-04-24 07:58:23.452206035 +0200
@@ -239,9 +239,6 @@
struct spi_gpio *spi_gpio = spi_to_spi_gpio(spi);
struct device_node *np = spi->master->dev.of_node;
@@ -280067,9 +258450,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-gpio.c linux-linaro-stable-mx6/drivers/s
return status;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-imx.c linux-linaro-stable-mx6/drivers/spi/spi-imx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-imx.c linux-solidrun/drivers/spi/spi-imx.c
--- linux-3.10.36/drivers/spi/spi-imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-imx.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-imx.c 2014-04-24 07:58:23.452206035 +0200
@@ -37,7 +37,6 @@
#include <linux/of.h>
#include <linux/of_device.h>
@@ -280316,9 +258699,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-imx.c linux-linaro-stable-mx6/drivers/sp
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-lm70llp.c linux-linaro-stable-mx6/drivers/spi/spi-lm70llp.c
+diff -Nur linux-3.10.36/drivers/spi/spi-lm70llp.c linux-solidrun/drivers/spi/spi-lm70llp.c
--- linux-3.10.36/drivers/spi/spi-lm70llp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-lm70llp.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-lm70llp.c 2014-04-24 07:58:23.452206035 +0200
@@ -222,7 +222,7 @@
/*
* SPI and bitbang hookup.
@@ -280328,9 +258711,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-lm70llp.c linux-linaro-stable-mx6/driver
pp->bitbang.chipselect = lm70_chipselect;
pp->bitbang.txrx_word[SPI_MODE_0] = lm70_txrx;
pp->bitbang.flags = SPI_3WIRE;
-diff -Nur linux-3.10.36/drivers/spi/spi-mxs.c linux-linaro-stable-mx6/drivers/spi/spi-mxs.c
+diff -Nur linux-3.10.36/drivers/spi/spi-mxs.c linux-solidrun/drivers/spi/spi-mxs.c
--- linux-3.10.36/drivers/spi/spi-mxs.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-mxs.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-mxs.c 2014-04-24 07:58:23.452206035 +0200
@@ -75,12 +75,6 @@
if (t && t->bits_per_word)
bits_per_word = t->bits_per_word;
@@ -280352,9 +258735,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-mxs.c linux-linaro-stable-mx6/drivers/sp
master->mode_bits = SPI_CPOL | SPI_CPHA;
master->num_chipselect = 3;
master->dev.of_node = np;
-diff -Nur linux-3.10.36/drivers/spi/spi-nuc900.c linux-linaro-stable-mx6/drivers/spi/spi-nuc900.c
+diff -Nur linux-3.10.36/drivers/spi/spi-nuc900.c linux-solidrun/drivers/spi/spi-nuc900.c
--- linux-3.10.36/drivers/spi/spi-nuc900.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-nuc900.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-nuc900.c 2014-04-24 07:58:23.452206035 +0200
@@ -174,17 +174,6 @@
spin_unlock_irqrestore(&hw->lock, flags);
}
@@ -280384,9 +258767,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-nuc900.c linux-linaro-stable-mx6/drivers
hw->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (hw->res == NULL) {
-diff -Nur linux-3.10.36/drivers/spi/spi-oc-tiny.c linux-linaro-stable-mx6/drivers/spi/spi-oc-tiny.c
+diff -Nur linux-3.10.36/drivers/spi/spi-oc-tiny.c linux-solidrun/drivers/spi/spi-oc-tiny.c
--- linux-3.10.36/drivers/spi/spi-oc-tiny.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-oc-tiny.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-oc-tiny.c 2014-04-24 07:58:23.452206035 +0200
@@ -306,7 +306,7 @@
platform_set_drvdata(pdev, hw);
@@ -280412,9 +258795,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-oc-tiny.c linux-linaro-stable-mx6/driver
spi_master_put(master);
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-omap-100k.c linux-linaro-stable-mx6/drivers/spi/spi-omap-100k.c
+diff -Nur linux-3.10.36/drivers/spi/spi-omap-100k.c linux-solidrun/drivers/spi/spi-omap-100k.c
--- linux-3.10.36/drivers/spi/spi-omap-100k.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-omap-100k.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-omap-100k.c 2014-04-24 07:58:23.452206035 +0200
@@ -298,12 +298,6 @@
struct omap1_spi100k *spi100k;
struct omap1_spi100k_cs *cs = spi->controller_state;
@@ -280448,9 +258831,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-omap-100k.c linux-linaro-stable-mx6/driv
dev_set_drvdata(&pdev->dev, master);
-diff -Nur linux-3.10.36/drivers/spi/spi-omap2-mcspi.c linux-linaro-stable-mx6/drivers/spi/spi-omap2-mcspi.c
+diff -Nur linux-3.10.36/drivers/spi/spi-omap2-mcspi.c linux-solidrun/drivers/spi/spi-omap2-mcspi.c
--- linux-3.10.36/drivers/spi/spi-omap2-mcspi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-omap2-mcspi.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-omap2-mcspi.c 2014-04-24 07:58:23.452206035 +0200
@@ -857,12 +857,6 @@
struct omap2_mcspi_dma *mcspi_dma;
struct omap2_mcspi_cs *cs = spi->controller_state;
@@ -280485,9 +258868,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-omap2-mcspi.c linux-linaro-stable-mx6/dr
master->setup = omap2_mcspi_setup;
master->prepare_transfer_hardware = omap2_prepare_transfer;
master->unprepare_transfer_hardware = omap2_unprepare_transfer;
-diff -Nur linux-3.10.36/drivers/spi/spi-ppc4xx.c linux-linaro-stable-mx6/drivers/spi/spi-ppc4xx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-ppc4xx.c linux-solidrun/drivers/spi/spi-ppc4xx.c
--- linux-3.10.36/drivers/spi/spi-ppc4xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-ppc4xx.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-ppc4xx.c 2014-04-24 07:58:23.452206035 +0200
@@ -190,12 +190,6 @@
speed = min(t->speed_hz, spi->max_speed_hz);
}
@@ -280522,9 +258905,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-ppc4xx.c linux-linaro-stable-mx6/drivers
/* the spi->mode bits understood by this driver: */
bbp->master->mode_bits =
-diff -Nur linux-3.10.36/drivers/spi/spi-pxa2xx.c linux-linaro-stable-mx6/drivers/spi/spi-pxa2xx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-pxa2xx.c linux-solidrun/drivers/spi/spi-pxa2xx.c
--- linux-3.10.36/drivers/spi/spi-pxa2xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-pxa2xx.c 2014-04-21 13:50:41.954725862 +0200
++++ linux-solidrun/drivers/spi/spi-pxa2xx.c 2014-04-24 07:58:23.456206049 +0200
@@ -881,21 +881,6 @@
rx_thres = RX_THRESH_DFLT;
}
@@ -280581,9 +258964,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-pxa2xx.c linux-linaro-stable-mx6/drivers
return 0;
}
-diff -Nur linux-3.10.36/drivers/spi/spi-s3c64xx.c linux-linaro-stable-mx6/drivers/spi/spi-s3c64xx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-s3c64xx.c linux-solidrun/drivers/spi/spi-s3c64xx.c
--- linux-3.10.36/drivers/spi/spi-s3c64xx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-s3c64xx.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi-s3c64xx.c 2014-04-24 07:58:23.456206049 +0200
@@ -1314,7 +1314,8 @@
master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer;
master->num_chipselect = sci->num_cs;
@@ -280610,9 +258993,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-s3c64xx.c linux-linaro-stable-mx6/driver
spi_master_put(master);
return 0;
-diff -Nur linux-3.10.36/drivers/spi/spi-sirf.c linux-linaro-stable-mx6/drivers/spi/spi-sirf.c
+diff -Nur linux-3.10.36/drivers/spi/spi-sirf.c linux-solidrun/drivers/spi/spi-sirf.c
--- linux-3.10.36/drivers/spi/spi-sirf.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-sirf.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi-sirf.c 2014-04-24 07:58:23.456206049 +0200
@@ -425,10 +425,6 @@
rxfifo_ctrl = SIRFSOC_SPI_FIFO_THD(SIRFSOC_SPI_FIFO_SIZE / 2) |
SIRFSOC_SPI_FIFO_WIDTH_DWORD;
@@ -280640,9 +259023,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-sirf.c linux-linaro-stable-mx6/drivers/s
sspi->bitbang.master->dev.of_node = pdev->dev.of_node;
sspi->p = pinctrl_get_select_default(&pdev->dev);
-diff -Nur linux-3.10.36/drivers/spi/spi-ti-ssp.c linux-linaro-stable-mx6/drivers/spi/spi-ti-ssp.c
+diff -Nur linux-3.10.36/drivers/spi/spi-ti-ssp.c linux-solidrun/drivers/spi/spi-ti-ssp.c
--- linux-3.10.36/drivers/spi/spi-ti-ssp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-ti-ssp.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi-ti-ssp.c 2014-04-24 07:58:23.456206049 +0200
@@ -237,14 +237,6 @@
spin_unlock(&hw->lock);
}
@@ -280681,9 +259064,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-ti-ssp.c linux-linaro-stable-mx6/drivers
master->transfer = ti_ssp_spi_transfer;
error = spi_register_master(master);
-diff -Nur linux-3.10.36/drivers/spi/spi-topcliff-pch.c linux-linaro-stable-mx6/drivers/spi/spi-topcliff-pch.c
+diff -Nur linux-3.10.36/drivers/spi/spi-topcliff-pch.c linux-solidrun/drivers/spi/spi-topcliff-pch.c
--- linux-3.10.36/drivers/spi/spi-topcliff-pch.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-topcliff-pch.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi-topcliff-pch.c 2014-04-24 07:58:23.456206049 +0200
@@ -472,11 +472,6 @@
dev_dbg(&pspi->dev, "%s 8 bits per word\n", __func__);
}
@@ -280722,9 +259105,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-topcliff-pch.c linux-linaro-stable-mx6/d
data->board_dat = board_dat;
data->plat_dev = plat_dev;
-diff -Nur linux-3.10.36/drivers/spi/spi-txx9.c linux-linaro-stable-mx6/drivers/spi/spi-txx9.c
+diff -Nur linux-3.10.36/drivers/spi/spi-txx9.c linux-solidrun/drivers/spi/spi-txx9.c
--- linux-3.10.36/drivers/spi/spi-txx9.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-txx9.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi-txx9.c 2014-04-24 07:58:23.456206049 +0200
@@ -116,17 +116,12 @@
static int txx9spi_setup(struct spi_device *spi)
{
@@ -280760,9 +259143,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-txx9.c linux-linaro-stable-mx6/drivers/s
ret = spi_register_master(master);
if (ret)
-diff -Nur linux-3.10.36/drivers/spi/spi-xcomm.c linux-linaro-stable-mx6/drivers/spi/spi-xcomm.c
+diff -Nur linux-3.10.36/drivers/spi/spi-xcomm.c linux-solidrun/drivers/spi/spi-xcomm.c
--- linux-3.10.36/drivers/spi/spi-xcomm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-xcomm.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi-xcomm.c 2014-04-24 07:58:23.456206049 +0200
@@ -76,7 +76,7 @@
{
unsigned int speed;
@@ -280797,9 +259180,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-xcomm.c linux-linaro-stable-mx6/drivers/
master->transfer_one_message = spi_xcomm_transfer_one;
master->dev.of_node = i2c->dev.of_node;
i2c_set_clientdata(i2c, master);
-diff -Nur linux-3.10.36/drivers/spi/spi-xilinx.c linux-linaro-stable-mx6/drivers/spi/spi-xilinx.c
+diff -Nur linux-3.10.36/drivers/spi/spi-xilinx.c linux-solidrun/drivers/spi/spi-xilinx.c
--- linux-3.10.36/drivers/spi/spi-xilinx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/spi/spi-xilinx.c 2014-04-21 13:50:41.958725879 +0200
++++ linux-solidrun/drivers/spi/spi-xilinx.c 2014-04-24 07:58:23.456206049 +0200
@@ -232,21 +232,6 @@
return 0;
}
@@ -280835,9 +259218,9 @@ diff -Nur linux-3.10.36/drivers/spi/spi-xilinx.c linux-linaro-stable-mx6/drivers
init_completion(&xspi->done);
if (!request_mem_region(mem->start, resource_size(mem),
-diff -Nur linux-3.10.36/drivers/staging/android/binder.c linux-linaro-stable-mx6/drivers/staging/android/binder.c
+diff -Nur linux-3.10.36/drivers/staging/android/binder.c linux-solidrun/drivers/staging/android/binder.c
--- linux-3.10.36/drivers/staging/android/binder.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/android/binder.c 2014-04-21 13:50:41.962725896 +0200
++++ linux-solidrun/drivers/staging/android/binder.c 2014-04-24 07:58:23.464206076 +0200
@@ -2902,7 +2902,7 @@
refs++;
@@ -280855,9 +259238,9 @@ diff -Nur linux-3.10.36/drivers/staging/android/binder.c linux-linaro-stable-mx6
binder_debug(BINDER_DEBUG_DEAD_BINDER,
"node %d now dead, refs %d, death %d\n",
node->debug_id, refs, death);
-diff -Nur linux-3.10.36/drivers/staging/comedi/drivers/adv_pci1710.c linux-linaro-stable-mx6/drivers/staging/comedi/drivers/adv_pci1710.c
+diff -Nur linux-3.10.36/drivers/staging/comedi/drivers/adv_pci1710.c linux-solidrun/drivers/staging/comedi/drivers/adv_pci1710.c
--- linux-3.10.36/drivers/staging/comedi/drivers/adv_pci1710.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/comedi/drivers/adv_pci1710.c 2014-04-21 13:50:41.986725997 +0200
++++ linux-solidrun/drivers/staging/comedi/drivers/adv_pci1710.c 2014-04-24 07:58:23.572206458 +0200
@@ -489,7 +489,6 @@
struct comedi_insn *insn, unsigned int *data)
{
@@ -280910,9 +259293,9 @@ diff -Nur linux-3.10.36/drivers/staging/comedi/drivers/adv_pci1710.c linux-linar
return n;
}
-diff -Nur linux-3.10.36/drivers/staging/iio/adc/ad799x_core.c linux-linaro-stable-mx6/drivers/staging/iio/adc/ad799x_core.c
+diff -Nur linux-3.10.36/drivers/staging/iio/adc/ad799x_core.c linux-solidrun/drivers/staging/iio/adc/ad799x_core.c
--- linux-3.10.36/drivers/staging/iio/adc/ad799x_core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/iio/adc/ad799x_core.c 2014-04-21 13:50:42.062726318 +0200
++++ linux-solidrun/drivers/staging/iio/adc/ad799x_core.c 2014-04-24 07:58:23.776207174 +0200
@@ -644,8 +644,7 @@
return 0;
@@ -280923,9 +259306,9 @@ diff -Nur linux-3.10.36/drivers/staging/iio/adc/ad799x_core.c linux-linaro-stabl
error_cleanup_ring:
ad799x_ring_cleanup(indio_dev);
error_disable_reg:
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.c linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.c linux-solidrun/drivers/staging/imx-drm/dw-hdmi-audio.c
--- linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/dw-hdmi-audio.c 2014-04-24 07:58:23.820207330 +0200
@@ -0,0 +1,550 @@
+/*
+ * DesignWare HDMI audio driver
@@ -281477,9 +259860,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.c linux-linaro-sta
+{
+ snd_card_free(dw->card);
+}
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.h linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.h
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.h linux-solidrun/drivers/staging/imx-drm/dw-hdmi-audio.h
--- linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.h 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/dw-hdmi-audio.h 2014-04-24 07:58:23.820207330 +0200
@@ -0,0 +1,13 @@
+#ifndef DW_HDMI_AUDIO_H
+#define DW_HDMI_AUDIO_H
@@ -281494,9 +259877,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-audio.h linux-linaro-sta
+void snd_dw_hdmi_remove(struct snd_dw_hdmi *dw);
+
+#endif
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.c linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.c linux-solidrun/drivers/staging/imx-drm/dw-hdmi-cec.c
--- linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/dw-hdmi-cec.c 2014-04-24 07:58:23.820207330 +0200
@@ -0,0 +1,561 @@
+/* http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/tree/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c?h=imx_3.0.35_4.1.0 */
+#include <linux/cdev.h>
@@ -282059,9 +260442,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.c linux-linaro-stabl
+MODULE_DESCRIPTION("Synopsis Designware HDMI CEC driver for i.MX");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS(PLATFORM_MODULE_PREFIX "dw-hdmi-cec");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.h linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.h
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.h linux-solidrun/drivers/staging/imx-drm/dw-hdmi-cec.h
--- linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.h 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/dw-hdmi-cec.h 2014-04-24 07:58:23.820207330 +0200
@@ -0,0 +1,16 @@
+#ifndef DW_HDMI_CEC_H
+#define DW_HDMI_CEC_H
@@ -282079,9 +260462,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/dw-hdmi-cec.h linux-linaro-stabl
+};
+
+#endif
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-drm-core.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm-core.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-drm-core.c linux-solidrun/drivers/staging/imx-drm/imx-drm-core.c
--- linux-3.10.36/drivers/staging/imx-drm/imx-drm-core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm-core.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/imx-drm-core.c 2014-04-24 07:58:23.820207330 +0200
@@ -13,14 +13,14 @@
* GNU General Public License for more details.
*
@@ -283259,9 +261642,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-drm-core.c linux-linaro-stab
MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
MODULE_DESCRIPTION("i.MX drm driver core");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-drm.h linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm.h
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-drm.h linux-solidrun/drivers/staging/imx-drm/imx-drm.h
--- linux-3.10.36/drivers/staging/imx-drm/imx-drm.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm.h 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/imx-drm.h 2014-04-24 07:58:23.820207330 +0200
@@ -5,15 +5,19 @@
#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3')
@@ -283342,9 +261725,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-drm.h linux-linaro-stable-mx
+void imx_drm_encoder_destroy(struct drm_encoder *encoder);
#endif /* _IMX_DRM_H_ */
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-fb.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fb.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-fb.c linux-solidrun/drivers/staging/imx-drm/imx-fb.c
--- linux-3.10.36/drivers/staging/imx-drm/imx-fb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/staging/imx-drm/imx-fb.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-/*
- * i.MX drm driver
@@ -283393,9 +261776,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-fb.c linux-linaro-stable-mx6
-
- dev->mode_config.funcs = &imx_drm_mode_config_funcs;
-}
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-fbdev.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fbdev.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-fbdev.c linux-solidrun/drivers/staging/imx-drm/imx-fbdev.c
--- linux-3.10.36/drivers/staging/imx-drm/imx-fbdev.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fbdev.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/staging/imx-drm/imx-fbdev.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-/*
- * i.MX drm driver
@@ -283471,9 +261854,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-fbdev.c linux-linaro-stable-
-MODULE_DESCRIPTION("Freescale i.MX legacy fb driver");
-MODULE_AUTHOR("Sascha Hauer, Pengutronix");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.c linux-solidrun/drivers/staging/imx-drm/imx-hdmi.c
--- linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/imx-hdmi.c 2014-04-24 07:58:23.820207330 +0200
@@ -0,0 +1,1842 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -285317,9 +263700,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.c linux-linaro-stable-m
+MODULE_DESCRIPTION("i.MX6 HDMI transmitter driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-hdmi");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.h linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.h
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.h linux-solidrun/drivers/staging/imx-drm/imx-hdmi.h
--- linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.h 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/imx-hdmi.h 2014-04-24 07:58:23.820207330 +0200
@@ -0,0 +1,1040 @@
+/*
+ * Copyright (C) 2011 Freescale Semiconductor, Inc.
@@ -286361,9 +264744,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-hdmi.h linux-linaro-stable-m
+void hdmi_disable_cec(struct imx_hdmi *hdmi);
+
+#endif /* __IMX_HDMI_H__ */
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-ldb.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-ldb.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-ldb.c linux-solidrun/drivers/staging/imx-drm/imx-ldb.c
--- linux-3.10.36/drivers/staging/imx-drm/imx-ldb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-ldb.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/imx-ldb.c 2014-04-24 07:58:23.820207330 +0200
@@ -0,0 +1,606 @@
+/*
+ * i.MX drm driver - LVDS display bridge
@@ -286971,9 +265354,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-ldb.c linux-linaro-stable-mx
+MODULE_AUTHOR("Sascha Hauer, Pengutronix");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRIVER_NAME);
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-tve.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-tve.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-tve.c linux-solidrun/drivers/staging/imx-drm/imx-tve.c
--- linux-3.10.36/drivers/staging/imx-drm/imx-tve.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-tve.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/imx-tve.c 2014-04-24 07:58:23.820207330 +0200
@@ -20,9 +20,9 @@
#include <linux/clk.h>
@@ -287391,9 +265774,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/imx-tve.c linux-linaro-stable-mx
MODULE_AUTHOR("Philipp Zabel, Pengutronix");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-tve");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h linux-solidrun/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h
--- linux-3.10.36/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h 2014-04-24 07:58:23.824207344 +0200
@@ -97,6 +97,7 @@
int ipu_idmac_enable_channel(struct ipuv3_channel *channel);
@@ -287427,9 +265810,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h linux-linaro
};
#endif /* __DRM_IPU_H__ */
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-common.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-common.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-common.c linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-common.c
--- linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-common.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-common.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-common.c 2014-04-24 07:58:23.824207344 +0200
@@ -27,8 +27,11 @@
#include <linux/list.h>
#include <linux/irq.h>
@@ -288015,9 +266398,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-common.c linux-linaro
MODULE_DESCRIPTION("i.MX IPU v3 driver");
MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dc.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dc.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dc.c linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-dc.c
--- linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dc.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-dc.c 2014-04-24 07:58:23.824207344 +0200
@@ -91,6 +91,7 @@
IPU_DC_MAP_RGB565,
IPU_DC_MAP_GBR24, /* TVEv2 */
@@ -288084,9 +266467,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dc.c linux-linaro-sta
return 0;
}
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-di.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-di.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-di.c linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-di.c
--- linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-di.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-di.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-di.c 2014-04-24 07:58:23.824207344 +0200
@@ -19,9 +19,6 @@
#include <linux/io.h>
#include <linux/err.h>
@@ -288522,9 +266905,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-di.c linux-linaro-sta
- clk_unregister(di->clk_di_pixel);
- kfree(di->clk_name);
}
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c
--- linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c 2014-04-24 07:58:23.824207344 +0200
@@ -61,7 +61,7 @@
static const struct dmfc_channel_data dmfcdata[] = {
@@ -288587,9 +266970,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c linux-linaro-s
dev_dbg(dev, "dmfc: 8 slots with %ldMpixel/s bandwidth each\n",
priv->bandwidth_per_slot / 1000000);
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dp.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dp.c linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
--- linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dp.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-dp.c 2014-04-24 07:58:23.824207344 +0200
@@ -46,6 +46,8 @@
#define DP_COM_CONF_CSC_DEF_BG (2 << 8)
#define DP_COM_CONF_CSC_DEF_BOTH (1 << 8)
@@ -288643,9 +267026,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-dp.c linux-linaro-sta
priv->flow[i].base = priv->base + ipu_dp_flow_base[i];
priv->flow[i].priv = priv;
}
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-prv.h linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-prv.h
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-prv.h linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-prv.h
--- linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-prv.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-prv.h 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipu-v3/ipu-prv.h 2014-04-24 07:58:23.824207344 +0200
@@ -110,7 +110,7 @@
#define IDMAC_BAND_EN(ch) IPU_IDMAC_REG(0x0040 + 4 * ((ch) / 32))
#define IDMAC_CHA_BUSY(ch) IPU_IDMAC_REG(0x0100 + 4 * ((ch) / 32))
@@ -288666,9 +267049,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipu-v3/ipu-prv.h linux-linaro-st
struct ipu_dc_priv *dc_priv;
struct ipu_dp_priv *dp_priv;
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-crtc.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-crtc.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-crtc.c linux-solidrun/drivers/staging/imx-drm/ipuv3-crtc.c
--- linux-3.10.36/drivers/staging/imx-drm/ipuv3-crtc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-crtc.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipuv3-crtc.c 2014-04-24 07:58:23.824207344 +0200
@@ -17,44 +17,36 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
@@ -289183,9 +267566,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-crtc.c linux-linaro-stable
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-ipuv3-crtc");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.c linux-solidrun/drivers/staging/imx-drm/ipuv3-plane.c
--- linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipuv3-plane.c 2014-04-24 07:58:23.824207344 +0200
@@ -0,0 +1,375 @@
+/*
+ * i.MX IPUv3 DP Overlay Planes
@@ -289562,9 +267945,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.c linux-linaro-stabl
+
+ return ipu_plane;
+}
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.h linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.h
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.h linux-solidrun/drivers/staging/imx-drm/ipuv3-plane.h
--- linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.h 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/ipuv3-plane.h 2014-04-24 07:58:23.824207344 +0200
@@ -0,0 +1,55 @@
+#ifndef __IPUV3_PLANE_H__
+#define __IPUV3_PLANE_H__
@@ -289621,9 +268004,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/ipuv3-plane.h linux-linaro-stabl
+int ipu_plane_irq(struct ipu_plane *plane);
+
+#endif
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/Kconfig linux-linaro-stable-mx6/drivers/staging/imx-drm/Kconfig
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/Kconfig linux-solidrun/drivers/staging/imx-drm/Kconfig
--- linux-3.10.36/drivers/staging/imx-drm/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/Kconfig 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/Kconfig 2014-04-24 07:58:23.820207330 +0200
@@ -1,6 +1,7 @@
config DRM_IMX
tristate "DRM Support for Freescale i.MX"
@@ -289673,9 +268056,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/Kconfig linux-linaro-stable-mx6/
+ Support the CEC interface which is part of the Synposis
+ Designware HDMI block. This is used in conjunction with
+ the i.MX HDMI driver.
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/Makefile linux-linaro-stable-mx6/drivers/staging/imx-drm/Makefile
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/Makefile linux-solidrun/drivers/staging/imx-drm/Makefile
--- linux-3.10.36/drivers/staging/imx-drm/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/Makefile 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/Makefile 2014-04-24 07:58:23.820207330 +0200
@@ -1,10 +1,15 @@
-imxdrm-objs := imx-drm-core.o imx-fb.o
@@ -289695,9 +268078,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/Makefile linux-linaro-stable-mx6
+obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o
+obj-$(CONFIG_DRM_IMX_HDMI) += imxhdmi.o
+obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/parallel-display.c linux-linaro-stable-mx6/drivers/staging/imx-drm/parallel-display.c
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/parallel-display.c linux-solidrun/drivers/staging/imx-drm/parallel-display.c
--- linux-3.10.36/drivers/staging/imx-drm/parallel-display.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/parallel-display.c 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/parallel-display.c 2014-04-24 07:58:23.824207344 +0200
@@ -18,12 +18,12 @@
* MA 02110-1301, USA.
*/
@@ -289931,9 +268314,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/parallel-display.c linux-linaro-
MODULE_AUTHOR("Sascha Hauer, Pengutronix");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-parallel-display");
-diff -Nur linux-3.10.36/drivers/staging/imx-drm/TODO linux-linaro-stable-mx6/drivers/staging/imx-drm/TODO
+diff -Nur linux-3.10.36/drivers/staging/imx-drm/TODO linux-solidrun/drivers/staging/imx-drm/TODO
--- linux-3.10.36/drivers/staging/imx-drm/TODO 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/TODO 2014-04-21 13:50:42.070726351 +0200
++++ linux-solidrun/drivers/staging/imx-drm/TODO 2014-04-24 07:58:23.820207330 +0200
@@ -6,12 +6,9 @@
- Factor out more code to common helper functions
- decide where to put the base driver. It is not specific to a subsystem
@@ -289947,9 +268330,9 @@ diff -Nur linux-3.10.36/drivers/staging/imx-drm/TODO linux-linaro-stable-mx6/dri
- Add i.MX6 HDMI support
- Add support for IC (Image converter)
- Add support for CSI (CMOS Sensor interface)
-diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target.c linux-linaro-stable-mx6/drivers/target/iscsi/iscsi_target.c
+diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target.c linux-solidrun/drivers/target/iscsi/iscsi_target.c
--- linux-3.10.36/drivers/target/iscsi/iscsi_target.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/target/iscsi/iscsi_target.c 2014-04-21 13:50:42.226727009 +0200
++++ linux-solidrun/drivers/target/iscsi/iscsi_target.c 2014-04-24 07:58:24.792210751 +0200
@@ -3653,7 +3653,7 @@
break;
case ISTATE_REMOVE:
@@ -289979,9 +268362,9 @@ diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target.c linux-linaro-stable-
iscsit_free_queue_reqs_for_conn(conn);
/*
-diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target_erl2.c linux-linaro-stable-mx6/drivers/target/iscsi/iscsi_target_erl2.c
+diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target_erl2.c linux-solidrun/drivers/target/iscsi/iscsi_target_erl2.c
--- linux-3.10.36/drivers/target/iscsi/iscsi_target_erl2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/target/iscsi/iscsi_target_erl2.c 2014-04-21 13:50:42.226727009 +0200
++++ linux-solidrun/drivers/target/iscsi/iscsi_target_erl2.c 2014-04-24 07:58:24.792210751 +0200
@@ -140,7 +140,7 @@
list_for_each_entry_safe(cmd, cmd_tmp,
&cr->conn_recovery_cmd_list, i_conn_node) {
@@ -290054,9 +268437,9 @@ diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target_erl2.c linux-linaro-st
spin_unlock_bh(&conn->cmd_lock);
iscsit_free_all_datain_reqs(cmd);
-diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target_tpg.c linux-linaro-stable-mx6/drivers/target/iscsi/iscsi_target_tpg.c
+diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target_tpg.c linux-solidrun/drivers/target/iscsi/iscsi_target_tpg.c
--- linux-3.10.36/drivers/target/iscsi/iscsi_target_tpg.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/target/iscsi/iscsi_target_tpg.c 2014-04-21 13:50:42.230727026 +0200
++++ linux-solidrun/drivers/target/iscsi/iscsi_target_tpg.c 2014-04-24 07:58:24.796210765 +0200
@@ -138,7 +138,7 @@
list_for_each_entry(tpg, &tiqn->tiqn_tpg_list, tpg_list) {
@@ -290066,9 +268449,9 @@ diff -Nur linux-3.10.36/drivers/target/iscsi/iscsi_target_tpg.c linux-linaro-sta
spin_unlock(&tpg->tpg_state_lock);
continue;
}
-diff -Nur linux-3.10.36/drivers/thermal/cpu_cooling.c linux-linaro-stable-mx6/drivers/thermal/cpu_cooling.c
+diff -Nur linux-3.10.36/drivers/thermal/cpu_cooling.c linux-solidrun/drivers/thermal/cpu_cooling.c
--- linux-3.10.36/drivers/thermal/cpu_cooling.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/thermal/cpu_cooling.c 2014-04-21 13:50:42.238727060 +0200
++++ linux-solidrun/drivers/thermal/cpu_cooling.c 2014-04-24 07:58:24.804210791 +0200
@@ -167,7 +167,7 @@
continue;
@@ -290078,9 +268461,9 @@ diff -Nur linux-3.10.36/drivers/thermal/cpu_cooling.c linux-linaro-stable-mx6/dr
descend = !!(freq > table[i].frequency);
freq = table[i].frequency;
-diff -Nur linux-3.10.36/drivers/thermal/device_cooling.c linux-linaro-stable-mx6/drivers/thermal/device_cooling.c
+diff -Nur linux-3.10.36/drivers/thermal/device_cooling.c linux-solidrun/drivers/thermal/device_cooling.c
--- linux-3.10.36/drivers/thermal/device_cooling.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/thermal/device_cooling.c 2014-04-21 13:50:42.238727060 +0200
++++ linux-solidrun/drivers/thermal/device_cooling.c 2014-04-24 07:58:24.804210791 +0200
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -290233,9 +268616,9 @@ diff -Nur linux-3.10.36/drivers/thermal/device_cooling.c linux-linaro-stable-mx6
+ kfree(devfreq_dev);
+}
+EXPORT_SYMBOL_GPL(devfreq_cooling_unregister);
-diff -Nur linux-3.10.36/drivers/thermal/imx_thermal.c linux-linaro-stable-mx6/drivers/thermal/imx_thermal.c
+diff -Nur linux-3.10.36/drivers/thermal/imx_thermal.c linux-solidrun/drivers/thermal/imx_thermal.c
--- linux-3.10.36/drivers/thermal/imx_thermal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/thermal/imx_thermal.c 2014-04-21 13:50:42.238727060 +0200
++++ linux-solidrun/drivers/thermal/imx_thermal.c 2014-04-24 07:58:24.804210791 +0200
@@ -0,0 +1,471 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -290708,9 +269091,9 @@ diff -Nur linux-3.10.36/drivers/thermal/imx_thermal.c linux-linaro-stable-mx6/dr
+MODULE_DESCRIPTION("Thermal driver for Freescale i.MX SoCs");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:imx-thermal");
-diff -Nur linux-3.10.36/drivers/thermal/Kconfig linux-linaro-stable-mx6/drivers/thermal/Kconfig
+diff -Nur linux-3.10.36/drivers/thermal/Kconfig linux-solidrun/drivers/thermal/Kconfig
--- linux-3.10.36/drivers/thermal/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/thermal/Kconfig 2014-04-21 13:50:42.238727060 +0200
++++ linux-solidrun/drivers/thermal/Kconfig 2014-04-24 07:58:24.804210791 +0200
@@ -91,6 +91,24 @@
because userland can easily disable the thermal policy by simply
flooding this sysfs node with low temperature values.
@@ -290736,9 +269119,9 @@ diff -Nur linux-3.10.36/drivers/thermal/Kconfig linux-linaro-stable-mx6/drivers/
config SPEAR_THERMAL
bool "SPEAr thermal sensor driver"
depends on PLAT_SPEAR
-diff -Nur linux-3.10.36/drivers/thermal/Makefile linux-linaro-stable-mx6/drivers/thermal/Makefile
+diff -Nur linux-3.10.36/drivers/thermal/Makefile linux-solidrun/drivers/thermal/Makefile
--- linux-3.10.36/drivers/thermal/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/thermal/Makefile 2014-04-21 13:50:42.238727060 +0200
++++ linux-solidrun/drivers/thermal/Makefile 2014-04-24 07:58:24.804210791 +0200
@@ -21,6 +21,8 @@
obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o
obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o
@@ -290748,9 +269131,9 @@ diff -Nur linux-3.10.36/drivers/thermal/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
-diff -Nur linux-3.10.36/drivers/tty/n_gsm.c linux-linaro-stable-mx6/drivers/tty/n_gsm.c
+diff -Nur linux-3.10.36/drivers/tty/n_gsm.c linux-solidrun/drivers/tty/n_gsm.c
--- linux-3.10.36/drivers/tty/n_gsm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/n_gsm.c 2014-04-21 13:50:42.246727094 +0200
++++ linux-solidrun/drivers/tty/n_gsm.c 2014-04-24 07:58:24.836210906 +0200
@@ -1089,7 +1089,6 @@
{
unsigned int addr = 0;
@@ -290776,9 +269159,9 @@ diff -Nur linux-3.10.36/drivers/tty/n_gsm.c linux-linaro-stable-mx6/drivers/tty/
tty = tty_port_tty_get(&dlci->port);
gsm_process_modem(tty, dlci, modem, clen);
if (tty) {
-diff -Nur linux-3.10.36/drivers/tty/serial/ar933x_uart.c linux-linaro-stable-mx6/drivers/tty/serial/ar933x_uart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/ar933x_uart.c linux-solidrun/drivers/tty/serial/ar933x_uart.c
--- linux-3.10.36/drivers/tty/serial/ar933x_uart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/ar933x_uart.c 2014-04-21 13:50:42.254727128 +0200
++++ linux-solidrun/drivers/tty/serial/ar933x_uart.c 2014-04-24 07:58:24.884211074 +0200
@@ -703,7 +703,6 @@
struct ar933x_uart_port *up;
@@ -290787,9 +269170,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/ar933x_uart.c linux-linaro-stable-mx6
if (up) {
uart_remove_one_port(&ar933x_uart_driver, &up->port);
-diff -Nur linux-3.10.36/drivers/tty/serial/atmel_serial.c linux-linaro-stable-mx6/drivers/tty/serial/atmel_serial.c
+diff -Nur linux-3.10.36/drivers/tty/serial/atmel_serial.c linux-solidrun/drivers/tty/serial/atmel_serial.c
--- linux-3.10.36/drivers/tty/serial/atmel_serial.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/atmel_serial.c 2014-04-21 13:50:42.254727128 +0200
++++ linux-solidrun/drivers/tty/serial/atmel_serial.c 2014-04-24 07:58:24.884211074 +0200
@@ -1853,7 +1853,6 @@
int ret = 0;
@@ -290798,9 +269181,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/atmel_serial.c linux-linaro-stable-mx
ret = uart_remove_one_port(&atmel_uart, port);
-diff -Nur linux-3.10.36/drivers/tty/serial/bcm63xx_uart.c linux-linaro-stable-mx6/drivers/tty/serial/bcm63xx_uart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/bcm63xx_uart.c linux-solidrun/drivers/tty/serial/bcm63xx_uart.c
--- linux-3.10.36/drivers/tty/serial/bcm63xx_uart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/bcm63xx_uart.c 2014-04-21 13:50:42.254727128 +0200
++++ linux-solidrun/drivers/tty/serial/bcm63xx_uart.c 2014-04-24 07:58:24.884211074 +0200
@@ -852,7 +852,6 @@
port = platform_get_drvdata(pdev);
@@ -290809,9 +269192,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/bcm63xx_uart.c linux-linaro-stable-mx
/* mark port as free */
ports[pdev->id].membase = 0;
return 0;
-diff -Nur linux-3.10.36/drivers/tty/serial/clps711x.c linux-linaro-stable-mx6/drivers/tty/serial/clps711x.c
+diff -Nur linux-3.10.36/drivers/tty/serial/clps711x.c linux-solidrun/drivers/tty/serial/clps711x.c
--- linux-3.10.36/drivers/tty/serial/clps711x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/clps711x.c 2014-04-21 13:50:42.254727128 +0200
++++ linux-solidrun/drivers/tty/serial/clps711x.c 2014-04-24 07:58:24.884211074 +0200
@@ -438,8 +438,7 @@
s->uart_clk = devm_clk_get(&pdev->dev, "uart");
if (IS_ERR(s->uart_clk)) {
@@ -290851,9 +269234,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/clps711x.c linux-linaro-stable-mx6/dr
return 0;
}
-diff -Nur linux-3.10.36/drivers/tty/serial/efm32-uart.c linux-linaro-stable-mx6/drivers/tty/serial/efm32-uart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/efm32-uart.c linux-solidrun/drivers/tty/serial/efm32-uart.c
--- linux-3.10.36/drivers/tty/serial/efm32-uart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/efm32-uart.c 2014-04-21 13:50:42.254727128 +0200
++++ linux-solidrun/drivers/tty/serial/efm32-uart.c 2014-04-24 07:58:24.972211382 +0200
@@ -778,8 +778,6 @@
{
struct efm32_uart_port *efm_port = platform_get_drvdata(pdev);
@@ -290863,9 +269246,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/efm32-uart.c linux-linaro-stable-mx6/
uart_remove_one_port(&efm32_uart_reg, &efm_port->port);
if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(efm32_uart_ports))
-diff -Nur linux-3.10.36/drivers/tty/serial/fsl_lpuart.c linux-linaro-stable-mx6/drivers/tty/serial/fsl_lpuart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/fsl_lpuart.c linux-solidrun/drivers/tty/serial/fsl_lpuart.c
--- linux-3.10.36/drivers/tty/serial/fsl_lpuart.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/tty/serial/fsl_lpuart.c 2014-04-21 13:50:42.254727128 +0200
++++ linux-solidrun/drivers/tty/serial/fsl_lpuart.c 2014-04-24 07:58:24.972211382 +0200
@@ -0,0 +1,879 @@
+/*
+ * Freescale lpuart serial port driver
@@ -291746,9 +270129,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/fsl_lpuart.c linux-linaro-stable-mx6/
+
+MODULE_DESCRIPTION("Freescale lpuart serial port driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/tty/serial/imx.c linux-linaro-stable-mx6/drivers/tty/serial/imx.c
+diff -Nur linux-3.10.36/drivers/tty/serial/imx.c linux-solidrun/drivers/tty/serial/imx.c
--- linux-3.10.36/drivers/tty/serial/imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/imx.c 2014-04-21 13:50:42.258727144 +0200
++++ linux-solidrun/drivers/tty/serial/imx.c 2014-04-24 07:58:24.976211397 +0200
@@ -47,11 +47,12 @@
#include <linux/slab.h>
#include <linux/of.h>
@@ -292634,9 +271017,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/imx.c linux-linaro-stable-mx6/drivers
if (pdata && pdata->exit)
pdata->exit(pdev);
-diff -Nur linux-3.10.36/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/drivers/tty/serial/Kconfig
+diff -Nur linux-3.10.36/drivers/tty/serial/Kconfig linux-solidrun/drivers/tty/serial/Kconfig
--- linux-3.10.36/drivers/tty/serial/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/Kconfig 2014-04-21 13:50:42.250727111 +0200
++++ linux-solidrun/drivers/tty/serial/Kconfig 2014-04-24 07:58:24.868211016 +0200
@@ -1484,6 +1484,20 @@
If multiple cards are present, the default limit of 32 ports may
need to be increased.
@@ -292658,17 +271041,17 @@ diff -Nur linux-3.10.36/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/drive
endmenu
endif # TTY
-diff -Nur linux-3.10.36/drivers/tty/serial/Makefile linux-linaro-stable-mx6/drivers/tty/serial/Makefile
+diff -Nur linux-3.10.36/drivers/tty/serial/Makefile linux-solidrun/drivers/tty/serial/Makefile
--- linux-3.10.36/drivers/tty/serial/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/Makefile 2014-04-21 13:50:42.250727111 +0200
++++ linux-solidrun/drivers/tty/serial/Makefile 2014-04-24 07:58:24.868211016 +0200
@@ -85,3 +85,4 @@
obj-$(CONFIG_SERIAL_EFM32_UART) += efm32-uart.o
obj-$(CONFIG_SERIAL_ARC) += arc_uart.o
obj-$(CONFIG_SERIAL_RP2) += rp2.o
+obj-$(CONFIG_SERIAL_FSL_LPUART) += fsl_lpuart.o
-diff -Nur linux-3.10.36/drivers/tty/serial/mpc52xx_uart.c linux-linaro-stable-mx6/drivers/tty/serial/mpc52xx_uart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/mpc52xx_uart.c linux-solidrun/drivers/tty/serial/mpc52xx_uart.c
--- linux-3.10.36/drivers/tty/serial/mpc52xx_uart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/mpc52xx_uart.c 2014-04-21 13:50:42.262727161 +0200
++++ linux-solidrun/drivers/tty/serial/mpc52xx_uart.c 2014-04-24 07:58:24.980211412 +0200
@@ -84,16 +84,6 @@
static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id);
static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port);
@@ -292686,9 +271069,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/mpc52xx_uart.c linux-linaro-stable-mx
/* ======================================================================== */
/* PSC fifo operations for isolating differences between 52xx and 512x */
/* ======================================================================== */
-diff -Nur linux-3.10.36/drivers/tty/serial/mxs-auart.c linux-linaro-stable-mx6/drivers/tty/serial/mxs-auart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/mxs-auart.c linux-solidrun/drivers/tty/serial/mxs-auart.c
--- linux-3.10.36/drivers/tty/serial/mxs-auart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/mxs-auart.c 2014-04-21 13:50:42.262727161 +0200
++++ linux-solidrun/drivers/tty/serial/mxs-auart.c 2014-04-24 07:58:24.980211412 +0200
@@ -32,7 +32,6 @@
#include <linux/clk.h>
#include <linux/delay.h>
@@ -292718,9 +271101,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/mxs-auart.c linux-linaro-stable-mx6/d
if (of_id) {
pdev->id_entry = of_id->data;
s->devtype = pdev->id_entry->driver_data;
-diff -Nur linux-3.10.36/drivers/tty/serial/netx-serial.c linux-linaro-stable-mx6/drivers/tty/serial/netx-serial.c
+diff -Nur linux-3.10.36/drivers/tty/serial/netx-serial.c linux-solidrun/drivers/tty/serial/netx-serial.c
--- linux-3.10.36/drivers/tty/serial/netx-serial.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/netx-serial.c 2014-04-21 13:50:42.262727161 +0200
++++ linux-solidrun/drivers/tty/serial/netx-serial.c 2014-04-24 07:58:25.072211734 +0200
@@ -693,8 +693,6 @@
{
struct netx_port *sport = platform_get_drvdata(pdev);
@@ -292730,9 +271113,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/netx-serial.c linux-linaro-stable-mx6
if (sport)
uart_remove_one_port(&netx_reg, &sport->port);
-diff -Nur linux-3.10.36/drivers/tty/serial/pmac_zilog.c linux-linaro-stable-mx6/drivers/tty/serial/pmac_zilog.c
+diff -Nur linux-3.10.36/drivers/tty/serial/pmac_zilog.c linux-solidrun/drivers/tty/serial/pmac_zilog.c
--- linux-3.10.36/drivers/tty/serial/pmac_zilog.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/pmac_zilog.c 2014-04-21 13:50:42.262727161 +0200
++++ linux-solidrun/drivers/tty/serial/pmac_zilog.c 2014-04-24 07:58:25.076211749 +0200
@@ -1798,7 +1798,6 @@
uart_remove_one_port(&pmz_uart_reg, &uap->port);
@@ -292741,9 +271124,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/pmac_zilog.c linux-linaro-stable-mx6/
uap->port.dev = NULL;
return 0;
-diff -Nur linux-3.10.36/drivers/tty/serial/pnx8xxx_uart.c linux-linaro-stable-mx6/drivers/tty/serial/pnx8xxx_uart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/pnx8xxx_uart.c linux-solidrun/drivers/tty/serial/pnx8xxx_uart.c
--- linux-3.10.36/drivers/tty/serial/pnx8xxx_uart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/pnx8xxx_uart.c 2014-04-21 13:50:42.262727161 +0200
++++ linux-solidrun/drivers/tty/serial/pnx8xxx_uart.c 2014-04-24 07:58:25.076211749 +0200
@@ -801,8 +801,6 @@
{
struct pnx8xxx_port *sport = platform_get_drvdata(pdev);
@@ -292753,9 +271136,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/pnx8xxx_uart.c linux-linaro-stable-mx
if (sport)
uart_remove_one_port(&pnx8xxx_reg, &sport->port);
-diff -Nur linux-3.10.36/drivers/tty/serial/pxa.c linux-linaro-stable-mx6/drivers/tty/serial/pxa.c
+diff -Nur linux-3.10.36/drivers/tty/serial/pxa.c linux-solidrun/drivers/tty/serial/pxa.c
--- linux-3.10.36/drivers/tty/serial/pxa.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/pxa.c 2014-04-21 13:50:42.266727178 +0200
++++ linux-solidrun/drivers/tty/serial/pxa.c 2014-04-24 07:58:25.076211749 +0200
@@ -945,8 +945,6 @@
{
struct uart_pxa_port *sport = platform_get_drvdata(dev);
@@ -292765,9 +271148,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/pxa.c linux-linaro-stable-mx6/drivers
uart_remove_one_port(&serial_pxa_reg, &sport->port);
clk_unprepare(sport->clk);
-diff -Nur linux-3.10.36/drivers/tty/serial/sa1100.c linux-linaro-stable-mx6/drivers/tty/serial/sa1100.c
+diff -Nur linux-3.10.36/drivers/tty/serial/sa1100.c linux-solidrun/drivers/tty/serial/sa1100.c
--- linux-3.10.36/drivers/tty/serial/sa1100.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/sa1100.c 2014-04-21 13:50:42.266727178 +0200
++++ linux-solidrun/drivers/tty/serial/sa1100.c 2014-04-24 07:58:25.076211749 +0200
@@ -864,8 +864,6 @@
{
struct sa1100_port *sport = platform_get_drvdata(pdev);
@@ -292777,9 +271160,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/sa1100.c linux-linaro-stable-mx6/driv
if (sport)
uart_remove_one_port(&sa1100_reg, &sport->port);
-diff -Nur linux-3.10.36/drivers/tty/serial/sccnxp.c linux-linaro-stable-mx6/drivers/tty/serial/sccnxp.c
+diff -Nur linux-3.10.36/drivers/tty/serial/sccnxp.c linux-solidrun/drivers/tty/serial/sccnxp.c
--- linux-3.10.36/drivers/tty/serial/sccnxp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/sccnxp.c 2014-04-21 13:50:42.266727178 +0200
++++ linux-solidrun/drivers/tty/serial/sccnxp.c 2014-04-24 07:58:25.076211749 +0200
@@ -997,8 +997,6 @@
}
@@ -292797,9 +271180,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/sccnxp.c linux-linaro-stable-mx6/driv
if (!IS_ERR(s->regulator))
return regulator_disable(s->regulator);
-diff -Nur linux-3.10.36/drivers/tty/serial/serial_core.c linux-linaro-stable-mx6/drivers/tty/serial/serial_core.c
+diff -Nur linux-3.10.36/drivers/tty/serial/serial_core.c linux-solidrun/drivers/tty/serial/serial_core.c
--- linux-3.10.36/drivers/tty/serial/serial_core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/serial_core.c 2014-04-21 13:50:42.266727178 +0200
++++ linux-solidrun/drivers/tty/serial/serial_core.c 2014-04-24 07:58:25.076211749 +0200
@@ -50,12 +50,6 @@
#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8)
@@ -292813,9 +271196,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/serial_core.c linux-linaro-stable-mx6
static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
struct ktermios *old_termios);
static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
-diff -Nur linux-3.10.36/drivers/tty/serial/sirfsoc_uart.c linux-linaro-stable-mx6/drivers/tty/serial/sirfsoc_uart.c
+diff -Nur linux-3.10.36/drivers/tty/serial/sirfsoc_uart.c linux-solidrun/drivers/tty/serial/sirfsoc_uart.c
--- linux-3.10.36/drivers/tty/serial/sirfsoc_uart.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/sirfsoc_uart.c 2014-04-21 13:50:42.266727178 +0200
++++ linux-solidrun/drivers/tty/serial/sirfsoc_uart.c 2014-04-24 07:58:25.084211778 +0200
@@ -716,7 +716,6 @@
clk_disable_unprepare(sirfport->clk);
clk_put(sirfport->clk);
@@ -292833,9 +271216,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/sirfsoc_uart.c linux-linaro-stable-mx
if (sirfport->hw_flow_ctrl)
pinctrl_put(sirfport->p);
clk_disable_unprepare(sirfport->clk);
-diff -Nur linux-3.10.36/drivers/tty/serial/vt8500_serial.c linux-linaro-stable-mx6/drivers/tty/serial/vt8500_serial.c
+diff -Nur linux-3.10.36/drivers/tty/serial/vt8500_serial.c linux-solidrun/drivers/tty/serial/vt8500_serial.c
--- linux-3.10.36/drivers/tty/serial/vt8500_serial.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/vt8500_serial.c 2014-04-21 13:50:42.270727195 +0200
++++ linux-solidrun/drivers/tty/serial/vt8500_serial.c 2014-04-24 07:58:25.088211791 +0200
@@ -631,7 +631,6 @@
{
struct vt8500_port *vt8500_port = platform_get_drvdata(pdev);
@@ -292844,9 +271227,9 @@ diff -Nur linux-3.10.36/drivers/tty/serial/vt8500_serial.c linux-linaro-stable-m
clk_disable_unprepare(vt8500_port->clk);
uart_remove_one_port(&vt8500_uart_driver, &vt8500_port->uart);
-diff -Nur linux-3.10.36/drivers/tty/vt/vt.c linux-linaro-stable-mx6/drivers/tty/vt/vt.c
+diff -Nur linux-3.10.36/drivers/tty/vt/vt.c linux-solidrun/drivers/tty/vt/vt.c
--- linux-3.10.36/drivers/tty/vt/vt.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/vt/vt.c 2014-04-21 13:50:42.278727228 +0200
++++ linux-solidrun/drivers/tty/vt/vt.c 2014-04-24 07:58:25.120211905 +0200
@@ -1164,8 +1164,6 @@
scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char,
vc->vc_screenbuf_size >> 1);
@@ -292856,9 +271239,9 @@ diff -Nur linux-3.10.36/drivers/tty/vt/vt.c linux-linaro-stable-mx6/drivers/tty/
/* fall through */
case 2: /* erase whole display */
count = vc->vc_cols * vc->vc_rows;
-diff -Nur linux-3.10.36/drivers/usb/chipidea/bits.h linux-linaro-stable-mx6/drivers/usb/chipidea/bits.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/bits.h linux-solidrun/drivers/usb/chipidea/bits.h
--- linux-3.10.36/drivers/usb/chipidea/bits.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/bits.h 2014-04-21 13:50:42.278727228 +0200
++++ linux-solidrun/drivers/usb/chipidea/bits.h 2014-04-24 07:58:25.124211918 +0200
@@ -48,10 +48,25 @@
#define PORTSC_SUSP BIT(7)
#define PORTSC_HSP BIT(9)
@@ -292908,9 +271291,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/bits.h linux-linaro-stable-mx6/driv
/* USBMODE */
#define USBMODE_CM (0x03UL << 0)
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.c linux-solidrun/drivers/usb/chipidea/ci13xxx_imx.c
--- linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/usb/chipidea/ci13xxx_imx.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,274 +0,0 @@
-/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -293186,9 +271569,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.c linux-linaro-stable-m
-MODULE_DESCRIPTION("CI13xxx i.MX USB binding");
-MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
-MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>");
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.h linux-solidrun/drivers/usb/chipidea/ci13xxx_imx.h
--- linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/usb/chipidea/ci13xxx_imx.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -293221,9 +271604,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_imx.h linux-linaro-stable-m
-void usbmisc_unset_ops(const struct usbmisc_ops *ops);
-int
-usbmisc_get_init_data(struct device *dev, struct usbmisc_usb_device *usbdev);
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_msm.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_msm.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_msm.c linux-solidrun/drivers/usb/chipidea/ci13xxx_msm.c
--- linux-3.10.36/drivers/usb/chipidea/ci13xxx_msm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_msm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/usb/chipidea/ci13xxx_msm.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- *
@@ -293324,9 +271707,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_msm.c linux-linaro-stable-m
-
-MODULE_ALIAS("platform:msm_hsusb");
-MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_pci.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_pci.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_pci.c linux-solidrun/drivers/usb/chipidea/ci13xxx_pci.c
--- linux-3.10.36/drivers/usb/chipidea/ci13xxx_pci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/drivers/usb/chipidea/ci13xxx_pci.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,158 +0,0 @@
-/*
- * ci13xxx_pci.c - MIPS USB IP core family device controller
@@ -293486,9 +271869,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci13xxx_pci.c linux-linaro-stable-m
-MODULE_DESCRIPTION("MIPS CI13XXX USB Peripheral Controller");
-MODULE_LICENSE("GPL");
-MODULE_VERSION("June 2008");
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci.h linux-solidrun/drivers/usb/chipidea/ci.h
--- linux-3.10.36/drivers/usb/chipidea/ci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci.h 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/ci.h 2014-04-24 07:58:25.124211918 +0200
@@ -22,14 +22,14 @@
* DEFINE
*****************************************************************************/
@@ -293757,9 +272140,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci.h linux-linaro-stable-mx6/driver
+ u32 value, unsigned int timeout_ms);
#endif /* __DRIVERS_USB_CHIPIDEA_CI_H */
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.c linux-solidrun/drivers/usb/chipidea/ci_hdrc_imx.c
--- linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/ci_hdrc_imx.c 2014-04-24 07:58:25.124211918 +0200
@@ -0,0 +1,444 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -294205,9 +272588,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.c linux-linaro-stable-m
+MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
+MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
+MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>");
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.h linux-solidrun/drivers/usb/chipidea/ci_hdrc_imx.h
--- linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.h 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/ci_hdrc_imx.h 2014-04-24 07:58:25.124211918 +0200
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -294230,9 +272613,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_imx.h linux-linaro-stable-m
+int imx_usbmisc_init(struct imx_usbmisc_data *);
+int imx_usbmisc_init_post(struct imx_usbmisc_data *);
+int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *, bool);
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_msm.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_msm.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_msm.c linux-solidrun/drivers/usb/chipidea/ci_hdrc_msm.c
--- linux-3.10.36/drivers/usb/chipidea/ci_hdrc_msm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_msm.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/ci_hdrc_msm.c 2014-04-24 07:58:25.124211918 +0200
@@ -0,0 +1,101 @@
+/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
+ *
@@ -294335,9 +272718,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_msm.c linux-linaro-stable-m
+MODULE_ALIAS("platform:msm_hsusb");
+MODULE_ALIAS("platform:ci13xxx_msm");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_pci.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_pci.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_pci.c linux-solidrun/drivers/usb/chipidea/ci_hdrc_pci.c
--- linux-3.10.36/drivers/usb/chipidea/ci_hdrc_pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_pci.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/ci_hdrc_pci.c 2014-04-24 07:58:25.124211918 +0200
@@ -0,0 +1,150 @@
+/*
+ * ci_hdrc_pci.c - MIPS USB IP core family device controller
@@ -294489,9 +272872,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/ci_hdrc_pci.c linux-linaro-stable-m
+MODULE_LICENSE("GPL");
+MODULE_VERSION("June 2008");
+MODULE_ALIAS("platform:ci13xxx_pci");
-diff -Nur linux-3.10.36/drivers/usb/chipidea/core.c linux-linaro-stable-mx6/drivers/usb/chipidea/core.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/core.c linux-solidrun/drivers/usb/chipidea/core.c
--- linux-3.10.36/drivers/usb/chipidea/core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/core.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/core.c 2014-04-24 07:58:25.124211918 +0200
@@ -43,8 +43,7 @@
*
* TODO List
@@ -295216,9 +273599,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/core.c linux-linaro-stable-mx6/driv
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("David Lopo <dlopo@chipidea.mips.com>");
MODULE_DESCRIPTION("ChipIdea HDRC Driver");
-diff -Nur linux-3.10.36/drivers/usb/chipidea/debug.c linux-linaro-stable-mx6/drivers/usb/chipidea/debug.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/debug.c linux-solidrun/drivers/usb/chipidea/debug.c
--- linux-3.10.36/drivers/usb/chipidea/debug.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/debug.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/debug.c 2014-04-24 07:58:25.124211918 +0200
@@ -18,7 +18,7 @@
*/
static int ci_device_show(struct seq_file *s, void *data)
@@ -295360,9 +273743,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/debug.c linux-linaro-stable-mx6/dri
{
debugfs_remove_recursive(ci->debugfs);
}
-diff -Nur linux-3.10.36/drivers/usb/chipidea/debug.h linux-linaro-stable-mx6/drivers/usb/chipidea/debug.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/debug.h linux-solidrun/drivers/usb/chipidea/debug.h
--- linux-3.10.36/drivers/usb/chipidea/debug.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/debug.h 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/debug.h 2014-04-24 07:58:25.124211918 +0200
@@ -14,15 +14,15 @@
#define __DRIVERS_USB_CHIPIDEA_DEBUG_H
@@ -295383,9 +273766,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/debug.h linux-linaro-stable-mx6/dri
{
}
#endif
-diff -Nur linux-3.10.36/drivers/usb/chipidea/host.c linux-linaro-stable-mx6/drivers/usb/chipidea/host.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/host.c linux-solidrun/drivers/usb/chipidea/host.c
--- linux-3.10.36/drivers/usb/chipidea/host.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/host.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/host.c 2014-04-24 07:58:25.124211918 +0200
@@ -24,6 +24,7 @@
#include <linux/usb.h>
#include <linux/usb/hcd.h>
@@ -295661,9 +274044,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/host.c linux-linaro-stable-mx6/driv
+
return 0;
}
-diff -Nur linux-3.10.36/drivers/usb/chipidea/host.h linux-linaro-stable-mx6/drivers/usb/chipidea/host.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/host.h linux-solidrun/drivers/usb/chipidea/host.h
--- linux-3.10.36/drivers/usb/chipidea/host.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/host.h 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/host.h 2014-04-24 07:58:25.124211918 +0200
@@ -3,15 +3,21 @@
#ifdef CONFIG_USB_CHIPIDEA_HOST
@@ -295688,9 +274071,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/host.h linux-linaro-stable-mx6/driv
#endif
#endif /* __DRIVERS_USB_CHIPIDEA_HOST_H */
-diff -Nur linux-3.10.36/drivers/usb/chipidea/Kconfig linux-linaro-stable-mx6/drivers/usb/chipidea/Kconfig
+diff -Nur linux-3.10.36/drivers/usb/chipidea/Kconfig linux-solidrun/drivers/usb/chipidea/Kconfig
--- linux-3.10.36/drivers/usb/chipidea/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/Kconfig 2014-04-21 13:50:42.278727228 +0200
++++ linux-solidrun/drivers/usb/chipidea/Kconfig 2014-04-24 07:58:25.124211918 +0200
@@ -1,6 +1,6 @@
config USB_CHIPIDEA
tristate "ChipIdea Highspeed Dual Role Controller"
@@ -295717,9 +274100,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/Kconfig linux-linaro-stable-mx6/dri
select USB_EHCI_ROOT_HUB_TT
help
Say Y here to enable host controller functionality of the
-diff -Nur linux-3.10.36/drivers/usb/chipidea/Makefile linux-linaro-stable-mx6/drivers/usb/chipidea/Makefile
+diff -Nur linux-3.10.36/drivers/usb/chipidea/Makefile linux-solidrun/drivers/usb/chipidea/Makefile
--- linux-3.10.36/drivers/usb/chipidea/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/Makefile 2014-04-21 13:50:42.278727228 +0200
++++ linux-solidrun/drivers/usb/chipidea/Makefile 2014-04-24 07:58:25.124211918 +0200
@@ -2,20 +2,20 @@
obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o
@@ -295746,9 +274129,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/Makefile linux-linaro-stable-mx6/dr
+ifneq ($(CONFIG_OF),)
+ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_imx.o usbmisc_imx.o
endif
-diff -Nur linux-3.10.36/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/otg.c linux-solidrun/drivers/usb/chipidea/otg.c
--- linux-3.10.36/drivers/usb/chipidea/otg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/otg.c 2014-04-24 07:58:25.124211918 +0200
@@ -0,0 +1,164 @@
+/*
+ * otg.c - ChipIdea USB IP core OTG driver
@@ -295914,9 +274297,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/drive
+ ci_disable_otg_interrupt(ci, OTGSC_INT_EN_BITS);
+ ci_clear_otg_interrupt(ci, OTGSC_INT_STATUS_BITS);
+}
-diff -Nur linux-3.10.36/drivers/usb/chipidea/otg.h linux-linaro-stable-mx6/drivers/usb/chipidea/otg.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/otg.h linux-solidrun/drivers/usb/chipidea/otg.h
--- linux-3.10.36/drivers/usb/chipidea/otg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/otg.h 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/otg.h 2014-04-24 07:58:25.124211918 +0200
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -295954,9 +274337,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/otg.h linux-linaro-stable-mx6/drive
+void ci_handle_vbus_connected(struct ci_hdrc *ci);
+
+#endif /* __DRIVERS_USB_CHIPIDEA_OTG_H */
-diff -Nur linux-3.10.36/drivers/usb/chipidea/udc.c linux-linaro-stable-mx6/drivers/usb/chipidea/udc.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/udc.c linux-solidrun/drivers/usb/chipidea/udc.c
--- linux-3.10.36/drivers/usb/chipidea/udc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/udc.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/udc.c 2014-04-24 07:58:25.124211918 +0200
@@ -20,13 +20,13 @@
#include <linux/pm_runtime.h>
#include <linux/usb/ch9.h>
@@ -297760,9 +276143,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/udc.c linux-linaro-stable-mx6/drive
- return 0;
+ return udc_start(ci);
}
-diff -Nur linux-3.10.36/drivers/usb/chipidea/udc.h linux-linaro-stable-mx6/drivers/usb/chipidea/udc.h
+diff -Nur linux-3.10.36/drivers/usb/chipidea/udc.h linux-solidrun/drivers/usb/chipidea/udc.h
--- linux-3.10.36/drivers/usb/chipidea/udc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/udc.h 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/udc.h 2014-04-24 07:58:25.124211918 +0200
@@ -20,7 +20,7 @@
#define TX 1 /* similar to USB_DIR_IN but can be used as an index */
@@ -297844,9 +276227,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/udc.h linux-linaro-stable-mx6/drive
#endif
#endif /* __DRIVERS_USB_CHIPIDEA_UDC_H */
-diff -Nur linux-3.10.36/drivers/usb/chipidea/usbmisc_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/usbmisc_imx.c
+diff -Nur linux-3.10.36/drivers/usb/chipidea/usbmisc_imx.c linux-solidrun/drivers/usb/chipidea/usbmisc_imx.c
--- linux-3.10.36/drivers/usb/chipidea/usbmisc_imx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/usbmisc_imx.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/chipidea/usbmisc_imx.c 2014-04-24 07:58:25.124211918 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -298137,9 +276520,9 @@ diff -Nur linux-3.10.36/drivers/usb/chipidea/usbmisc_imx.c linux-linaro-stable-m
MODULE_ALIAS("platform:usbmisc-imx");
MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/usb/core/config.c linux-linaro-stable-mx6/drivers/usb/core/config.c
+diff -Nur linux-3.10.36/drivers/usb/core/config.c linux-solidrun/drivers/usb/core/config.c
--- linux-3.10.36/drivers/usb/core/config.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/config.c 2014-04-21 13:50:42.282727246 +0200
++++ linux-solidrun/drivers/usb/core/config.c 2014-04-24 07:58:25.124211918 +0200
@@ -718,10 +718,6 @@
result = -ENOMEM;
goto err;
@@ -298151,9 +276534,9 @@ diff -Nur linux-3.10.36/drivers/usb/core/config.c linux-linaro-stable-mx6/driver
result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,
bigbuffer, length);
if (result < 0) {
-diff -Nur linux-3.10.36/drivers/usb/core/hcd.c linux-linaro-stable-mx6/drivers/usb/core/hcd.c
+diff -Nur linux-3.10.36/drivers/usb/core/hcd.c linux-solidrun/drivers/usb/core/hcd.c
--- linux-3.10.36/drivers/usb/core/hcd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/hcd.c 2014-04-21 13:50:42.286727263 +0200
++++ linux-solidrun/drivers/usb/core/hcd.c 2014-04-24 07:58:25.128211932 +0200
@@ -1010,6 +1010,7 @@
dev_name(&usb_dev->dev), retval);
return retval;
@@ -298175,9 +276558,9 @@ diff -Nur linux-3.10.36/drivers/usb/core/hcd.c linux-linaro-stable-mx6/drivers/u
return retval;
error_create_attr_group:
-diff -Nur linux-3.10.36/drivers/usb/core/hub.c linux-linaro-stable-mx6/drivers/usb/core/hub.c
+diff -Nur linux-3.10.36/drivers/usb/core/hub.c linux-solidrun/drivers/usb/core/hub.c
--- linux-3.10.36/drivers/usb/core/hub.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/hub.c 2014-04-21 13:50:42.286727263 +0200
++++ linux-solidrun/drivers/usb/core/hub.c 2014-04-24 07:58:25.128211932 +0200
@@ -135,7 +135,7 @@
return usb_get_intfdata(hdev->actconfig->interface[0]);
}
@@ -298209,9 +276592,9 @@ diff -Nur linux-3.10.36/drivers/usb/core/hub.c linux-linaro-stable-mx6/drivers/u
usb_phy_notify_disconnect(hcd->phy, udev->speed);
usb_disconnect(&hub->ports[port1 - 1]->child);
}
-diff -Nur linux-3.10.36/drivers/usb/core/quirks.c linux-linaro-stable-mx6/drivers/usb/core/quirks.c
+diff -Nur linux-3.10.36/drivers/usb/core/quirks.c linux-solidrun/drivers/usb/core/quirks.c
--- linux-3.10.36/drivers/usb/core/quirks.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/quirks.c 2014-04-21 13:50:42.286727263 +0200
++++ linux-solidrun/drivers/usb/core/quirks.c 2014-04-24 07:58:25.128211932 +0200
@@ -46,10 +46,6 @@
/* Microsoft LifeCam-VX700 v2.0 */
{ USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },
@@ -298223,9 +276606,9 @@ diff -Nur linux-3.10.36/drivers/usb/core/quirks.c linux-linaro-stable-mx6/driver
/* Logitech Quickcam Fusion */
{ USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME },
-diff -Nur linux-3.10.36/drivers/usb/core/usb.h linux-linaro-stable-mx6/drivers/usb/core/usb.h
+diff -Nur linux-3.10.36/drivers/usb/core/usb.h linux-solidrun/drivers/usb/core/usb.h
--- linux-3.10.36/drivers/usb/core/usb.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/usb.h 2014-04-21 13:50:42.286727263 +0200
++++ linux-solidrun/drivers/usb/core/usb.h 2014-04-24 07:58:25.132211946 +0200
@@ -35,6 +35,7 @@
unsigned int size);
extern int usb_get_bos_descriptor(struct usb_device *dev);
@@ -298234,9 +276617,9 @@ diff -Nur linux-3.10.36/drivers/usb/core/usb.h linux-linaro-stable-mx6/drivers/u
extern char *usb_cache_string(struct usb_device *udev, int index);
extern int usb_set_configuration(struct usb_device *dev, int configuration);
extern int usb_choose_configuration(struct usb_device *udev);
-diff -Nur linux-3.10.36/drivers/usb/gadget/bcm63xx_udc.c linux-linaro-stable-mx6/drivers/usb/gadget/bcm63xx_udc.c
+diff -Nur linux-3.10.36/drivers/usb/gadget/bcm63xx_udc.c linux-solidrun/drivers/usb/gadget/bcm63xx_udc.c
--- linux-3.10.36/drivers/usb/gadget/bcm63xx_udc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/bcm63xx_udc.c 2014-04-21 13:50:42.290727279 +0200
++++ linux-solidrun/drivers/usb/gadget/bcm63xx_udc.c 2014-04-24 07:58:25.140211975 +0200
@@ -361,30 +361,24 @@
bcm_writel(val, udc->iudma_regs + off);
}
@@ -298362,9 +276745,9 @@ diff -Nur linux-3.10.36/drivers/usb/gadget/bcm63xx_udc.c linux-linaro-stable-mx6
seq_printf(s, " desc: %d/%d used", iudma->n_bds_used,
iudma->n_bds);
-diff -Nur linux-3.10.36/drivers/usb/gadget/f_mass_storage.c linux-linaro-stable-mx6/drivers/usb/gadget/f_mass_storage.c
+diff -Nur linux-3.10.36/drivers/usb/gadget/f_mass_storage.c linux-solidrun/drivers/usb/gadget/f_mass_storage.c
--- linux-3.10.36/drivers/usb/gadget/f_mass_storage.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/f_mass_storage.c 2014-04-21 13:50:42.294727296 +0200
++++ linux-solidrun/drivers/usb/gadget/f_mass_storage.c 2014-04-24 07:58:25.144211990 +0200
@@ -349,8 +349,15 @@
struct usb_ep *bulk_in;
@@ -298480,9 +276863,9 @@ diff -Nur linux-3.10.36/drivers/usb/gadget/f_mass_storage.c linux-linaro-stable-
/* Find all the endpoints we will use */
ep = usb_ep_autoconfig(gadget, &fsg_fs_bulk_in_desc);
if (!ep)
-diff -Nur linux-3.10.36/drivers/usb/gadget/fsl_updater.c linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.c
+diff -Nur linux-3.10.36/drivers/usb/gadget/fsl_updater.c linux-solidrun/drivers/usb/gadget/fsl_updater.c
--- linux-3.10.36/drivers/usb/gadget/fsl_updater.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.c 2014-04-21 13:50:42.298727313 +0200
++++ linux-solidrun/drivers/usb/gadget/fsl_updater.c 2014-04-24 07:58:25.144211990 +0200
@@ -0,0 +1,594 @@
+/*
+ * Freescale UUT driver
@@ -299078,9 +277461,9 @@ diff -Nur linux-3.10.36/drivers/usb/gadget/fsl_updater.c linux-linaro-stable-mx6
+ utp_send_status(fsg);
+ return -1;
+}
-diff -Nur linux-3.10.36/drivers/usb/gadget/fsl_updater.h linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h
+diff -Nur linux-3.10.36/drivers/usb/gadget/fsl_updater.h linux-solidrun/drivers/usb/gadget/fsl_updater.h
--- linux-3.10.36/drivers/usb/gadget/fsl_updater.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h 2014-04-21 13:50:42.298727313 +0200
++++ linux-solidrun/drivers/usb/gadget/fsl_updater.h 2014-04-24 07:58:25.144211990 +0200
@@ -0,0 +1,150 @@
+/*
+ * Freescale UUT driver
@@ -299232,9 +277615,9 @@ diff -Nur linux-3.10.36/drivers/usb/gadget/fsl_updater.h linux-linaro-stable-mx6
+
+#endif /* __FSL_UPDATER_H */
+
-diff -Nur linux-3.10.36/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig
+diff -Nur linux-3.10.36/drivers/usb/gadget/Kconfig linux-solidrun/drivers/usb/gadget/Kconfig
--- linux-3.10.36/drivers/usb/gadget/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig 2014-04-21 13:50:42.290727279 +0200
++++ linux-solidrun/drivers/usb/gadget/Kconfig 2014-04-24 07:58:25.136211960 +0200
@@ -751,6 +751,12 @@
Say "y" to link the driver statically, or "m" to build
a dynamically linked module called "g_mass_storage".
@@ -299248,9 +277631,9 @@ diff -Nur linux-3.10.36/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/drive
config USB_GADGET_TARGET
tristate "USB Gadget Target Fabric Module"
depends on TARGET_CORE
-diff -Nur linux-3.10.36/drivers/usb/gadget/mass_storage.c linux-linaro-stable-mx6/drivers/usb/gadget/mass_storage.c
+diff -Nur linux-3.10.36/drivers/usb/gadget/mass_storage.c linux-solidrun/drivers/usb/gadget/mass_storage.c
--- linux-3.10.36/drivers/usb/gadget/mass_storage.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/mass_storage.c 2014-04-21 13:50:42.302727330 +0200
++++ linux-solidrun/drivers/usb/gadget/mass_storage.c 2014-04-24 07:58:25.148212002 +0200
@@ -189,7 +189,7 @@
{
return usb_composite_probe(&msg_driver);
@@ -299260,9 +277643,9 @@ diff -Nur linux-3.10.36/drivers/usb/gadget/mass_storage.c linux-linaro-stable-mx
static void msg_cleanup(void)
{
-diff -Nur linux-3.10.36/drivers/usb/gadget/zero.c linux-linaro-stable-mx6/drivers/usb/gadget/zero.c
+diff -Nur linux-3.10.36/drivers/usb/gadget/zero.c linux-solidrun/drivers/usb/gadget/zero.c
--- linux-3.10.36/drivers/usb/gadget/zero.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/zero.c 2014-04-21 13:50:42.310727363 +0200
++++ linux-solidrun/drivers/usb/gadget/zero.c 2014-04-24 07:58:25.160212045 +0200
@@ -95,6 +95,18 @@
module_param(autoresume, uint, S_IRUGO);
MODULE_PARM_DESC(autoresume, "zero, or seconds before remote wakeup");
@@ -299309,9 +277692,9 @@ diff -Nur linux-3.10.36/drivers/usb/gadget/zero.c linux-linaro-stable-mx6/driver
}
/* support OTG systems */
-diff -Nur linux-3.10.36/drivers/usb/host/ehci.h linux-linaro-stable-mx6/drivers/usb/host/ehci.h
+diff -Nur linux-3.10.36/drivers/usb/host/ehci.h linux-solidrun/drivers/usb/host/ehci.h
--- linux-3.10.36/drivers/usb/host/ehci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/ehci.h 2014-04-21 13:50:42.314727380 +0200
++++ linux-solidrun/drivers/usb/host/ehci.h 2014-04-24 07:58:25.164212059 +0200
@@ -816,6 +816,8 @@
extern void ehci_init_driver(struct hc_driver *drv,
const struct ehci_driver_overrides *over);
@@ -299321,9 +277704,9 @@ diff -Nur linux-3.10.36/drivers/usb/host/ehci.h linux-linaro-stable-mx6/drivers/
#ifdef CONFIG_PM
extern int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);
-diff -Nur linux-3.10.36/drivers/usb/host/ehci-hcd.c linux-linaro-stable-mx6/drivers/usb/host/ehci-hcd.c
+diff -Nur linux-3.10.36/drivers/usb/host/ehci-hcd.c linux-solidrun/drivers/usb/host/ehci-hcd.c
--- linux-3.10.36/drivers/usb/host/ehci-hcd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hcd.c 2014-04-21 13:50:42.314727380 +0200
++++ linux-solidrun/drivers/usb/host/ehci-hcd.c 2014-04-24 07:58:25.160212045 +0200
@@ -139,7 +139,7 @@
/*-------------------------------------------------------------------------*/
@@ -299425,9 +277808,9 @@ diff -Nur linux-3.10.36/drivers/usb/host/ehci-hcd.c linux-linaro-stable-mx6/driv
if (pcd_status)
usb_hcd_poll_rh_status(hcd);
return IRQ_HANDLED;
-diff -Nur linux-3.10.36/drivers/usb/host/ehci-hub.c linux-linaro-stable-mx6/drivers/usb/host/ehci-hub.c
+diff -Nur linux-3.10.36/drivers/usb/host/ehci-hub.c linux-solidrun/drivers/usb/host/ehci-hub.c
--- linux-3.10.36/drivers/usb/host/ehci-hub.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hub.c 2014-04-21 13:50:42.314727380 +0200
++++ linux-solidrun/drivers/usb/host/ehci-hub.c 2014-04-24 07:58:25.160212045 +0200
@@ -877,7 +877,7 @@
PORT_SUSPEND | PORT_RESUME);
ehci_writel(ehci, temp, status_reg);
@@ -299446,9 +277829,9 @@ diff -Nur linux-3.10.36/drivers/usb/host/ehci-hub.c linux-linaro-stable-mx6/driv
PORT_RESET, 0, 1000);
if (retval != 0) {
ehci_err (ehci, "port %d reset error %d\n",
-diff -Nur linux-3.10.36/drivers/usb/host/ehci-tegra.c linux-linaro-stable-mx6/drivers/usb/host/ehci-tegra.c
+diff -Nur linux-3.10.36/drivers/usb/host/ehci-tegra.c linux-solidrun/drivers/usb/host/ehci-tegra.c
--- linux-3.10.36/drivers/usb/host/ehci-tegra.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-tegra.c 2014-04-21 13:50:42.314727380 +0200
++++ linux-solidrun/drivers/usb/host/ehci-tegra.c 2014-04-24 07:58:25.164212059 +0200
@@ -179,7 +179,7 @@
* If a transaction is in progress, there may be a delay in
* suspending the port. Poll until the port is suspended.
@@ -299496,9 +277879,9 @@ diff -Nur linux-3.10.36/drivers/usb/host/ehci-tegra.c linux-linaro-stable-mx6/dr
PORT_SUSPEND, 1000)) {
pr_err("%s: timeout waiting for PORT_SUSPEND\n",
__func__);
-diff -Nur linux-3.10.36/drivers/usb/host/Kconfig linux-linaro-stable-mx6/drivers/usb/host/Kconfig
+diff -Nur linux-3.10.36/drivers/usb/host/Kconfig linux-solidrun/drivers/usb/host/Kconfig
--- linux-3.10.36/drivers/usb/host/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/Kconfig 2014-04-21 13:50:42.310727363 +0200
++++ linux-solidrun/drivers/usb/host/Kconfig 2014-04-24 07:58:25.160212045 +0200
@@ -65,7 +65,7 @@
config USB_EHCI_ROOT_HUB_TT
@@ -299517,9 +277900,9 @@ diff -Nur linux-3.10.36/drivers/usb/host/Kconfig linux-linaro-stable-mx6/drivers
default y
---help---
This changes the periodic scheduling code to fill more of the low
-diff -Nur linux-3.10.36/drivers/usb/host/xhci-pci.c linux-linaro-stable-mx6/drivers/usb/host/xhci-pci.c
+diff -Nur linux-3.10.36/drivers/usb/host/xhci-pci.c linux-solidrun/drivers/usb/host/xhci-pci.c
--- linux-3.10.36/drivers/usb/host/xhci-pci.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/xhci-pci.c 2014-04-21 13:50:42.330727448 +0200
++++ linux-solidrun/drivers/usb/host/xhci-pci.c 2014-04-24 07:58:25.176212101 +0200
@@ -113,11 +113,6 @@
xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
@@ -299532,9 +277915,9 @@ diff -Nur linux-3.10.36/drivers/usb/host/xhci-pci.c linux-linaro-stable-mx6/driv
if (pdev->vendor == PCI_VENDOR_ID_VIA)
xhci->quirks |= XHCI_RESET_ON_RESUME;
}
-diff -Nur linux-3.10.36/drivers/usb/phy/Makefile linux-linaro-stable-mx6/drivers/usb/phy/Makefile
+diff -Nur linux-3.10.36/drivers/usb/phy/Makefile linux-solidrun/drivers/usb/phy/Makefile
--- linux-3.10.36/drivers/usb/phy/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/phy/Makefile 2014-04-21 13:50:42.342727498 +0200
++++ linux-solidrun/drivers/usb/phy/Makefile 2014-04-24 07:58:25.192212156 +0200
@@ -5,6 +5,7 @@
ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
@@ -299543,9 +277926,9 @@ diff -Nur linux-3.10.36/drivers/usb/phy/Makefile linux-linaro-stable-mx6/drivers
# transceiver drivers, keep the list sorted
-diff -Nur linux-3.10.36/drivers/usb/phy/of.c linux-linaro-stable-mx6/drivers/usb/phy/of.c
+diff -Nur linux-3.10.36/drivers/usb/phy/of.c linux-solidrun/drivers/usb/phy/of.c
--- linux-3.10.36/drivers/usb/phy/of.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/phy/of.c 2014-04-21 13:50:42.342727498 +0200
++++ linux-solidrun/drivers/usb/phy/of.c 2014-04-24 07:58:25.192212156 +0200
@@ -0,0 +1,47 @@
+/*
+ * USB of helper code
@@ -299594,9 +277977,9 @@ diff -Nur linux-3.10.36/drivers/usb/phy/of.c linux-linaro-stable-mx6/drivers/usb
+ return USBPHY_INTERFACE_MODE_UNKNOWN;
+}
+EXPORT_SYMBOL_GPL(of_usb_get_phy_mode);
-diff -Nur linux-3.10.36/drivers/usb/phy/phy-mxs-usb.c linux-linaro-stable-mx6/drivers/usb/phy/phy-mxs-usb.c
+diff -Nur linux-3.10.36/drivers/usb/phy/phy-mxs-usb.c linux-solidrun/drivers/usb/phy/phy-mxs-usb.c
--- linux-3.10.36/drivers/usb/phy/phy-mxs-usb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/phy/phy-mxs-usb.c 2014-04-21 13:50:42.342727498 +0200
++++ linux-solidrun/drivers/usb/phy/phy-mxs-usb.c 2014-04-24 07:58:25.192212156 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -300142,9 +278525,9 @@ diff -Nur linux-3.10.36/drivers/usb/phy/phy-mxs-usb.c linux-linaro-stable-mx6/dr
},
};
-diff -Nur linux-3.10.36/drivers/usb/serial/ftdi_sio.c linux-linaro-stable-mx6/drivers/usb/serial/ftdi_sio.c
+diff -Nur linux-3.10.36/drivers/usb/serial/ftdi_sio.c linux-solidrun/drivers/usb/serial/ftdi_sio.c
--- linux-3.10.36/drivers/usb/serial/ftdi_sio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/serial/ftdi_sio.c 2014-04-21 13:50:42.350727532 +0200
++++ linux-solidrun/drivers/usb/serial/ftdi_sio.c 2014-04-24 07:58:25.480213170 +0200
@@ -155,7 +155,6 @@
{ USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },
@@ -300171,9 +278554,9 @@ diff -Nur linux-3.10.36/drivers/usb/serial/ftdi_sio.c linux-linaro-stable-mx6/dr
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
-diff -Nur linux-3.10.36/drivers/usb/serial/ftdi_sio_ids.h linux-linaro-stable-mx6/drivers/usb/serial/ftdi_sio_ids.h
+diff -Nur linux-3.10.36/drivers/usb/serial/ftdi_sio_ids.h linux-solidrun/drivers/usb/serial/ftdi_sio_ids.h
--- linux-3.10.36/drivers/usb/serial/ftdi_sio_ids.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/serial/ftdi_sio_ids.h 2014-04-21 13:50:42.350727532 +0200
++++ linux-solidrun/drivers/usb/serial/ftdi_sio_ids.h 2014-04-24 07:58:25.520213311 +0200
@@ -50,7 +50,6 @@
#define TI_XDS100V2_PID 0xa6d0
@@ -300205,9 +278588,9 @@ diff -Nur linux-3.10.36/drivers/usb/serial/ftdi_sio_ids.h linux-linaro-stable-mx
- * Manufacturer: Cressi
- */
-#define FTDI_CRESSI_PID 0x87d0
-diff -Nur linux-3.10.36/drivers/usb/serial/option.c linux-linaro-stable-mx6/drivers/usb/serial/option.c
+diff -Nur linux-3.10.36/drivers/usb/serial/option.c linux-solidrun/drivers/usb/serial/option.c
--- linux-3.10.36/drivers/usb/serial/option.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/serial/option.c 2014-04-21 13:50:42.358727566 +0200
++++ linux-solidrun/drivers/usb/serial/option.c 2014-04-24 07:58:26.968218408 +0200
@@ -1362,8 +1362,7 @@
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1267, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1268, 0xff, 0xff, 0xff) },
@@ -300228,9 +278611,9 @@ diff -Nur linux-3.10.36/drivers/usb/serial/option.c linux-linaro-stable-mx6/driv
{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX) },
{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX),
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
-diff -Nur linux-3.10.36/drivers/usb/serial/qcserial.c linux-linaro-stable-mx6/drivers/usb/serial/qcserial.c
+diff -Nur linux-3.10.36/drivers/usb/serial/qcserial.c linux-solidrun/drivers/usb/serial/qcserial.c
--- linux-3.10.36/drivers/usb/serial/qcserial.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/serial/qcserial.c 2014-04-21 13:50:42.358727566 +0200
++++ linux-solidrun/drivers/usb/serial/qcserial.c 2014-04-24 07:58:26.968218408 +0200
@@ -139,9 +139,6 @@
{USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 0)}, /* Sierra Wireless EM7700 Device Management */
{USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 2)}, /* Sierra Wireless EM7700 NMEA */
@@ -300241,9 +278624,9 @@ diff -Nur linux-3.10.36/drivers/usb/serial/qcserial.c linux-linaro-stable-mx6/dr
{ } /* Terminating entry */
};
-diff -Nur linux-3.10.36/drivers/usb/storage/Kconfig linux-linaro-stable-mx6/drivers/usb/storage/Kconfig
+diff -Nur linux-3.10.36/drivers/usb/storage/Kconfig linux-solidrun/drivers/usb/storage/Kconfig
--- linux-3.10.36/drivers/usb/storage/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/storage/Kconfig 2014-04-21 13:50:42.362727583 +0200
++++ linux-solidrun/drivers/usb/storage/Kconfig 2014-04-24 07:58:27.024218604 +0200
@@ -18,9 +18,7 @@
This option depends on 'SCSI' support being enabled, but you
@@ -300255,9 +278638,9 @@ diff -Nur linux-3.10.36/drivers/usb/storage/Kconfig linux-linaro-stable-mx6/driv
To compile this driver as a module, choose M here: the
module will be called usb-storage.
-diff -Nur linux-3.10.36/drivers/usb/storage/scsiglue.c linux-linaro-stable-mx6/drivers/usb/storage/scsiglue.c
+diff -Nur linux-3.10.36/drivers/usb/storage/scsiglue.c linux-solidrun/drivers/usb/storage/scsiglue.c
--- linux-3.10.36/drivers/usb/storage/scsiglue.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/storage/scsiglue.c 2014-04-21 13:50:42.366727600 +0200
++++ linux-solidrun/drivers/usb/storage/scsiglue.c 2014-04-24 07:58:27.032218633 +0200
@@ -78,8 +78,6 @@
static int slave_alloc (struct scsi_device *sdev)
@@ -300278,9 +278661,9 @@ diff -Nur linux-3.10.36/drivers/usb/storage/scsiglue.c linux-linaro-stable-mx6/d
return 0;
}
-diff -Nur linux-3.10.36/drivers/usb/storage/unusual_cypress.h linux-linaro-stable-mx6/drivers/usb/storage/unusual_cypress.h
+diff -Nur linux-3.10.36/drivers/usb/storage/unusual_cypress.h linux-solidrun/drivers/usb/storage/unusual_cypress.h
--- linux-3.10.36/drivers/usb/storage/unusual_cypress.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/storage/unusual_cypress.h 2014-04-21 13:50:42.366727600 +0200
++++ linux-solidrun/drivers/usb/storage/unusual_cypress.h 2014-04-24 07:58:27.032218633 +0200
@@ -31,7 +31,7 @@
"Cypress ISD-300LP",
USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
@@ -300290,9 +278673,9 @@ diff -Nur linux-3.10.36/drivers/usb/storage/unusual_cypress.h linux-linaro-stabl
"Super Top",
"USB 2.0 SATA BRIDGE",
USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
-diff -Nur linux-3.10.36/drivers/usb/storage/unusual_devs.h linux-linaro-stable-mx6/drivers/usb/storage/unusual_devs.h
+diff -Nur linux-3.10.36/drivers/usb/storage/unusual_devs.h linux-solidrun/drivers/usb/storage/unusual_devs.h
--- linux-3.10.36/drivers/usb/storage/unusual_devs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/storage/unusual_devs.h 2014-04-21 13:50:42.366727600 +0200
++++ linux-solidrun/drivers/usb/storage/unusual_devs.h 2014-04-24 07:58:27.036218647 +0200
@@ -1455,13 +1455,6 @@
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ),
@@ -300307,9 +278690,9 @@ diff -Nur linux-3.10.36/drivers/usb/storage/unusual_devs.h linux-linaro-stable-m
/* Reported by Michael Stattmann <michael@stattmann.com> */
UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000,
"Sony Ericsson",
-diff -Nur linux-3.10.36/drivers/usb/usb-common.c linux-linaro-stable-mx6/drivers/usb/usb-common.c
+diff -Nur linux-3.10.36/drivers/usb/usb-common.c linux-solidrun/drivers/usb/usb-common.c
--- linux-3.10.36/drivers/usb/usb-common.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/usb-common.c 2014-04-21 13:50:42.370727617 +0200
++++ linux-solidrun/drivers/usb/usb-common.c 2014-04-24 07:58:27.036218647 +0200
@@ -13,7 +13,9 @@
#include <linux/kernel.h>
@@ -300358,9 +278741,9 @@ diff -Nur linux-3.10.36/drivers/usb/usb-common.c linux-linaro-stable-mx6/drivers
+#endif
+
MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/vfio/vfio_iommu_type1.c linux-linaro-stable-mx6/drivers/vfio/vfio_iommu_type1.c
+diff -Nur linux-3.10.36/drivers/vfio/vfio_iommu_type1.c linux-solidrun/drivers/vfio/vfio_iommu_type1.c
--- linux-3.10.36/drivers/vfio/vfio_iommu_type1.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/vfio/vfio_iommu_type1.c 2014-04-21 13:50:42.374727633 +0200
++++ linux-solidrun/drivers/vfio/vfio_iommu_type1.c 2014-04-24 07:58:27.080218801 +0200
@@ -138,12 +138,12 @@
if (pfn_valid(pfn)) {
bool reserved;
@@ -300376,9 +278759,9 @@ diff -Nur linux-3.10.36/drivers/vfio/vfio_iommu_type1.c linux-linaro-stable-mx6/
* but the hugepage may have been split
* from under us (and we may not hold a
* reference count on the head page so it can
-diff -Nur linux-3.10.36/drivers/video/amba-clcd.c linux-linaro-stable-mx6/drivers/video/amba-clcd.c
+diff -Nur linux-3.10.36/drivers/video/amba-clcd.c linux-solidrun/drivers/video/amba-clcd.c
--- linux-3.10.36/drivers/video/amba-clcd.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/amba-clcd.c 2014-04-21 13:50:42.378727650 +0200
++++ linux-solidrun/drivers/video/amba-clcd.c 2014-04-24 07:58:27.144219026 +0200
@@ -16,7 +16,10 @@
#include <linux/string.h>
#include <linux/slab.h>
@@ -300694,9 +279077,9 @@ diff -Nur linux-3.10.36/drivers/video/amba-clcd.c linux-linaro-stable-mx6/driver
ret = amba_request_regions(dev, NULL);
if (ret) {
-diff -Nur linux-3.10.36/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c
+diff -Nur linux-3.10.36/drivers/video/arm-hdlcd.c linux-solidrun/drivers/video/arm-hdlcd.c
--- linux-3.10.36/drivers/video/arm-hdlcd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c 2014-04-21 13:50:42.378727650 +0200
++++ linux-solidrun/drivers/video/arm-hdlcd.c 2014-04-24 07:58:27.144219026 +0200
@@ -0,0 +1,844 @@
+/*
+ * drivers/video/arm-hdlcd.c
@@ -301542,9 +279925,9 @@ diff -Nur linux-3.10.36/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/driver
+MODULE_AUTHOR("Liviu Dudau");
+MODULE_DESCRIPTION("ARM HDLCD core driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/drivers/video/backlight/backlight.c linux-linaro-stable-mx6/drivers/video/backlight/backlight.c
+diff -Nur linux-3.10.36/drivers/video/backlight/backlight.c linux-solidrun/drivers/video/backlight/backlight.c
--- linux-3.10.36/drivers/video/backlight/backlight.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/backlight/backlight.c 2014-04-21 13:50:42.386727684 +0200
++++ linux-solidrun/drivers/video/backlight/backlight.c 2014-04-24 07:58:27.152219055 +0200
@@ -38,6 +38,8 @@
{
struct backlight_device *bd;
@@ -301585,9 +279968,9 @@ diff -Nur linux-3.10.36/drivers/video/backlight/backlight.c linux-linaro-stable-
}
mutex_unlock(&bd->ops_lock);
return 0;
-diff -Nur linux-3.10.36/drivers/video/console/fbcon.c linux-linaro-stable-mx6/drivers/video/console/fbcon.c
+diff -Nur linux-3.10.36/drivers/video/console/fbcon.c linux-solidrun/drivers/video/console/fbcon.c
--- linux-3.10.36/drivers/video/console/fbcon.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/console/fbcon.c 2014-04-21 13:50:42.394727718 +0200
++++ linux-solidrun/drivers/video/console/fbcon.c 2014-04-24 07:58:27.180219152 +0200
@@ -404,7 +404,7 @@
struct fb_info *info = (struct fb_info *) dev_addr;
struct fbcon_ops *ops = info->fbcon_par;
@@ -301597,9 +279980,9 @@ diff -Nur linux-3.10.36/drivers/video/console/fbcon.c linux-linaro-stable-mx6/dr
mod_timer(&ops->cursor_timer, jiffies + HZ/5);
}
-diff -Nur linux-3.10.36/drivers/video/Kconfig linux-linaro-stable-mx6/drivers/video/Kconfig
+diff -Nur linux-3.10.36/drivers/video/Kconfig linux-solidrun/drivers/video/Kconfig
--- linux-3.10.36/drivers/video/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/Kconfig 2014-04-21 13:50:42.378727650 +0200
++++ linux-solidrun/drivers/video/Kconfig 2014-04-24 07:58:27.144219026 +0200
@@ -39,6 +39,11 @@
config HDMI
bool
@@ -301664,9 +280047,9 @@ diff -Nur linux-3.10.36/drivers/video/Kconfig linux-linaro-stable-mx6/drivers/vi
if VT
source "drivers/video/console/Kconfig"
endif
-diff -Nur linux-3.10.36/drivers/video/Makefile linux-linaro-stable-mx6/drivers/video/Makefile
+diff -Nur linux-3.10.36/drivers/video/Makefile linux-solidrun/drivers/video/Makefile
--- linux-3.10.36/drivers/video/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/Makefile 2014-04-21 13:50:42.378727650 +0200
++++ linux-solidrun/drivers/video/Makefile 2014-04-24 07:58:27.144219026 +0200
@@ -53,6 +53,7 @@
obj-$(CONFIG_FB_SAVAGE) += savage/
obj-$(CONFIG_FB_GEODE) += geode/
@@ -301690,9 +280073,9 @@ diff -Nur linux-3.10.36/drivers/video/Makefile linux-linaro-stable-mx6/drivers/v
+
+# platform specific output drivers
+obj-$(CONFIG_VEXPRESS_DVI_CONTROL) += vexpress-dvi.o
-diff -Nur linux-3.10.36/drivers/video/mxc/epdc_regs.h linux-linaro-stable-mx6/drivers/video/mxc/epdc_regs.h
+diff -Nur linux-3.10.36/drivers/video/mxc/epdc_regs.h linux-solidrun/drivers/video/mxc/epdc_regs.h
--- linux-3.10.36/drivers/video/mxc/epdc_regs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/epdc_regs.h 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/epdc_regs.h 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,442 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -302136,9 +280519,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/epdc_regs.h linux-linaro-stable-mx6/dr
+};
+
+#endif /* __EPDC_REGS_INCLUDED__ */
-diff -Nur linux-3.10.36/drivers/video/mxc/Kconfig linux-linaro-stable-mx6/drivers/video/mxc/Kconfig
+diff -Nur linux-3.10.36/drivers/video/mxc/Kconfig linux-solidrun/drivers/video/mxc/Kconfig
--- linux-3.10.36/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/Kconfig 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/Kconfig 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,63 @@
+config FB_MXC
+ tristate "MXC Framebuffer support"
@@ -302203,9 +280586,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/Kconfig linux-linaro-stable-mx6/driver
+config FB_MXS_SII902X
+ tristate "Si Image SII9022 DVI/HDMI Interface Chip"
+ depends on FB_MXS && I2C
-diff -Nur linux-3.10.36/drivers/video/mxc/ldb.c linux-linaro-stable-mx6/drivers/video/mxc/ldb.c
+diff -Nur linux-3.10.36/drivers/video/mxc/ldb.c linux-solidrun/drivers/video/mxc/ldb.c
--- linux-3.10.36/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/ldb.c 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/ldb.c 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,1036 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -303243,9 +281626,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/ldb.c linux-linaro-stable-mx6/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MXC LDB driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/video/mxc/Makefile linux-linaro-stable-mx6/drivers/video/mxc/Makefile
+diff -Nur linux-3.10.36/drivers/video/mxc/Makefile linux-solidrun/drivers/video/mxc/Makefile
--- linux-3.10.36/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/Makefile 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/Makefile 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,8 @@
+obj-$(CONFIG_FB_MXC_LDB) += ldb.o
+obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o
@@ -303255,9 +281638,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/Makefile linux-linaro-stable-mx6/drive
+obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o
+obj-$(CONFIG_FB_MXC_EINK_PANEL) += mxc_epdc_fb.o
+obj-$(CONFIG_FB_MXS_SII902X) += mxsfb_sii902x.o
-diff -Nur linux-3.10.36/drivers/video/mxc/mipi_dsi.c linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mipi_dsi.c linux-solidrun/drivers/video/mxc/mipi_dsi.c
--- linux-3.10.36/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.c 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/mipi_dsi.c 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,953 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -304212,9 +282595,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mipi_dsi.c linux-linaro-stable-mx6/dri
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI DSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/video/mxc/mipi_dsi.h linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.h
+diff -Nur linux-3.10.36/drivers/video/mxc/mipi_dsi.h linux-solidrun/drivers/video/mxc/mipi_dsi.h
--- linux-3.10.36/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.h 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/mipi_dsi.h 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -304328,9 +282711,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mipi_dsi.h linux-linaro-stable-mx6/dri
+#endif
+
+#endif
-diff -Nur linux-3.10.36/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxc_dispdrv.c linux-solidrun/drivers/video/mxc/mxc_dispdrv.c
--- linux-3.10.36/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/mxc_dispdrv.c 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -304482,9 +282865,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable-mx6/
+ return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata);
-diff -Nur linux-3.10.36/drivers/video/mxc/mxc_dispdrv.h linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.h
+diff -Nur linux-3.10.36/drivers/video/mxc/mxc_dispdrv.h linux-solidrun/drivers/video/mxc/mxc_dispdrv.h
--- linux-3.10.36/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.h 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/mxc_dispdrv.h 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -304540,9 +282923,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_dispdrv.h linux-linaro-stable-mx6/
+int mxc_dispdrv_setdata(struct mxc_dispdrv_handle *handle, void *data);
+void *mxc_dispdrv_getdata(struct mxc_dispdrv_handle *handle);
+#endif
-diff -Nur linux-3.10.36/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxc_edid.c linux-solidrun/drivers/video/mxc/mxc_edid.c
--- linux-3.10.36/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/mxc_edid.c 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,762 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -305306,9 +283689,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx6/dri
+}
+EXPORT_SYMBOL(mxc_edid_read);
+
-diff -Nur linux-3.10.36/drivers/video/mxc/mxc_epdc_fb.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_epdc_fb.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxc_epdc_fb.c linux-solidrun/drivers/video/mxc/mxc_epdc_fb.c
--- linux-3.10.36/drivers/video/mxc/mxc_epdc_fb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_epdc_fb.c 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/mxc_epdc_fb.c 2014-04-24 07:58:27.228219323 +0200
@@ -0,0 +1,5541 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -310851,9 +289234,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_epdc_fb.c linux-linaro-stable-mx6/
+MODULE_DESCRIPTION("MXC EPDC framebuffer driver");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("fb");
-diff -Nur linux-3.10.36/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-linaro-stable-mx6/drivers/video/mxc/mxcfb_hx8369_wvga.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-solidrun/drivers/video/mxc/mxcfb_hx8369_wvga.c
--- linux-3.10.36/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-04-21 13:50:42.426727853 +0200
++++ linux-solidrun/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-04-24 07:58:27.232219337 +0200
@@ -0,0 +1,449 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -311304,9 +289687,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-linaro-stabl
+ mipid_bl_update_status(bl);
+ return 0;
+}
-diff -Nur linux-3.10.36/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxc_hdmi.c linux-solidrun/drivers/video/mxc/mxc_hdmi.c
--- linux-3.10.36/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c 2014-04-21 13:50:42.422727836 +0200
++++ linux-solidrun/drivers/video/mxc/mxc_hdmi.c 2014-04-24 07:58:27.232219337 +0200
@@ -0,0 +1,2934 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -313121,10 +291504,10 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ */
+ mode = &hdmi->fbi->monspecs.modedb[i];
+
-+ if (!(mode->vmode & FB_VMODE_INTERLACED) &&
-+ (mxc_edid_mode_to_vic(mode) != 0)) {
++ if (!(mode->vmode & FB_VMODE_INTERLACED)) {
++ int vic = mxc_edid_mode_to_vic(mode);
+
-+ dev_dbg(&hdmi->pdev->dev, "Added mode %d:", i);
++ dev_dbg(&hdmi->pdev->dev, "%s: Added mode %d(VIC %u):", __func__, i, vic);
+ dev_dbg(&hdmi->pdev->dev,
+ "xres = %d, yres = %d, freq = %d, vmode = %d, flag = %d\n",
+ hdmi->fbi->monspecs.modedb[i].xres,
@@ -314242,9 +292625,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+module_exit(mxc_hdmi_i2c_exit);
+
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-diff -Nur linux-3.10.36/drivers/video/mxc/mxc_ipuv3_fb.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_ipuv3_fb.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxc_ipuv3_fb.c linux-solidrun/drivers/video/mxc/mxc_ipuv3_fb.c
--- linux-3.10.36/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_ipuv3_fb.c 2014-04-21 13:50:42.426727853 +0200
++++ linux-solidrun/drivers/video/mxc/mxc_ipuv3_fb.c 2014-04-24 07:58:27.232219337 +0200
@@ -0,0 +1,2583 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -316829,9 +295212,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_ipuv3_fb.c linux-linaro-stable-mx6
+MODULE_DESCRIPTION("MXC framebuffer driver");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("fb");
-diff -Nur linux-3.10.36/drivers/video/mxc/mxc_lcdif.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_lcdif.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxc_lcdif.c linux-solidrun/drivers/video/mxc/mxc_lcdif.c
--- linux-3.10.36/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_lcdif.c 2014-04-21 13:50:42.426727853 +0200
++++ linux-solidrun/drivers/video/mxc/mxc_lcdif.c 2014-04-24 07:58:27.232219337 +0200
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -317068,9 +295451,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxc_lcdif.c linux-linaro-stable-mx6/dr
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX ipuv3 LCD extern port driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/video/mxc/mxsfb_sii902x.c linux-linaro-stable-mx6/drivers/video/mxc/mxsfb_sii902x.c
+diff -Nur linux-3.10.36/drivers/video/mxc/mxsfb_sii902x.c linux-solidrun/drivers/video/mxc/mxsfb_sii902x.c
--- linux-3.10.36/drivers/video/mxc/mxsfb_sii902x.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxsfb_sii902x.c 2014-04-21 13:50:42.426727853 +0200
++++ linux-solidrun/drivers/video/mxc/mxsfb_sii902x.c 2014-04-24 07:58:27.232219337 +0200
@@ -0,0 +1,532 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -317604,9 +295987,9 @@ diff -Nur linux-3.10.36/drivers/video/mxc/mxsfb_sii902x.c linux-linaro-stable-mx
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("SII902x DVI/HDMI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/drivers/video/mxsfb.c linux-linaro-stable-mx6/drivers/video/mxsfb.c
+diff -Nur linux-3.10.36/drivers/video/mxsfb.c linux-solidrun/drivers/video/mxsfb.c
--- linux-3.10.36/drivers/video/mxsfb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/mxsfb.c 2014-04-21 13:50:42.426727853 +0200
++++ linux-solidrun/drivers/video/mxsfb.c 2014-04-24 07:58:27.232219337 +0200
@@ -4,7 +4,7 @@
* This code is based on:
* Author: Vitaly Wool <vital@embeddedalley.com>
@@ -318374,9 +296757,9 @@ diff -Nur linux-3.10.36/drivers/video/mxsfb.c linux-linaro-stable-mx6/drivers/vi
},
};
-diff -Nur linux-3.10.36/drivers/video/vexpress-dvi.c linux-linaro-stable-mx6/drivers/video/vexpress-dvi.c
+diff -Nur linux-3.10.36/drivers/video/vexpress-dvi.c linux-solidrun/drivers/video/vexpress-dvi.c
--- linux-3.10.36/drivers/video/vexpress-dvi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/vexpress-dvi.c 2014-04-21 13:50:42.458727988 +0200
++++ linux-solidrun/drivers/video/vexpress-dvi.c 2014-04-24 07:58:27.436220054 +0200
@@ -0,0 +1,220 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -318598,9 +296981,9 @@ diff -Nur linux-3.10.36/drivers/video/vexpress-dvi.c linux-linaro-stable-mx6/dri
+ return platform_driver_register(&vexpress_dvi_driver);
+}
+device_initcall(vexpress_dvi_init);
-diff -Nur linux-3.10.36/drivers/vme/bridges/vme_ca91cx42.c linux-linaro-stable-mx6/drivers/vme/bridges/vme_ca91cx42.c
+diff -Nur linux-3.10.36/drivers/vme/bridges/vme_ca91cx42.c linux-solidrun/drivers/vme/bridges/vme_ca91cx42.c
--- linux-3.10.36/drivers/vme/bridges/vme_ca91cx42.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/vme/bridges/vme_ca91cx42.c 2014-04-21 13:50:42.466728022 +0200
++++ linux-solidrun/drivers/vme/bridges/vme_ca91cx42.c 2014-04-24 07:58:27.448220097 +0200
@@ -880,7 +880,7 @@
if (done == count)
goto out;
@@ -318619,9 +297002,9 @@ diff -Nur linux-3.10.36/drivers/vme/bridges/vme_ca91cx42.c linux-linaro-stable-m
if ((count - done) < 2) {
iowrite8(*(u8 *)(buf + done), addr + done);
done += 1;
-diff -Nur linux-3.10.36/drivers/vme/bridges/vme_tsi148.c linux-linaro-stable-mx6/drivers/vme/bridges/vme_tsi148.c
+diff -Nur linux-3.10.36/drivers/vme/bridges/vme_tsi148.c linux-solidrun/drivers/vme/bridges/vme_tsi148.c
--- linux-3.10.36/drivers/vme/bridges/vme_tsi148.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/vme/bridges/vme_tsi148.c 2014-04-21 13:50:42.466728022 +0200
++++ linux-solidrun/drivers/vme/bridges/vme_tsi148.c 2014-04-24 07:58:27.448220097 +0200
@@ -1283,7 +1283,7 @@
if (done == count)
goto out;
@@ -318640,9 +297023,9 @@ diff -Nur linux-3.10.36/drivers/vme/bridges/vme_tsi148.c linux-linaro-stable-mx6
if ((count - done) < 2) {
iowrite8(*(u8 *)(buf + done), addr + done);
done += 1;
-diff -Nur linux-3.10.36/firmware/imx/epdc_E060SCM.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E060SCM.fw.ihex
+diff -Nur linux-3.10.36/firmware/imx/epdc_E060SCM.fw.ihex linux-solidrun/firmware/imx/epdc_E060SCM.fw.ihex
--- linux-3.10.36/firmware/imx/epdc_E060SCM.fw.ihex 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/firmware/imx/epdc_E060SCM.fw.ihex 2014-04-21 13:50:42.522728257 +0200
++++ linux-solidrun/firmware/imx/epdc_E060SCM.fw.ihex 2014-04-24 07:58:28.000222040 +0200
@@ -0,0 +1,61613 @@
+:100000003488C47C012D0100DD0900000706A4002E
+:100010000358211D3CCA018502000000400000FE7B
@@ -380257,9 +358640,9 @@ diff -Nur linux-3.10.36/firmware/imx/epdc_E060SCM.fw.ihex linux-linaro-stable-mx
+:1009B0000000000000000000000000000000000037
+:0709C0000000000000000030
+:00000001FF
-diff -Nur linux-3.10.36/firmware/imx/epdc_E60_V110.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E60_V110.fw.ihex
+diff -Nur linux-3.10.36/firmware/imx/epdc_E60_V110.fw.ihex linux-solidrun/firmware/imx/epdc_E60_V110.fw.ihex
--- linux-3.10.36/firmware/imx/epdc_E60_V110.fw.ihex 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/firmware/imx/epdc_E60_V110.fw.ihex 2014-04-21 13:50:42.542728342 +0200
++++ linux-solidrun/firmware/imx/epdc_E60_V110.fw.ihex 2014-04-24 07:58:28.020222110 +0200
@@ -0,0 +1,45914 @@
+:10000000C7FFA986DE9C0000E30100000003250075
+:100010000127020E3C03000000000000400000C366
@@ -426175,9 +404558,9 @@ diff -Nur linux-3.10.36/firmware/imx/epdc_E60_V110.fw.ihex linux-linaro-stable-m
+:1034C00000000000000000000000000000000000FC
+:0F34D000000000000000000000000000000000ED
+:00000001FF
-diff -Nur linux-3.10.36/firmware/imx/epdc_E60_V220.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E60_V220.fw.ihex
+diff -Nur linux-3.10.36/firmware/imx/epdc_E60_V220.fw.ihex linux-solidrun/firmware/imx/epdc_E60_V220.fw.ihex
--- linux-3.10.36/firmware/imx/epdc_E60_V220.fw.ihex 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/firmware/imx/epdc_E60_V220.fw.ihex 2014-04-21 13:50:42.546728359 +0200
++++ linux-solidrun/firmware/imx/epdc_E60_V220.fw.ihex 2014-04-24 07:58:28.024222125 +0200
@@ -0,0 +1,77569 @@
+:10000000BD611693236A0100BC04000007060500C9
+:100010000304021D3C180085000000004000001190
@@ -503748,9 +482131,9 @@ diff -Nur linux-3.10.36/firmware/imx/epdc_E60_V220.fw.ihex linux-linaro-stable-m
+:10EEB0000000000000000000000000000000000052
+:07EEC000000000000000004B
+:00000001FF
-diff -Nur linux-3.10.36/firmware/imx/epdc_E97_V110.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E97_V110.fw.ihex
+diff -Nur linux-3.10.36/firmware/imx/epdc_E97_V110.fw.ihex linux-solidrun/firmware/imx/epdc_E97_V110.fw.ihex
--- linux-3.10.36/firmware/imx/epdc_E97_V110.fw.ihex 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/firmware/imx/epdc_E97_V110.fw.ihex 2014-04-21 13:50:42.550728375 +0200
++++ linux-solidrun/firmware/imx/epdc_E97_V110.fw.ihex 2014-04-24 07:58:28.028222137 +0200
@@ -0,0 +1,54512 @@
+:1000000095533B1702B60000B701000004042C0012
+:100010000131020E6101010000000000410000D228
@@ -558264,9 +536647,9 @@ diff -Nur linux-3.10.36/firmware/imx/epdc_E97_V110.fw.ihex linux-linaro-stable-m
+:104E000000000000000000000000000000000000A2
+:104E10000000000000000000000000000000000092
+:00000001FF
-diff -Nur linux-3.10.36/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-linaro-stable-mx6/firmware/imx/sdma/sdma-imx6q.bin.ihex
+diff -Nur linux-3.10.36/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-solidrun/firmware/imx/sdma/sdma-imx6q.bin.ihex
--- linux-3.10.36/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-04-21 13:50:42.550728375 +0200
++++ linux-solidrun/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-04-24 07:58:28.028222137 +0200
@@ -0,0 +1,116 @@
+:1000000053444D4101000000010000001C000000AD
+:1000100026000000B40000007A0600008202000002
@@ -558384,9 +536767,9 @@ diff -Nur linux-3.10.36/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-linaro-stabl
+:10071000DD6F087FD169010FC86FDD6F037F0101B5
+:0E0720000004129B0700FF680C680002129B89
+:00000001FF
-diff -Nur linux-3.10.36/firmware/Makefile linux-linaro-stable-mx6/firmware/Makefile
+diff -Nur linux-3.10.36/firmware/Makefile linux-solidrun/firmware/Makefile
--- linux-3.10.36/firmware/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/firmware/Makefile 2014-04-21 13:50:42.490728122 +0200
++++ linux-solidrun/firmware/Makefile 2014-04-24 07:58:27.960221899 +0200
@@ -61,6 +61,7 @@
radeon/RV770_pfp.bin radeon/RV770_me.bin \
radeon/RV730_pfp.bin radeon/RV730_me.bin \
@@ -558415,9 +536798,9 @@ diff -Nur linux-3.10.36/firmware/Makefile linux-linaro-stable-mx6/firmware/Makef
# Don't depend on ihex2fw if we're installing and it already exists.
# Putting it after | in the dependencies doesn't seem sufficient when
# we're installing after a cross-compile, because ihex2fw has dependencies
-diff -Nur linux-3.10.36/fs/attr.c linux-linaro-stable-mx6/fs/attr.c
+diff -Nur linux-3.10.36/fs/attr.c linux-solidrun/fs/attr.c
--- linux-3.10.36/fs/attr.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/attr.c 2014-04-21 13:50:42.574728477 +0200
++++ linux-solidrun/fs/attr.c 2014-04-24 07:58:28.080222321 +0200
@@ -182,6 +182,11 @@
return -EPERM;
}
@@ -558430,9 +536813,9 @@ diff -Nur linux-3.10.36/fs/attr.c linux-linaro-stable-mx6/fs/attr.c
if ((ia_valid & ATTR_MODE)) {
umode_t amode = attr->ia_mode;
/* Flag setting protected by i_mutex */
-diff -Nur linux-3.10.36/fs/bio-integrity.c linux-linaro-stable-mx6/fs/bio-integrity.c
+diff -Nur linux-3.10.36/fs/bio-integrity.c linux-solidrun/fs/bio-integrity.c
--- linux-3.10.36/fs/bio-integrity.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/bio-integrity.c 2014-04-21 13:50:42.578728494 +0200
++++ linux-solidrun/fs/bio-integrity.c 2014-04-24 07:58:28.508223827 +0200
@@ -114,14 +114,6 @@
}
EXPORT_SYMBOL(bio_integrity_free);
@@ -558466,9 +536849,9 @@ diff -Nur linux-3.10.36/fs/bio-integrity.c linux-linaro-stable-mx6/fs/bio-integr
void *kaddr = kmap_atomic(bv->bv_page);
bix.data_buf = kaddr + bv->bv_offset;
bix.data_size = bv->bv_len;
-diff -Nur linux-3.10.36/fs/btrfs/compression.c linux-linaro-stable-mx6/fs/btrfs/compression.c
+diff -Nur linux-3.10.36/fs/btrfs/compression.c linux-solidrun/fs/btrfs/compression.c
--- linux-3.10.36/fs/btrfs/compression.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/btrfs/compression.c 2014-04-21 13:50:42.578728494 +0200
++++ linux-solidrun/fs/btrfs/compression.c 2014-04-24 07:58:28.512223841 +0200
@@ -1009,8 +1009,6 @@
bytes = min(bytes, working_bytes);
kaddr = kmap_atomic(page_out);
@@ -558478,9 +536861,9 @@ diff -Nur linux-3.10.36/fs/btrfs/compression.c linux-linaro-stable-mx6/fs/btrfs/
kunmap_atomic(kaddr);
flush_dcache_page(page_out);
-diff -Nur linux-3.10.36/fs/btrfs/inode.c linux-linaro-stable-mx6/fs/btrfs/inode.c
+diff -Nur linux-3.10.36/fs/btrfs/inode.c linux-solidrun/fs/btrfs/inode.c
--- linux-3.10.36/fs/btrfs/inode.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/btrfs/inode.c 2014-04-21 13:50:42.586728527 +0200
++++ linux-solidrun/fs/btrfs/inode.c 2014-04-24 07:58:28.524223884 +0200
@@ -2655,7 +2655,7 @@
EXTENT_DEFRAG, 1, cached_state);
if (ret) {
@@ -558505,9 +536888,9 @@ diff -Nur linux-3.10.36/fs/btrfs/inode.c linux-linaro-stable-mx6/fs/btrfs/inode.
if (newsize > oldsize) {
truncate_pagecache(inode, oldsize, newsize);
-diff -Nur linux-3.10.36/fs/buffer.c linux-linaro-stable-mx6/fs/buffer.c
+diff -Nur linux-3.10.36/fs/buffer.c linux-solidrun/fs/buffer.c
--- linux-3.10.36/fs/buffer.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/buffer.c 2014-04-21 13:50:42.594728561 +0200
++++ linux-solidrun/fs/buffer.c 2014-04-24 07:58:28.532223912 +0200
@@ -620,16 +620,14 @@
static void __set_page_dirty(struct page *page,
struct address_space *mapping, int warn)
@@ -558527,9 +536910,9 @@ diff -Nur linux-3.10.36/fs/buffer.c linux-linaro-stable-mx6/fs/buffer.c
__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
}
-diff -Nur linux-3.10.36/fs/cifs/cifsacl.c linux-linaro-stable-mx6/fs/cifs/cifsacl.c
+diff -Nur linux-3.10.36/fs/cifs/cifsacl.c linux-solidrun/fs/cifs/cifsacl.c
--- linux-3.10.36/fs/cifs/cifsacl.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/cifsacl.c 2014-04-21 13:50:42.602728595 +0200
++++ linux-solidrun/fs/cifs/cifsacl.c 2014-04-24 07:58:28.540223940 +0200
@@ -1027,30 +1027,15 @@
__u32 secdesclen = 0;
struct cifs_ntsd *pntsd = NULL; /* acl obtained from server */
@@ -558592,9 +536975,9 @@ diff -Nur linux-3.10.36/fs/cifs/cifsacl.c linux-linaro-stable-mx6/fs/cifs/cifsac
+out:
return rc;
}
-diff -Nur linux-3.10.36/fs/cifs/cifsglob.h linux-linaro-stable-mx6/fs/cifs/cifsglob.h
+diff -Nur linux-3.10.36/fs/cifs/cifsglob.h linux-solidrun/fs/cifs/cifsglob.h
--- linux-3.10.36/fs/cifs/cifsglob.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/cifsglob.h 2014-04-21 13:50:42.602728595 +0200
++++ linux-solidrun/fs/cifs/cifsglob.h 2014-04-24 07:58:28.540223940 +0200
@@ -370,16 +370,6 @@
void (*new_lease_key)(struct cifs_fid *fid);
int (*calc_signature)(struct smb_rqst *rqst,
@@ -558612,9 +536995,9 @@ diff -Nur linux-3.10.36/fs/cifs/cifsglob.h linux-linaro-stable-mx6/fs/cifs/cifsg
};
struct smb_version_values {
-diff -Nur linux-3.10.36/fs/cifs/file.c linux-linaro-stable-mx6/fs/cifs/file.c
+diff -Nur linux-3.10.36/fs/cifs/file.c linux-solidrun/fs/cifs/file.c
--- linux-3.10.36/fs/cifs/file.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/file.c 2014-04-21 13:50:42.606728612 +0200
++++ linux-solidrun/fs/cifs/file.c 2014-04-24 07:58:28.544223953 +0200
@@ -2353,7 +2353,7 @@
unsigned long nr_segs, loff_t *poffset)
{
@@ -558672,9 +537055,9 @@ diff -Nur linux-3.10.36/fs/cifs/file.c linux-linaro-stable-mx6/fs/cifs/file.c
wdata->sync_mode = WB_SYNC_ALL;
wdata->nr_pages = nr_pages;
wdata->offset = (__u64)offset;
-diff -Nur linux-3.10.36/fs/cifs/inode.c linux-linaro-stable-mx6/fs/cifs/inode.c
+diff -Nur linux-3.10.36/fs/cifs/inode.c linux-solidrun/fs/cifs/inode.c
--- linux-3.10.36/fs/cifs/inode.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/inode.c 2014-04-21 13:50:42.606728612 +0200
++++ linux-solidrun/fs/cifs/inode.c 2014-04-24 07:58:28.544223953 +0200
@@ -490,15 +490,10 @@
return PTR_ERR(tlink);
tcon = tlink_tcon(tlink);
@@ -558695,9 +537078,9 @@ diff -Nur linux-3.10.36/fs/cifs/inode.c linux-linaro-stable-mx6/fs/cifs/inode.c
cifs_put_tlink(tlink);
if (rc < 0)
return (int)rc;
-diff -Nur linux-3.10.36/fs/cifs/smb1ops.c linux-linaro-stable-mx6/fs/cifs/smb1ops.c
+diff -Nur linux-3.10.36/fs/cifs/smb1ops.c linux-solidrun/fs/cifs/smb1ops.c
--- linux-3.10.36/fs/cifs/smb1ops.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/smb1ops.c 2014-04-21 13:50:42.610728629 +0200
++++ linux-solidrun/fs/cifs/smb1ops.c 2014-04-24 07:58:28.544223953 +0200
@@ -948,14 +948,6 @@
.mand_lock = cifs_mand_lock,
.mand_unlock_range = cifs_unlock_range,
@@ -558713,9 +537096,9 @@ diff -Nur linux-3.10.36/fs/cifs/smb1ops.c linux-linaro-stable-mx6/fs/cifs/smb1op
};
struct smb_version_values smb1_values = {
-diff -Nur linux-3.10.36/fs/cifs/smb2glob.h linux-linaro-stable-mx6/fs/cifs/smb2glob.h
+diff -Nur linux-3.10.36/fs/cifs/smb2glob.h linux-solidrun/fs/cifs/smb2glob.h
--- linux-3.10.36/fs/cifs/smb2glob.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/smb2glob.h 2014-04-21 13:50:42.610728629 +0200
++++ linux-solidrun/fs/cifs/smb2glob.h 2014-04-24 07:58:28.544223953 +0200
@@ -55,7 +55,4 @@
#define SMB2_NTLMV2_SESSKEY_SIZE (16)
#define SMB2_HMACSHA256_SIZE (32)
@@ -558724,9 +537107,9 @@ diff -Nur linux-3.10.36/fs/cifs/smb2glob.h linux-linaro-stable-mx6/fs/cifs/smb2g
-#define SMB2_MAX_BUFFER_SIZE 65536
-
#endif /* _SMB2_GLOB_H */
-diff -Nur linux-3.10.36/fs/cifs/smb2ops.c linux-linaro-stable-mx6/fs/cifs/smb2ops.c
+diff -Nur linux-3.10.36/fs/cifs/smb2ops.c linux-solidrun/fs/cifs/smb2ops.c
--- linux-3.10.36/fs/cifs/smb2ops.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/smb2ops.c 2014-04-21 13:50:42.610728629 +0200
++++ linux-solidrun/fs/cifs/smb2ops.c 2014-04-24 07:58:28.548223967 +0200
@@ -181,8 +181,11 @@
/* start with specified wsize, or default */
wsize = volume_info->wsize ? volume_info->wsize : CIFS_DEFAULT_IOSIZE;
@@ -558755,9 +537138,9 @@ diff -Nur linux-3.10.36/fs/cifs/smb2ops.c linux-linaro-stable-mx6/fs/cifs/smb2op
return rsize;
}
-diff -Nur linux-3.10.36/fs/cifs/smb2pdu.c linux-linaro-stable-mx6/fs/cifs/smb2pdu.c
+diff -Nur linux-3.10.36/fs/cifs/smb2pdu.c linux-solidrun/fs/cifs/smb2pdu.c
--- linux-3.10.36/fs/cifs/smb2pdu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/smb2pdu.c 2014-04-21 13:50:42.610728629 +0200
++++ linux-solidrun/fs/cifs/smb2pdu.c 2014-04-24 07:58:28.548223967 +0200
@@ -408,9 +408,6 @@
server->dialect = le16_to_cpu(rsp->DialectRevision);
@@ -558768,9 +537151,9 @@ diff -Nur linux-3.10.36/fs/cifs/smb2pdu.c linux-linaro-stable-mx6/fs/cifs/smb2pd
server->max_read = le32_to_cpu(rsp->MaxReadSize);
server->max_write = le32_to_cpu(rsp->MaxWriteSize);
/* BB Do we need to validate the SecurityMode? */
-diff -Nur linux-3.10.36/fs/cifs/xattr.c linux-linaro-stable-mx6/fs/cifs/xattr.c
+diff -Nur linux-3.10.36/fs/cifs/xattr.c linux-solidrun/fs/cifs/xattr.c
--- linux-3.10.36/fs/cifs/xattr.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/cifs/xattr.c 2014-04-21 13:50:42.614728645 +0200
++++ linux-solidrun/fs/cifs/xattr.c 2014-04-24 07:58:28.548223967 +0200
@@ -82,11 +82,9 @@
goto remove_ea_exit;
@@ -558889,9 +537272,9 @@ diff -Nur linux-3.10.36/fs/cifs/xattr.c linux-linaro-stable-mx6/fs/cifs/xattr.c
list_ea_exit:
kfree(full_path);
free_xid(xid);
-diff -Nur linux-3.10.36/fs/debugfs/file.c linux-linaro-stable-mx6/fs/debugfs/file.c
+diff -Nur linux-3.10.36/fs/debugfs/file.c linux-solidrun/fs/debugfs/file.c
--- linux-3.10.36/fs/debugfs/file.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/debugfs/file.c 2014-04-21 13:50:42.618728662 +0200
++++ linux-solidrun/fs/debugfs/file.c 2014-04-24 07:58:28.552223983 +0200
@@ -21,6 +21,7 @@
#include <linux/debugfs.h>
#include <linux/io.h>
@@ -558948,9 +537331,9 @@ diff -Nur linux-3.10.36/fs/debugfs/file.c linux-linaro-stable-mx6/fs/debugfs/fil
static ssize_t read_file_bool(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
-diff -Nur linux-3.10.36/fs/ext4/ext4.h linux-linaro-stable-mx6/fs/ext4/ext4.h
+diff -Nur linux-3.10.36/fs/ext4/ext4.h linux-solidrun/fs/ext4/ext4.h
--- linux-3.10.36/fs/ext4/ext4.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ext4/ext4.h 2014-04-21 13:50:42.638728747 +0200
++++ linux-solidrun/fs/ext4/ext4.h 2014-04-24 07:58:28.792224826 +0200
@@ -774,8 +774,6 @@
if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime)) \
(einode)->xtime.tv_sec = \
@@ -558960,9 +537343,9 @@ diff -Nur linux-3.10.36/fs/ext4/ext4.h linux-linaro-stable-mx6/fs/ext4/ext4.h
if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra)) \
ext4_decode_extra_time(&(einode)->xtime, \
raw_inode->xtime ## _extra); \
-diff -Nur linux-3.10.36/fs/ext4/inode.c linux-linaro-stable-mx6/fs/ext4/inode.c
+diff -Nur linux-3.10.36/fs/ext4/inode.c linux-solidrun/fs/ext4/inode.c
--- linux-3.10.36/fs/ext4/inode.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ext4/inode.c 2014-04-21 13:50:42.642728764 +0200
++++ linux-solidrun/fs/ext4/inode.c 2014-04-24 07:58:28.796224840 +0200
@@ -38,7 +38,6 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -559009,9 +537392,9 @@ diff -Nur linux-3.10.36/fs/ext4/inode.c linux-linaro-stable-mx6/fs/ext4/inode.c
if (S_ISREG(inode->i_mode) &&
(attr->ia_size < inode->i_size)) {
if (ext4_should_order_data(inode)) {
-diff -Nur linux-3.10.36/fs/ext4/ioctl.c linux-linaro-stable-mx6/fs/ext4/ioctl.c
+diff -Nur linux-3.10.36/fs/ext4/ioctl.c linux-solidrun/fs/ext4/ioctl.c
--- linux-3.10.36/fs/ext4/ioctl.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ext4/ioctl.c 2014-04-21 13:50:42.642728764 +0200
++++ linux-solidrun/fs/ext4/ioctl.c 2014-04-24 07:58:28.832224968 +0200
@@ -145,7 +145,7 @@
handle = ext4_journal_start(inode_bl, EXT4_HT_MOVE_EXTENTS, 2);
if (IS_ERR(handle)) {
@@ -559029,9 +537412,9 @@ diff -Nur linux-3.10.36/fs/ext4/ioctl.c linux-linaro-stable-mx6/fs/ext4/ioctl.c
ext4_inode_resume_unlocked_dio(inode);
ext4_inode_resume_unlocked_dio(inode_bl);
-diff -Nur linux-3.10.36/fs/ext4/resize.c linux-linaro-stable-mx6/fs/ext4/resize.c
+diff -Nur linux-3.10.36/fs/ext4/resize.c linux-solidrun/fs/ext4/resize.c
--- linux-3.10.36/fs/ext4/resize.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ext4/resize.c 2014-04-21 13:50:42.642728764 +0200
++++ linux-solidrun/fs/ext4/resize.c 2014-04-24 07:58:28.844225009 +0200
@@ -238,7 +238,6 @@
ext4_group_t group;
ext4_group_t last_group;
@@ -559116,9 +537499,9 @@ diff -Nur linux-3.10.36/fs/ext4/resize.c linux-linaro-stable-mx6/fs/ext4/resize.
block = start;
}
-diff -Nur linux-3.10.36/fs/ext4/super.c linux-linaro-stable-mx6/fs/ext4/super.c
+diff -Nur linux-3.10.36/fs/ext4/super.c linux-solidrun/fs/ext4/super.c
--- linux-3.10.36/fs/ext4/super.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ext4/super.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/ext4/super.c 2014-04-24 07:58:28.844225009 +0200
@@ -3592,22 +3592,16 @@
for (i = 0; i < 4; i++)
sbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]);
@@ -559149,9 +537532,9 @@ diff -Nur linux-3.10.36/fs/ext4/super.c linux-linaro-stable-mx6/fs/ext4/super.c
}
/* Handle clustersize */
-diff -Nur linux-3.10.36/fs/f2fs/acl.c linux-linaro-stable-mx6/fs/f2fs/acl.c
+diff -Nur linux-3.10.36/fs/f2fs/acl.c linux-solidrun/fs/f2fs/acl.c
--- linux-3.10.36/fs/f2fs/acl.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/acl.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/acl.c 2014-04-24 07:58:28.860225065 +0200
@@ -205,7 +205,8 @@
return acl;
}
@@ -559234,9 +537617,9 @@ diff -Nur linux-3.10.36/fs/f2fs/acl.c linux-linaro-stable-mx6/fs/f2fs/acl.c
release_and_out:
posix_acl_release(acl);
-diff -Nur linux-3.10.36/fs/f2fs/acl.h linux-linaro-stable-mx6/fs/f2fs/acl.h
+diff -Nur linux-3.10.36/fs/f2fs/acl.h linux-solidrun/fs/f2fs/acl.h
--- linux-3.10.36/fs/f2fs/acl.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/acl.h 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/acl.h 2014-04-24 07:58:28.860225065 +0200
@@ -36,9 +36,9 @@
#ifdef CONFIG_F2FS_FS_POSIX_ACL
@@ -559260,9 +537643,9 @@ diff -Nur linux-3.10.36/fs/f2fs/acl.h linux-linaro-stable-mx6/fs/f2fs/acl.h
{
return 0;
}
-diff -Nur linux-3.10.36/fs/f2fs/checkpoint.c linux-linaro-stable-mx6/fs/f2fs/checkpoint.c
+diff -Nur linux-3.10.36/fs/f2fs/checkpoint.c linux-solidrun/fs/f2fs/checkpoint.c
--- linux-3.10.36/fs/f2fs/checkpoint.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/checkpoint.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/checkpoint.c 2014-04-24 07:58:28.860225065 +0200
@@ -81,7 +81,7 @@
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
@@ -559637,9 +538020,9 @@ diff -Nur linux-3.10.36/fs/f2fs/checkpoint.c linux-linaro-stable-mx6/fs/f2fs/che
ckpt->checkpoint_ver = cpu_to_le64(++ckpt_ver);
/* write cached NAT/SIT entries to NAT/SIT area */
-diff -Nur linux-3.10.36/fs/f2fs/data.c linux-linaro-stable-mx6/fs/f2fs/data.c
+diff -Nur linux-3.10.36/fs/f2fs/data.c linux-solidrun/fs/f2fs/data.c
--- linux-3.10.36/fs/f2fs/data.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/data.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/data.c 2014-04-24 07:58:28.860225065 +0200
@@ -37,9 +37,9 @@
struct page *node_page = dn->node_page;
unsigned int ofs_in_node = dn->ofs_in_node;
@@ -559949,9 +538332,9 @@ diff -Nur linux-3.10.36/fs/f2fs/data.c linux-linaro-stable-mx6/fs/f2fs/data.c
.set_page_dirty = f2fs_set_data_page_dirty,
.invalidatepage = f2fs_invalidate_data_page,
.releasepage = f2fs_release_data_page,
-diff -Nur linux-3.10.36/fs/f2fs/debug.c linux-linaro-stable-mx6/fs/f2fs/debug.c
+diff -Nur linux-3.10.36/fs/f2fs/debug.c linux-solidrun/fs/f2fs/debug.c
--- linux-3.10.36/fs/f2fs/debug.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/debug.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/debug.c 2014-04-24 07:58:28.860225065 +0200
@@ -29,7 +29,7 @@
static void update_general_status(struct f2fs_sb_info *sbi)
@@ -560063,9 +538446,9 @@ diff -Nur linux-3.10.36/fs/f2fs/debug.c linux-linaro-stable-mx6/fs/f2fs/debug.c
}
void __init f2fs_create_root_stats(void)
-diff -Nur linux-3.10.36/fs/f2fs/dir.c linux-linaro-stable-mx6/fs/f2fs/dir.c
+diff -Nur linux-3.10.36/fs/f2fs/dir.c linux-solidrun/fs/f2fs/dir.c
--- linux-3.10.36/fs/f2fs/dir.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/dir.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/dir.c 2014-04-24 07:58:28.860225065 +0200
@@ -13,6 +13,7 @@
#include "f2fs.h"
#include "node.h"
@@ -560315,9 +538698,9 @@ diff -Nur linux-3.10.36/fs/f2fs/dir.c linux-linaro-stable-mx6/fs/f2fs/dir.c
}
if (bit_pos == NR_DENTRY_IN_BLOCK) {
-diff -Nur linux-3.10.36/fs/f2fs/f2fs.h linux-linaro-stable-mx6/fs/f2fs/f2fs.h
+diff -Nur linux-3.10.36/fs/f2fs/f2fs.h linux-solidrun/fs/f2fs/f2fs.h
--- linux-3.10.36/fs/f2fs/f2fs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/f2fs.h 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/f2fs.h 2014-04-24 07:58:28.860225065 +0200
@@ -17,6 +17,14 @@
#include <linux/slab.h>
#include <linux/crc32.h>
@@ -560896,9 +539279,9 @@ diff -Nur linux-3.10.36/fs/f2fs/f2fs.h linux-linaro-stable-mx6/fs/f2fs/f2fs.h
#define stat_inc_seg_count(si, type)
#define stat_inc_tot_blk_count(si, blks)
#define stat_inc_data_blk_count(si, blks)
-diff -Nur linux-3.10.36/fs/f2fs/file.c linux-linaro-stable-mx6/fs/f2fs/file.c
+diff -Nur linux-3.10.36/fs/f2fs/file.c linux-solidrun/fs/f2fs/file.c
--- linux-3.10.36/fs/f2fs/file.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/file.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/file.c 2014-04-24 07:58:28.860225065 +0200
@@ -35,18 +35,18 @@
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
block_t old_blk_addr;
@@ -561226,9 +539609,9 @@ diff -Nur linux-3.10.36/fs/f2fs/file.c linux-linaro-stable-mx6/fs/f2fs/file.c
{
unsigned int oldflags;
-diff -Nur linux-3.10.36/fs/f2fs/gc.c linux-linaro-stable-mx6/fs/f2fs/gc.c
+diff -Nur linux-3.10.36/fs/f2fs/gc.c linux-solidrun/fs/f2fs/gc.c
--- linux-3.10.36/fs/f2fs/gc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/gc.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/gc.c 2014-04-24 07:58:28.860225065 +0200
@@ -29,10 +29,11 @@
static int gc_thread_func(void *data)
{
@@ -561535,9 +539918,9 @@ diff -Nur linux-3.10.36/fs/f2fs/gc.c linux-linaro-stable-mx6/fs/f2fs/gc.c
data_page = get_lock_data_page(inode,
start_bidx + ofs_in_node);
if (IS_ERR(data_page))
-diff -Nur linux-3.10.36/fs/f2fs/gc.h linux-linaro-stable-mx6/fs/f2fs/gc.h
+diff -Nur linux-3.10.36/fs/f2fs/gc.h linux-solidrun/fs/f2fs/gc.h
--- linux-3.10.36/fs/f2fs/gc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/gc.h 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/gc.h 2014-04-24 07:58:28.860225065 +0200
@@ -13,18 +13,26 @@
* whether IO subsystem is idle
* or not
@@ -561606,9 +539989,9 @@ diff -Nur linux-3.10.36/fs/f2fs/gc.h linux-linaro-stable-mx6/fs/f2fs/gc.h
return wait;
}
-diff -Nur linux-3.10.36/fs/f2fs/inode.c linux-linaro-stable-mx6/fs/f2fs/inode.c
+diff -Nur linux-3.10.36/fs/f2fs/inode.c linux-solidrun/fs/f2fs/inode.c
--- linux-3.10.36/fs/f2fs/inode.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/inode.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/inode.c 2014-04-24 07:58:28.860225065 +0200
@@ -37,6 +37,31 @@
inode->i_flags |= S_DIRSYNC;
}
@@ -561804,9 +540187,9 @@ diff -Nur linux-3.10.36/fs/f2fs/inode.c linux-linaro-stable-mx6/fs/f2fs/inode.c
sb_end_intwrite(inode->i_sb);
no_delete:
-diff -Nur linux-3.10.36/fs/f2fs/Kconfig linux-linaro-stable-mx6/fs/f2fs/Kconfig
+diff -Nur linux-3.10.36/fs/f2fs/Kconfig linux-solidrun/fs/f2fs/Kconfig
--- linux-3.10.36/fs/f2fs/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/Kconfig 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/Kconfig 2014-04-24 07:58:28.860225065 +0200
@@ -51,3 +51,23 @@
Linux website <http://acl.bestbits.at/>.
@@ -561831,9 +540214,9 @@ diff -Nur linux-3.10.36/fs/f2fs/Kconfig linux-linaro-stable-mx6/fs/f2fs/Kconfig
+ Enables BUG_ONs which check the file system consistency in runtime.
+
+ If you want to improve the performance, say N.
-diff -Nur linux-3.10.36/fs/f2fs/namei.c linux-linaro-stable-mx6/fs/f2fs/namei.c
+diff -Nur linux-3.10.36/fs/f2fs/namei.c linux-solidrun/fs/f2fs/namei.c
--- linux-3.10.36/fs/f2fs/namei.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/namei.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/namei.c 2014-04-24 07:58:28.864225080 +0200
@@ -27,19 +27,19 @@
nid_t ino;
struct inode *inode;
@@ -562145,9 +540528,9 @@ diff -Nur linux-3.10.36/fs/f2fs/namei.c linux-linaro-stable-mx6/fs/f2fs/namei.c
.setattr = f2fs_setattr,
.get_acl = f2fs_get_acl,
#ifdef CONFIG_F2FS_FS_XATTR
-diff -Nur linux-3.10.36/fs/f2fs/node.c linux-linaro-stable-mx6/fs/f2fs/node.c
+diff -Nur linux-3.10.36/fs/f2fs/node.c linux-solidrun/fs/f2fs/node.c
--- linux-3.10.36/fs/f2fs/node.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/node.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/node.c 2014-04-24 07:58:28.864225080 +0200
@@ -204,7 +204,7 @@
}
e->ni = *ni;
@@ -562746,9 +541129,9 @@ diff -Nur linux-3.10.36/fs/f2fs/node.c linux-linaro-stable-mx6/fs/f2fs/node.c
write_unlock(&nm_i->nat_tree_lock);
kfree(nm_i->nat_bitmap);
-diff -Nur linux-3.10.36/fs/f2fs/node.h linux-linaro-stable-mx6/fs/f2fs/node.h
+diff -Nur linux-3.10.36/fs/f2fs/node.h linux-solidrun/fs/f2fs/node.h
--- linux-3.10.36/fs/f2fs/node.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/node.h 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/node.h 2014-04-24 07:58:28.864225080 +0200
@@ -155,8 +155,7 @@
static inline void fill_node_footer(struct page *page, nid_t nid,
nid_t ino, unsigned int ofs, bool reset)
@@ -562967,9 +541350,9 @@ diff -Nur linux-3.10.36/fs/f2fs/node.h linux-linaro-stable-mx6/fs/f2fs/node.h
}
+#define set_dentry_mark(page, mark) set_mark(page, mark, DENT_BIT_SHIFT)
+#define set_fsync_mark(page, mark) set_mark(page, mark, FSYNC_BIT_SHIFT)
-diff -Nur linux-3.10.36/fs/f2fs/recovery.c linux-linaro-stable-mx6/fs/f2fs/recovery.c
+diff -Nur linux-3.10.36/fs/f2fs/recovery.c linux-solidrun/fs/f2fs/recovery.c
--- linux-3.10.36/fs/f2fs/recovery.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/recovery.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/recovery.c 2014-04-24 07:58:28.864225080 +0200
@@ -40,45 +40,71 @@
static int recover_dentry(struct page *ipage, struct inode *inode)
@@ -563406,9 +541789,9 @@ diff -Nur linux-3.10.36/fs/f2fs/recovery.c linux-linaro-stable-mx6/fs/f2fs/recov
+ write_checkpoint(sbi, false);
return err;
}
-diff -Nur linux-3.10.36/fs/f2fs/segment.c linux-linaro-stable-mx6/fs/f2fs/segment.c
+diff -Nur linux-3.10.36/fs/f2fs/segment.c linux-solidrun/fs/f2fs/segment.c
--- linux-3.10.36/fs/f2fs/segment.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/segment.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/segment.c 2014-04-24 07:58:28.864225080 +0200
@@ -36,6 +36,14 @@
}
}
@@ -563981,9 +542364,9 @@ diff -Nur linux-3.10.36/fs/f2fs/segment.c linux-linaro-stable-mx6/fs/f2fs/segmen
destroy_dirty_segmap(sbi);
destroy_curseg(sbi);
destroy_free_segmap(sbi);
-diff -Nur linux-3.10.36/fs/f2fs/segment.h linux-linaro-stable-mx6/fs/f2fs/segment.h
+diff -Nur linux-3.10.36/fs/f2fs/segment.h linux-solidrun/fs/f2fs/segment.h
--- linux-3.10.36/fs/f2fs/segment.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/segment.h 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/segment.h 2014-04-24 07:58:28.864225080 +0200
@@ -14,6 +14,8 @@
#define NULL_SEGNO ((unsigned int)(~0))
#define NULL_SECNO ((unsigned int)(~0))
@@ -564095,9 +542478,9 @@ diff -Nur linux-3.10.36/fs/f2fs/segment.h linux-linaro-stable-mx6/fs/f2fs/segmen
static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi,
unsigned int start)
-diff -Nur linux-3.10.36/fs/f2fs/super.c linux-linaro-stable-mx6/fs/f2fs/super.c
+diff -Nur linux-3.10.36/fs/f2fs/super.c linux-solidrun/fs/f2fs/super.c
--- linux-3.10.36/fs/f2fs/super.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/super.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/super.c 2014-04-24 07:58:28.864225080 +0200
@@ -18,45 +18,185 @@
#include <linux/parser.h>
#include <linux/mount.h>
@@ -564904,9 +543287,9 @@ diff -Nur linux-3.10.36/fs/f2fs/super.c linux-linaro-stable-mx6/fs/f2fs/super.c
}
module_init(init_f2fs_fs)
-diff -Nur linux-3.10.36/fs/f2fs/xattr.c linux-linaro-stable-mx6/fs/f2fs/xattr.c
+diff -Nur linux-3.10.36/fs/f2fs/xattr.c linux-solidrun/fs/f2fs/xattr.c
--- linux-3.10.36/fs/f2fs/xattr.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/xattr.c 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/xattr.c 2014-04-24 07:58:28.864225080 +0200
@@ -20,6 +20,7 @@
*/
#include <linux/rwsem.h>
@@ -565463,9 +543846,9 @@ diff -Nur linux-3.10.36/fs/f2fs/xattr.c linux-linaro-stable-mx6/fs/f2fs/xattr.c
+
+ return err;
+}
-diff -Nur linux-3.10.36/fs/f2fs/xattr.h linux-linaro-stable-mx6/fs/f2fs/xattr.h
+diff -Nur linux-3.10.36/fs/f2fs/xattr.h linux-solidrun/fs/f2fs/xattr.h
--- linux-3.10.36/fs/f2fs/xattr.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/f2fs/xattr.h 2014-04-21 13:50:42.646728780 +0200
++++ linux-solidrun/fs/f2fs/xattr.h 2014-04-24 07:58:28.864225080 +0200
@@ -51,7 +51,7 @@
#define XATTR_HDR(ptr) ((struct f2fs_xattr_header *)(ptr))
@@ -565542,9 +543925,9 @@ diff -Nur linux-3.10.36/fs/f2fs/xattr.h linux-linaro-stable-mx6/fs/f2fs/xattr.h
+}
+#endif
#endif /* __F2FS_XATTR_H__ */
-diff -Nur linux-3.10.36/fs/file.c linux-linaro-stable-mx6/fs/file.c
+diff -Nur linux-3.10.36/fs/file.c linux-solidrun/fs/file.c
--- linux-3.10.36/fs/file.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/file.c 2014-04-21 13:50:42.650728797 +0200
++++ linux-solidrun/fs/file.c 2014-04-24 07:58:28.868225095 +0200
@@ -34,7 +34,7 @@
* vmalloc() if the allocation size will be considered "large" by the VM.
*/
@@ -565554,9 +543937,9 @@ diff -Nur linux-3.10.36/fs/file.c linux-linaro-stable-mx6/fs/file.c
if (data != NULL)
return data;
}
-diff -Nur linux-3.10.36/fs/jffs2/fs.c linux-linaro-stable-mx6/fs/jffs2/fs.c
+diff -Nur linux-3.10.36/fs/jffs2/fs.c linux-solidrun/fs/jffs2/fs.c
--- linux-3.10.36/fs/jffs2/fs.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/jffs2/fs.c 2014-04-21 13:50:42.674728899 +0200
++++ linux-solidrun/fs/jffs2/fs.c 2014-04-24 07:58:29.072225811 +0200
@@ -515,6 +515,10 @@
c = JFFS2_SB_INFO(sb);
@@ -565568,9 +543951,9 @@ diff -Nur linux-3.10.36/fs/jffs2/fs.c linux-linaro-stable-mx6/fs/jffs2/fs.c
#ifndef CONFIG_JFFS2_FS_WRITEBUFFER
if (c->mtd->type == MTD_NANDFLASH) {
pr_err("Cannot operate on NAND flash unless jffs2 NAND support is compiled in\n");
-diff -Nur linux-3.10.36/fs/lockd/svclock.c linux-linaro-stable-mx6/fs/lockd/svclock.c
+diff -Nur linux-3.10.36/fs/lockd/svclock.c linux-solidrun/fs/lockd/svclock.c
--- linux-3.10.36/fs/lockd/svclock.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/lockd/svclock.c 2014-04-21 13:50:42.686728949 +0200
++++ linux-solidrun/fs/lockd/svclock.c 2014-04-24 07:58:29.100225911 +0200
@@ -767,7 +767,6 @@
struct nlm_file *file = block->b_file;
struct nlm_lock *lock = &block->b_call->a_args.lock;
@@ -565596,9 +543979,9 @@ diff -Nur linux-3.10.36/fs/lockd/svclock.c linux-linaro-stable-mx6/fs/lockd/svcl
switch (error) {
case 0:
-diff -Nur linux-3.10.36/fs/namei.c linux-linaro-stable-mx6/fs/namei.c
+diff -Nur linux-3.10.36/fs/namei.c linux-solidrun/fs/namei.c
--- linux-3.10.36/fs/namei.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/namei.c 2014-04-21 13:50:42.694728982 +0200
++++ linux-solidrun/fs/namei.c 2014-04-24 07:58:29.108225939 +0200
@@ -3655,7 +3655,6 @@
out_dput:
done_path_create(&new_path, new_dentry);
@@ -565607,9 +543990,9 @@ diff -Nur linux-3.10.36/fs/namei.c linux-linaro-stable-mx6/fs/namei.c
how |= LOOKUP_REVAL;
goto retry;
}
-diff -Nur linux-3.10.36/fs/nfs/delegation.c linux-linaro-stable-mx6/fs/nfs/delegation.c
+diff -Nur linux-3.10.36/fs/nfs/delegation.c linux-solidrun/fs/nfs/delegation.c
--- linux-3.10.36/fs/nfs/delegation.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/nfs/delegation.c 2014-04-21 13:50:42.698728999 +0200
++++ linux-solidrun/fs/nfs/delegation.c 2014-04-24 07:58:29.112225952 +0200
@@ -656,19 +656,16 @@
rcu_read_lock();
@@ -565634,9 +544017,9 @@ diff -Nur linux-3.10.36/fs/nfs/delegation.c linux-linaro-stable-mx6/fs/nfs/deleg
}
static struct inode *
-diff -Nur linux-3.10.36/fs/nfs/nfs4proc.c linux-linaro-stable-mx6/fs/nfs/nfs4proc.c
+diff -Nur linux-3.10.36/fs/nfs/nfs4proc.c linux-solidrun/fs/nfs/nfs4proc.c
--- linux-3.10.36/fs/nfs/nfs4proc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/nfs/nfs4proc.c 2014-04-21 13:50:42.702729016 +0200
++++ linux-solidrun/fs/nfs/nfs4proc.c 2014-04-24 07:58:29.116225967 +0200
@@ -3607,9 +3607,8 @@
{
nfs4_stateid current_stateid;
@@ -565649,9 +544032,9 @@ diff -Nur linux-3.10.36/fs/nfs/nfs4proc.c linux-linaro-stable-mx6/fs/nfs/nfs4pro
return nfs4_stateid_match(stateid, &current_stateid);
}
-diff -Nur linux-3.10.36/fs/ocfs2/file.c linux-linaro-stable-mx6/fs/ocfs2/file.c
+diff -Nur linux-3.10.36/fs/ocfs2/file.c linux-solidrun/fs/ocfs2/file.c
--- linux-3.10.36/fs/ocfs2/file.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ocfs2/file.c 2014-04-21 13:50:42.754729236 +0200
++++ linux-solidrun/fs/ocfs2/file.c 2014-04-24 07:58:29.264226487 +0200
@@ -2374,8 +2374,8 @@
if (((file->f_flags & O_DSYNC) && !direct_io) || IS_SYNC(inode) ||
@@ -565674,9 +544057,9 @@ diff -Nur linux-3.10.36/fs/ocfs2/file.c linux-linaro-stable-mx6/fs/ocfs2/file.c
}
/*
-diff -Nur linux-3.10.36/fs/ocfs2/quota_global.c linux-linaro-stable-mx6/fs/ocfs2/quota_global.c
+diff -Nur linux-3.10.36/fs/ocfs2/quota_global.c linux-solidrun/fs/ocfs2/quota_global.c
--- linux-3.10.36/fs/ocfs2/quota_global.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ocfs2/quota_global.c 2014-04-21 13:50:42.758729252 +0200
++++ linux-solidrun/fs/ocfs2/quota_global.c 2014-04-24 07:58:29.268226501 +0200
@@ -717,12 +717,6 @@
*/
if (status < 0)
@@ -565718,9 +544101,9 @@ diff -Nur linux-3.10.36/fs/ocfs2/quota_global.c linux-linaro-stable-mx6/fs/ocfs2
OCFS2_DQUOT(dquot)->dq_use_count++;
OCFS2_DQUOT(dquot)->dq_origspace = dquot->dq_dqb.dqb_curspace;
-diff -Nur linux-3.10.36/fs/ocfs2/quota_local.c linux-linaro-stable-mx6/fs/ocfs2/quota_local.c
+diff -Nur linux-3.10.36/fs/ocfs2/quota_local.c linux-solidrun/fs/ocfs2/quota_local.c
--- linux-3.10.36/fs/ocfs2/quota_local.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/ocfs2/quota_local.c 2014-04-21 13:50:42.758729252 +0200
++++ linux-solidrun/fs/ocfs2/quota_local.c 2014-04-24 07:58:29.268226501 +0200
@@ -1303,6 +1303,10 @@
ocfs2_journal_dirty(handle, od->dq_chunk->qc_headerbh);
@@ -565732,9 +544115,9 @@ diff -Nur linux-3.10.36/fs/ocfs2/quota_local.c linux-linaro-stable-mx6/fs/ocfs2/
return status;
}
-diff -Nur linux-3.10.36/fs/proc/base.c linux-linaro-stable-mx6/fs/proc/base.c
+diff -Nur linux-3.10.36/fs/proc/base.c linux-solidrun/fs/proc/base.c
--- linux-3.10.36/fs/proc/base.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/proc/base.c 2014-04-21 13:50:42.766729286 +0200
++++ linux-solidrun/fs/proc/base.c 2014-04-24 07:58:29.276226530 +0200
@@ -1825,7 +1825,6 @@
if (rc)
goto out_mmput;
@@ -565743,9 +544126,9 @@ diff -Nur linux-3.10.36/fs/proc/base.c linux-linaro-stable-mx6/fs/proc/base.c
down_read(&mm->mmap_sem);
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
-diff -Nur linux-3.10.36/fs/proc/page.c linux-linaro-stable-mx6/fs/proc/page.c
+diff -Nur linux-3.10.36/fs/proc/page.c linux-solidrun/fs/proc/page.c
--- linux-3.10.36/fs/proc/page.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/proc/page.c 2014-04-21 13:50:42.766729286 +0200
++++ linux-solidrun/fs/proc/page.c 2014-04-24 07:58:29.288226572 +0200
@@ -121,7 +121,7 @@
* just checks PG_head/PG_tail, so we need to check PageLRU to make
* sure a given page is a thp, not a non-huge compound page.
@@ -565755,9 +544138,9 @@ diff -Nur linux-3.10.36/fs/proc/page.c linux-linaro-stable-mx6/fs/proc/page.c
u |= 1 << KPF_THP;
/*
-diff -Nur linux-3.10.36/fs/quota/dquot.c linux-linaro-stable-mx6/fs/quota/dquot.c
+diff -Nur linux-3.10.36/fs/quota/dquot.c linux-solidrun/fs/quota/dquot.c
--- linux-3.10.36/fs/quota/dquot.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/quota/dquot.c 2014-04-21 13:50:42.770729303 +0200
++++ linux-solidrun/fs/quota/dquot.c 2014-04-24 07:58:29.324226698 +0200
@@ -581,17 +581,9 @@
dqstats_inc(DQST_LOOKUPS);
dqput(old_dquot);
@@ -565779,9 +544162,9 @@ diff -Nur linux-3.10.36/fs/quota/dquot.c linux-linaro-stable-mx6/fs/quota/dquot.
spin_lock(&dq_list_lock);
/* We are safe to continue now because our dquot could not
* be moved out of the inuse list while we hold the reference */
-diff -Nur linux-3.10.36/include/asm-generic/gpio.h linux-linaro-stable-mx6/include/asm-generic/gpio.h
+diff -Nur linux-3.10.36/include/asm-generic/gpio.h linux-solidrun/include/asm-generic/gpio.h
--- linux-3.10.36/include/asm-generic/gpio.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/asm-generic/gpio.h 2014-04-21 13:50:42.830729556 +0200
++++ linux-solidrun/include/asm-generic/gpio.h 2014-04-24 07:58:34.340244354 +0200
@@ -10,6 +10,8 @@
#ifdef CONFIG_GPIOLIB
@@ -566053,9 +544436,9 @@ diff -Nur linux-3.10.36/include/asm-generic/gpio.h linux-linaro-stable-mx6/inclu
-#endif /* CONFIG_GPIO_SYSFS */
-
#endif /* _ASM_GENERIC_GPIO_H */
-diff -Nur linux-3.10.36/include/drm/drm_crtc_helper.h linux-linaro-stable-mx6/include/drm/drm_crtc_helper.h
+diff -Nur linux-3.10.36/include/drm/drm_crtc_helper.h linux-solidrun/include/drm/drm_crtc_helper.h
--- linux-3.10.36/include/drm/drm_crtc_helper.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/drm/drm_crtc_helper.h 2014-04-21 13:50:42.838729590 +0200
++++ linux-solidrun/include/drm/drm_crtc_helper.h 2014-04-24 07:58:34.352244397 +0200
@@ -127,6 +127,7 @@
extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY);
@@ -566064,9 +544447,9 @@ diff -Nur linux-3.10.36/include/drm/drm_crtc_helper.h linux-linaro-stable-mx6/in
extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
struct drm_display_mode *mode,
-diff -Nur linux-3.10.36/include/dt-bindings/clock/imx6sl-clock.h linux-linaro-stable-mx6/include/dt-bindings/clock/imx6sl-clock.h
+diff -Nur linux-3.10.36/include/dt-bindings/clock/imx6sl-clock.h linux-solidrun/include/dt-bindings/clock/imx6sl-clock.h
--- linux-3.10.36/include/dt-bindings/clock/imx6sl-clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/dt-bindings/clock/imx6sl-clock.h 2014-04-21 13:50:42.842729606 +0200
++++ linux-solidrun/include/dt-bindings/clock/imx6sl-clock.h 2014-04-24 07:58:34.356244411 +0200
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -566220,9 +544603,9 @@ diff -Nur linux-3.10.36/include/dt-bindings/clock/imx6sl-clock.h linux-linaro-st
+#define IMX6SL_CLK_CLK_END 137
+
+#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.10.36/include/dt-bindings/clock/vf610-clock.h linux-linaro-stable-mx6/include/dt-bindings/clock/vf610-clock.h
+diff -Nur linux-3.10.36/include/dt-bindings/clock/vf610-clock.h linux-solidrun/include/dt-bindings/clock/vf610-clock.h
--- linux-3.10.36/include/dt-bindings/clock/vf610-clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/dt-bindings/clock/vf610-clock.h 2014-04-21 13:50:42.842729606 +0200
++++ linux-solidrun/include/dt-bindings/clock/vf610-clock.h 2014-04-24 07:58:34.356244411 +0200
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -566389,9 +544772,9 @@ diff -Nur linux-3.10.36/include/dt-bindings/clock/vf610-clock.h linux-linaro-sta
+#define VF610_CLK_END 150
+
+#endif /* __DT_BINDINGS_CLOCK_VF610_H */
-diff -Nur linux-3.10.36/include/linux/arm-cci.h linux-linaro-stable-mx6/include/linux/arm-cci.h
+diff -Nur linux-3.10.36/include/linux/arm-cci.h linux-solidrun/include/linux/arm-cci.h
--- linux-3.10.36/include/linux/arm-cci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/arm-cci.h 2014-04-21 13:50:42.846729624 +0200
++++ linux-solidrun/include/linux/arm-cci.h 2014-04-24 07:58:34.384244509 +0200
@@ -0,0 +1,61 @@
+/*
+ * CCI cache coherent interconnect support
@@ -566454,9 +544837,9 @@ diff -Nur linux-3.10.36/include/linux/arm-cci.h linux-linaro-stable-mx6/include/
+ __cci_control_port_by_index(dev, true)
+
+#endif
-diff -Nur linux-3.10.36/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/include/linux/arm-hdlcd.h
+diff -Nur linux-3.10.36/include/linux/arm-hdlcd.h linux-solidrun/include/linux/arm-hdlcd.h
--- linux-3.10.36/include/linux/arm-hdlcd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/arm-hdlcd.h 2014-04-21 13:50:42.846729624 +0200
++++ linux-solidrun/include/linux/arm-hdlcd.h 2014-04-24 07:58:34.384244509 +0200
@@ -0,0 +1,122 @@
+/*
+ * include/linux/arm-hdlcd.h
@@ -566580,9 +544963,9 @@ diff -Nur linux-3.10.36/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/includ
+ struct completion vsync_completion;
+ unsigned char *edid;
+};
-diff -Nur linux-3.10.36/include/linux/backlight.h linux-linaro-stable-mx6/include/linux/backlight.h
+diff -Nur linux-3.10.36/include/linux/backlight.h linux-solidrun/include/linux/backlight.h
--- linux-3.10.36/include/linux/backlight.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/backlight.h 2014-04-21 13:50:42.846729624 +0200
++++ linux-solidrun/include/linux/backlight.h 2014-04-24 07:58:34.388244523 +0200
@@ -9,6 +9,7 @@
#define _LINUX_BACKLIGHT_H
@@ -566603,9 +544986,9 @@ diff -Nur linux-3.10.36/include/linux/backlight.h linux-linaro-stable-mx6/includ
};
static inline void backlight_update_status(struct backlight_device *bd)
-diff -Nur linux-3.10.36/include/linux/bitops.h linux-linaro-stable-mx6/include/linux/bitops.h
+diff -Nur linux-3.10.36/include/linux/bitops.h linux-solidrun/include/linux/bitops.h
--- linux-3.10.36/include/linux/bitops.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/bitops.h 2014-04-21 13:50:42.850729641 +0200
++++ linux-solidrun/include/linux/bitops.h 2014-04-24 07:58:34.388244523 +0200
@@ -185,21 +185,6 @@
#ifdef __KERNEL__
@@ -566628,9 +545011,9 @@ diff -Nur linux-3.10.36/include/linux/bitops.h linux-linaro-stable-mx6/include/l
#ifndef find_last_bit
/**
* find_last_bit - find the last set bit in a memory region
-diff -Nur linux-3.10.36/include/linux/busfreq-imx6.h linux-linaro-stable-mx6/include/linux/busfreq-imx6.h
+diff -Nur linux-3.10.36/include/linux/busfreq-imx6.h linux-solidrun/include/linux/busfreq-imx6.h
--- linux-3.10.36/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/busfreq-imx6.h 2014-04-21 13:50:42.850729641 +0200
++++ linux-solidrun/include/linux/busfreq-imx6.h 2014-04-24 07:58:34.392244537 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -566655,9 +545038,9 @@ diff -Nur linux-3.10.36/include/linux/busfreq-imx6.h linux-linaro-stable-mx6/inc
+void request_bus_freq(enum bus_freq_mode mode);
+void release_bus_freq(enum bus_freq_mode mode);
+#endif
-diff -Nur linux-3.10.36/include/linux/can/skb.h linux-linaro-stable-mx6/include/linux/can/skb.h
+diff -Nur linux-3.10.36/include/linux/can/skb.h linux-solidrun/include/linux/can/skb.h
--- linux-3.10.36/include/linux/can/skb.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/can/skb.h 2014-04-21 13:50:42.850729641 +0200
++++ linux-solidrun/include/linux/can/skb.h 2014-04-24 07:58:34.392244537 +0200
@@ -11,9 +11,7 @@
#define CAN_SKB_H
@@ -566709,9 +545092,9 @@ diff -Nur linux-3.10.36/include/linux/can/skb.h linux-linaro-stable-mx6/include/
-}
-
#endif /* CAN_SKB_H */
-diff -Nur linux-3.10.36/include/linux/ceph/osd_client.h linux-linaro-stable-mx6/include/linux/ceph/osd_client.h
+diff -Nur linux-3.10.36/include/linux/ceph/osd_client.h linux-solidrun/include/linux/ceph/osd_client.h
--- linux-3.10.36/include/linux/ceph/osd_client.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/ceph/osd_client.h 2014-04-21 13:50:42.854729657 +0200
++++ linux-solidrun/include/linux/ceph/osd_client.h 2014-04-24 07:58:34.396244553 +0200
@@ -138,7 +138,6 @@
__le64 *r_request_pool;
void *r_request_pgid;
@@ -566720,9 +545103,9 @@ diff -Nur linux-3.10.36/include/linux/ceph/osd_client.h linux-linaro-stable-mx6/
struct ceph_eversion *r_request_reassert_version;
int r_result;
-diff -Nur linux-3.10.36/include/linux/compiler-gcc4.h linux-linaro-stable-mx6/include/linux/compiler-gcc4.h
+diff -Nur linux-3.10.36/include/linux/compiler-gcc4.h linux-solidrun/include/linux/compiler-gcc4.h
--- linux-3.10.36/include/linux/compiler-gcc4.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/compiler-gcc4.h 2014-04-21 13:50:42.854729657 +0200
++++ linux-solidrun/include/linux/compiler-gcc4.h 2014-04-24 07:58:34.396244553 +0200
@@ -75,7 +75,11 @@
*
* (asm goto is automatically volatile - the naming reflects this.)
@@ -566736,9 +545119,9 @@ diff -Nur linux-3.10.36/include/linux/compiler-gcc4.h linux-linaro-stable-mx6/in
#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
#if GCC_VERSION >= 40400
-diff -Nur linux-3.10.36/include/linux/component.h linux-linaro-stable-mx6/include/linux/component.h
+diff -Nur linux-3.10.36/include/linux/component.h linux-solidrun/include/linux/component.h
--- linux-3.10.36/include/linux/component.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/component.h 2014-04-21 13:50:42.854729657 +0200
++++ linux-solidrun/include/linux/component.h 2014-04-24 07:58:34.396244553 +0200
@@ -0,0 +1,32 @@
+#ifndef COMPONENT_H
+#define COMPONENT_H
@@ -566772,9 +545155,9 @@ diff -Nur linux-3.10.36/include/linux/component.h linux-linaro-stable-mx6/includ
+ int (*compare)(struct device *, void *), void *compare_data);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/cpufreq.h linux-linaro-stable-mx6/include/linux/cpufreq.h
+diff -Nur linux-3.10.36/include/linux/cpufreq.h linux-solidrun/include/linux/cpufreq.h
--- linux-3.10.36/include/linux/cpufreq.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/cpufreq.h 2014-04-21 13:50:42.858729674 +0200
++++ linux-solidrun/include/linux/cpufreq.h 2014-04-24 07:58:34.400244566 +0200
@@ -393,6 +393,9 @@
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE)
extern struct cpufreq_governor cpufreq_gov_conservative;
@@ -566785,9 +545168,9 @@ diff -Nur linux-3.10.36/include/linux/cpufreq.h linux-linaro-stable-mx6/include/
#endif
-diff -Nur linux-3.10.36/include/linux/cpu.h linux-linaro-stable-mx6/include/linux/cpu.h
+diff -Nur linux-3.10.36/include/linux/cpu.h linux-solidrun/include/linux/cpu.h
--- linux-3.10.36/include/linux/cpu.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/cpu.h 2014-04-21 13:50:42.858729674 +0200
++++ linux-solidrun/include/linux/cpu.h 2014-04-24 07:58:34.400244566 +0200
@@ -29,6 +29,7 @@
extern int register_cpu(struct cpu *cpu, int num);
extern struct device *get_cpu_device(unsigned cpu);
@@ -566808,9 +545191,9 @@ diff -Nur linux-3.10.36/include/linux/cpu.h linux-linaro-stable-mx6/include/linu
+void idle_notifier_call_chain(unsigned long val);
+
#endif /* _LINUX_CPU_H_ */
-diff -Nur linux-3.10.36/include/linux/debugfs.h linux-linaro-stable-mx6/include/linux/debugfs.h
+diff -Nur linux-3.10.36/include/linux/debugfs.h linux-solidrun/include/linux/debugfs.h
--- linux-3.10.36/include/linux/debugfs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/debugfs.h 2014-04-21 13:50:42.858729674 +0200
++++ linux-solidrun/include/linux/debugfs.h 2014-04-24 07:58:34.400244566 +0200
@@ -79,6 +79,8 @@
struct dentry *parent, u64 *value);
struct dentry *debugfs_create_size_t(const char *name, umode_t mode,
@@ -566820,9 +545203,9 @@ diff -Nur linux-3.10.36/include/linux/debugfs.h linux-linaro-stable-mx6/include/
struct dentry *debugfs_create_bool(const char *name, umode_t mode,
struct dentry *parent, u32 *value);
-diff -Nur linux-3.10.36/include/linux/device_cooling.h linux-linaro-stable-mx6/include/linux/device_cooling.h
+diff -Nur linux-3.10.36/include/linux/device_cooling.h linux-solidrun/include/linux/device_cooling.h
--- linux-3.10.36/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/device_cooling.h 2014-04-21 13:50:42.862729691 +0200
++++ linux-solidrun/include/linux/device_cooling.h 2014-04-24 07:58:34.404244580 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -566869,9 +545252,9 @@ diff -Nur linux-3.10.36/include/linux/device_cooling.h linux-linaro-stable-mx6/i
+}
+#endif
+#endif /* __DEVICE_THERMAL_H__ */
-diff -Nur linux-3.10.36/include/linux/device.h linux-linaro-stable-mx6/include/linux/device.h
+diff -Nur linux-3.10.36/include/linux/device.h linux-solidrun/include/linux/device.h
--- linux-3.10.36/include/linux/device.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/device.h 2014-04-21 13:50:42.862729691 +0200
++++ linux-solidrun/include/linux/device.h 2014-04-24 07:58:34.404244580 +0200
@@ -47,7 +47,11 @@
};
@@ -566954,9 +545337,9 @@ diff -Nur linux-3.10.36/include/linux/device.h linux-linaro-stable-mx6/include/l
#define DEVICE_ULONG_ATTR(_name, _mode, _var) \
struct dev_ext_attribute dev_attr_##_name = \
{ __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) }
-diff -Nur linux-3.10.36/include/linux/dmaengine.h linux-linaro-stable-mx6/include/linux/dmaengine.h
+diff -Nur linux-3.10.36/include/linux/dmaengine.h linux-solidrun/include/linux/dmaengine.h
--- linux-3.10.36/include/linux/dmaengine.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/dmaengine.h 2014-04-21 13:50:42.862729691 +0200
++++ linux-solidrun/include/linux/dmaengine.h 2014-04-24 07:58:34.404244580 +0200
@@ -341,6 +341,8 @@
* @slave_id: Slave requester id. Only valid for slave channels. The dma
* slave peripheral will have unique id as dma requester which need to be
@@ -566975,9 +545358,9 @@ diff -Nur linux-3.10.36/include/linux/dmaengine.h linux-linaro-stable-mx6/includ
};
static inline const char *dma_chan_name(struct dma_chan *chan)
-diff -Nur linux-3.10.36/include/linux/err.h linux-linaro-stable-mx6/include/linux/err.h
+diff -Nur linux-3.10.36/include/linux/err.h linux-solidrun/include/linux/err.h
--- linux-3.10.36/include/linux/err.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/err.h 2014-04-21 13:50:42.866729708 +0200
++++ linux-solidrun/include/linux/err.h 2014-04-24 07:58:34.408244594 +0200
@@ -52,7 +52,7 @@
return (void *) ptr;
}
@@ -566997,9 +545380,9 @@ diff -Nur linux-3.10.36/include/linux/err.h linux-linaro-stable-mx6/include/linu
#endif
#endif /* _LINUX_ERR_H */
-diff -Nur linux-3.10.36/include/linux/f2fs_fs.h linux-linaro-stable-mx6/include/linux/f2fs_fs.h
+diff -Nur linux-3.10.36/include/linux/f2fs_fs.h linux-solidrun/include/linux/f2fs_fs.h
--- linux-3.10.36/include/linux/f2fs_fs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/f2fs_fs.h 2014-04-21 13:50:42.866729708 +0200
++++ linux-solidrun/include/linux/f2fs_fs.h 2014-04-24 07:58:34.408244594 +0200
@@ -140,14 +140,24 @@
} __packed;
@@ -567038,9 +545421,9 @@ diff -Nur linux-3.10.36/include/linux/f2fs_fs.h linux-linaro-stable-mx6/include/
__le32 i_nid[5]; /* direct(2), indirect(2),
double_indirect(1) node id */
-diff -Nur linux-3.10.36/include/linux/firewire.h linux-linaro-stable-mx6/include/linux/firewire.h
+diff -Nur linux-3.10.36/include/linux/firewire.h linux-solidrun/include/linux/firewire.h
--- linux-3.10.36/include/linux/firewire.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/firewire.h 2014-04-21 13:50:42.866729708 +0200
++++ linux-solidrun/include/linux/firewire.h 2014-04-24 07:58:34.412244608 +0200
@@ -200,7 +200,6 @@
unsigned irmc:1;
unsigned bc_implemented:2;
@@ -567049,9 +545432,9 @@ diff -Nur linux-3.10.36/include/linux/firewire.h linux-linaro-stable-mx6/include
struct delayed_work work;
struct fw_attribute_group attribute_group;
};
-diff -Nur linux-3.10.36/include/linux/ftrace_event.h linux-linaro-stable-mx6/include/linux/ftrace_event.h
+diff -Nur linux-3.10.36/include/linux/ftrace_event.h linux-solidrun/include/linux/ftrace_event.h
--- linux-3.10.36/include/linux/ftrace_event.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/ftrace_event.h 2014-04-21 13:50:42.870729725 +0200
++++ linux-solidrun/include/linux/ftrace_event.h 2014-04-24 07:58:34.416244621 +0200
@@ -325,6 +325,10 @@
FILTER_TRACE_FN,
};
@@ -567063,9 +545446,9 @@ diff -Nur linux-3.10.36/include/linux/ftrace_event.h linux-linaro-stable-mx6/inc
extern int trace_event_raw_init(struct ftrace_event_call *call);
extern int trace_define_field(struct ftrace_event_call *call, const char *type,
const char *name, int offset, int size,
-diff -Nur linux-3.10.36/include/linux/genalloc.h linux-linaro-stable-mx6/include/linux/genalloc.h
+diff -Nur linux-3.10.36/include/linux/genalloc.h linux-solidrun/include/linux/genalloc.h
--- linux-3.10.36/include/linux/genalloc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/genalloc.h 2014-04-21 13:50:42.870729725 +0200
++++ linux-solidrun/include/linux/genalloc.h 2014-04-24 07:58:34.416244621 +0200
@@ -94,6 +94,8 @@
}
extern void gen_pool_destroy(struct gen_pool *);
@@ -567075,9 +545458,9 @@ diff -Nur linux-3.10.36/include/linux/genalloc.h linux-linaro-stable-mx6/include
extern void gen_pool_free(struct gen_pool *, unsigned long, size_t);
extern void gen_pool_for_each_chunk(struct gen_pool *,
void (*)(struct gen_pool *, struct gen_pool_chunk *, void *), void *);
-diff -Nur linux-3.10.36/include/linux/gpio/consumer.h linux-linaro-stable-mx6/include/linux/gpio/consumer.h
+diff -Nur linux-3.10.36/include/linux/gpio/consumer.h linux-solidrun/include/linux/gpio/consumer.h
--- linux-3.10.36/include/linux/gpio/consumer.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/gpio/consumer.h 2014-04-21 13:50:42.870729725 +0200
++++ linux-solidrun/include/linux/gpio/consumer.h 2014-04-24 07:58:34.416244621 +0200
@@ -0,0 +1,253 @@
+#ifndef __LINUX_GPIO_CONSUMER_H
+#define __LINUX_GPIO_CONSUMER_H
@@ -567332,9 +545715,9 @@ diff -Nur linux-3.10.36/include/linux/gpio/consumer.h linux-linaro-stable-mx6/in
+#endif /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */
+
+#endif
-diff -Nur linux-3.10.36/include/linux/gpio/driver.h linux-linaro-stable-mx6/include/linux/gpio/driver.h
+diff -Nur linux-3.10.36/include/linux/gpio/driver.h linux-solidrun/include/linux/gpio/driver.h
--- linux-3.10.36/include/linux/gpio/driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/gpio/driver.h 2014-04-21 13:50:42.870729725 +0200
++++ linux-solidrun/include/linux/gpio/driver.h 2014-04-24 07:58:34.416244621 +0200
@@ -0,0 +1,190 @@
+#ifndef __LINUX_GPIO_DRIVER_H
+#define __LINUX_GPIO_DRIVER_H
@@ -567526,9 +545909,9 @@ diff -Nur linux-3.10.36/include/linux/gpio/driver.h linux-linaro-stable-mx6/incl
+void gpiod_add_table(struct gpiod_lookup *table, size_t size);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/gpio.h linux-linaro-stable-mx6/include/linux/gpio.h
+diff -Nur linux-3.10.36/include/linux/gpio.h linux-solidrun/include/linux/gpio.h
--- linux-3.10.36/include/linux/gpio.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/gpio.h 2014-04-21 13:50:42.870729725 +0200
++++ linux-solidrun/include/linux/gpio.h 2014-04-24 07:58:34.416244621 +0200
@@ -16,14 +16,17 @@
#define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW)
#define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH)
@@ -567570,9 +545953,9 @@ diff -Nur linux-3.10.36/include/linux/gpio.h linux-linaro-stable-mx6/include/lin
static inline int irq_to_gpio(unsigned irq)
{
/* irq can never have been returned from gpio_to_irq() */
-diff -Nur linux-3.10.36/include/linux/hardirq.h linux-linaro-stable-mx6/include/linux/hardirq.h
+diff -Nur linux-3.10.36/include/linux/hardirq.h linux-solidrun/include/linux/hardirq.h
--- linux-3.10.36/include/linux/hardirq.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/hardirq.h 2014-04-21 13:50:42.870729725 +0200
++++ linux-solidrun/include/linux/hardirq.h 2014-04-24 07:58:34.416244621 +0200
@@ -124,8 +124,10 @@
#if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)
@@ -567584,9 +545967,9 @@ diff -Nur linux-3.10.36/include/linux/hardirq.h linux-linaro-stable-mx6/include/
#endif
#if defined(CONFIG_TINY_RCU) || defined(CONFIG_TINY_PREEMPT_RCU)
-diff -Nur linux-3.10.36/include/linux/huge_mm.h linux-linaro-stable-mx6/include/linux/huge_mm.h
+diff -Nur linux-3.10.36/include/linux/huge_mm.h linux-solidrun/include/linux/huge_mm.h
--- linux-3.10.36/include/linux/huge_mm.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/huge_mm.h 2014-04-21 13:50:42.874729741 +0200
++++ linux-solidrun/include/linux/huge_mm.h 2014-04-24 07:58:34.420244636 +0200
@@ -159,6 +159,23 @@
return HPAGE_PMD_NR;
return 1;
@@ -567619,9 +546002,9 @@ diff -Nur linux-3.10.36/include/linux/huge_mm.h linux-linaro-stable-mx6/include/
static inline int hugepage_madvise(struct vm_area_struct *vma,
unsigned long *vm_flags, int advice)
{
-diff -Nur linux-3.10.36/include/linux/interrupt.h linux-linaro-stable-mx6/include/linux/interrupt.h
+diff -Nur linux-3.10.36/include/linux/interrupt.h linux-solidrun/include/linux/interrupt.h
--- linux-3.10.36/include/linux/interrupt.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/interrupt.h 2014-04-21 13:50:42.886729792 +0200
++++ linux-solidrun/include/linux/interrupt.h 2014-04-24 07:58:34.432244679 +0200
@@ -219,6 +219,7 @@
extern void disable_percpu_irq(unsigned int irq);
extern void enable_irq(unsigned int irq);
@@ -567630,9 +546013,9 @@ diff -Nur linux-3.10.36/include/linux/interrupt.h linux-linaro-stable-mx6/includ
/* The following three functions are for the core kernel use only. */
#ifdef CONFIG_GENERIC_HARDIRQS
-diff -Nur linux-3.10.36/include/linux/ipc_namespace.h linux-linaro-stable-mx6/include/linux/ipc_namespace.h
+diff -Nur linux-3.10.36/include/linux/ipc_namespace.h linux-solidrun/include/linux/ipc_namespace.h
--- linux-3.10.36/include/linux/ipc_namespace.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/ipc_namespace.h 2014-04-21 13:50:42.886729792 +0200
++++ linux-solidrun/include/linux/ipc_namespace.h 2014-04-24 07:58:34.432244679 +0200
@@ -119,7 +119,9 @@
* the new maximum will handle anyone else. I may have to revisit this
* in the future.
@@ -567643,9 +546026,9 @@ diff -Nur linux-3.10.36/include/linux/ipc_namespace.h linux-linaro-stable-mx6/in
#define MIN_MSGMAX 1
#define DFLT_MSG 10U
#define DFLT_MSGMAX 10
-diff -Nur linux-3.10.36/include/linux/ipu.h linux-linaro-stable-mx6/include/linux/ipu.h
+diff -Nur linux-3.10.36/include/linux/ipu.h linux-solidrun/include/linux/ipu.h
--- linux-3.10.36/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/ipu.h 2014-04-21 13:50:42.886729792 +0200
++++ linux-solidrun/include/linux/ipu.h 2014-04-24 07:58:34.436244693 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc.
@@ -567685,9 +546068,9 @@ diff -Nur linux-3.10.36/include/linux/ipu.h linux-linaro-stable-mx6/include/linu
+int ipu_check_task(struct ipu_task *task);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/ipu-v3.h linux-linaro-stable-mx6/include/linux/ipu-v3.h
+diff -Nur linux-3.10.36/include/linux/ipu-v3.h linux-solidrun/include/linux/ipu-v3.h
--- linux-3.10.36/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/ipu-v3.h 2014-04-21 13:50:42.886729792 +0200
++++ linux-solidrun/include/linux/ipu-v3.h 2014-04-24 07:58:34.436244693 +0200
@@ -0,0 +1,752 @@
+/*
+ * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de>
@@ -568441,9 +546824,9 @@ diff -Nur linux-3.10.36/include/linux/ipu-v3.h linux-linaro-stable-mx6/include/l
+};
+
+#endif /* __LINUX_IPU_V3_H_ */
-diff -Nur linux-3.10.36/include/linux/irqchip/arm-gic.h linux-linaro-stable-mx6/include/linux/irqchip/arm-gic.h
+diff -Nur linux-3.10.36/include/linux/irqchip/arm-gic.h linux-solidrun/include/linux/irqchip/arm-gic.h
--- linux-3.10.36/include/linux/irqchip/arm-gic.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/irqchip/arm-gic.h 2014-04-21 13:50:42.886729792 +0200
++++ linux-solidrun/include/linux/irqchip/arm-gic.h 2014-04-24 07:58:34.436244693 +0200
@@ -31,6 +31,8 @@
#define GIC_DIST_TARGET 0x800
#define GIC_DIST_CONFIG 0xc00
@@ -568473,9 +546856,9 @@ diff -Nur linux-3.10.36/include/linux/irqchip/arm-gic.h linux-linaro-stable-mx6/
#endif /* __ASSEMBLY */
#endif
-diff -Nur linux-3.10.36/include/linux/isl29023.h linux-linaro-stable-mx6/include/linux/isl29023.h
+diff -Nur linux-3.10.36/include/linux/isl29023.h linux-solidrun/include/linux/isl29023.h
--- linux-3.10.36/include/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/isl29023.h 2014-04-21 13:50:42.890729809 +0200
++++ linux-solidrun/include/linux/isl29023.h 2014-04-24 07:58:34.436244693 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -568524,9 +546907,9 @@ diff -Nur linux-3.10.36/include/linux/isl29023.h linux-linaro-stable-mx6/include
+#define ISL29023_RANGE_64K 0x3
+
+#endif
-diff -Nur linux-3.10.36/include/linux/jiffies.h linux-linaro-stable-mx6/include/linux/jiffies.h
+diff -Nur linux-3.10.36/include/linux/jiffies.h linux-solidrun/include/linux/jiffies.h
--- linux-3.10.36/include/linux/jiffies.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/jiffies.h 2014-04-21 13:50:42.890729809 +0200
++++ linux-solidrun/include/linux/jiffies.h 2014-04-24 07:58:34.440244706 +0200
@@ -101,13 +101,13 @@
#define time_after(a,b) \
(typecheck(unsigned long, a) && \
@@ -568559,9 +546942,9 @@ diff -Nur linux-3.10.36/include/linux/jiffies.h linux-linaro-stable-mx6/include/
#define time_before_eq64(a,b) time_after_eq64(b,a)
/*
-diff -Nur linux-3.10.36/include/linux/mfd/max17135.h linux-linaro-stable-mx6/include/linux/mfd/max17135.h
+diff -Nur linux-3.10.36/include/linux/mfd/max17135.h linux-solidrun/include/linux/mfd/max17135.h
--- linux-3.10.36/include/linux/mfd/max17135.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mfd/max17135.h 2014-04-21 13:50:42.902729860 +0200
++++ linux-solidrun/include/linux/mfd/max17135.h 2014-04-24 07:58:34.452244750 +0200
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -568783,9 +547166,9 @@ diff -Nur linux-3.10.36/include/linux/mfd/max17135.h linux-linaro-stable-mx6/inc
+int max17135_reg_write(int reg_num, const unsigned int reg_val);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stable-mx6/include/linux/mfd/mxc-hdmi-core.h
+diff -Nur linux-3.10.36/include/linux/mfd/mxc-hdmi-core.h linux-solidrun/include/linux/mfd/mxc-hdmi-core.h
--- linux-3.10.36/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mfd/mxc-hdmi-core.h 2014-04-21 13:50:42.906729876 +0200
++++ linux-solidrun/include/linux/mfd/mxc-hdmi-core.h 2014-04-24 07:58:34.456244763 +0200
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -568851,9 +547234,9 @@ diff -Nur linux-3.10.36/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stable-mx
+int check_hdmi_state(void);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-linaro-stable-mx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+diff -Nur linux-3.10.36/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-solidrun/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
--- linux-3.10.36/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-04-21 13:50:42.906729876 +0200
++++ linux-solidrun/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-04-24 07:58:34.460244776 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -569055,9 +547438,9 @@ diff -Nur linux-3.10.36/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-linaro
+#define IMX6SL_GPR1_FEC_CLOCK_MUX2_SEL_MASK (0x1 << 14)
#endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
-diff -Nur linux-3.10.36/include/linux/mipi_csi2.h linux-linaro-stable-mx6/include/linux/mipi_csi2.h
+diff -Nur linux-3.10.36/include/linux/mipi_csi2.h linux-solidrun/include/linux/mipi_csi2.h
--- linux-3.10.36/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mipi_csi2.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mipi_csi2.h 2014-04-24 07:58:34.468244806 +0200
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -569150,9 +547533,9 @@ diff -Nur linux-3.10.36/include/linux/mipi_csi2.h linux-linaro-stable-mx6/includ
+int mipi_csi2_reset(struct mipi_csi2_info *info);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/mipi_dsi.h linux-linaro-stable-mx6/include/linux/mipi_dsi.h
+diff -Nur linux-3.10.36/include/linux/mipi_dsi.h linux-solidrun/include/linux/mipi_dsi.h
--- linux-3.10.36/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mipi_dsi.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mipi_dsi.h 2014-04-24 07:58:34.468244806 +0200
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -569325,9 +547708,9 @@ diff -Nur linux-3.10.36/include/linux/mipi_dsi.h linux-linaro-stable-mx6/include
+#define DSI_PHY_CLK_INIT_COMMAND (0x44)
+#define DSI_GEN_PLD_DATA_BUF_SIZE (0x4)
+#endif
-diff -Nur linux-3.10.36/include/linux/mmc/card.h linux-linaro-stable-mx6/include/linux/mmc/card.h
+diff -Nur linux-3.10.36/include/linux/mmc/card.h linux-solidrun/include/linux/mmc/card.h
--- linux-3.10.36/include/linux/mmc/card.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/card.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mmc/card.h 2014-04-24 07:58:34.468244806 +0200
@@ -86,10 +86,13 @@
unsigned int data_sector_size; /* 512 bytes or 4KB */
unsigned int data_tag_unit_size; /* DATA TAG UNIT size */
@@ -569350,9 +547733,9 @@ diff -Nur linux-3.10.36/include/linux/mmc/card.h linux-linaro-stable-mx6/include
u8 raw_sec_trim_mult; /* 229 */
u8 raw_sec_erase_mult; /* 230 */
u8 raw_sec_feature_support;/* 231 */
-diff -Nur linux-3.10.36/include/linux/mmc/core.h linux-linaro-stable-mx6/include/linux/mmc/core.h
+diff -Nur linux-3.10.36/include/linux/mmc/core.h linux-solidrun/include/linux/mmc/core.h
--- linux-3.10.36/include/linux/mmc/core.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/core.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mmc/core.h 2014-04-24 07:58:34.468244806 +0200
@@ -96,6 +96,8 @@
*/
@@ -569362,9 +547745,9 @@ diff -Nur linux-3.10.36/include/linux/mmc/core.h linux-linaro-stable-mx6/include
struct mmc_data *data; /* data segment associated with cmd */
struct mmc_request *mrq; /* associated request */
-diff -Nur linux-3.10.36/include/linux/mmc/host.h linux-linaro-stable-mx6/include/linux/mmc/host.h
+diff -Nur linux-3.10.36/include/linux/mmc/host.h linux-solidrun/include/linux/mmc/host.h
--- linux-3.10.36/include/linux/mmc/host.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/host.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mmc/host.h 2014-04-24 07:58:34.468244806 +0200
@@ -281,6 +281,8 @@
#define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \
MMC_CAP2_PACKED_WR)
@@ -569404,9 +547787,9 @@ diff -Nur linux-3.10.36/include/linux/mmc/host.h linux-linaro-stable-mx6/include
#ifdef CONFIG_REGULATOR
int mmc_regulator_get_ocrmask(struct regulator *supply);
int mmc_regulator_set_ocr(struct mmc_host *mmc,
-diff -Nur linux-3.10.36/include/linux/mmc/mmc.h linux-linaro-stable-mx6/include/linux/mmc/mmc.h
+diff -Nur linux-3.10.36/include/linux/mmc/mmc.h linux-solidrun/include/linux/mmc/mmc.h
--- linux-3.10.36/include/linux/mmc/mmc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/mmc.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mmc/mmc.h 2014-04-24 07:58:34.468244806 +0200
@@ -292,6 +292,7 @@
#define EXT_CSD_RPMB_MULT 168 /* RO */
#define EXT_CSD_BOOT_WP 173 /* R/W */
@@ -569453,9 +547836,9 @@ diff -Nur linux-3.10.36/include/linux/mmc/mmc.h linux-linaro-stable-mx6/include/
#define EXT_CSD_RST_N_EN_MASK 0x3
#define EXT_CSD_RST_N_ENABLED 1 /* RST_n is enabled on card */
-diff -Nur linux-3.10.36/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/include/linux/mmc/sdhci.h
+diff -Nur linux-3.10.36/include/linux/mmc/sdhci.h linux-solidrun/include/linux/mmc/sdhci.h
--- linux-3.10.36/include/linux/mmc/sdhci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/sdhci.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mmc/sdhci.h 2014-04-24 07:58:34.472244819 +0200
@@ -57,12 +57,8 @@
#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)
/* Controller reports inverted write-protect state */
@@ -569519,9 +547902,9 @@ diff -Nur linux-3.10.36/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/includ
wait_queue_head_t buf_ready_int; /* Waitqueue for Buffer Read Ready interrupt */
unsigned int tuning_done; /* Condition flag set when CMD19 succeeds */
-diff -Nur linux-3.10.36/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h
+diff -Nur linux-3.10.36/include/linux/mmc/sdio_ids.h linux-solidrun/include/linux/mmc/sdio_ids.h
--- linux-3.10.36/include/linux/mmc/sdio_ids.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mmc/sdio_ids.h 2014-04-24 07:58:34.472244819 +0200
@@ -23,6 +23,15 @@
/*
* Vendors and devices. Sort key: vendor first, device next.
@@ -569538,9 +547921,9 @@ diff -Nur linux-3.10.36/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx6/inc
#define SDIO_VENDOR_ID_INTEL 0x0089
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403
-diff -Nur linux-3.10.36/include/linux/mmc/slot-gpio.h linux-linaro-stable-mx6/include/linux/mmc/slot-gpio.h
+diff -Nur linux-3.10.36/include/linux/mmc/slot-gpio.h linux-solidrun/include/linux/mmc/slot-gpio.h
--- linux-3.10.36/include/linux/mmc/slot-gpio.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/slot-gpio.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mmc/slot-gpio.h 2014-04-24 07:58:34.472244819 +0200
@@ -18,7 +18,8 @@
void mmc_gpio_free_ro(struct mmc_host *host);
@@ -569551,9 +547934,9 @@ diff -Nur linux-3.10.36/include/linux/mmc/slot-gpio.h linux-linaro-stable-mx6/in
void mmc_gpio_free_cd(struct mmc_host *host);
#endif
-diff -Nur linux-3.10.36/include/linux/mm.h linux-linaro-stable-mx6/include/linux/mm.h
+diff -Nur linux-3.10.36/include/linux/mm.h linux-solidrun/include/linux/mm.h
--- linux-3.10.36/include/linux/mm.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mm.h 2014-04-21 13:50:42.914729911 +0200
++++ linux-solidrun/include/linux/mm.h 2014-04-24 07:58:34.468244806 +0200
@@ -361,18 +361,8 @@
static inline struct page *compound_head(struct page *page)
@@ -569575,9 +547958,9 @@ diff -Nur linux-3.10.36/include/linux/mm.h linux-linaro-stable-mx6/include/linux
return page;
}
-diff -Nur linux-3.10.36/include/linux/msi.h linux-linaro-stable-mx6/include/linux/msi.h
+diff -Nur linux-3.10.36/include/linux/msi.h linux-solidrun/include/linux/msi.h
--- linux-3.10.36/include/linux/msi.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/msi.h 2014-04-21 13:50:42.918729927 +0200
++++ linux-solidrun/include/linux/msi.h 2014-04-24 07:58:34.476244833 +0200
@@ -35,6 +35,7 @@
u32 masked; /* mask bits */
@@ -569619,9 +548002,9 @@ diff -Nur linux-3.10.36/include/linux/msi.h linux-linaro-stable-mx6/include/linu
+};
#endif /* LINUX_MSI_H */
-diff -Nur linux-3.10.36/include/linux/mtd/bbm.h linux-linaro-stable-mx6/include/linux/mtd/bbm.h
+diff -Nur linux-3.10.36/include/linux/mtd/bbm.h linux-solidrun/include/linux/mtd/bbm.h
--- linux-3.10.36/include/linux/mtd/bbm.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mtd/bbm.h 2014-04-21 13:50:42.918729927 +0200
++++ linux-solidrun/include/linux/mtd/bbm.h 2014-04-24 07:58:34.476244833 +0200
@@ -91,10 +91,6 @@
* with NAND_BBT_CREATE.
*/
@@ -569633,9 +548016,9 @@ diff -Nur linux-3.10.36/include/linux/mtd/bbm.h linux-linaro-stable-mx6/include/
/* Write bbt if neccecary */
#define NAND_BBT_WRITE 0x00002000
/* Read and write back block contents when writing bbt */
-diff -Nur linux-3.10.36/include/linux/mtd/map.h linux-linaro-stable-mx6/include/linux/mtd/map.h
+diff -Nur linux-3.10.36/include/linux/mtd/map.h linux-solidrun/include/linux/mtd/map.h
--- linux-3.10.36/include/linux/mtd/map.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mtd/map.h 2014-04-21 13:50:42.918729927 +0200
++++ linux-solidrun/include/linux/mtd/map.h 2014-04-24 07:58:34.476244833 +0200
@@ -438,7 +438,7 @@
if (map->cached)
memcpy(to, (char *)map->cached + from, len);
@@ -569645,9 +548028,9 @@ diff -Nur linux-3.10.36/include/linux/mtd/map.h linux-linaro-stable-mx6/include/
}
static inline void inline_map_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-diff -Nur linux-3.10.36/include/linux/mtd/mtd.h linux-linaro-stable-mx6/include/linux/mtd/mtd.h
+diff -Nur linux-3.10.36/include/linux/mtd/mtd.h linux-solidrun/include/linux/mtd/mtd.h
--- linux-3.10.36/include/linux/mtd/mtd.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mtd/mtd.h 2014-04-21 13:50:42.918729927 +0200
++++ linux-solidrun/include/linux/mtd/mtd.h 2014-04-24 07:58:34.476244833 +0200
@@ -173,6 +173,9 @@
/* ECC layout structure pointer - read only! */
struct nand_ecclayout *ecclayout;
@@ -569670,9 +548053,9 @@ diff -Nur linux-3.10.36/include/linux/mtd/mtd.h linux-linaro-stable-mx6/include/
static inline int mtd_can_have_bb(const struct mtd_info *mtd)
{
return !!mtd->_block_isbad;
-diff -Nur linux-3.10.36/include/linux/mtd/nand.h linux-linaro-stable-mx6/include/linux/mtd/nand.h
+diff -Nur linux-3.10.36/include/linux/mtd/nand.h linux-solidrun/include/linux/mtd/nand.h
--- linux-3.10.36/include/linux/mtd/nand.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mtd/nand.h 2014-04-21 13:50:42.918729927 +0200
++++ linux-solidrun/include/linux/mtd/nand.h 2014-04-24 07:58:34.476244833 +0200
@@ -56,7 +56,7 @@
* is supported now. If you add a chip with bigger oobsize/page
* adjust this accordingly.
@@ -569887,9 +548270,9 @@ diff -Nur linux-3.10.36/include/linux/mtd/nand.h linux-linaro-stable-mx6/include
+ return chip->bits_per_cell == 1;
+}
#endif /* __LINUX_MTD_NAND_H */
-diff -Nur linux-3.10.36/include/linux/mxc_asrc.h linux-linaro-stable-mx6/include/linux/mxc_asrc.h
+diff -Nur linux-3.10.36/include/linux/mxc_asrc.h linux-solidrun/include/linux/mxc_asrc.h
--- linux-3.10.36/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_asrc.h 2014-04-21 13:50:42.922729944 +0200
++++ linux-solidrun/include/linux/mxc_asrc.h 2014-04-24 07:58:34.480244847 +0200
@@ -0,0 +1,386 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -570277,9 +548660,9 @@ diff -Nur linux-3.10.36/include/linux/mxc_asrc.h linux-linaro-stable-mx6/include
+ u32 in_wm, u32 out_wm);
+
+#endif/* __MXC_ASRC_H__ */
-diff -Nur linux-3.10.36/include/linux/mxcfb_epdc.h linux-linaro-stable-mx6/include/linux/mxcfb_epdc.h
+diff -Nur linux-3.10.36/include/linux/mxcfb_epdc.h linux-solidrun/include/linux/mxcfb_epdc.h
--- linux-3.10.36/include/linux/mxcfb_epdc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxcfb_epdc.h 2014-04-21 13:50:42.922729944 +0200
++++ linux-solidrun/include/linux/mxcfb_epdc.h 2014-04-24 07:58:34.480244847 +0200
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -570353,9 +548736,9 @@ diff -Nur linux-3.10.36/include/linux/mxcfb_epdc.h linux-linaro-stable-mx6/inclu
+int mxc_spdc_get_pwrdown_delay(struct fb_info *info);
+int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
+#endif
-diff -Nur linux-3.10.36/include/linux/mxcfb.h linux-linaro-stable-mx6/include/linux/mxcfb.h
+diff -Nur linux-3.10.36/include/linux/mxcfb.h linux-solidrun/include/linux/mxcfb.h
--- linux-3.10.36/include/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxcfb.h 2014-04-21 13:50:42.922729944 +0200
++++ linux-solidrun/include/linux/mxcfb.h 2014-04-24 07:58:34.480244847 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -570403,9 +548786,9 @@ diff -Nur linux-3.10.36/include/linux/mxcfb.h linux-linaro-stable-mx6/include/li
+ int num_modes, int dev_mode);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/mxc_mlb.h linux-linaro-stable-mx6/include/linux/mxc_mlb.h
+diff -Nur linux-3.10.36/include/linux/mxc_mlb.h linux-solidrun/include/linux/mxc_mlb.h
--- linux-3.10.36/include/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_mlb.h 2014-04-21 13:50:42.922729944 +0200
++++ linux-solidrun/include/linux/mxc_mlb.h 2014-04-24 07:58:34.480244847 +0200
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -570462,9 +548845,9 @@ diff -Nur linux-3.10.36/include/linux/mxc_mlb.h linux-linaro-stable-mx6/include/
+
+
+#endif /* _MXC_MLB_H */
-diff -Nur linux-3.10.36/include/linux/mxc_v4l2.h linux-linaro-stable-mx6/include/linux/mxc_v4l2.h
+diff -Nur linux-3.10.36/include/linux/mxc_v4l2.h linux-solidrun/include/linux/mxc_v4l2.h
--- linux-3.10.36/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_v4l2.h 2014-04-21 13:50:42.922729944 +0200
++++ linux-solidrun/include/linux/mxc_v4l2.h 2014-04-24 07:58:34.480244847 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -570493,9 +548876,9 @@ diff -Nur linux-3.10.36/include/linux/mxc_v4l2.h linux-linaro-stable-mx6/include
+#include <uapi/linux/mxc_v4l2.h>
+
+#endif
-diff -Nur linux-3.10.36/include/linux/mxc_vpu.h linux-linaro-stable-mx6/include/linux/mxc_vpu.h
+diff -Nur linux-3.10.36/include/linux/mxc_vpu.h linux-solidrun/include/linux/mxc_vpu.h
--- linux-3.10.36/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_vpu.h 2014-04-21 13:50:42.922729944 +0200
++++ linux-solidrun/include/linux/mxc_vpu.h 2014-04-24 07:58:34.480244847 +0200
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -570615,9 +548998,9 @@ diff -Nur linux-3.10.36/include/linux/mxc_vpu.h linux-linaro-stable-mx6/include/
+void vl2cc_cleanup(void);
+
+#endif
-diff -Nur linux-3.10.36/include/linux/netdevice.h linux-linaro-stable-mx6/include/linux/netdevice.h
+diff -Nur linux-3.10.36/include/linux/netdevice.h linux-solidrun/include/linux/netdevice.h
--- linux-3.10.36/include/linux/netdevice.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/netdevice.h 2014-04-21 13:50:42.922729944 +0200
++++ linux-solidrun/include/linux/netdevice.h 2014-04-24 07:58:34.480244847 +0200
@@ -2761,12 +2761,7 @@
void netif_stacked_transfer_operstate(const struct net_device *rootdev,
struct net_device *dev);
@@ -570632,9 +549015,9 @@ diff -Nur linux-3.10.36/include/linux/netdevice.h linux-linaro-stable-mx6/includ
static inline bool net_gso_ok(netdev_features_t features, int gso_type)
{
-diff -Nur linux-3.10.36/include/linux/of_address.h linux-linaro-stable-mx6/include/linux/of_address.h
+diff -Nur linux-3.10.36/include/linux/of_address.h linux-solidrun/include/linux/of_address.h
--- linux-3.10.36/include/linux/of_address.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/of_address.h 2014-04-21 13:50:42.930729978 +0200
++++ linux-solidrun/include/linux/of_address.h 2014-04-24 07:58:34.492244890 +0200
@@ -4,6 +4,36 @@
#include <linux/errno.h>
#include <linux/of.h>
@@ -570704,9 +549087,9 @@ diff -Nur linux-3.10.36/include/linux/of_address.h linux-linaro-stable-mx6/inclu
#endif /* CONFIG_OF_ADDRESS */
-diff -Nur linux-3.10.36/include/linux/of_gpio.h linux-linaro-stable-mx6/include/linux/of_gpio.h
+diff -Nur linux-3.10.36/include/linux/of_gpio.h linux-solidrun/include/linux/of_gpio.h
--- linux-3.10.36/include/linux/of_gpio.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/of_gpio.h 2014-04-21 13:50:42.930729978 +0200
++++ linux-solidrun/include/linux/of_gpio.h 2014-04-24 07:58:34.492244890 +0200
@@ -19,8 +19,10 @@
#include <linux/errno.h>
#include <linux/gpio.h>
@@ -570783,9 +549166,9 @@ diff -Nur linux-3.10.36/include/linux/of_gpio.h linux-linaro-stable-mx6/include/
static inline int of_get_gpio_flags(struct device_node *np, int index,
enum of_gpio_flags *flags)
{
-diff -Nur linux-3.10.36/include/linux/of.h linux-linaro-stable-mx6/include/linux/of.h
+diff -Nur linux-3.10.36/include/linux/of.h linux-solidrun/include/linux/of.h
--- linux-3.10.36/include/linux/of.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/of.h 2014-04-21 13:50:42.930729978 +0200
++++ linux-solidrun/include/linux/of.h 2014-04-24 07:58:34.492244890 +0200
@@ -266,6 +266,7 @@
extern const void *of_get_property(const struct device_node *node,
const char *name,
@@ -570852,9 +549235,9 @@ diff -Nur linux-3.10.36/include/linux/of.h linux-linaro-stable-mx6/include/linux
#define of_match_ptr(_ptr) NULL
#define of_match_node(_matches, _node) NULL
-diff -Nur linux-3.10.36/include/linux/of_pci.h linux-linaro-stable-mx6/include/linux/of_pci.h
+diff -Nur linux-3.10.36/include/linux/of_pci.h linux-solidrun/include/linux/of_pci.h
--- linux-3.10.36/include/linux/of_pci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/of_pci.h 2014-04-21 13:50:42.930729978 +0200
++++ linux-solidrun/include/linux/of_pci.h 2014-04-24 07:58:34.492244890 +0200
@@ -2,6 +2,7 @@
#define __OF_PCI_H
@@ -570882,9 +549265,9 @@ diff -Nur linux-3.10.36/include/linux/of_pci.h linux-linaro-stable-mx6/include/l
+#endif
#endif
-diff -Nur linux-3.10.36/include/linux/pci.h linux-linaro-stable-mx6/include/linux/pci.h
+diff -Nur linux-3.10.36/include/linux/pci.h linux-solidrun/include/linux/pci.h
--- linux-3.10.36/include/linux/pci.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/pci.h 2014-04-21 13:50:42.930729978 +0200
++++ linux-solidrun/include/linux/pci.h 2014-04-24 07:58:34.496244904 +0200
@@ -432,6 +432,7 @@
struct resource busn_res; /* bus numbers routed to this bus */
@@ -570893,9 +549276,9 @@ diff -Nur linux-3.10.36/include/linux/pci.h linux-linaro-stable-mx6/include/linu
void *sysdata; /* hook for sys-specific extension */
struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */
-diff -Nur linux-3.10.36/include/linux/pinctrl/consumer.h linux-linaro-stable-mx6/include/linux/pinctrl/consumer.h
+diff -Nur linux-3.10.36/include/linux/pinctrl/consumer.h linux-solidrun/include/linux/pinctrl/consumer.h
--- linux-3.10.36/include/linux/pinctrl/consumer.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/pinctrl/consumer.h 2014-04-21 13:50:42.934729995 +0200
++++ linux-solidrun/include/linux/pinctrl/consumer.h 2014-04-24 07:58:34.496244904 +0200
@@ -40,6 +40,25 @@
extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev);
extern void devm_pinctrl_put(struct pinctrl *p);
@@ -570944,9 +549327,9 @@ diff -Nur linux-3.10.36/include/linux/pinctrl/consumer.h linux-linaro-stable-mx6
#endif
-diff -Nur linux-3.10.36/include/linux/pinctrl/devinfo.h linux-linaro-stable-mx6/include/linux/pinctrl/devinfo.h
+diff -Nur linux-3.10.36/include/linux/pinctrl/devinfo.h linux-solidrun/include/linux/pinctrl/devinfo.h
--- linux-3.10.36/include/linux/pinctrl/devinfo.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/pinctrl/devinfo.h 2014-04-21 13:50:42.934729995 +0200
++++ linux-solidrun/include/linux/pinctrl/devinfo.h 2014-04-24 07:58:34.496244904 +0200
@@ -28,6 +28,10 @@
struct dev_pin_info {
struct pinctrl *p;
@@ -570958,9 +549341,9 @@ diff -Nur linux-3.10.36/include/linux/pinctrl/devinfo.h linux-linaro-stable-mx6/
};
extern int pinctrl_bind_pins(struct device *dev);
-diff -Nur linux-3.10.36/include/linux/pinctrl/pinctrl.h linux-linaro-stable-mx6/include/linux/pinctrl/pinctrl.h
+diff -Nur linux-3.10.36/include/linux/pinctrl/pinctrl.h linux-solidrun/include/linux/pinctrl/pinctrl.h
--- linux-3.10.36/include/linux/pinctrl/pinctrl.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/pinctrl/pinctrl.h 2014-04-21 13:50:42.934729995 +0200
++++ linux-solidrun/include/linux/pinctrl/pinctrl.h 2014-04-24 07:58:34.500244918 +0200
@@ -49,7 +49,8 @@
* @name: a name for the chip in this range
* @id: an ID number for the chip in this range
@@ -570979,9 +549362,9 @@ diff -Nur linux-3.10.36/include/linux/pinctrl/pinctrl.h linux-linaro-stable-mx6/
unsigned int npins;
struct gpio_chip *gc;
};
-diff -Nur linux-3.10.36/include/linux/platform_data/brcmfmac-sdio.h linux-linaro-stable-mx6/include/linux/platform_data/brcmfmac-sdio.h
+diff -Nur linux-3.10.36/include/linux/platform_data/brcmfmac-sdio.h linux-solidrun/include/linux/platform_data/brcmfmac-sdio.h
--- linux-3.10.36/include/linux/platform_data/brcmfmac-sdio.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/platform_data/brcmfmac-sdio.h 2014-04-21 13:50:42.934729995 +0200
++++ linux-solidrun/include/linux/platform_data/brcmfmac-sdio.h 2014-04-24 07:58:34.500244918 +0200
@@ -90,6 +90,14 @@
* oob_irq_nr, oob_irq_flags: the OOB interrupt information. The values are
* used for registering the irq using request_irq function.
@@ -571007,9 +549390,9 @@ diff -Nur linux-3.10.36/include/linux/platform_data/brcmfmac-sdio.h linux-linaro
void (*power_on)(void);
void (*power_off)(void);
void (*reset)(void);
-diff -Nur linux-3.10.36/include/linux/platform_data/dma-imx.h linux-linaro-stable-mx6/include/linux/platform_data/dma-imx.h
+diff -Nur linux-3.10.36/include/linux/platform_data/dma-imx.h linux-solidrun/include/linux/platform_data/dma-imx.h
--- linux-3.10.36/include/linux/platform_data/dma-imx.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/platform_data/dma-imx.h 2014-04-21 13:50:42.938730011 +0200
++++ linux-solidrun/include/linux/platform_data/dma-imx.h 2014-04-24 07:58:34.500244918 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -571050,9 +549433,9 @@ diff -Nur linux-3.10.36/include/linux/platform_data/dma-imx.h linux-linaro-stabl
static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
{
return strstr(dev_name(chan->device->dev), "sdma") ||
-diff -Nur linux-3.10.36/include/linux/platform_data/dma-imx-sdma.h linux-linaro-stable-mx6/include/linux/platform_data/dma-imx-sdma.h
+diff -Nur linux-3.10.36/include/linux/platform_data/dma-imx-sdma.h linux-solidrun/include/linux/platform_data/dma-imx-sdma.h
--- linux-3.10.36/include/linux/platform_data/dma-imx-sdma.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/platform_data/dma-imx-sdma.h 2014-04-21 13:50:42.938730011 +0200
++++ linux-solidrun/include/linux/platform_data/dma-imx-sdma.h 2014-04-24 07:58:34.500244918 +0200
@@ -43,6 +43,9 @@
s32 dptc_dvfs_addr;
s32 utra_addr;
@@ -571063,9 +549446,9 @@ diff -Nur linux-3.10.36/include/linux/platform_data/dma-imx-sdma.h linux-linaro-
};
/**
-diff -Nur linux-3.10.36/include/linux/platform_data/mmc-esdhc-imx.h linux-linaro-stable-mx6/include/linux/platform_data/mmc-esdhc-imx.h
+diff -Nur linux-3.10.36/include/linux/platform_data/mmc-esdhc-imx.h linux-solidrun/include/linux/platform_data/mmc-esdhc-imx.h
--- linux-3.10.36/include/linux/platform_data/mmc-esdhc-imx.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/platform_data/mmc-esdhc-imx.h 2014-04-21 13:50:42.938730011 +0200
++++ linux-solidrun/include/linux/platform_data/mmc-esdhc-imx.h 2014-04-24 07:58:34.504244932 +0200
@@ -10,6 +10,8 @@
#ifndef __ASM_ARCH_IMX_ESDHC_H
#define __ASM_ARCH_IMX_ESDHC_H
@@ -571091,9 +549474,9 @@ diff -Nur linux-3.10.36/include/linux/platform_data/mmc-esdhc-imx.h linux-linaro
+ unsigned int delay_line;
};
#endif /* __ASM_ARCH_IMX_ESDHC_H */
-diff -Nur linux-3.10.36/include/linux/pmic_status.h linux-linaro-stable-mx6/include/linux/pmic_status.h
+diff -Nur linux-3.10.36/include/linux/pmic_status.h linux-solidrun/include/linux/pmic_status.h
--- linux-3.10.36/include/linux/pmic_status.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/pmic_status.h 2014-04-21 13:50:42.946730045 +0200
++++ linux-solidrun/include/linux/pmic_status.h 2014-04-24 07:58:34.508244945 +0200
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -571177,9 +549560,9 @@ diff -Nur linux-3.10.36/include/linux/pmic_status.h linux-linaro-stable-mx6/incl
+} while (0);
+
+#endif /* __ASM_ARCH_MXC_PMIC_STATUS_H__ */
-diff -Nur linux-3.10.36/include/linux/power/imx6_usb_charger.h linux-linaro-stable-mx6/include/linux/power/imx6_usb_charger.h
+diff -Nur linux-3.10.36/include/linux/power/imx6_usb_charger.h linux-solidrun/include/linux/power/imx6_usb_charger.h
--- linux-3.10.36/include/linux/power/imx6_usb_charger.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/power/imx6_usb_charger.h 2014-04-21 13:50:42.946730045 +0200
++++ linux-solidrun/include/linux/power/imx6_usb_charger.h 2014-04-24 07:58:34.828246072 +0200
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -571261,9 +549644,9 @@ diff -Nur linux-3.10.36/include/linux/power/imx6_usb_charger.h linux-linaro-stab
+#endif
+
+#endif /* __IMXUSB6_CHARGER_H */
-diff -Nur linux-3.10.36/include/linux/power/sabresd_battery.h linux-linaro-stable-mx6/include/linux/power/sabresd_battery.h
+diff -Nur linux-3.10.36/include/linux/power/sabresd_battery.h linux-solidrun/include/linux/power/sabresd_battery.h
--- linux-3.10.36/include/linux/power/sabresd_battery.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/power/sabresd_battery.h 2014-04-21 13:50:42.946730045 +0200
++++ linux-solidrun/include/linux/power/sabresd_battery.h 2014-04-24 07:58:34.828246072 +0200
@@ -0,0 +1,65 @@
+/*
+ * sabresd_battery.h - Maxim 8903 USB/Adapter Charger Driver
@@ -571330,9 +549713,9 @@ diff -Nur linux-3.10.36/include/linux/power/sabresd_battery.h linux-linaro-stabl
+};
+
+#endif /* __SABRESD_BATTERY_H__ */
-diff -Nur linux-3.10.36/include/linux/pxp_dma.h linux-linaro-stable-mx6/include/linux/pxp_dma.h
+diff -Nur linux-3.10.36/include/linux/pxp_dma.h linux-solidrun/include/linux/pxp_dma.h
--- linux-3.10.36/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/pxp_dma.h 2014-04-21 13:50:42.950730062 +0200
++++ linux-solidrun/include/linux/pxp_dma.h 2014-04-24 07:58:34.828246072 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -571413,9 +549796,9 @@ diff -Nur linux-3.10.36/include/linux/pxp_dma.h linux-linaro-stable-mx6/include/
+#endif
+
+#endif
-diff -Nur linux-3.10.36/include/linux/regulator/consumer.h linux-linaro-stable-mx6/include/linux/regulator/consumer.h
+diff -Nur linux-3.10.36/include/linux/regulator/consumer.h linux-solidrun/include/linux/regulator/consumer.h
--- linux-3.10.36/include/linux/regulator/consumer.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/regulator/consumer.h 2014-04-21 13:50:42.950730062 +0200
++++ linux-solidrun/include/linux/regulator/consumer.h 2014-04-24 07:58:36.776252929 +0200
@@ -2,6 +2,7 @@
* consumer.h -- SoC Regulator consumer support.
*
@@ -571433,9 +549816,9 @@ diff -Nur linux-3.10.36/include/linux/regulator/consumer.h linux-linaro-stable-m
struct regulator;
-diff -Nur linux-3.10.36/include/linux/regulator/pfuze100.h linux-linaro-stable-mx6/include/linux/regulator/pfuze100.h
+diff -Nur linux-3.10.36/include/linux/regulator/pfuze100.h linux-solidrun/include/linux/regulator/pfuze100.h
--- linux-3.10.36/include/linux/regulator/pfuze100.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/regulator/pfuze100.h 2014-04-21 13:50:42.954730079 +0200
++++ linux-solidrun/include/linux/regulator/pfuze100.h 2014-04-24 07:58:36.780252944 +0200
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -571481,9 +549864,9 @@ diff -Nur linux-3.10.36/include/linux/regulator/pfuze100.h linux-linaro-stable-m
+};
+
+#endif /* __LINUX_REG_PFUZE100_H */
-diff -Nur linux-3.10.36/include/linux/reset.h linux-linaro-stable-mx6/include/linux/reset.h
+diff -Nur linux-3.10.36/include/linux/reset.h linux-solidrun/include/linux/reset.h
--- linux-3.10.36/include/linux/reset.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/reset.h 2014-04-21 13:50:42.954730079 +0200
++++ linux-solidrun/include/linux/reset.h 2014-04-24 07:58:36.780252944 +0200
@@ -12,6 +12,13 @@
void reset_control_put(struct reset_control *rstc);
struct reset_control *devm_reset_control_get(struct device *dev, const char *id);
@@ -571498,9 +549881,9 @@ diff -Nur linux-3.10.36/include/linux/reset.h linux-linaro-stable-mx6/include/li
+#endif /* CONFIG_RESET_CONTROLLER */
#endif
-diff -Nur linux-3.10.36/include/linux/sched.h linux-linaro-stable-mx6/include/linux/sched.h
+diff -Nur linux-3.10.36/include/linux/sched.h linux-solidrun/include/linux/sched.h
--- linux-3.10.36/include/linux/sched.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/sched.h 2014-04-21 13:50:42.958730096 +0200
++++ linux-solidrun/include/linux/sched.h 2014-04-24 07:58:36.784252959 +0200
@@ -889,6 +889,13 @@
bool cpus_share_cache(int this_cpu, int that_cpu);
@@ -571528,9 +549911,9 @@ diff -Nur linux-3.10.36/include/linux/sched.h linux-linaro-stable-mx6/include/li
};
#ifdef CONFIG_SCHEDSTATS
-diff -Nur linux-3.10.36/include/linux/serial_core.h linux-linaro-stable-mx6/include/linux/serial_core.h
+diff -Nur linux-3.10.36/include/linux/serial_core.h linux-solidrun/include/linux/serial_core.h
--- linux-3.10.36/include/linux/serial_core.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/serial_core.h 2014-04-21 13:50:42.958730096 +0200
++++ linux-solidrun/include/linux/serial_core.h 2014-04-24 07:58:36.784252959 +0200
@@ -31,6 +31,13 @@
#include <linux/sysrq.h>
#include <uapi/linux/serial_core.h>
@@ -571545,9 +549928,9 @@ diff -Nur linux-3.10.36/include/linux/serial_core.h linux-linaro-stable-mx6/incl
struct uart_port;
struct serial_struct;
struct device;
-diff -Nur linux-3.10.36/include/linux/skbuff.h linux-linaro-stable-mx6/include/linux/skbuff.h
+diff -Nur linux-3.10.36/include/linux/skbuff.h linux-solidrun/include/linux/skbuff.h
--- linux-3.10.36/include/linux/skbuff.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/skbuff.h 2014-04-21 13:50:42.962730113 +0200
++++ linux-solidrun/include/linux/skbuff.h 2014-04-24 07:58:36.788252973 +0200
@@ -2488,8 +2488,6 @@
extern struct sk_buff *skb_segment(struct sk_buff *skb,
netdev_features_t features);
@@ -571580,9 +549963,9 @@ diff -Nur linux-3.10.36/include/linux/skbuff.h linux-linaro-stable-mx6/include/l
-}
#endif /* __KERNEL__ */
#endif /* _LINUX_SKBUFF_H */
-diff -Nur linux-3.10.36/include/linux/spi/spi_bitbang.h linux-linaro-stable-mx6/include/linux/spi/spi_bitbang.h
+diff -Nur linux-3.10.36/include/linux/spi/spi_bitbang.h linux-solidrun/include/linux/spi/spi_bitbang.h
--- linux-3.10.36/include/linux/spi/spi_bitbang.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/spi/spi_bitbang.h 2014-04-21 13:50:42.966730129 +0200
++++ linux-solidrun/include/linux/spi/spi_bitbang.h 2014-04-24 07:58:36.800253014 +0200
@@ -4,11 +4,7 @@
#include <linux/workqueue.h>
@@ -571603,9 +549986,9 @@ diff -Nur linux-3.10.36/include/linux/spi/spi_bitbang.h linux-linaro-stable-mx6/
extern int spi_bitbang_setup_transfer(struct spi_device *spi,
struct spi_transfer *t);
-diff -Nur linux-3.10.36/include/linux/spi/spi.h linux-linaro-stable-mx6/include/linux/spi/spi.h
+diff -Nur linux-3.10.36/include/linux/spi/spi.h linux-solidrun/include/linux/spi/spi.h
--- linux-3.10.36/include/linux/spi/spi.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/spi/spi.h 2014-04-21 13:50:42.966730129 +0200
++++ linux-solidrun/include/linux/spi/spi.h 2014-04-24 07:58:36.800253014 +0200
@@ -23,6 +23,7 @@
#include <linux/mod_devicetable.h>
#include <linux/slab.h>
@@ -571796,9 +550179,9 @@ diff -Nur linux-3.10.36/include/linux/spi/spi.h linux-linaro-stable-mx6/include/
/* ... may need additional spi_device chip config data here.
* avoid stuff protocol drivers can set; but include stuff
-diff -Nur linux-3.10.36/include/linux/sysfs.h linux-linaro-stable-mx6/include/linux/sysfs.h
+diff -Nur linux-3.10.36/include/linux/sysfs.h linux-solidrun/include/linux/sysfs.h
--- linux-3.10.36/include/linux/sysfs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/sysfs.h 2014-04-21 13:50:42.970730146 +0200
++++ linux-solidrun/include/linux/sysfs.h 2014-04-24 07:58:36.808253044 +0200
@@ -92,6 +92,15 @@
#define __ATTR_IGNORE_LOCKDEP __ATTR
#endif
@@ -571815,9 +550198,9 @@ diff -Nur linux-3.10.36/include/linux/sysfs.h linux-linaro-stable-mx6/include/li
#define attr_name(_attr) (_attr).attr.name
struct file;
-diff -Nur linux-3.10.36/include/linux/tracepoint.h linux-linaro-stable-mx6/include/linux/tracepoint.h
+diff -Nur linux-3.10.36/include/linux/tracepoint.h linux-solidrun/include/linux/tracepoint.h
--- linux-3.10.36/include/linux/tracepoint.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/tracepoint.h 2014-04-21 13:50:42.974730163 +0200
++++ linux-solidrun/include/linux/tracepoint.h 2014-04-24 07:58:36.812253057 +0200
@@ -60,12 +60,6 @@
unsigned int num_tracepoints;
struct tracepoint * const *tracepoints_ptrs;
@@ -571831,9 +550214,9 @@ diff -Nur linux-3.10.36/include/linux/tracepoint.h linux-linaro-stable-mx6/inclu
#endif /* CONFIG_MODULES */
struct tracepoint_iter {
-diff -Nur linux-3.10.36/include/linux/usb/chipidea.h linux-linaro-stable-mx6/include/linux/usb/chipidea.h
+diff -Nur linux-3.10.36/include/linux/usb/chipidea.h linux-solidrun/include/linux/usb/chipidea.h
--- linux-3.10.36/include/linux/usb/chipidea.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/usb/chipidea.h 2014-04-21 13:50:42.978730180 +0200
++++ linux-solidrun/include/linux/usb/chipidea.h 2014-04-24 07:58:36.816253071 +0200
@@ -7,32 +7,44 @@
#include <linux/usb/otg.h>
@@ -571894,9 +550277,9 @@ diff -Nur linux-3.10.36/include/linux/usb/chipidea.h linux-linaro-stable-mx6/inc
+void ci_hdrc_remove_device(struct platform_device *pdev);
#endif
-diff -Nur linux-3.10.36/include/linux/usb/of.h linux-linaro-stable-mx6/include/linux/usb/of.h
+diff -Nur linux-3.10.36/include/linux/usb/of.h linux-solidrun/include/linux/usb/of.h
--- linux-3.10.36/include/linux/usb/of.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/usb/of.h 2014-04-21 13:50:42.982730197 +0200
++++ linux-solidrun/include/linux/usb/of.h 2014-04-24 07:58:36.820253085 +0200
@@ -0,0 +1,32 @@
+/*
+ * OF helpers for usb devices.
@@ -571930,9 +550313,9 @@ diff -Nur linux-3.10.36/include/linux/usb/of.h linux-linaro-stable-mx6/include/l
+#endif
+
+#endif /* __LINUX_USB_OF_H */
-diff -Nur linux-3.10.36/include/linux/usb/otg.h linux-linaro-stable-mx6/include/linux/usb/otg.h
+diff -Nur linux-3.10.36/include/linux/usb/otg.h linux-solidrun/include/linux/usb/otg.h
--- linux-3.10.36/include/linux/usb/otg.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/usb/otg.h 2014-04-21 13:50:42.982730197 +0200
++++ linux-solidrun/include/linux/usb/otg.h 2014-04-24 07:58:36.820253085 +0200
@@ -92,4 +92,11 @@
/* for OTG controller drivers (and maybe other stuff) */
extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num);
@@ -571945,9 +550328,9 @@ diff -Nur linux-3.10.36/include/linux/usb/otg.h linux-linaro-stable-mx6/include/
+};
+
#endif /* __LINUX_USB_OTG_H */
-diff -Nur linux-3.10.36/include/linux/usb/phy.h linux-linaro-stable-mx6/include/linux/usb/phy.h
+diff -Nur linux-3.10.36/include/linux/usb/phy.h linux-solidrun/include/linux/usb/phy.h
--- linux-3.10.36/include/linux/usb/phy.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/usb/phy.h 2014-04-21 13:50:42.982730197 +0200
++++ linux-solidrun/include/linux/usb/phy.h 2014-04-24 07:58:36.820253085 +0200
@@ -12,6 +12,15 @@
#include <linux/notifier.h>
#include <linux/usb.h>
@@ -572029,9 +550412,9 @@ diff -Nur linux-3.10.36/include/linux/usb/phy.h linux-linaro-stable-mx6/include/
/* notifiers */
static inline int
-diff -Nur linux-3.10.36/include/linux/vexpress.h linux-linaro-stable-mx6/include/linux/vexpress.h
+diff -Nur linux-3.10.36/include/linux/vexpress.h linux-solidrun/include/linux/vexpress.h
--- linux-3.10.36/include/linux/vexpress.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/vexpress.h 2014-04-21 13:50:42.982730197 +0200
++++ linux-solidrun/include/linux/vexpress.h 2014-04-24 07:58:36.820253085 +0200
@@ -68,7 +68,8 @@
*/
struct vexpress_config_bridge_info {
@@ -572118,9 +550501,9 @@ diff -Nur linux-3.10.36/include/linux/vexpress.h linux-linaro-stable-mx6/include
+#endif
+
#endif
-diff -Nur linux-3.10.36/include/linux/vmstat.h linux-linaro-stable-mx6/include/linux/vmstat.h
+diff -Nur linux-3.10.36/include/linux/vmstat.h linux-solidrun/include/linux/vmstat.h
--- linux-3.10.36/include/linux/vmstat.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/vmstat.h 2014-04-21 13:50:42.986730214 +0200
++++ linux-solidrun/include/linux/vmstat.h 2014-04-24 07:58:36.824253099 +0200
@@ -195,7 +195,7 @@
extern void dec_zone_state(struct zone *, enum zone_stat_item);
extern void __dec_zone_state(struct zone *, enum zone_stat_item);
@@ -572130,9 +550513,9 @@ diff -Nur linux-3.10.36/include/linux/vmstat.h linux-linaro-stable-mx6/include/l
void refresh_zone_stat_thresholds(void);
void drain_zonestat(struct zone *zone, struct per_cpu_pageset *);
-diff -Nur linux-3.10.36/include/linux/workqueue.h linux-linaro-stable-mx6/include/linux/workqueue.h
+diff -Nur linux-3.10.36/include/linux/workqueue.h linux-solidrun/include/linux/workqueue.h
--- linux-3.10.36/include/linux/workqueue.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/workqueue.h 2014-04-21 13:50:42.986730214 +0200
++++ linux-solidrun/include/linux/workqueue.h 2014-04-24 07:58:36.824253099 +0200
@@ -303,6 +303,33 @@
WQ_CPU_INTENSIVE = 1 << 5, /* cpu instensive workqueue */
WQ_SYSFS = 1 << 6, /* visible in sysfs, see wq_sysfs_register() */
@@ -572187,9 +550570,9 @@ diff -Nur linux-3.10.36/include/linux/workqueue.h linux-linaro-stable-mx6/includ
static inline struct workqueue_struct * __deprecated __system_nrt_wq(void)
{
-diff -Nur linux-3.10.36/include/linux/zbud.h linux-linaro-stable-mx6/include/linux/zbud.h
+diff -Nur linux-3.10.36/include/linux/zbud.h linux-solidrun/include/linux/zbud.h
--- linux-3.10.36/include/linux/zbud.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/zbud.h 2014-04-21 13:50:42.986730214 +0200
++++ linux-solidrun/include/linux/zbud.h 2014-04-24 07:58:36.824253099 +0200
@@ -0,0 +1,22 @@
+#ifndef _ZBUD_H_
+#define _ZBUD_H_
@@ -572213,9 +550596,9 @@ diff -Nur linux-3.10.36/include/linux/zbud.h linux-linaro-stable-mx6/include/lin
+int zbud_get_pool_size(struct zbud_pool *pool);
+
+#endif /* _ZBUD_H_ */
-diff -Nur linux-3.10.36/include/net/tcp.h linux-linaro-stable-mx6/include/net/tcp.h
+diff -Nur linux-3.10.36/include/net/tcp.h linux-solidrun/include/net/tcp.h
--- linux-3.10.36/include/net/tcp.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/net/tcp.h 2014-04-21 13:50:43.030730399 +0200
++++ linux-solidrun/include/net/tcp.h 2014-04-24 07:58:36.908253395 +0200
@@ -1308,8 +1308,7 @@
/* Fast Open cookie. Size 0 means a cookie request */
struct tcp_fastopen_cookie cookie;
@@ -572226,9 +550609,9 @@ diff -Nur linux-3.10.36/include/net/tcp.h linux-linaro-stable-mx6/include/net/tc
};
void tcp_free_fastopen_req(struct tcp_sock *tp);
-diff -Nur linux-3.10.36/include/sound/memalloc.h linux-linaro-stable-mx6/include/sound/memalloc.h
+diff -Nur linux-3.10.36/include/sound/memalloc.h linux-solidrun/include/sound/memalloc.h
--- linux-3.10.36/include/sound/memalloc.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/sound/memalloc.h 2014-04-21 13:50:43.046730467 +0200
++++ linux-solidrun/include/sound/memalloc.h 2014-04-24 07:58:36.952253550 +0200
@@ -52,6 +52,11 @@
#else
#define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV /* no SG-buf support */
@@ -572241,9 +550624,9 @@ diff -Nur linux-3.10.36/include/sound/memalloc.h linux-linaro-stable-mx6/include
/*
* info for buffer allocation
-diff -Nur linux-3.10.36/include/sound/wm8962.h linux-linaro-stable-mx6/include/sound/wm8962.h
+diff -Nur linux-3.10.36/include/sound/wm8962.h linux-solidrun/include/sound/wm8962.h
--- linux-3.10.36/include/sound/wm8962.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/sound/wm8962.h 2014-04-21 13:50:43.050730483 +0200
++++ linux-solidrun/include/sound/wm8962.h 2014-04-24 07:58:36.956253563 +0200
@@ -55,6 +55,9 @@
* in a DC measurement configuration.
*/
@@ -572254,9 +550637,9 @@ diff -Nur linux-3.10.36/include/sound/wm8962.h linux-linaro-stable-mx6/include/s
};
#endif
-diff -Nur linux-3.10.36/include/target/iscsi/iscsi_transport.h linux-linaro-stable-mx6/include/target/iscsi/iscsi_transport.h
+diff -Nur linux-3.10.36/include/target/iscsi/iscsi_transport.h linux-solidrun/include/target/iscsi/iscsi_transport.h
--- linux-3.10.36/include/target/iscsi/iscsi_transport.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/target/iscsi/iscsi_transport.h 2014-04-21 13:50:43.050730483 +0200
++++ linux-solidrun/include/target/iscsi/iscsi_transport.h 2014-04-24 07:58:36.960253578 +0200
@@ -11,7 +11,6 @@
int (*iscsit_setup_np)(struct iscsi_np *, struct __kernel_sockaddr_storage *);
int (*iscsit_accept_np)(struct iscsi_np *, struct iscsi_conn *);
@@ -572265,9 +550648,9 @@ diff -Nur linux-3.10.36/include/target/iscsi/iscsi_transport.h linux-linaro-stab
void (*iscsit_free_conn)(struct iscsi_conn *);
struct iscsi_cmd *(*iscsit_alloc_cmd)(struct iscsi_conn *, gfp_t);
int (*iscsit_get_login_rx)(struct iscsi_conn *, struct iscsi_login *);
-diff -Nur linux-3.10.36/include/trace/events/arm-ipi.h linux-linaro-stable-mx6/include/trace/events/arm-ipi.h
+diff -Nur linux-3.10.36/include/trace/events/arm-ipi.h linux-solidrun/include/trace/events/arm-ipi.h
--- linux-3.10.36/include/trace/events/arm-ipi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/trace/events/arm-ipi.h 2014-04-21 13:50:43.050730483 +0200
++++ linux-solidrun/include/trace/events/arm-ipi.h 2014-04-24 07:58:36.960253578 +0200
@@ -0,0 +1,100 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM arm-ipi
@@ -572369,9 +550752,9 @@ diff -Nur linux-3.10.36/include/trace/events/arm-ipi.h linux-linaro-stable-mx6/i
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-3.10.36/include/trace/events/f2fs.h linux-linaro-stable-mx6/include/trace/events/f2fs.h
+diff -Nur linux-3.10.36/include/trace/events/f2fs.h linux-solidrun/include/trace/events/f2fs.h
--- linux-3.10.36/include/trace/events/f2fs.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/trace/events/f2fs.h 2014-04-21 13:50:43.054730500 +0200
++++ linux-solidrun/include/trace/events/f2fs.h 2014-04-24 07:58:36.960253578 +0200
@@ -36,6 +36,11 @@
{ CURSEG_COLD_NODE, "Cold NODE" }, \
{ NO_CHECK_TYPE, "No TYPE" })
@@ -572437,9 +550820,9 @@ diff -Nur linux-3.10.36/include/trace/events/f2fs.h linux-linaro-stable-mx6/incl
TRACE_EVENT(f2fs_submit_write_page,
TP_PROTO(struct page *page, block_t blk_addr, int type),
-diff -Nur linux-3.10.36/include/trace/events/power_cpu_migrate.h linux-linaro-stable-mx6/include/trace/events/power_cpu_migrate.h
+diff -Nur linux-3.10.36/include/trace/events/power_cpu_migrate.h linux-solidrun/include/trace/events/power_cpu_migrate.h
--- linux-3.10.36/include/trace/events/power_cpu_migrate.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/trace/events/power_cpu_migrate.h 2014-04-21 13:50:43.054730500 +0200
++++ linux-solidrun/include/trace/events/power_cpu_migrate.h 2014-04-24 07:58:36.960253578 +0200
@@ -0,0 +1,67 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM power
@@ -572508,9 +550891,9 @@ diff -Nur linux-3.10.36/include/trace/events/power_cpu_migrate.h linux-linaro-st
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE power_cpu_migrate
+#include <trace/define_trace.h>
-diff -Nur linux-3.10.36/include/trace/events/sched.h linux-linaro-stable-mx6/include/trace/events/sched.h
+diff -Nur linux-3.10.36/include/trace/events/sched.h linux-solidrun/include/trace/events/sched.h
--- linux-3.10.36/include/trace/events/sched.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/trace/events/sched.h 2014-04-21 13:50:43.054730500 +0200
++++ linux-solidrun/include/trace/events/sched.h 2014-04-24 07:58:36.960253578 +0200
@@ -430,6 +430,280 @@
__entry->oldprio, __entry->newprio)
);
@@ -572792,9 +551175,9 @@ diff -Nur linux-3.10.36/include/trace/events/sched.h linux-linaro-stable-mx6/inc
#endif /* _TRACE_SCHED_H */
/* This part must be outside protection */
-diff -Nur linux-3.10.36/include/trace/events/smp.h linux-linaro-stable-mx6/include/trace/events/smp.h
+diff -Nur linux-3.10.36/include/trace/events/smp.h linux-solidrun/include/trace/events/smp.h
--- linux-3.10.36/include/trace/events/smp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/trace/events/smp.h 2014-04-21 13:50:43.054730500 +0200
++++ linux-solidrun/include/trace/events/smp.h 2014-04-24 07:58:36.960253578 +0200
@@ -0,0 +1,90 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM smp
@@ -572886,9 +551269,9 @@ diff -Nur linux-3.10.36/include/trace/events/smp.h linux-linaro-stable-mx6/inclu
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-3.10.36/include/trace/events/spi.h linux-linaro-stable-mx6/include/trace/events/spi.h
+diff -Nur linux-3.10.36/include/trace/events/spi.h linux-solidrun/include/trace/events/spi.h
--- linux-3.10.36/include/trace/events/spi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/trace/events/spi.h 2014-04-21 13:50:43.054730500 +0200
++++ linux-solidrun/include/trace/events/spi.h 2014-04-24 07:58:36.960253578 +0200
@@ -0,0 +1,156 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM spi
@@ -573046,9 +551429,9 @@ diff -Nur linux-3.10.36/include/trace/events/spi.h linux-linaro-stable-mx6/inclu
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-3.10.36/include/trace/ftrace.h linux-linaro-stable-mx6/include/trace/ftrace.h
+diff -Nur linux-3.10.36/include/trace/ftrace.h linux-solidrun/include/trace/ftrace.h
--- linux-3.10.36/include/trace/ftrace.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/trace/ftrace.h 2014-04-21 13:50:43.054730500 +0200
++++ linux-solidrun/include/trace/ftrace.h 2014-04-24 07:58:36.964253593 +0200
@@ -299,12 +299,15 @@
#undef __array
#define __array(type, item, len) \
@@ -573067,9 +551450,9 @@ diff -Nur linux-3.10.36/include/trace/ftrace.h linux-linaro-stable-mx6/include/t
if (ret) \
return ret; \
} while (0);
-diff -Nur linux-3.10.36/include/uapi/linux/ipu.h linux-linaro-stable-mx6/include/uapi/linux/ipu.h
+diff -Nur linux-3.10.36/include/uapi/linux/ipu.h linux-solidrun/include/uapi/linux/ipu.h
--- linux-3.10.36/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/ipu.h 2014-04-21 13:50:43.078730602 +0200
++++ linux-solidrun/include/uapi/linux/ipu.h 2014-04-24 07:58:37.024253804 +0200
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -573353,9 +551736,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/ipu.h linux-linaro-stable-mx6/include
+#define IPU_FREE _IOW('I', 0x4, int)
+
+#endif
-diff -Nur linux-3.10.36/include/uapi/linux/isl29023.h linux-linaro-stable-mx6/include/uapi/linux/isl29023.h
+diff -Nur linux-3.10.36/include/uapi/linux/isl29023.h linux-solidrun/include/uapi/linux/isl29023.h
--- linux-3.10.36/include/uapi/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/isl29023.h 2014-04-21 13:50:43.078730602 +0200
++++ linux-solidrun/include/uapi/linux/isl29023.h 2014-04-24 07:58:37.024253804 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -573404,9 +551787,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/isl29023.h linux-linaro-stable-mx6/in
+#define ISL29023_RANGE_64K 0x3
+
+#endif
-diff -Nur linux-3.10.36/include/uapi/linux/Kbuild linux-linaro-stable-mx6/include/uapi/linux/Kbuild
+diff -Nur linux-3.10.36/include/uapi/linux/Kbuild linux-solidrun/include/uapi/linux/Kbuild
--- linux-3.10.36/include/uapi/linux/Kbuild 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/uapi/linux/Kbuild 2014-04-21 13:50:43.062730534 +0200
++++ linux-solidrun/include/uapi/linux/Kbuild 2014-04-24 07:58:37.008253746 +0200
@@ -225,6 +225,7 @@
header-y += kvm_para.h
endif
@@ -573433,9 +551816,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/Kbuild linux-linaro-stable-mx6/includ
header-y += qnx4_fs.h
header-y += qnxtypes.h
header-y += quota.h
-diff -Nur linux-3.10.36/include/uapi/linux/mxc_asrc.h linux-linaro-stable-mx6/include/uapi/linux/mxc_asrc.h
+diff -Nur linux-3.10.36/include/uapi/linux/mxc_asrc.h linux-solidrun/include/uapi/linux/mxc_asrc.h
--- linux-3.10.36/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_asrc.h 2014-04-21 13:50:43.082730618 +0200
++++ linux-solidrun/include/uapi/linux/mxc_asrc.h 2014-04-24 07:58:37.028253817 +0200
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -573580,9 +551963,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/mxc_asrc.h linux-linaro-stable-mx6/in
+ ASRC_INPUT_BUFFER_UNDERRUN = 0x10,
+};
+#endif/* __MXC_ASRC_UAPI_H__ */
-diff -Nur linux-3.10.36/include/uapi/linux/mxcfb.h linux-linaro-stable-mx6/include/uapi/linux/mxcfb.h
+diff -Nur linux-3.10.36/include/uapi/linux/mxcfb.h linux-solidrun/include/uapi/linux/mxcfb.h
--- linux-3.10.36/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxcfb.h 2014-04-21 13:50:43.082730618 +0200
++++ linux-solidrun/include/uapi/linux/mxcfb.h 2014-04-24 07:58:37.028253817 +0200
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -573758,9 +552141,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/mxcfb.h linux-linaro-stable-mx6/inclu
+#define MXCFB_SET_UPDATE_SCHEME _IOW('F', 0x32, __u32)
+#define MXCFB_GET_WORK_BUFFER _IOWR('F', 0x34, unsigned long)
+#endif
-diff -Nur linux-3.10.36/include/uapi/linux/mxc_mlb.h linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h
+diff -Nur linux-3.10.36/include/uapi/linux/mxc_mlb.h linux-solidrun/include/uapi/linux/mxc_mlb.h
--- linux-3.10.36/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h 2014-04-21 13:50:43.082730618 +0200
++++ linux-solidrun/include/uapi/linux/mxc_mlb.h 2014-04-24 07:58:37.028253817 +0200
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -573817,9 +552200,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/mxc_mlb.h linux-linaro-stable-mx6/inc
+
+
+#endif /* _MXC_MLB_H */
-diff -Nur linux-3.10.36/include/uapi/linux/mxc_v4l2.h linux-linaro-stable-mx6/include/uapi/linux/mxc_v4l2.h
+diff -Nur linux-3.10.36/include/uapi/linux/mxc_v4l2.h linux-solidrun/include/uapi/linux/mxc_v4l2.h
--- linux-3.10.36/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_v4l2.h 2014-04-21 13:50:43.082730618 +0200
++++ linux-solidrun/include/uapi/linux/mxc_v4l2.h 2014-04-24 07:58:37.028253817 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -573877,9 +552260,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/mxc_v4l2.h linux-linaro-stable-mx6/in
+};
+
+#endif
-diff -Nur linux-3.10.36/include/uapi/linux/pxp_dma.h linux-linaro-stable-mx6/include/uapi/linux/pxp_dma.h
+diff -Nur linux-3.10.36/include/uapi/linux/pxp_dma.h linux-solidrun/include/uapi/linux/pxp_dma.h
--- linux-3.10.36/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/pxp_dma.h 2014-04-21 13:50:43.098730686 +0200
++++ linux-solidrun/include/uapi/linux/pxp_dma.h 2014-04-24 07:58:37.044253874 +0200
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -574070,9 +552453,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/pxp_dma.h linux-linaro-stable-mx6/inc
+};
+
+#endif
-diff -Nur linux-3.10.36/include/uapi/linux/serial_core.h linux-linaro-stable-mx6/include/uapi/linux/serial_core.h
+diff -Nur linux-3.10.36/include/uapi/linux/serial_core.h linux-solidrun/include/uapi/linux/serial_core.h
--- linux-3.10.36/include/uapi/linux/serial_core.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/uapi/linux/serial_core.h 2014-04-21 13:50:43.098730686 +0200
++++ linux-solidrun/include/uapi/linux/serial_core.h 2014-04-24 07:58:37.044253874 +0200
@@ -226,4 +226,7 @@
/* Rocketport EXPRESS/INFINITY */
#define PORT_RP2 102
@@ -574081,9 +552464,9 @@ diff -Nur linux-3.10.36/include/uapi/linux/serial_core.h linux-linaro-stable-mx6
+#define PORT_LPUART 103
+
#endif /* _UAPILINUX_SERIAL_CORE_H */
-diff -Nur linux-3.10.36/include/uapi/mtd/mtd-abi.h linux-linaro-stable-mx6/include/uapi/mtd/mtd-abi.h
+diff -Nur linux-3.10.36/include/uapi/mtd/mtd-abi.h linux-solidrun/include/uapi/mtd/mtd-abi.h
--- linux-3.10.36/include/uapi/mtd/mtd-abi.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/include/uapi/mtd/mtd-abi.h 2014-04-21 13:50:43.110730737 +0200
++++ linux-solidrun/include/uapi/mtd/mtd-abi.h 2014-04-24 07:58:37.056253916 +0200
@@ -94,10 +94,10 @@
#define MTD_RAM 1
#define MTD_ROM 2
@@ -574107,9 +552490,9 @@ diff -Nur linux-3.10.36/include/uapi/mtd/mtd-abi.h linux-linaro-stable-mx6/inclu
+}
+
#endif /* __MTD_ABI_H__ */
-diff -Nur linux-3.10.36/include/video/mxc_edid.h linux-linaro-stable-mx6/include/video/mxc_edid.h
+diff -Nur linux-3.10.36/include/video/mxc_edid.h linux-solidrun/include/video/mxc_edid.h
--- linux-3.10.36/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/video/mxc_edid.h 2014-04-21 13:50:43.118730770 +0200
++++ linux-solidrun/include/video/mxc_edid.h 2014-04-24 07:58:37.140254211 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -574216,9 +552599,9 @@ diff -Nur linux-3.10.36/include/video/mxc_edid.h linux-linaro-stable-mx6/include
+int mxc_edid_parse_ext_blk(unsigned char *edid, struct mxc_edid_cfg *cfg,
+ struct fb_monspecs *specs);
+#endif
-diff -Nur linux-3.10.36/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include/video/mxc_hdmi.h
+diff -Nur linux-3.10.36/include/video/mxc_hdmi.h linux-solidrun/include/video/mxc_hdmi.h
--- linux-3.10.36/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/video/mxc_hdmi.h 2014-04-21 13:50:43.118730770 +0200
++++ linux-solidrun/include/video/mxc_hdmi.h 2014-04-24 07:58:37.140254211 +0200
@@ -0,0 +1,1019 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -575239,9 +553622,9 @@ diff -Nur linux-3.10.36/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include
+
+
+#endif /* __MXC_HDMI_H__ */
-diff -Nur linux-3.10.36/ipc/mq_sysctl.c linux-linaro-stable-mx6/ipc/mq_sysctl.c
+diff -Nur linux-3.10.36/ipc/mq_sysctl.c linux-solidrun/ipc/mq_sysctl.c
--- linux-3.10.36/ipc/mq_sysctl.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/ipc/mq_sysctl.c 2014-04-21 13:50:43.126730804 +0200
++++ linux-solidrun/ipc/mq_sysctl.c 2014-04-24 07:58:37.152254254 +0200
@@ -22,16 +22,6 @@
return which;
}
@@ -575284,9 +553667,9 @@ diff -Nur linux-3.10.36/ipc/mq_sysctl.c linux-linaro-stable-mx6/ipc/mq_sysctl.c
},
{
.procname = "msg_max",
-diff -Nur linux-3.10.36/ipc/mqueue.c linux-linaro-stable-mx6/ipc/mqueue.c
+diff -Nur linux-3.10.36/ipc/mqueue.c linux-solidrun/ipc/mqueue.c
--- linux-3.10.36/ipc/mqueue.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/ipc/mqueue.c 2014-04-21 13:50:43.126730804 +0200
++++ linux-solidrun/ipc/mqueue.c 2014-04-24 07:58:37.152254254 +0200
@@ -433,9 +433,9 @@
error = -EACCES;
goto out_unlock;
@@ -575300,9 +553683,9 @@ diff -Nur linux-3.10.36/ipc/mqueue.c linux-linaro-stable-mx6/ipc/mqueue.c
error = -ENOSPC;
goto out_unlock;
}
-diff -Nur linux-3.10.36/ipc/msg.c linux-linaro-stable-mx6/ipc/msg.c
+diff -Nur linux-3.10.36/ipc/msg.c linux-solidrun/ipc/msg.c
--- linux-3.10.36/ipc/msg.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/ipc/msg.c 2014-04-21 13:50:43.126730804 +0200
++++ linux-solidrun/ipc/msg.c 2014-04-24 07:58:37.152254254 +0200
@@ -885,8 +885,6 @@
return -EINVAL;
@@ -575312,9 +553695,9 @@ diff -Nur linux-3.10.36/ipc/msg.c linux-linaro-stable-mx6/ipc/msg.c
copy = prepare_copy(buf, min_t(size_t, bufsz, ns->msg_ctlmax));
if (IS_ERR(copy))
return PTR_ERR(copy);
-diff -Nur linux-3.10.36/kernel/auditfilter.c linux-linaro-stable-mx6/kernel/auditfilter.c
+diff -Nur linux-3.10.36/kernel/auditfilter.c linux-solidrun/kernel/auditfilter.c
--- linux-3.10.36/kernel/auditfilter.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/auditfilter.c 2014-04-21 13:50:43.130730821 +0200
++++ linux-solidrun/kernel/auditfilter.c 2014-04-24 07:58:37.156254268 +0200
@@ -423,7 +423,7 @@
f->lsm_rule = NULL;
@@ -575324,9 +553707,9 @@ diff -Nur linux-3.10.36/kernel/auditfilter.c linux-linaro-stable-mx6/kernel/audi
f->type = AUDIT_LOGINUID_SET;
f->val = 0;
}
-diff -Nur linux-3.10.36/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c
+diff -Nur linux-3.10.36/kernel/cpu.c linux-solidrun/kernel/cpu.c
--- linux-3.10.36/kernel/cpu.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/cpu.c 2014-04-21 13:50:43.134730838 +0200
++++ linux-solidrun/kernel/cpu.c 2014-04-24 07:58:37.156254268 +0200
@@ -726,3 +726,22 @@
{
cpumask_copy(to_cpumask(cpu_online_bits), src);
@@ -575350,9 +553733,9 @@ diff -Nur linux-3.10.36/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c
+ atomic_notifier_call_chain(&idle_notifier, val, NULL);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_call_chain);
-diff -Nur linux-3.10.36/kernel/cpuset.c linux-linaro-stable-mx6/kernel/cpuset.c
+diff -Nur linux-3.10.36/kernel/cpuset.c linux-solidrun/kernel/cpuset.c
--- linux-3.10.36/kernel/cpuset.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/cpuset.c 2014-04-21 13:50:43.134730838 +0200
++++ linux-solidrun/kernel/cpuset.c 2014-04-24 07:58:37.160254282 +0200
@@ -2422,9 +2422,9 @@
task_lock(current);
@@ -575364,9 +553747,9 @@ diff -Nur linux-3.10.36/kernel/cpuset.c linux-linaro-stable-mx6/kernel/cpuset.c
mutex_unlock(&callback_mutex);
return allowed;
}
-diff -Nur linux-3.10.36/kernel/events/core.c linux-linaro-stable-mx6/kernel/events/core.c
+diff -Nur linux-3.10.36/kernel/events/core.c linux-solidrun/kernel/events/core.c
--- linux-3.10.36/kernel/events/core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/events/core.c 2014-04-21 13:50:43.138730855 +0200
++++ linux-solidrun/kernel/events/core.c 2014-04-24 07:58:37.164254295 +0200
@@ -7421,14 +7421,14 @@
static void __perf_event_exit_context(void *__info)
{
@@ -575400,9 +553783,9 @@ diff -Nur linux-3.10.36/kernel/events/core.c linux-linaro-stable-mx6/kernel/even
}
#else
static inline void perf_event_exit_cpu(int cpu) { }
-diff -Nur linux-3.10.36/kernel/irq/handle.c linux-linaro-stable-mx6/kernel/irq/handle.c
+diff -Nur linux-3.10.36/kernel/irq/handle.c linux-solidrun/kernel/irq/handle.c
--- linux-3.10.36/kernel/irq/handle.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/irq/handle.c 2014-04-21 13:50:43.142730872 +0200
++++ linux-solidrun/kernel/irq/handle.c 2014-04-24 07:58:37.212254465 +0200
@@ -51,7 +51,7 @@
"but no thread function available.", irq, action->name);
}
@@ -575421,9 +553804,9 @@ diff -Nur linux-3.10.36/kernel/irq/handle.c linux-linaro-stable-mx6/kernel/irq/h
/* Fall through to add to randomness */
case IRQ_HANDLED:
-diff -Nur linux-3.10.36/kernel/irq/internals.h linux-linaro-stable-mx6/kernel/irq/internals.h
+diff -Nur linux-3.10.36/kernel/irq/internals.h linux-solidrun/kernel/irq/internals.h
--- linux-3.10.36/kernel/irq/internals.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/irq/internals.h 2014-04-21 13:50:43.142730872 +0200
++++ linux-solidrun/kernel/irq/internals.h 2014-04-24 07:58:37.212254465 +0200
@@ -82,6 +82,7 @@
/* Resending of interrupts :*/
void check_irq_resend(struct irq_desc *desc, unsigned int irq);
@@ -575432,9 +553815,9 @@ diff -Nur linux-3.10.36/kernel/irq/internals.h linux-linaro-stable-mx6/kernel/ir
#ifdef CONFIG_PROC_FS
extern void register_irq_proc(unsigned int irq, struct irq_desc *desc);
-diff -Nur linux-3.10.36/kernel/irq/irqdesc.c linux-linaro-stable-mx6/kernel/irq/irqdesc.c
+diff -Nur linux-3.10.36/kernel/irq/irqdesc.c linux-solidrun/kernel/irq/irqdesc.c
--- linux-3.10.36/kernel/irq/irqdesc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/irq/irqdesc.c 2014-04-21 13:50:43.142730872 +0200
++++ linux-solidrun/kernel/irq/irqdesc.c 2014-04-24 07:58:37.212254465 +0200
@@ -23,10 +23,35 @@
static struct lock_class_key irq_desc_lock_class;
@@ -575481,9 +553864,9 @@ diff -Nur linux-3.10.36/kernel/irq/irqdesc.c linux-linaro-stable-mx6/kernel/irq/
static void free_desc(unsigned int irq)
{
-diff -Nur linux-3.10.36/kernel/irq/manage.c linux-linaro-stable-mx6/kernel/irq/manage.c
+diff -Nur linux-3.10.36/kernel/irq/manage.c linux-solidrun/kernel/irq/manage.c
--- linux-3.10.36/kernel/irq/manage.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/irq/manage.c 2014-04-21 13:50:43.142730872 +0200
++++ linux-solidrun/kernel/irq/manage.c 2014-04-24 07:58:37.212254465 +0200
@@ -32,24 +32,10 @@
early_param("threadirqs", setup_forced_irqthreads);
#endif
@@ -575613,9 +553996,9 @@ diff -Nur linux-3.10.36/kernel/irq/manage.c linux-linaro-stable-mx6/kernel/irq/m
static void irq_setup_forced_threading(struct irqaction *new)
{
if (!force_irqthreads)
-diff -Nur linux-3.10.36/kernel/power/Kconfig linux-linaro-stable-mx6/kernel/power/Kconfig
+diff -Nur linux-3.10.36/kernel/power/Kconfig linux-solidrun/kernel/power/Kconfig
--- linux-3.10.36/kernel/power/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/power/Kconfig 2014-04-21 13:50:43.146730888 +0200
++++ linux-solidrun/kernel/power/Kconfig 2014-04-24 07:58:37.224254508 +0200
@@ -263,6 +263,26 @@
bool
depends on PM
@@ -575643,9 +554026,9 @@ diff -Nur linux-3.10.36/kernel/power/Kconfig linux-linaro-stable-mx6/kernel/powe
config PM_GENERIC_DOMAINS_SLEEP
def_bool y
depends on PM_SLEEP && PM_GENERIC_DOMAINS
-diff -Nur linux-3.10.36/kernel/sched/auto_group.c linux-linaro-stable-mx6/kernel/sched/auto_group.c
+diff -Nur linux-3.10.36/kernel/sched/auto_group.c linux-solidrun/kernel/sched/auto_group.c
--- linux-3.10.36/kernel/sched/auto_group.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/sched/auto_group.c 2014-04-21 13:50:43.154730922 +0200
++++ linux-solidrun/kernel/sched/auto_group.c 2014-04-24 07:58:37.232254536 +0200
@@ -77,6 +77,8 @@
if (IS_ERR(tg))
goto out_free;
@@ -575663,9 +554046,9 @@ diff -Nur linux-3.10.36/kernel/sched/auto_group.c linux-linaro-stable-mx6/kernel
return ag;
out_free:
-diff -Nur linux-3.10.36/kernel/sched/core.c linux-linaro-stable-mx6/kernel/sched/core.c
+diff -Nur linux-3.10.36/kernel/sched/core.c linux-solidrun/kernel/sched/core.c
--- linux-3.10.36/kernel/sched/core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/sched/core.c 2014-04-21 13:50:43.154730922 +0200
++++ linux-solidrun/kernel/sched/core.c 2014-04-24 07:58:37.232254536 +0200
@@ -1623,6 +1623,20 @@
#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)
p->se.avg.runnable_avg_period = 0;
@@ -575715,9 +554098,9 @@ diff -Nur linux-3.10.36/kernel/sched/core.c linux-linaro-stable-mx6/kernel/sched
else
p->sched_class = &fair_sched_class;
set_load_weight(p);
-diff -Nur linux-3.10.36/kernel/sched/debug.c linux-linaro-stable-mx6/kernel/sched/debug.c
+diff -Nur linux-3.10.36/kernel/sched/debug.c linux-solidrun/kernel/sched/debug.c
--- linux-3.10.36/kernel/sched/debug.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/sched/debug.c 2014-04-21 13:50:43.154730922 +0200
++++ linux-solidrun/kernel/sched/debug.c 2014-04-24 07:58:37.232254536 +0200
@@ -94,6 +94,7 @@
#ifdef CONFIG_SMP
P(se->avg.runnable_avg_sum);
@@ -575748,9 +554131,9 @@ diff -Nur linux-3.10.36/kernel/sched/debug.c linux-linaro-stable-mx6/kernel/sche
P(policy);
P(prio);
#undef PN
-diff -Nur linux-3.10.36/kernel/sched/fair.c linux-linaro-stable-mx6/kernel/sched/fair.c
+diff -Nur linux-3.10.36/kernel/sched/fair.c linux-solidrun/kernel/sched/fair.c
--- linux-3.10.36/kernel/sched/fair.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/sched/fair.c 2014-04-21 13:50:43.158730939 +0200
++++ linux-solidrun/kernel/sched/fair.c 2014-04-24 07:58:37.232254536 +0200
@@ -31,9 +31,18 @@
#include <linux/task_work.h>
@@ -577809,9 +556192,9 @@ diff -Nur linux-3.10.36/kernel/sched/fair.c linux-linaro-stable-mx6/kernel/sched
+
+core_initcall(register_sched_cpufreq_notifier);
+#endif /* CONFIG_HMP_FREQUENCY_INVARIANT_SCALE */
-diff -Nur linux-3.10.36/kernel/sched/sched.h linux-linaro-stable-mx6/kernel/sched/sched.h
+diff -Nur linux-3.10.36/kernel/sched/sched.h linux-solidrun/kernel/sched/sched.h
--- linux-3.10.36/kernel/sched/sched.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/sched/sched.h 2014-04-21 13:50:43.158730939 +0200
++++ linux-solidrun/kernel/sched/sched.h 2014-04-24 07:58:37.232254536 +0200
@@ -142,7 +142,7 @@
atomic_t load_weight;
@@ -577853,9 +556236,9 @@ diff -Nur linux-3.10.36/kernel/sched/sched.h linux-linaro-stable-mx6/kernel/sche
#endif /* CONFIG_SMP */
#include "stats.h"
-diff -Nur linux-3.10.36/kernel/smp.c linux-linaro-stable-mx6/kernel/smp.c
+diff -Nur linux-3.10.36/kernel/smp.c linux-solidrun/kernel/smp.c
--- linux-3.10.36/kernel/smp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/smp.c 2014-04-21 13:50:43.158730939 +0200
++++ linux-solidrun/kernel/smp.c 2014-04-24 07:58:37.236254550 +0200
@@ -12,6 +12,8 @@
#include <linux/gfp.h>
#include <linux/smp.h>
@@ -577906,9 +556289,9 @@ diff -Nur linux-3.10.36/kernel/smp.c linux-linaro-stable-mx6/kernel/smp.c
local_irq_restore(flags);
} else {
if ((unsigned)cpu < nr_cpu_ids && cpu_online(cpu)) {
-diff -Nur linux-3.10.36/kernel/time/jiffies.c linux-linaro-stable-mx6/kernel/time/jiffies.c
+diff -Nur linux-3.10.36/kernel/time/jiffies.c linux-solidrun/kernel/time/jiffies.c
--- linux-3.10.36/kernel/time/jiffies.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/time/jiffies.c 2014-04-21 13:50:43.162730955 +0200
++++ linux-solidrun/kernel/time/jiffies.c 2014-04-24 07:58:37.240254564 +0200
@@ -51,13 +51,7 @@
* HZ shrinks, so values greater than 8 overflow 32bits when
* HZ=100.
@@ -577923,9 +556306,9 @@ diff -Nur linux-3.10.36/kernel/time/jiffies.c linux-linaro-stable-mx6/kernel/tim
static cycle_t jiffies_read(struct clocksource *cs)
{
-diff -Nur linux-3.10.36/kernel/time/tick-broadcast.c linux-linaro-stable-mx6/kernel/time/tick-broadcast.c
+diff -Nur linux-3.10.36/kernel/time/tick-broadcast.c linux-solidrun/kernel/time/tick-broadcast.c
--- linux-3.10.36/kernel/time/tick-broadcast.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/time/tick-broadcast.c 2014-04-21 13:50:43.162730955 +0200
++++ linux-solidrun/kernel/time/tick-broadcast.c 2014-04-24 07:58:38.308258324 +0200
@@ -594,13 +594,6 @@
cpumask_clear(tick_broadcast_force_mask);
@@ -577963,9 +556346,9 @@ diff -Nur linux-3.10.36/kernel/time/tick-broadcast.c linux-linaro-stable-mx6/ker
raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
}
-diff -Nur linux-3.10.36/kernel/trace/ring_buffer.c linux-linaro-stable-mx6/kernel/trace/ring_buffer.c
+diff -Nur linux-3.10.36/kernel/trace/ring_buffer.c linux-solidrun/kernel/trace/ring_buffer.c
--- linux-3.10.36/kernel/trace/ring_buffer.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/trace/ring_buffer.c 2014-04-21 13:50:43.166730973 +0200
++++ linux-solidrun/kernel/trace/ring_buffer.c 2014-04-24 07:58:38.316258352 +0200
@@ -2396,13 +2396,6 @@
write &= RB_WRITE_MASK;
tail = write - length;
@@ -577980,9 +556363,9 @@ diff -Nur linux-3.10.36/kernel/trace/ring_buffer.c linux-linaro-stable-mx6/kerne
/* See if we shot pass the end of this buffer page */
if (unlikely(write > BUF_PAGE_SIZE))
return rb_move_tail(cpu_buffer, length, tail,
-diff -Nur linux-3.10.36/kernel/trace/trace_events.c linux-linaro-stable-mx6/kernel/trace/trace_events.c
+diff -Nur linux-3.10.36/kernel/trace/trace_events.c linux-solidrun/kernel/trace/trace_events.c
--- linux-3.10.36/kernel/trace/trace_events.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/trace/trace_events.c 2014-04-21 13:50:43.170730990 +0200
++++ linux-solidrun/kernel/trace/trace_events.c 2014-04-24 07:58:38.356258493 +0200
@@ -27,6 +27,12 @@
DEFINE_MUTEX(event_mutex);
@@ -578013,9 +556396,9 @@ diff -Nur linux-3.10.36/kernel/trace/trace_events.c linux-linaro-stable-mx6/kern
start = mod->trace_events;
end = mod->trace_events + mod->num_trace_events;
-diff -Nur linux-3.10.36/kernel/trace/trace_export.c linux-linaro-stable-mx6/kernel/trace/trace_export.c
+diff -Nur linux-3.10.36/kernel/trace/trace_export.c linux-solidrun/kernel/trace/trace_export.c
--- linux-3.10.36/kernel/trace/trace_export.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/trace/trace_export.c 2014-04-21 13:50:43.170730990 +0200
++++ linux-solidrun/kernel/trace/trace_export.c 2014-04-24 07:58:38.356258493 +0200
@@ -95,12 +95,15 @@
#undef __array
#define __array(type, item, len) \
@@ -578034,9 +556417,9 @@ diff -Nur linux-3.10.36/kernel/trace/trace_export.c linux-linaro-stable-mx6/kern
if (ret) \
return ret; \
} while (0);
-diff -Nur linux-3.10.36/kernel/tracepoint.c linux-linaro-stable-mx6/kernel/tracepoint.c
+diff -Nur linux-3.10.36/kernel/tracepoint.c linux-solidrun/kernel/tracepoint.c
--- linux-3.10.36/kernel/tracepoint.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/tracepoint.c 2014-04-21 13:50:43.174731007 +0200
++++ linux-solidrun/kernel/tracepoint.c 2014-04-24 07:58:38.356258493 +0200
@@ -631,11 +631,6 @@
EXPORT_SYMBOL_GPL(tracepoint_iter_reset);
@@ -578058,9 +556441,9 @@ diff -Nur linux-3.10.36/kernel/tracepoint.c linux-linaro-stable-mx6/kernel/trace
return 0;
mutex_lock(&tracepoints_mutex);
tp_mod = kmalloc(sizeof(struct tp_module), GFP_KERNEL);
-diff -Nur linux-3.10.36/kernel/workqueue.c linux-linaro-stable-mx6/kernel/workqueue.c
+diff -Nur linux-3.10.36/kernel/workqueue.c linux-solidrun/kernel/workqueue.c
--- linux-3.10.36/kernel/workqueue.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/workqueue.c 2014-04-21 13:50:43.174731007 +0200
++++ linux-solidrun/kernel/workqueue.c 2014-04-24 07:58:38.360258507 +0200
@@ -272,6 +272,15 @@
static bool wq_disable_numa;
module_param_named(disable_numa, wq_disable_numa, bool, 0444);
@@ -578137,9 +556520,9 @@ diff -Nur linux-3.10.36/kernel/workqueue.c linux-linaro-stable-mx6/kernel/workqu
return 0;
}
early_initcall(init_workqueues);
-diff -Nur linux-3.10.36/lib/genalloc.c linux-linaro-stable-mx6/lib/genalloc.c
+diff -Nur linux-3.10.36/lib/genalloc.c linux-solidrun/lib/genalloc.c
--- linux-3.10.36/lib/genalloc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/lib/genalloc.c 2014-04-21 13:50:43.182731040 +0200
++++ linux-solidrun/lib/genalloc.c 2014-04-24 07:58:38.364258521 +0200
@@ -313,6 +313,34 @@
EXPORT_SYMBOL(gen_pool_alloc);
@@ -578175,9 +556558,9 @@ diff -Nur linux-3.10.36/lib/genalloc.c linux-linaro-stable-mx6/lib/genalloc.c
* gen_pool_free - free allocated special memory back to the pool
* @pool: pool to free to
* @addr: starting address of memory to free back to pool
-diff -Nur linux-3.10.36/lib/Makefile linux-linaro-stable-mx6/lib/Makefile
+diff -Nur linux-3.10.36/lib/Makefile linux-solidrun/lib/Makefile
--- linux-3.10.36/lib/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/lib/Makefile 2014-04-21 13:50:43.174731007 +0200
++++ linux-solidrun/lib/Makefile 2014-04-24 07:58:38.360258507 +0200
@@ -45,7 +45,6 @@
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o
@@ -578186,9 +556569,9 @@ diff -Nur linux-3.10.36/lib/Makefile linux-linaro-stable-mx6/lib/Makefile
CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
-diff -Nur linux-3.10.36/linaro/configs/android.conf linux-linaro-stable-mx6/linaro/configs/android.conf
+diff -Nur linux-3.10.36/linaro/configs/android.conf linux-solidrun/linaro/configs/android.conf
--- linux-3.10.36/linaro/configs/android.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/android.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/android.conf 2014-04-24 07:58:38.520259071 +0200
@@ -0,0 +1,40 @@
+CONFIG_IPV6=y
+# CONFIG_IPV6_SIT is not set
@@ -578230,9 +556613,9 @@ diff -Nur linux-3.10.36/linaro/configs/android.conf linux-linaro-stable-mx6/lina
+CONFIG_ADF_FBDEV=y
+CONFIG_ADF_MEMBLOCK=y
+CONFIG_DMA_SHARED_BUFFER=y
-diff -Nur linux-3.10.36/linaro/configs/arndale.conf linux-linaro-stable-mx6/linaro/configs/arndale.conf
+diff -Nur linux-3.10.36/linaro/configs/arndale.conf linux-solidrun/linaro/configs/arndale.conf
--- linux-3.10.36/linaro/configs/arndale.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/arndale.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/arndale.conf 2014-04-24 07:58:38.520259071 +0200
@@ -0,0 +1,66 @@
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PARTITION_ADVANCED=y
@@ -578300,18 +556683,18 @@ diff -Nur linux-3.10.36/linaro/configs/arndale.conf linux-linaro-stable-mx6/lina
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_DEBUG_USER=y
+CONFIG_TUN=y
-diff -Nur linux-3.10.36/linaro/configs/big-LITTLE-IKS.conf linux-linaro-stable-mx6/linaro/configs/big-LITTLE-IKS.conf
+diff -Nur linux-3.10.36/linaro/configs/big-LITTLE-IKS.conf linux-solidrun/linaro/configs/big-LITTLE-IKS.conf
--- linux-3.10.36/linaro/configs/big-LITTLE-IKS.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/big-LITTLE-IKS.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/big-LITTLE-IKS.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,5 @@
+CONFIG_BIG_LITTLE=y
+CONFIG_BL_SWITCHER=y
+CONFIG_ARM_DT_BL_CPUFREQ=y
+CONFIG_ARM_VEXPRESS_BL_CPUFREQ=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-diff -Nur linux-3.10.36/linaro/configs/big-LITTLE-MP.conf linux-linaro-stable-mx6/linaro/configs/big-LITTLE-MP.conf
+diff -Nur linux-3.10.36/linaro/configs/big-LITTLE-MP.conf linux-solidrun/linaro/configs/big-LITTLE-MP.conf
--- linux-3.10.36/linaro/configs/big-LITTLE-MP.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/big-LITTLE-MP.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/big-LITTLE-MP.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,12 @@
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_SCHED=y
@@ -578325,14 +556708,14 @@ diff -Nur linux-3.10.36/linaro/configs/big-LITTLE-MP.conf linux-linaro-stable-mx
+CONFIG_HMP_VARIABLE_SCALE=y
+CONFIG_HMP_FREQUENCY_INVARIANT_SCALE=y
+CONFIG_SCHED_HMP_LITTLE_PACKING=y
-diff -Nur linux-3.10.36/linaro/configs/debug.conf linux-linaro-stable-mx6/linaro/configs/debug.conf
+diff -Nur linux-3.10.36/linaro/configs/debug.conf linux-solidrun/linaro/configs/debug.conf
--- linux-3.10.36/linaro/configs/debug.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/debug.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/debug.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1 @@
+CONFIG_PROVE_LOCKING=y
-diff -Nur linux-3.10.36/linaro/configs/distribution.conf linux-linaro-stable-mx6/linaro/configs/distribution.conf
+diff -Nur linux-3.10.36/linaro/configs/distribution.conf linux-solidrun/linaro/configs/distribution.conf
--- linux-3.10.36/linaro/configs/distribution.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/distribution.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/distribution.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,44 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_CGROUPS=y
@@ -578378,9 +556761,9 @@ diff -Nur linux-3.10.36/linaro/configs/distribution.conf linux-linaro-stable-mx6
+CONFIG_SECURITY_SMACK=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
-diff -Nur linux-3.10.36/linaro/configs/highbank.conf linux-linaro-stable-mx6/linaro/configs/highbank.conf
+diff -Nur linux-3.10.36/linaro/configs/highbank.conf linux-solidrun/linaro/configs/highbank.conf
--- linux-3.10.36/linaro/configs/highbank.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/highbank.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/highbank.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,40 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_NO_HZ=y
@@ -578422,9 +556805,9 @@ diff -Nur linux-3.10.36/linaro/configs/highbank.conf linux-linaro-stable-mx6/lin
+CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
+CONFIG_PL330_DMA=y
-diff -Nur linux-3.10.36/linaro/configs/kvm-guest.conf linux-linaro-stable-mx6/linaro/configs/kvm-guest.conf
+diff -Nur linux-3.10.36/linaro/configs/kvm-guest.conf linux-solidrun/linaro/configs/kvm-guest.conf
--- linux-3.10.36/linaro/configs/kvm-guest.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/kvm-guest.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/kvm-guest.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,11 @@
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_VIRTIO_BLK=y
@@ -578437,9 +556820,9 @@ diff -Nur linux-3.10.36/linaro/configs/kvm-guest.conf linux-linaro-stable-mx6/li
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_THUMB2_KERNEL is not set
-diff -Nur linux-3.10.36/linaro/configs/kvm-host.conf linux-linaro-stable-mx6/linaro/configs/kvm-host.conf
+diff -Nur linux-3.10.36/linaro/configs/kvm-host.conf linux-solidrun/linaro/configs/kvm-host.conf
--- linux-3.10.36/linaro/configs/kvm-host.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/kvm-host.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/kvm-host.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,11 @@
+CONFIG_VIRTUALIZATION=y
+CONFIG_ARM_LPAE=y
@@ -578452,9 +556835,9 @@ diff -Nur linux-3.10.36/linaro/configs/kvm-host.conf linux-linaro-stable-mx6/lin
+CONFIG_KVM_MMIO=y
+CONFIG_KVM=y
+CONFIG_BLK_DEV_NBD=m
-diff -Nur linux-3.10.36/linaro/configs/linaro-base.conf linux-linaro-stable-mx6/linaro/configs/linaro-base.conf
+diff -Nur linux-3.10.36/linaro/configs/linaro-base.conf linux-solidrun/linaro/configs/linaro-base.conf
--- linux-3.10.36/linaro/configs/linaro-base.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/linaro-base.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/linaro-base.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,94 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
@@ -578550,9 +556933,9 @@ diff -Nur linux-3.10.36/linaro/configs/linaro-base.conf linux-linaro-stable-mx6/
+CONFIG_FUNCTION_TRACER=y
+CONFIG_ENABLE_DEFAULT_TRACERS=y
+CONFIG_PROC_DEVICETREE=y
-diff -Nur linux-3.10.36/linaro/configs/omap4.conf linux-linaro-stable-mx6/linaro/configs/omap4.conf
+diff -Nur linux-3.10.36/linaro/configs/omap4.conf linux-solidrun/linaro/configs/omap4.conf
--- linux-3.10.36/linaro/configs/omap4.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/omap4.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/omap4.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,194 @@
+CONFIG_EXPERT=y
+CONFIG_KPROBES=y
@@ -578748,9 +557131,9 @@ diff -Nur linux-3.10.36/linaro/configs/omap4.conf linux-linaro-stable-mx6/linaro
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_LIBCRC32C=y
+# CONFIG_CPU_FREQ is not set
-diff -Nur linux-3.10.36/linaro/configs/ubuntu-minimal.conf linux-linaro-stable-mx6/linaro/configs/ubuntu-minimal.conf
+diff -Nur linux-3.10.36/linaro/configs/ubuntu-minimal.conf linux-solidrun/linaro/configs/ubuntu-minimal.conf
--- linux-3.10.36/linaro/configs/ubuntu-minimal.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/ubuntu-minimal.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/ubuntu-minimal.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,44 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_CGROUPS=y
@@ -578796,9 +557179,9 @@ diff -Nur linux-3.10.36/linaro/configs/ubuntu-minimal.conf linux-linaro-stable-m
+CONFIG_SECURITY_SMACK=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
-diff -Nur linux-3.10.36/linaro/configs/vexpress64.conf linux-linaro-stable-mx6/linaro/configs/vexpress64.conf
+diff -Nur linux-3.10.36/linaro/configs/vexpress64.conf linux-solidrun/linaro/configs/vexpress64.conf
--- linux-3.10.36/linaro/configs/vexpress64.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/vexpress64.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/vexpress64.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,32 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_SMP=y
@@ -578832,9 +557215,9 @@ diff -Nur linux-3.10.36/linaro/configs/vexpress64.conf linux-linaro-stable-mx6/l
+CONFIG_VIRTIO_MMIO=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
-diff -Nur linux-3.10.36/linaro/configs/vexpress.conf linux-linaro-stable-mx6/linaro/configs/vexpress.conf
+diff -Nur linux-3.10.36/linaro/configs/vexpress.conf linux-solidrun/linaro/configs/vexpress.conf
--- linux-3.10.36/linaro/configs/vexpress.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/vexpress.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/vexpress.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,63 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
@@ -578899,14 +557282,14 @@ diff -Nur linux-3.10.36/linaro/configs/vexpress.conf linux-linaro-stable-mx6/lin
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-diff -Nur linux-3.10.36/linaro/configs/vexpress-tuning.conf linux-linaro-stable-mx6/linaro/configs/vexpress-tuning.conf
+diff -Nur linux-3.10.36/linaro/configs/vexpress-tuning.conf linux-solidrun/linaro/configs/vexpress-tuning.conf
--- linux-3.10.36/linaro/configs/vexpress-tuning.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/vexpress-tuning.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/vexpress-tuning.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1 @@
+# CONFIG_PROVE_LOCKING is not set
-diff -Nur linux-3.10.36/linaro/configs/xen.conf linux-linaro-stable-mx6/linaro/configs/xen.conf
+diff -Nur linux-3.10.36/linaro/configs/xen.conf linux-solidrun/linaro/configs/xen.conf
--- linux-3.10.36/linaro/configs/xen.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/xen.conf 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/linaro/configs/xen.conf 2014-04-24 07:58:38.532259113 +0200
@@ -0,0 +1,7 @@
+CONFIG_XEN=y
+CONFIG_XEN_NETDEV_FRONTEND=y
@@ -578915,9 +557298,9 @@ diff -Nur linux-3.10.36/linaro/configs/xen.conf linux-linaro-stable-mx6/linaro/c
+CONFIG_XEN_BLKDEV_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
-diff -Nur linux-3.10.36/mm/compaction.c linux-linaro-stable-mx6/mm/compaction.c
+diff -Nur linux-3.10.36/mm/compaction.c linux-solidrun/mm/compaction.c
--- linux-3.10.36/mm/compaction.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/compaction.c 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/mm/compaction.c 2014-04-24 07:58:38.532259113 +0200
@@ -252,6 +252,7 @@
{
int nr_scanned = 0, total_isolated = 0;
@@ -578980,9 +557363,9 @@ diff -Nur linux-3.10.36/mm/compaction.c linux-linaro-stable-mx6/mm/compaction.c
total_isolated = 0;
if (locked)
-diff -Nur linux-3.10.36/mm/hugetlb.c linux-linaro-stable-mx6/mm/hugetlb.c
+diff -Nur linux-3.10.36/mm/hugetlb.c linux-solidrun/mm/hugetlb.c
--- linux-3.10.36/mm/hugetlb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/hugetlb.c 2014-04-21 13:50:43.198731107 +0200
++++ linux-solidrun/mm/hugetlb.c 2014-04-24 07:58:38.540259140 +0200
@@ -21,7 +21,6 @@
#include <linux/rmap.h>
#include <linux/swap.h>
@@ -579009,9 +557392,9 @@ diff -Nur linux-3.10.36/mm/hugetlb.c linux-linaro-stable-mx6/mm/hugetlb.c
list_move(&page->lru, &h->hugepage_activelist);
set_page_refcounted(page);
h->free_huge_pages--;
-diff -Nur linux-3.10.36/mm/Kconfig linux-linaro-stable-mx6/mm/Kconfig
+diff -Nur linux-3.10.36/mm/Kconfig linux-solidrun/mm/Kconfig
--- linux-3.10.36/mm/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/Kconfig 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/mm/Kconfig 2014-04-24 07:58:38.532259113 +0200
@@ -477,3 +477,28 @@
and swap data is stored as normal on the matching swap device.
@@ -579041,9 +557424,9 @@ diff -Nur linux-3.10.36/mm/Kconfig linux-linaro-stable-mx6/mm/Kconfig
+ from this compressed store much faster than most tradition
+ swap devices resulting in reduced I/O and faster performance
+ for many workloads.
-diff -Nur linux-3.10.36/mm/ksm.c linux-linaro-stable-mx6/mm/ksm.c
+diff -Nur linux-3.10.36/mm/ksm.c linux-solidrun/mm/ksm.c
--- linux-3.10.36/mm/ksm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/ksm.c 2014-04-21 13:50:43.198731107 +0200
++++ linux-solidrun/mm/ksm.c 2014-04-24 07:58:38.540259140 +0200
@@ -444,7 +444,7 @@
static struct page *page_trans_compound_anon(struct page *page)
{
@@ -579053,9 +557436,9 @@ diff -Nur linux-3.10.36/mm/ksm.c linux-linaro-stable-mx6/mm/ksm.c
/*
* head may actually be splitted and freed from under
* us but it's ok here.
-diff -Nur linux-3.10.36/mm/Makefile linux-linaro-stable-mx6/mm/Makefile
+diff -Nur linux-3.10.36/mm/Makefile linux-solidrun/mm/Makefile
--- linux-3.10.36/mm/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/Makefile 2014-04-21 13:50:43.194731090 +0200
++++ linux-solidrun/mm/Makefile 2014-04-24 07:58:38.532259113 +0200
@@ -32,6 +32,7 @@
obj-$(CONFIG_BOUNCE) += bounce.o
obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o
@@ -579069,9 +557452,9 @@ diff -Nur linux-3.10.36/mm/Makefile linux-linaro-stable-mx6/mm/Makefile
obj-$(CONFIG_CLEANCACHE) += cleancache.o
obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o
+obj-$(CONFIG_ZBUD) += zbud.o
-diff -Nur linux-3.10.36/mm/memcontrol.c linux-linaro-stable-mx6/mm/memcontrol.c
+diff -Nur linux-3.10.36/mm/memcontrol.c linux-solidrun/mm/memcontrol.c
--- linux-3.10.36/mm/memcontrol.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/memcontrol.c 2014-04-21 13:50:43.202731125 +0200
++++ linux-solidrun/mm/memcontrol.c 2014-04-24 07:58:38.540259140 +0200
@@ -1220,7 +1220,7 @@
if (dead_count == iter->last_dead_count) {
smp_rmb();
@@ -579114,9 +557497,9 @@ diff -Nur linux-3.10.36/mm/memcontrol.c linux-linaro-stable-mx6/mm/memcontrol.c
mem_cgroup_destroy_all_caches(memcg);
}
-diff -Nur linux-3.10.36/mm/memory-failure.c linux-linaro-stable-mx6/mm/memory-failure.c
+diff -Nur linux-3.10.36/mm/memory-failure.c linux-solidrun/mm/memory-failure.c
--- linux-3.10.36/mm/memory-failure.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/memory-failure.c 2014-04-21 13:50:43.202731125 +0200
++++ linux-solidrun/mm/memory-failure.c 2014-04-24 07:58:38.540259140 +0200
@@ -943,10 +943,8 @@
* to it. Similarly, page lock is shifted.
*/
@@ -579197,9 +557580,9 @@ diff -Nur linux-3.10.36/mm/memory-failure.c linux-linaro-stable-mx6/mm/memory-fa
atomic_long_inc(&num_poisoned_pages);
}
} else {
-diff -Nur linux-3.10.36/mm/page_alloc.c linux-linaro-stable-mx6/mm/page_alloc.c
+diff -Nur linux-3.10.36/mm/page_alloc.c linux-solidrun/mm/page_alloc.c
--- linux-3.10.36/mm/page_alloc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/page_alloc.c 2014-04-21 13:50:43.206731142 +0200
++++ linux-solidrun/mm/page_alloc.c 2014-04-24 07:58:38.548259169 +0200
@@ -360,11 +360,9 @@
__SetPageHead(page);
for (i = 1; i < nr_pages; i++) {
@@ -579213,9 +557596,9 @@ diff -Nur linux-3.10.36/mm/page_alloc.c linux-linaro-stable-mx6/mm/page_alloc.c
}
}
-diff -Nur linux-3.10.36/mm/page-writeback.c linux-linaro-stable-mx6/mm/page-writeback.c
+diff -Nur linux-3.10.36/mm/page-writeback.c linux-solidrun/mm/page-writeback.c
--- linux-3.10.36/mm/page-writeback.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/page-writeback.c 2014-04-21 13:50:43.206731142 +0200
++++ linux-solidrun/mm/page-writeback.c 2014-04-24 07:58:38.544259154 +0200
@@ -2026,12 +2026,11 @@
if (!TestSetPageDirty(page)) {
struct address_space *mapping = page_mapping(page);
@@ -579239,9 +557622,9 @@ diff -Nur linux-3.10.36/mm/page-writeback.c linux-linaro-stable-mx6/mm/page-writ
if (mapping->host) {
/* !PageAnon && !swapper_space */
__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
-diff -Nur linux-3.10.36/mm/swap.c linux-linaro-stable-mx6/mm/swap.c
+diff -Nur linux-3.10.36/mm/swap.c linux-solidrun/mm/swap.c
--- linux-3.10.36/mm/swap.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/swap.c 2014-04-21 13:50:43.210731158 +0200
++++ linux-solidrun/mm/swap.c 2014-04-24 07:58:38.552259183 +0200
@@ -81,7 +81,7 @@
{
if (unlikely(PageTail(page))) {
@@ -579260,9 +557643,9 @@ diff -Nur linux-3.10.36/mm/swap.c linux-linaro-stable-mx6/mm/swap.c
if (likely(page != page_head && get_page_unless_zero(page_head))) {
/* Ref to put_compound_page() comment. */
-diff -Nur linux-3.10.36/mm/vmstat.c linux-linaro-stable-mx6/mm/vmstat.c
+diff -Nur linux-3.10.36/mm/vmstat.c linux-solidrun/mm/vmstat.c
--- linux-3.10.36/mm/vmstat.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/vmstat.c 2014-04-21 13:50:43.214731175 +0200
++++ linux-solidrun/mm/vmstat.c 2014-04-24 07:58:38.556259197 +0200
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -579428,9 +557811,9 @@ diff -Nur linux-3.10.36/mm/vmstat.c linux-linaro-stable-mx6/mm/vmstat.c
#endif
#ifdef CONFIG_PROC_FS
proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
-diff -Nur linux-3.10.36/mm/zbud.c linux-linaro-stable-mx6/mm/zbud.c
+diff -Nur linux-3.10.36/mm/zbud.c linux-solidrun/mm/zbud.c
--- linux-3.10.36/mm/zbud.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/mm/zbud.c 2014-04-21 13:50:43.214731175 +0200
++++ linux-solidrun/mm/zbud.c 2014-04-24 07:58:38.556259197 +0200
@@ -0,0 +1,564 @@
+/*
+ * zbud.c - Buddy Allocator for Compressed Pages
@@ -579996,9 +558379,9 @@ diff -Nur linux-3.10.36/mm/zbud.c linux-linaro-stable-mx6/mm/zbud.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Seth Jennings <sjenning <at> linux.vnet.ibm.com>");
+MODULE_DESCRIPTION("Buddy Allocator for Compressed Pages");
-diff -Nur linux-3.10.36/mm/zswap.c linux-linaro-stable-mx6/mm/zswap.c
+diff -Nur linux-3.10.36/mm/zswap.c linux-solidrun/mm/zswap.c
--- linux-3.10.36/mm/zswap.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/mm/zswap.c 2014-04-21 13:50:43.214731175 +0200
++++ linux-solidrun/mm/zswap.c 2014-04-24 07:58:38.556259197 +0200
@@ -0,0 +1,952 @@
+/*
+ * zswap.c - zswap driver file
@@ -580952,9 +559335,9 @@ diff -Nur linux-3.10.36/mm/zswap.c linux-linaro-stable-mx6/mm/zswap.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Seth Jennings <sjenning <at> linux.vnet.ibm.com>");
+MODULE_DESCRIPTION("Compressed cache for swap pages");
-diff -Nur linux-3.10.36/net/9p/trans_virtio.c linux-linaro-stable-mx6/net/9p/trans_virtio.c
+diff -Nur linux-3.10.36/net/9p/trans_virtio.c linux-solidrun/net/9p/trans_virtio.c
--- linux-3.10.36/net/9p/trans_virtio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/9p/trans_virtio.c 2014-04-21 13:50:43.218731192 +0200
++++ linux-solidrun/net/9p/trans_virtio.c 2014-04-24 07:58:38.560259211 +0200
@@ -340,10 +340,7 @@
int count = nr_pages;
while (nr_pages) {
@@ -580967,9 +559350,9 @@ diff -Nur linux-3.10.36/net/9p/trans_virtio.c linux-linaro-stable-mx6/net/9p/tra
data += s;
nr_pages--;
}
-diff -Nur linux-3.10.36/net/can/af_can.c linux-linaro-stable-mx6/net/can/af_can.c
+diff -Nur linux-3.10.36/net/can/af_can.c linux-solidrun/net/can/af_can.c
--- linux-3.10.36/net/can/af_can.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/can/af_can.c 2014-04-21 13:50:43.242731293 +0200
++++ linux-solidrun/net/can/af_can.c 2014-04-24 07:58:38.652259536 +0200
@@ -57,7 +57,6 @@
#include <linux/skbuff.h>
#include <linux/can.h>
@@ -580987,9 +559370,9 @@ diff -Nur linux-3.10.36/net/can/af_can.c linux-linaro-stable-mx6/net/can/af_can.
newskb->ip_summed = CHECKSUM_UNNECESSARY;
newskb->pkt_type = PACKET_BROADCAST;
}
-diff -Nur linux-3.10.36/net/can/bcm.c linux-linaro-stable-mx6/net/can/bcm.c
+diff -Nur linux-3.10.36/net/can/bcm.c linux-solidrun/net/can/bcm.c
--- linux-3.10.36/net/can/bcm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/can/bcm.c 2014-04-21 13:50:43.242731293 +0200
++++ linux-solidrun/net/can/bcm.c 2014-04-24 07:58:38.652259536 +0200
@@ -268,7 +268,7 @@
/* send with loopback */
@@ -581008,9 +559391,9 @@ diff -Nur linux-3.10.36/net/can/bcm.c linux-linaro-stable-mx6/net/can/bcm.c
err = can_send(skb, 1); /* send with loopback */
dev_put(dev);
-diff -Nur linux-3.10.36/net/ceph/osd_client.c linux-linaro-stable-mx6/net/ceph/osd_client.c
+diff -Nur linux-3.10.36/net/ceph/osd_client.c linux-solidrun/net/ceph/osd_client.c
--- linux-3.10.36/net/ceph/osd_client.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ceph/osd_client.c 2014-04-21 13:50:43.246731310 +0200
++++ linux-solidrun/net/ceph/osd_client.c 2014-04-24 07:58:38.660259562 +0200
@@ -1225,22 +1225,6 @@
EXPORT_SYMBOL(ceph_osdc_set_request_linger);
@@ -581156,9 +559539,9 @@ diff -Nur linux-3.10.36/net/ceph/osd_client.c linux-linaro-stable-mx6/net/ceph/o
ceph_monc_request_next_osdmap(&osdc->client->monc);
mutex_lock(&osdc->request_mutex);
-diff -Nur linux-3.10.36/net/core/dev.c linux-linaro-stable-mx6/net/core/dev.c
+diff -Nur linux-3.10.36/net/core/dev.c linux-solidrun/net/core/dev.c
--- linux-3.10.36/net/core/dev.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/dev.c 2014-04-21 13:50:43.246731310 +0200
++++ linux-solidrun/net/core/dev.c 2014-04-24 07:58:38.660259562 +0200
@@ -2374,7 +2374,7 @@
* 2. No high memory really exists on this machine.
*/
@@ -581230,9 +559613,9 @@ diff -Nur linux-3.10.36/net/core/dev.c linux-linaro-stable-mx6/net/core/dev.c
/*
* Returns true if either:
-diff -Nur linux-3.10.36/net/core/fib_rules.c linux-linaro-stable-mx6/net/core/fib_rules.c
+diff -Nur linux-3.10.36/net/core/fib_rules.c linux-solidrun/net/core/fib_rules.c
--- linux-3.10.36/net/core/fib_rules.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/fib_rules.c 2014-04-21 13:50:43.250731327 +0200
++++ linux-solidrun/net/core/fib_rules.c 2014-04-24 07:58:38.664259577 +0200
@@ -720,13 +720,6 @@
attach_rules(&ops->rules_list, dev);
break;
@@ -581247,9 +559630,9 @@ diff -Nur linux-3.10.36/net/core/fib_rules.c linux-linaro-stable-mx6/net/core/fi
case NETDEV_UNREGISTER:
list_for_each_entry(ops, &net->rules_ops, list)
detach_rules(&ops->rules_list, dev);
-diff -Nur linux-3.10.36/net/core/neighbour.c linux-linaro-stable-mx6/net/core/neighbour.c
+diff -Nur linux-3.10.36/net/core/neighbour.c linux-solidrun/net/core/neighbour.c
--- linux-3.10.36/net/core/neighbour.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/neighbour.c 2014-04-21 13:50:43.250731327 +0200
++++ linux-solidrun/net/core/neighbour.c 2014-04-24 07:58:38.664259577 +0200
@@ -764,6 +764,9 @@
nht = rcu_dereference_protected(tbl->nht,
lockdep_is_held(&tbl->lock));
@@ -581270,9 +559653,9 @@ diff -Nur linux-3.10.36/net/core/neighbour.c linux-linaro-stable-mx6/net/core/ne
for (i = 0 ; i < (1 << nht->hash_shift); i++) {
np = &nht->hash_buckets[i];
-diff -Nur linux-3.10.36/net/core/netpoll.c linux-linaro-stable-mx6/net/core/netpoll.c
+diff -Nur linux-3.10.36/net/core/netpoll.c linux-solidrun/net/core/netpoll.c
--- linux-3.10.36/net/core/netpoll.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/netpoll.c 2014-04-21 13:50:43.250731327 +0200
++++ linux-solidrun/net/core/netpoll.c 2014-04-24 07:58:38.664259577 +0200
@@ -948,7 +948,6 @@
{
char *cur=opt, *delim;
@@ -581298,9 +559681,9 @@ diff -Nur linux-3.10.36/net/core/netpoll.c linux-linaro-stable-mx6/net/core/netp
goto parse_failed;
else
np->ipv6 = (bool)ipv6;
-diff -Nur linux-3.10.36/net/core/skbuff.c linux-linaro-stable-mx6/net/core/skbuff.c
+diff -Nur linux-3.10.36/net/core/skbuff.c linux-solidrun/net/core/skbuff.c
--- linux-3.10.36/net/core/skbuff.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/skbuff.c 2014-04-21 13:50:43.254731344 +0200
++++ linux-solidrun/net/core/skbuff.c 2014-04-24 07:58:38.668259592 +0200
@@ -47,8 +47,6 @@
#include <linux/in.h>
#include <linux/inet.h>
@@ -581337,9 +559720,9 @@ diff -Nur linux-3.10.36/net/core/skbuff.c linux-linaro-stable-mx6/net/core/skbuf
- return hdr_len + shinfo->gso_size;
-}
-EXPORT_SYMBOL_GPL(skb_gso_transport_seglen);
-diff -Nur linux-3.10.36/net/core/sock.c linux-linaro-stable-mx6/net/core/sock.c
+diff -Nur linux-3.10.36/net/core/sock.c linux-solidrun/net/core/sock.c
--- linux-3.10.36/net/core/sock.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/sock.c 2014-04-21 13:50:43.254731344 +0200
++++ linux-solidrun/net/core/sock.c 2014-04-24 07:58:38.668259592 +0200
@@ -1814,7 +1814,7 @@
gfp_t gfp = sk->sk_allocation;
@@ -581349,9 +559732,9 @@ diff -Nur linux-3.10.36/net/core/sock.c linux-linaro-stable-mx6/net/core/sock.c
pfrag->page = alloc_pages(gfp, order);
if (likely(pfrag->page)) {
pfrag->offset = 0;
-diff -Nur linux-3.10.36/net/ieee802154/6lowpan.c linux-linaro-stable-mx6/net/ieee802154/6lowpan.c
+diff -Nur linux-3.10.36/net/ieee802154/6lowpan.c linux-solidrun/net/ieee802154/6lowpan.c
--- linux-3.10.36/net/ieee802154/6lowpan.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ieee802154/6lowpan.c 2014-04-21 13:50:43.262731377 +0200
++++ linux-solidrun/net/ieee802154/6lowpan.c 2014-04-24 07:58:38.696259690 +0200
@@ -1173,27 +1173,7 @@
.create = lowpan_header_create,
};
@@ -581380,9 +559763,9 @@ diff -Nur linux-3.10.36/net/ieee802154/6lowpan.c linux-linaro-stable-mx6/net/iee
.ndo_start_xmit = lowpan_xmit,
.ndo_set_mac_address = lowpan_set_address,
};
-diff -Nur linux-3.10.36/net/ipv4/devinet.c linux-linaro-stable-mx6/net/ipv4/devinet.c
+diff -Nur linux-3.10.36/net/ipv4/devinet.c linux-solidrun/net/ipv4/devinet.c
--- linux-3.10.36/net/ipv4/devinet.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv4/devinet.c 2014-04-21 13:50:43.266731394 +0200
++++ linux-solidrun/net/ipv4/devinet.c 2014-04-24 07:58:38.700259704 +0200
@@ -1433,8 +1433,7 @@
+ nla_total_size(4) /* IFA_ADDRESS */
+ nla_total_size(4) /* IFA_LOCAL */
@@ -581393,9 +559776,9 @@ diff -Nur linux-3.10.36/net/ipv4/devinet.c linux-linaro-stable-mx6/net/ipv4/devi
}
static inline u32 cstamp_delta(unsigned long cstamp)
-diff -Nur linux-3.10.36/net/ipv4/ip_forward.c linux-linaro-stable-mx6/net/ipv4/ip_forward.c
+diff -Nur linux-3.10.36/net/ipv4/ip_forward.c linux-solidrun/net/ipv4/ip_forward.c
--- linux-3.10.36/net/ipv4/ip_forward.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv4/ip_forward.c 2014-04-21 13:50:43.270731411 +0200
++++ linux-solidrun/net/ipv4/ip_forward.c 2014-04-24 07:58:38.988260719 +0200
@@ -39,71 +39,6 @@
#include <net/route.h>
#include <net/xfrm.h>
@@ -581488,9 +559871,9 @@ diff -Nur linux-3.10.36/net/ipv4/ip_forward.c linux-linaro-stable-mx6/net/ipv4/i
IP_INC_STATS(dev_net(rt->dst.dev), IPSTATS_MIB_FRAGFAILS);
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
htonl(dst_mtu(&rt->dst)));
-diff -Nur linux-3.10.36/net/ipv4/route.c linux-linaro-stable-mx6/net/ipv4/route.c
+diff -Nur linux-3.10.36/net/ipv4/route.c linux-solidrun/net/ipv4/route.c
--- linux-3.10.36/net/ipv4/route.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv4/route.c 2014-04-21 13:50:43.278731445 +0200
++++ linux-solidrun/net/ipv4/route.c 2014-04-24 07:58:39.104261126 +0200
@@ -1544,7 +1544,6 @@
rth->rt_gateway = 0;
rth->rt_uses_gateway = 0;
@@ -581516,9 +559899,9 @@ diff -Nur linux-3.10.36/net/ipv4/route.c linux-linaro-stable-mx6/net/ipv4/route.
if (res.type == RTN_UNREACHABLE) {
rth->dst.input= ip_error;
rth->dst.error= -err;
-diff -Nur linux-3.10.36/net/ipv4/tcp.c linux-linaro-stable-mx6/net/ipv4/tcp.c
+diff -Nur linux-3.10.36/net/ipv4/tcp.c linux-solidrun/net/ipv4/tcp.c
--- linux-3.10.36/net/ipv4/tcp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv4/tcp.c 2014-04-21 13:50:43.278731445 +0200
++++ linux-solidrun/net/ipv4/tcp.c 2014-04-24 07:58:39.120261182 +0200
@@ -1001,8 +1001,7 @@
}
}
@@ -581552,9 +559935,9 @@ diff -Nur linux-3.10.36/net/ipv4/tcp.c linux-linaro-stable-mx6/net/ipv4/tcp.c
if (err == -EINPROGRESS && copied_syn > 0)
goto out;
else if (err)
-diff -Nur linux-3.10.36/net/ipv4/tcp_output.c linux-linaro-stable-mx6/net/ipv4/tcp_output.c
+diff -Nur linux-3.10.36/net/ipv4/tcp_output.c linux-solidrun/net/ipv4/tcp_output.c
--- linux-3.10.36/net/ipv4/tcp_output.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv4/tcp_output.c 2014-04-21 13:50:43.282731462 +0200
++++ linux-solidrun/net/ipv4/tcp_output.c 2014-04-24 07:58:39.324261902 +0200
@@ -686,8 +686,7 @@
if ((1 << sk->sk_state) &
(TCPF_ESTABLISHED | TCPF_FIN_WAIT1 | TCPF_CLOSING |
@@ -581596,9 +559979,9 @@ diff -Nur linux-3.10.36/net/ipv4/tcp_output.c linux-linaro-stable-mx6/net/ipv4/t
sk->sk_allocation);
if (syn_data == NULL)
goto fallback;
-diff -Nur linux-3.10.36/net/ipv6/exthdrs_core.c linux-linaro-stable-mx6/net/ipv6/exthdrs_core.c
+diff -Nur linux-3.10.36/net/ipv6/exthdrs_core.c linux-solidrun/net/ipv6/exthdrs_core.c
--- linux-3.10.36/net/ipv6/exthdrs_core.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv6/exthdrs_core.c 2014-04-21 13:50:43.286731479 +0200
++++ linux-solidrun/net/ipv6/exthdrs_core.c 2014-04-24 07:58:39.524262605 +0200
@@ -212,7 +212,7 @@
found = (nexthdr == target);
@@ -581608,9 +559991,9 @@ diff -Nur linux-3.10.36/net/ipv6/exthdrs_core.c linux-linaro-stable-mx6/net/ipv6
break;
return -ENOENT;
}
-diff -Nur linux-3.10.36/net/ipv6/ip6_output.c linux-linaro-stable-mx6/net/ipv6/ip6_output.c
+diff -Nur linux-3.10.36/net/ipv6/ip6_output.c linux-solidrun/net/ipv6/ip6_output.c
--- linux-3.10.36/net/ipv6/ip6_output.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv6/ip6_output.c 2014-04-21 13:50:43.290731495 +0200
++++ linux-solidrun/net/ipv6/ip6_output.c 2014-04-24 07:58:39.528262619 +0200
@@ -345,20 +345,6 @@
return dst_output(skb);
}
@@ -581642,9 +560025,9 @@ diff -Nur linux-3.10.36/net/ipv6/ip6_output.c linux-linaro-stable-mx6/net/ipv6/i
/* Again, force OUTPUT device used as source address */
skb->dev = dst->dev;
icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
-diff -Nur linux-3.10.36/net/ipv6/udp_offload.c linux-linaro-stable-mx6/net/ipv6/udp_offload.c
+diff -Nur linux-3.10.36/net/ipv6/udp_offload.c linux-solidrun/net/ipv6/udp_offload.c
--- linux-3.10.36/net/ipv6/udp_offload.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ipv6/udp_offload.c 2014-04-21 13:50:43.298731529 +0200
++++ linux-solidrun/net/ipv6/udp_offload.c 2014-04-24 07:58:39.532262633 +0200
@@ -108,7 +108,7 @@
fptr = (struct frag_hdr *)(skb_network_header(skb) + unfrag_ip6hlen);
fptr->nexthdr = nexthdr;
@@ -581654,9 +560037,9 @@ diff -Nur linux-3.10.36/net/ipv6/udp_offload.c linux-linaro-stable-mx6/net/ipv6/
/* Fragment the skb. ipv6 header and the remaining fields of the
* fragment header are updated in ipv6_gso_segment()
-diff -Nur linux-3.10.36/net/mac80211/cfg.c linux-linaro-stable-mx6/net/mac80211/cfg.c
+diff -Nur linux-3.10.36/net/mac80211/cfg.c linux-solidrun/net/mac80211/cfg.c
--- linux-3.10.36/net/mac80211/cfg.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/cfg.c 2014-04-21 13:50:43.314731597 +0200
++++ linux-solidrun/net/mac80211/cfg.c 2014-04-24 07:58:39.632262986 +0200
@@ -975,10 +975,8 @@
IEEE80211_P2P_OPPPS_ENABLE_BIT;
@@ -581727,9 +560110,9 @@ diff -Nur linux-3.10.36/net/mac80211/cfg.c linux-linaro-stable-mx6/net/mac80211/
return 0;
}
-diff -Nur linux-3.10.36/net/mac80211/mesh_ps.c linux-linaro-stable-mx6/net/mac80211/mesh_ps.c
+diff -Nur linux-3.10.36/net/mac80211/mesh_ps.c linux-solidrun/net/mac80211/mesh_ps.c
--- linux-3.10.36/net/mac80211/mesh_ps.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/mesh_ps.c 2014-04-21 13:50:43.318731614 +0200
++++ linux-solidrun/net/mac80211/mesh_ps.c 2014-04-24 07:58:39.636263000 +0200
@@ -36,7 +36,6 @@
sdata->vif.addr);
nullfunc->frame_control = fc;
@@ -581738,9 +560121,9 @@ diff -Nur linux-3.10.36/net/mac80211/mesh_ps.c linux-linaro-stable-mx6/net/mac80
/* no address resolution for this frame -> set addr 1 immediately */
memcpy(nullfunc->addr1, sta->sta.addr, ETH_ALEN);
memset(skb_put(skb, 2), 0, 2); /* append QoS control field */
-diff -Nur linux-3.10.36/net/mac80211/mlme.c linux-linaro-stable-mx6/net/mac80211/mlme.c
+diff -Nur linux-3.10.36/net/mac80211/mlme.c linux-solidrun/net/mac80211/mlme.c
--- linux-3.10.36/net/mac80211/mlme.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/mlme.c 2014-04-21 13:50:43.318731614 +0200
++++ linux-solidrun/net/mac80211/mlme.c 2014-04-24 07:58:39.636263000 +0200
@@ -310,7 +310,6 @@
switch (vht_oper->chan_width) {
case IEEE80211_VHT_CHANWIDTH_USE_HT:
@@ -581778,9 +560161,9 @@ diff -Nur linux-3.10.36/net/mac80211/mlme.c linux-linaro-stable-mx6/net/mac80211
/* don't print the message below for VHT mismatch if VHT is disabled */
if (ret & IEEE80211_STA_DISABLE_VHT)
vht_chandef = *chandef;
-diff -Nur linux-3.10.36/net/mac80211/sta_info.c linux-linaro-stable-mx6/net/mac80211/sta_info.c
+diff -Nur linux-3.10.36/net/mac80211/sta_info.c linux-solidrun/net/mac80211/sta_info.c
--- linux-3.10.36/net/mac80211/sta_info.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/sta_info.c 2014-04-21 13:50:43.318731614 +0200
++++ linux-solidrun/net/mac80211/sta_info.c 2014-04-24 07:58:39.640263014 +0200
@@ -339,7 +339,6 @@
return NULL;
@@ -581814,9 +560197,9 @@ diff -Nur linux-3.10.36/net/mac80211/sta_info.c linux-linaro-stable-mx6/net/mac8
skb->priority = tid;
skb_set_queue_mapping(skb, ieee802_1d_to_ac[tid]);
-diff -Nur linux-3.10.36/net/mac80211/sta_info.h linux-linaro-stable-mx6/net/mac80211/sta_info.h
+diff -Nur linux-3.10.36/net/mac80211/sta_info.h linux-solidrun/net/mac80211/sta_info.h
--- linux-3.10.36/net/mac80211/sta_info.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/sta_info.h 2014-04-21 13:50:43.318731614 +0200
++++ linux-solidrun/net/mac80211/sta_info.h 2014-04-24 07:58:39.640263014 +0200
@@ -244,7 +244,6 @@
* @drv_unblock_wk: used for driver PS unblocking
* @listen_interval: listen interval of this station, when we're acting as AP
@@ -581838,9 +560221,9 @@ diff -Nur linux-3.10.36/net/mac80211/sta_info.h linux-linaro-stable-mx6/net/mac8
struct sk_buff_head ps_tx_buf[IEEE80211_NUM_ACS];
struct sk_buff_head tx_filtered[IEEE80211_NUM_ACS];
unsigned long driver_buffered_tids;
-diff -Nur linux-3.10.36/net/mac80211/tx.c linux-linaro-stable-mx6/net/mac80211/tx.c
+diff -Nur linux-3.10.36/net/mac80211/tx.c linux-solidrun/net/mac80211/tx.c
--- linux-3.10.36/net/mac80211/tx.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/tx.c 2014-04-21 13:50:43.322731630 +0200
++++ linux-solidrun/net/mac80211/tx.c 2014-04-24 07:58:39.640263014 +0200
@@ -461,20 +461,6 @@
sta->sta.addr, sta->sta.aid, ac);
if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
@@ -581879,9 +560262,9 @@ diff -Nur linux-3.10.36/net/mac80211/tx.c linux-linaro-stable-mx6/net/mac80211/t
return 0;
}
-diff -Nur linux-3.10.36/net/mac80211/wme.c linux-linaro-stable-mx6/net/mac80211/wme.c
+diff -Nur linux-3.10.36/net/mac80211/wme.c linux-solidrun/net/mac80211/wme.c
--- linux-3.10.36/net/mac80211/wme.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/wme.c 2014-04-21 13:50:43.322731630 +0200
++++ linux-solidrun/net/mac80211/wme.c 2014-04-24 07:58:39.640263014 +0200
@@ -153,11 +153,6 @@
return IEEE80211_AC_BE;
}
@@ -581894,9 +560277,9 @@ diff -Nur linux-3.10.36/net/mac80211/wme.c linux-linaro-stable-mx6/net/mac80211/
/* use the data classifier to determine what 802.1d tag the
* data frame has */
skb->priority = cfg80211_classify8021d(skb);
-diff -Nur linux-3.10.36/net/netfilter/nf_conntrack_proto_dccp.c linux-linaro-stable-mx6/net/netfilter/nf_conntrack_proto_dccp.c
+diff -Nur linux-3.10.36/net/netfilter/nf_conntrack_proto_dccp.c linux-solidrun/net/netfilter/nf_conntrack_proto_dccp.c
--- linux-3.10.36/net/netfilter/nf_conntrack_proto_dccp.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/netfilter/nf_conntrack_proto_dccp.c 2014-04-21 13:50:43.334731681 +0200
++++ linux-solidrun/net/netfilter/nf_conntrack_proto_dccp.c 2014-04-24 07:58:39.652263055 +0200
@@ -428,7 +428,7 @@
const char *msg;
u_int8_t state;
@@ -581924,9 +560307,9 @@ diff -Nur linux-3.10.36/net/netfilter/nf_conntrack_proto_dccp.c linux-linaro-sta
if (dh == NULL) {
msg = "nf_ct_dccp: short packet ";
goto out_invalid;
-diff -Nur linux-3.10.36/net/sctp/sm_statefuns.c linux-linaro-stable-mx6/net/sctp/sm_statefuns.c
+diff -Nur linux-3.10.36/net/sctp/sm_statefuns.c linux-solidrun/net/sctp/sm_statefuns.c
--- linux-3.10.36/net/sctp/sm_statefuns.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/sctp/sm_statefuns.c 2014-04-21 13:50:43.378731866 +0200
++++ linux-solidrun/net/sctp/sm_statefuns.c 2014-04-24 07:58:40.124264717 +0200
@@ -765,13 +765,6 @@
struct sctp_chunk auth;
sctp_ierror_t ret;
@@ -581941,9 +560324,9 @@ diff -Nur linux-3.10.36/net/sctp/sm_statefuns.c linux-linaro-stable-mx6/net/sctp
/* set-up our fake chunk so that we can process it */
auth.skb = chunk->auth_chunk;
auth.asoc = chunk->asoc;
-diff -Nur linux-3.10.36/net/sctp/socket.c linux-linaro-stable-mx6/net/sctp/socket.c
+diff -Nur linux-3.10.36/net/sctp/socket.c linux-solidrun/net/sctp/socket.c
--- linux-3.10.36/net/sctp/socket.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/sctp/socket.c 2014-04-21 13:50:43.382731884 +0200
++++ linux-solidrun/net/sctp/socket.c 2014-04-24 07:58:40.124264717 +0200
@@ -71,7 +71,6 @@
#include <linux/crypto.h>
#include <linux/slab.h>
@@ -582012,9 +560395,9 @@ diff -Nur linux-3.10.36/net/sctp/socket.c linux-linaro-stable-mx6/net/sctp/socke
if (err == 0 || err == -EINPROGRESS) {
if (copy_to_user(optval, &assoc_id, sizeof(assoc_id)))
return -EFAULT;
-diff -Nur linux-3.10.36/net/sunrpc/xprtsock.c linux-linaro-stable-mx6/net/sunrpc/xprtsock.c
+diff -Nur linux-3.10.36/net/sunrpc/xprtsock.c linux-solidrun/net/sunrpc/xprtsock.c
--- linux-3.10.36/net/sunrpc/xprtsock.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/sunrpc/xprtsock.c 2014-04-21 13:50:43.390731917 +0200
++++ linux-solidrun/net/sunrpc/xprtsock.c 2014-04-24 07:58:40.136264760 +0200
@@ -502,7 +502,6 @@
struct rpc_rqst *req = task->tk_rqstp;
struct rpc_xprt *xprt = req->rq_xprt;
@@ -582042,9 +560425,9 @@ diff -Nur linux-3.10.36/net/sunrpc/xprtsock.c linux-linaro-stable-mx6/net/sunrpc
return ret;
}
-diff -Nur linux-3.10.36/net/unix/af_unix.c linux-linaro-stable-mx6/net/unix/af_unix.c
+diff -Nur linux-3.10.36/net/unix/af_unix.c linux-solidrun/net/unix/af_unix.c
--- linux-3.10.36/net/unix/af_unix.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/net/unix/af_unix.c 2014-04-21 13:50:43.398731951 +0200
++++ linux-solidrun/net/unix/af_unix.c 2014-04-24 07:58:40.140264773 +0200
@@ -160,8 +160,9 @@
static inline unsigned int unix_hash_fold(__wsum n)
@@ -582056,9 +560439,9 @@ diff -Nur linux-3.10.36/net/unix/af_unix.c linux-linaro-stable-mx6/net/unix/af_u
hash ^= hash>>8;
return hash&(UNIX_HASH_SIZE-1);
}
-diff -Nur linux-3.10.36/scripts/mod/file2alias.c linux-linaro-stable-mx6/scripts/mod/file2alias.c
+diff -Nur linux-3.10.36/scripts/mod/file2alias.c linux-solidrun/scripts/mod/file2alias.c
--- linux-3.10.36/scripts/mod/file2alias.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/scripts/mod/file2alias.c 2014-04-21 13:50:43.430732086 +0200
++++ linux-solidrun/scripts/mod/file2alias.c 2014-04-24 07:58:41.804270633 +0200
@@ -208,8 +208,8 @@
range_lo < 0x9 ? "[%X-9" : "[%X",
range_lo);
@@ -582070,9 +560453,9 @@ diff -Nur linux-3.10.36/scripts/mod/file2alias.c linux-linaro-stable-mx6/scripts
}
}
if (bcdDevice_initial_digits < (sizeof(bcdDevice_lo) * 2 - 1))
-diff -Nur linux-3.10.36/scripts/package/builddeb linux-linaro-stable-mx6/scripts/package/builddeb
+diff -Nur linux-3.10.36/scripts/package/builddeb linux-solidrun/scripts/package/builddeb
--- linux-3.10.36/scripts/package/builddeb 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/scripts/package/builddeb 2014-04-21 13:50:43.430732086 +0200
++++ linux-solidrun/scripts/package/builddeb 2014-04-24 07:58:41.804270633 +0200
@@ -62,7 +62,7 @@
fi
@@ -582101,9 +560484,9 @@ diff -Nur linux-3.10.36/scripts/package/builddeb linux-linaro-stable-mx6/scripts
.
This is useful for people who need to build external modules
EOF
-diff -Nur linux-3.10.36/security/selinux/ss/policydb.c linux-linaro-stable-mx6/security/selinux/ss/policydb.c
+diff -Nur linux-3.10.36/security/selinux/ss/policydb.c linux-solidrun/security/selinux/ss/policydb.c
--- linux-3.10.36/security/selinux/ss/policydb.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/security/selinux/ss/policydb.c 2014-04-21 13:50:43.446732153 +0200
++++ linux-solidrun/security/selinux/ss/policydb.c 2014-04-24 07:58:41.880270901 +0200
@@ -3258,10 +3258,10 @@
if (rc)
return rc;
@@ -582119,9 +560502,9 @@ diff -Nur linux-3.10.36/security/selinux/ss/policydb.c linux-linaro-stable-mx6/s
rc = put_entry(buf, sizeof(u32), 4, fp);
if (rc)
-diff -Nur linux-3.10.36/security/selinux/ss/services.c linux-linaro-stable-mx6/security/selinux/ss/services.c
+diff -Nur linux-3.10.36/security/selinux/ss/services.c linux-solidrun/security/selinux/ss/services.c
--- linux-3.10.36/security/selinux/ss/services.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/security/selinux/ss/services.c 2014-04-21 13:50:43.446732153 +0200
++++ linux-solidrun/security/selinux/ss/services.c 2014-04-24 07:58:41.880270901 +0200
@@ -1231,10 +1231,6 @@
struct context context;
int rc = 0;
@@ -582133,9 +560516,9 @@ diff -Nur linux-3.10.36/security/selinux/ss/services.c linux-linaro-stable-mx6/s
if (!ss_initialized) {
int i;
-diff -Nur linux-3.10.36/sound/core/compress_offload.c linux-linaro-stable-mx6/sound/core/compress_offload.c
+diff -Nur linux-3.10.36/sound/core/compress_offload.c linux-solidrun/sound/core/compress_offload.c
--- linux-3.10.36/sound/core/compress_offload.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/core/compress_offload.c 2014-04-21 13:50:43.454732187 +0200
++++ linux-solidrun/sound/core/compress_offload.c 2014-04-24 07:58:41.916271027 +0200
@@ -133,7 +133,7 @@
kfree(data);
}
@@ -582145,9 +560528,9 @@ diff -Nur linux-3.10.36/sound/core/compress_offload.c linux-linaro-stable-mx6/so
}
static int snd_compr_free(struct inode *inode, struct file *f)
-diff -Nur linux-3.10.36/sound/core/memalloc.c linux-linaro-stable-mx6/sound/core/memalloc.c
+diff -Nur linux-3.10.36/sound/core/memalloc.c linux-solidrun/sound/core/memalloc.c
--- linux-3.10.36/sound/core/memalloc.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/core/memalloc.c 2014-04-21 13:50:43.458732204 +0200
++++ linux-solidrun/sound/core/memalloc.c 2014-04-24 07:58:41.920271041 +0200
@@ -30,6 +30,7 @@
#include <linux/seq_file.h>
#include <asm/uaccess.h>
@@ -582230,9 +560613,9 @@ diff -Nur linux-3.10.36/sound/core/memalloc.c linux-linaro-stable-mx6/sound/core
case SNDRV_DMA_TYPE_DEV:
snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
break;
-diff -Nur linux-3.10.36/sound/core/pcm_native.c linux-linaro-stable-mx6/sound/core/pcm_native.c
+diff -Nur linux-3.10.36/sound/core/pcm_native.c linux-solidrun/sound/core/pcm_native.c
--- linux-3.10.36/sound/core/pcm_native.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/core/pcm_native.c 2014-04-21 13:50:43.462732221 +0200
++++ linux-solidrun/sound/core/pcm_native.c 2014-04-24 07:58:41.920271041 +0200
@@ -3209,6 +3209,14 @@
struct vm_area_struct *area)
{
@@ -582248,9 +560631,9 @@ diff -Nur linux-3.10.36/sound/core/pcm_native.c linux-linaro-stable-mx6/sound/co
#ifdef ARCH_HAS_DMA_MMAP_COHERENT
if (!substream->ops->page &&
substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
-diff -Nur linux-3.10.36/sound/pci/hda/patch_analog.c linux-linaro-stable-mx6/sound/pci/hda/patch_analog.c
+diff -Nur linux-3.10.36/sound/pci/hda/patch_analog.c linux-solidrun/sound/pci/hda/patch_analog.c
--- linux-3.10.36/sound/pci/hda/patch_analog.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/pci/hda/patch_analog.c 2014-04-21 13:50:43.526732491 +0200
++++ linux-solidrun/sound/pci/hda/patch_analog.c 2014-04-24 07:58:45.132282353 +0200
@@ -1680,7 +1680,6 @@
return err;
spec = codec->spec;
@@ -582267,9 +560650,9 @@ diff -Nur linux-3.10.36/sound/pci/hda/patch_analog.c linux-linaro-stable-mx6/sou
spec->gen.beep_nid = 0x10;
set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
-diff -Nur linux-3.10.36/sound/pci/hda/patch_ca0132.c linux-linaro-stable-mx6/sound/pci/hda/patch_ca0132.c
+diff -Nur linux-3.10.36/sound/pci/hda/patch_ca0132.c linux-solidrun/sound/pci/hda/patch_ca0132.c
--- linux-3.10.36/sound/pci/hda/patch_ca0132.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/pci/hda/patch_ca0132.c 2014-04-21 13:50:43.530732507 +0200
++++ linux-solidrun/sound/pci/hda/patch_ca0132.c 2014-04-24 07:58:45.136282367 +0200
@@ -2662,6 +2662,60 @@
}
@@ -582380,9 +560763,9 @@ diff -Nur linux-3.10.36/sound/pci/hda/patch_ca0132.c linux-linaro-stable-mx6/sou
return 0;
}
-diff -Nur linux-3.10.36/sound/pci/hda/patch_realtek.c linux-linaro-stable-mx6/sound/pci/hda/patch_realtek.c
+diff -Nur linux-3.10.36/sound/pci/hda/patch_realtek.c linux-solidrun/sound/pci/hda/patch_realtek.c
--- linux-3.10.36/sound/pci/hda/patch_realtek.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/pci/hda/patch_realtek.c 2014-04-21 13:50:43.534732524 +0200
++++ linux-solidrun/sound/pci/hda/patch_realtek.c 2014-04-24 07:58:45.140282380 +0200
@@ -1765,7 +1765,6 @@
ALC889_FIXUP_IMAC91_VREF,
ALC889_FIXUP_MBA11_VREF,
@@ -582429,9 +560812,9 @@ diff -Nur linux-3.10.36/sound/pci/hda/patch_realtek.c linux-linaro-stable-mx6/so
SND_PCI_QUIRK(0x104d, 0x90b6, "Sony VAIO Pro 13", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),
SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
-diff -Nur linux-3.10.36/sound/pci/hda/patch_sigmatel.c linux-linaro-stable-mx6/sound/pci/hda/patch_sigmatel.c
+diff -Nur linux-3.10.36/sound/pci/hda/patch_sigmatel.c linux-solidrun/sound/pci/hda/patch_sigmatel.c
--- linux-3.10.36/sound/pci/hda/patch_sigmatel.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/pci/hda/patch_sigmatel.c 2014-04-21 13:50:43.534732524 +0200
++++ linux-solidrun/sound/pci/hda/patch_sigmatel.c 2014-04-24 07:58:45.144282394 +0200
@@ -83,7 +83,6 @@
STAC_DELL_M6_BOTH,
STAC_DELL_EQ,
@@ -582521,9 +560904,9 @@ diff -Nur linux-3.10.36/sound/pci/hda/patch_sigmatel.c linux-linaro-stable-mx6/s
SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x18df,
"HP Folio", STAC_92HD83XXX_HP_MIC_LED),
SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x1900,
-diff -Nur linux-3.10.36/sound/pci/oxygen/xonar_dg.c linux-linaro-stable-mx6/sound/pci/oxygen/xonar_dg.c
+diff -Nur linux-3.10.36/sound/pci/oxygen/xonar_dg.c linux-solidrun/sound/pci/oxygen/xonar_dg.c
--- linux-3.10.36/sound/pci/oxygen/xonar_dg.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/pci/oxygen/xonar_dg.c 2014-04-21 13:50:43.550732591 +0200
++++ linux-solidrun/sound/pci/oxygen/xonar_dg.c 2014-04-24 07:58:45.156282437 +0200
@@ -294,16 +294,6 @@
oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
data->output_sel == 1 ? GPIO_HP_REAR : 0,
@@ -582550,9 +560933,9 @@ diff -Nur linux-3.10.36/sound/pci/oxygen/xonar_dg.c linux-linaro-stable-mx6/soun
CAPTURE_1_FROM_SPDIF,
.dac_channels_pcm = 6,
.dac_channels_mixer = 0,
-diff -Nur linux-3.10.36/sound/soc/codecs/cs42888.c linux-linaro-stable-mx6/sound/soc/codecs/cs42888.c
+diff -Nur linux-3.10.36/sound/soc/codecs/cs42888.c linux-solidrun/sound/soc/codecs/cs42888.c
--- linux-3.10.36/sound/soc/codecs/cs42888.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.c 2014-04-21 13:50:43.570732676 +0200
++++ linux-solidrun/sound/soc/codecs/cs42888.c 2014-04-24 07:58:45.180282522 +0200
@@ -0,0 +1,934 @@
+/*
+ * cs42888.c -- CS42888 ALSA SoC Audio Driver
@@ -583488,9 +561871,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/cs42888.c linux-linaro-stable-mx6/sound
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Cirrus Logic CS42888 ALSA SoC Codec Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/sound/soc/codecs/cs42888.h linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h
+diff -Nur linux-3.10.36/sound/soc/codecs/cs42888.h linux-solidrun/sound/soc/codecs/cs42888.h
--- linux-3.10.36/sound/soc/codecs/cs42888.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h 2014-04-21 13:50:43.570732676 +0200
++++ linux-solidrun/sound/soc/codecs/cs42888.h 2014-04-24 07:58:45.180282522 +0200
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -583615,9 +561998,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/cs42888.h linux-linaro-stable-mx6/sound
+
+
+#endif
-diff -Nur linux-3.10.36/sound/soc/codecs/da732x.c linux-linaro-stable-mx6/sound/soc/codecs/da732x.c
+diff -Nur linux-3.10.36/sound/soc/codecs/da732x.c linux-solidrun/sound/soc/codecs/da732x.c
--- linux-3.10.36/sound/soc/codecs/da732x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/da732x.c 2014-04-21 13:50:43.574732693 +0200
++++ linux-solidrun/sound/soc/codecs/da732x.c 2014-04-24 07:58:45.184282536 +0200
@@ -1268,23 +1268,11 @@
},
};
@@ -583642,9 +562025,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/da732x.c linux-linaro-stable-mx6/sound/
.reg_defaults = da732x_reg_cache,
.num_reg_defaults = ARRAY_SIZE(da732x_reg_cache),
.cache_type = REGCACHE_RBTREE,
-diff -Nur linux-3.10.36/sound/soc/codecs/Kconfig linux-linaro-stable-mx6/sound/soc/codecs/Kconfig
+diff -Nur linux-3.10.36/sound/soc/codecs/Kconfig linux-solidrun/sound/soc/codecs/Kconfig
--- linux-3.10.36/sound/soc/codecs/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/Kconfig 2014-04-21 13:50:43.566732659 +0200
++++ linux-solidrun/sound/soc/codecs/Kconfig 2014-04-24 07:58:45.176282508 +0200
@@ -35,6 +35,7 @@
select SND_SOC_CS42L73 if I2C
select SND_SOC_CS4270 if I2C
@@ -583672,9 +562055,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/Kconfig linux-linaro-stable-mx6/sound/s
config SND_SOC_CX20442
tristate
depends on TTY
-diff -Nur linux-3.10.36/sound/soc/codecs/Makefile linux-linaro-stable-mx6/sound/soc/codecs/Makefile
+diff -Nur linux-3.10.36/sound/soc/codecs/Makefile linux-solidrun/sound/soc/codecs/Makefile
--- linux-3.10.36/sound/soc/codecs/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/Makefile 2014-04-21 13:50:43.566732659 +0200
++++ linux-solidrun/sound/soc/codecs/Makefile 2014-04-24 07:58:45.176282508 +0200
@@ -22,6 +22,7 @@
snd-soc-cs42l73-objs := cs42l73.o
snd-soc-cs4270-objs := cs4270.o
@@ -583700,9 +562083,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/Makefile linux-linaro-stable-mx6/sound/
obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o
obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o
obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o
-diff -Nur linux-3.10.36/sound/soc/codecs/max98090.c linux-linaro-stable-mx6/sound/soc/codecs/max98090.c
+diff -Nur linux-3.10.36/sound/soc/codecs/max98090.c linux-solidrun/sound/soc/codecs/max98090.c
--- linux-3.10.36/sound/soc/codecs/max98090.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/max98090.c 2014-04-21 13:50:43.574732693 +0200
++++ linux-solidrun/sound/soc/codecs/max98090.c 2014-04-24 07:58:45.184282536 +0200
@@ -336,7 +336,6 @@
case M98090_REG_RECORD_TDM_SLOT:
case M98090_REG_SAMPLE_RATE:
@@ -583745,9 +562128,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/max98090.c linux-linaro-stable-mx6/soun
case SND_SOC_BIAS_OFF:
/* Set internal pull-up to lowest power mode */
snd_soc_update_bits(codec, M98090_REG_JACK_DETECT,
-diff -Nur linux-3.10.36/sound/soc/codecs/omap-hdmi.c linux-linaro-stable-mx6/sound/soc/codecs/omap-hdmi.c
+diff -Nur linux-3.10.36/sound/soc/codecs/omap-hdmi.c linux-solidrun/sound/soc/codecs/omap-hdmi.c
--- linux-3.10.36/sound/soc/codecs/omap-hdmi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/omap-hdmi.c 2014-04-21 13:50:43.578732710 +0200
++++ linux-solidrun/sound/soc/codecs/omap-hdmi.c 2014-04-24 07:58:45.188282549 +0200
@@ -26,7 +26,7 @@
static struct snd_soc_codec_driver omap_hdmi_codec;
@@ -583757,9 +562140,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/omap-hdmi.c linux-linaro-stable-mx6/sou
.playback = {
.channels_min = 2,
.channels_max = 8,
-diff -Nur linux-3.10.36/sound/soc/codecs/spdif_receiver.c linux-linaro-stable-mx6/sound/soc/codecs/spdif_receiver.c
+diff -Nur linux-3.10.36/sound/soc/codecs/spdif_receiver.c linux-solidrun/sound/soc/codecs/spdif_receiver.c
--- linux-3.10.36/sound/soc/codecs/spdif_receiver.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_receiver.c 2014-04-21 13:50:43.578732710 +0200
++++ linux-solidrun/sound/soc/codecs/spdif_receiver.c 2014-04-24 07:58:45.188282549 +0200
@@ -24,6 +24,8 @@
#define STUB_RATES SNDRV_PCM_RATE_8000_192000
@@ -583769,9 +562152,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/spdif_receiver.c linux-linaro-stable-mx
SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
static struct snd_soc_codec_driver soc_codec_spdif_dir;
-diff -Nur linux-3.10.36/sound/soc/codecs/spdif_transciever.c linux-linaro-stable-mx6/sound/soc/codecs/spdif_transciever.c
+diff -Nur linux-3.10.36/sound/soc/codecs/spdif_transciever.c linux-solidrun/sound/soc/codecs/spdif_transciever.c
--- linux-3.10.36/sound/soc/codecs/spdif_transciever.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_transciever.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/sound/soc/codecs/spdif_transciever.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-/*
- * ALSA SoC SPDIF DIT driver
@@ -583842,9 +562225,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/spdif_transciever.c linux-linaro-stable
-MODULE_DESCRIPTION("SPDIF dummy codec driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-3.10.36/sound/soc/codecs/spdif_transmitter.c linux-linaro-stable-mx6/sound/soc/codecs/spdif_transmitter.c
+diff -Nur linux-3.10.36/sound/soc/codecs/spdif_transmitter.c linux-solidrun/sound/soc/codecs/spdif_transmitter.c
--- linux-3.10.36/sound/soc/codecs/spdif_transmitter.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_transmitter.c 2014-04-21 13:50:43.578732710 +0200
++++ linux-solidrun/sound/soc/codecs/spdif_transmitter.c 2014-04-24 07:58:45.188282549 +0200
@@ -0,0 +1,70 @@
+/*
+ * ALSA SoC SPDIF DIT driver
@@ -583916,9 +562299,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/spdif_transmitter.c linux-linaro-stable
+MODULE_DESCRIPTION("SPDIF dummy codec driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-3.10.36/sound/soc/codecs/sta32x.c linux-linaro-stable-mx6/sound/soc/codecs/sta32x.c
+diff -Nur linux-3.10.36/sound/soc/codecs/sta32x.c linux-solidrun/sound/soc/codecs/sta32x.c
--- linux-3.10.36/sound/soc/codecs/sta32x.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/sta32x.c 2014-04-21 13:50:43.578732710 +0200
++++ linux-solidrun/sound/soc/codecs/sta32x.c 2014-04-24 07:58:45.188282549 +0200
@@ -187,42 +187,42 @@
13, 16, TLV_DB_SCALE_ITEM(-1500, 300, 0),
};
@@ -584016,9 +562399,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/sta32x.c linux-linaro-stable-mx6/sound/
/* depending on mode, the attack/release thresholds have
* two different enum definitions; provide both
-diff -Nur linux-3.10.36/sound/soc/codecs/wm8770.c linux-linaro-stable-mx6/sound/soc/codecs/wm8770.c
+diff -Nur linux-3.10.36/sound/soc/codecs/wm8770.c linux-solidrun/sound/soc/codecs/wm8770.c
--- linux-3.10.36/sound/soc/codecs/wm8770.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/wm8770.c 2014-04-21 13:50:43.590732760 +0200
++++ linux-solidrun/sound/soc/codecs/wm8770.c 2014-04-24 07:58:45.200282593 +0200
@@ -196,8 +196,8 @@
"AIN5", "AIN6", "AIN7", "AIN8"
};
@@ -584030,9 +562413,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/wm8770.c linux-linaro-stable-mx6/sound/
static const struct snd_kcontrol_new ain_mux =
SOC_DAPM_ENUM("Capture Mux", ain_enum);
-diff -Nur linux-3.10.36/sound/soc/codecs/wm8958-dsp2.c linux-linaro-stable-mx6/sound/soc/codecs/wm8958-dsp2.c
+diff -Nur linux-3.10.36/sound/soc/codecs/wm8958-dsp2.c linux-solidrun/sound/soc/codecs/wm8958-dsp2.c
--- linux-3.10.36/sound/soc/codecs/wm8958-dsp2.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/wm8958-dsp2.c 2014-04-21 13:50:43.594732777 +0200
++++ linux-solidrun/sound/soc/codecs/wm8958-dsp2.c 2014-04-24 07:58:45.204282606 +0200
@@ -153,7 +153,7 @@
data32 &= 0xffffff;
@@ -584042,9 +562425,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/wm8958-dsp2.c linux-linaro-stable-mx6/s
data32 & 0xffffff,
block_len / 2,
(void *)(data + 8));
-diff -Nur linux-3.10.36/sound/soc/codecs/wm8962.c linux-linaro-stable-mx6/sound/soc/codecs/wm8962.c
+diff -Nur linux-3.10.36/sound/soc/codecs/wm8962.c linux-solidrun/sound/soc/codecs/wm8962.c
--- linux-3.10.36/sound/soc/codecs/wm8962.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/wm8962.c 2014-04-21 13:50:43.594732777 +0200
++++ linux-solidrun/sound/soc/codecs/wm8962.c 2014-04-24 07:58:45.204282606 +0200
@@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -584378,9 +562761,9 @@ diff -Nur linux-3.10.36/sound/soc/codecs/wm8962.c linux-linaro-stable-mx6/sound/
return 0;
}
#endif
-diff -Nur linux-3.10.36/sound/soc/fsl/eukrea-tlv320.c linux-linaro-stable-mx6/sound/soc/fsl/eukrea-tlv320.c
+diff -Nur linux-3.10.36/sound/soc/fsl/eukrea-tlv320.c linux-solidrun/sound/soc/fsl/eukrea-tlv320.c
--- linux-3.10.36/sound/soc/fsl/eukrea-tlv320.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/eukrea-tlv320.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/eukrea-tlv320.c 2014-04-24 07:58:45.216282649 +0200
@@ -80,7 +80,7 @@
.name = "tlv320aic23",
.stream_name = "TLV320AIC23",
@@ -584390,9 +562773,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/eukrea-tlv320.c linux-linaro-stable-mx6/so
.codec_name = "tlv320aic23-codec.0-001a",
.cpu_dai_name = "imx-ssi.0",
.ops = &eukrea_tlv320_snd_ops,
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.c
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc.c linux-solidrun/sound/soc/fsl/fsl_asrc.c
--- linux-3.10.36/sound/soc/fsl/fsl_asrc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_asrc.c 2014-04-24 07:58:45.216282649 +0200
@@ -0,0 +1,500 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -584894,9 +563277,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc.c linux-linaro-stable-mx6/sound/s
+MODULE_DESCRIPTION("i.MX ASoC ASRC P2P driver");
+MODULE_ALIAS("platform:fsl-asrc-p2p");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.h
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc.h linux-solidrun/sound/soc/fsl/fsl_asrc.h
--- linux-3.10.36/sound/soc/fsl/fsl_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.h 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_asrc.h 2014-04-24 07:58:45.216282649 +0200
@@ -0,0 +1,48 @@
+/*
+ * fsl_asrc.h - ALSA ASRC interface
@@ -584946,9 +563329,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc.h linux-linaro-stable-mx6/sound/s
+};
+
+#endif
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc_pcm.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc_pcm.c
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc_pcm.c linux-solidrun/sound/soc/fsl/fsl_asrc_pcm.c
--- linux-3.10.36/sound/soc/fsl/fsl_asrc_pcm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc_pcm.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_asrc_pcm.c 2014-04-24 07:58:45.216282649 +0200
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -584991,9 +563374,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_asrc_pcm.c linux-linaro-stable-mx6/sou
+MODULE_DESCRIPTION("i.MX ASoC PCM driver");
+MODULE_ALIAS("platform:imx-pcm-asrc");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_esai.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.c
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_esai.c linux-solidrun/sound/soc/fsl/fsl_esai.c
--- linux-3.10.36/sound/soc/fsl/fsl_esai.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_esai.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,710 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -585705,9 +564088,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_esai.c linux-linaro-stable-mx6/sound/s
+MODULE_DESCRIPTION("i.MX ASoC ESAI driver");
+MODULE_ALIAS("platform:fsl-esai-dai");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_esai.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.h
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_esai.h linux-solidrun/sound/soc/fsl/fsl_esai.h
--- linux-3.10.36/sound/soc/fsl/fsl_esai.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.h 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_esai.h 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,335 @@
+/*
+ * imx-esai.h -- ESAI driver header file for Freescale IMX
@@ -586044,9 +564427,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_esai.h linux-linaro-stable-mx6/sound/s
+};
+
+#endif
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_hdmi.c
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_hdmi.c linux-solidrun/sound/soc/fsl/fsl_hdmi.c
--- linux-3.10.36/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_hdmi.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_hdmi.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,611 @@
+/*
+ * ALSA SoC HDMI Audio Layer for Freescale i.MX
@@ -586659,9 +565042,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/s
+MODULE_DESCRIPTION("IMX HDMI TX DAI");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:fsl-hdmi-dai");
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_spdif.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.c
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_spdif.c linux-solidrun/sound/soc/fsl/fsl_spdif.c
--- linux-3.10.36/sound/soc/fsl/fsl_spdif.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_spdif.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,1282 @@
+/*
+ * Freescale S/PDIF ALSA SoC Digital Audio Interface (DAI) driver
@@ -587945,9 +566328,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_spdif.c linux-linaro-stable-mx6/sound/
+MODULE_DESCRIPTION("Freescale S/PDIF CPU DAI Driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:fsl-spdif-dai");
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_spdif.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.h
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_spdif.h linux-solidrun/sound/soc/fsl/fsl_spdif.h
--- linux-3.10.36/sound/soc/fsl/fsl_spdif.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.h 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_spdif.h 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,193 @@
+/*
+ * fsl_spdif.h - ALSA S/PDIF interface for the Freescale i.MX SoC
@@ -588142,9 +566525,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_spdif.h linux-linaro-stable-mx6/sound/
+#define FSL_SPDIF_FORMATS_CAPTURE (SNDRV_PCM_FMTBIT_S24_LE)
+
+#endif /* _FSL_SPDIF_DAI_H */
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_ssi.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.c
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_ssi.c linux-solidrun/sound/soc/fsl/fsl_ssi.c
--- linux-3.10.36/sound/soc/fsl/fsl_ssi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_ssi.c 2014-04-24 07:58:45.220282663 +0200
@@ -3,13 +3,14 @@
*
* Author: Timur Tabi <timur@freescale.com>
@@ -588859,9 +567242,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_ssi.c linux-linaro-stable-mx6/sound/so
MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
MODULE_DESCRIPTION("Freescale Synchronous Serial Interface (SSI) ASoC Driver");
MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.36/sound/soc/fsl/fsl_ssi.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.h
+diff -Nur linux-3.10.36/sound/soc/fsl/fsl_ssi.h linux-solidrun/sound/soc/fsl/fsl_ssi.h
--- linux-3.10.36/sound/soc/fsl/fsl_ssi.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.h 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/fsl_ssi.h 2014-04-24 07:58:45.220282663 +0200
@@ -3,7 +3,7 @@
*
* Author: Timur Tabi <timur@freescale.com>
@@ -588883,9 +567266,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/fsl_ssi.h linux-linaro-stable-mx6/sound/so
#define CCSR_SSI_SxCCR_PSR 0x00020000
#define CCSR_SSI_SxCCR_WL_SHIFT 13
#define CCSR_SSI_SxCCR_WL_MASK 0x0001E000
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-cs42888.c linux-linaro-stable-mx6/sound/soc/fsl/imx-cs42888.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-cs42888.c linux-solidrun/sound/soc/fsl/imx-cs42888.c
--- linux-3.10.36/sound/soc/fsl/imx-cs42888.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-cs42888.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-cs42888.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,370 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -589257,9 +567640,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-cs42888.c linux-linaro-stable-mx6/soun
+MODULE_DESCRIPTION("ALSA SoC cs42888 Machine Layer Driver");
+MODULE_ALIAS("platform:imx-cs42888");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi.c linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi.c linux-solidrun/sound/soc/fsl/imx-hdmi.c
--- linux-3.10.36/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-hdmi.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,113 @@
+/*
+ * ASoC HDMI Transmitter driver for IMX development boards
@@ -589374,9 +567757,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi.c linux-linaro-stable-mx6/sound/s
+MODULE_DESCRIPTION("IMX HDMI TX ASoC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-audio-hdmi");
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi-dma.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi-dma.c linux-solidrun/sound/soc/fsl/imx-hdmi-dma.c
--- linux-3.10.36/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi-dma.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-hdmi-dma.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,1104 @@
+/*
+ * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer
@@ -590482,9 +568865,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX HDMI audio DMA");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi.h linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.h
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi.h linux-solidrun/sound/soc/fsl/imx-hdmi.h
--- linux-3.10.36/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.h 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-hdmi.h 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -590591,9 +568974,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-hdmi.h linux-linaro-stable-mx6/sound/s
+ } while (0)
+
+#endif /* __IMX_HDMI_H */
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-mc13783.c linux-linaro-stable-mx6/sound/soc/fsl/imx-mc13783.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-mc13783.c linux-solidrun/sound/soc/fsl/imx-mc13783.c
--- linux-3.10.36/sound/soc/fsl/imx-mc13783.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-mc13783.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-mc13783.c 2014-04-24 07:58:45.220282663 +0200
@@ -64,7 +64,7 @@
.codec_dai_name = "mc13783-hifi",
.codec_name = "mc13783-codec",
@@ -590603,9 +568986,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-mc13783.c linux-linaro-stable-mx6/soun
.ops = &imx_mc13783_hifi_ops,
.symmetric_rates = 1,
.dai_fmt = FMT_SSI,
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm.c linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm.c linux-solidrun/sound/soc/fsl/imx-pcm.c
--- linux-3.10.36/sound/soc/fsl/imx-pcm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-solidrun/sound/soc/fsl/imx-pcm.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,145 +0,0 @@
-/*
- * Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de>
@@ -590752,9 +569135,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm.c linux-linaro-stable-mx6/sound/so
-MODULE_DESCRIPTION("Freescale i.MX PCM driver");
-MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-dma.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm-dma.c linux-solidrun/sound/soc/fsl/imx-pcm-dma.c
--- linux-3.10.36/sound/soc/fsl/imx-pcm-dma.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-dma.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-pcm-dma.c 2014-04-24 07:58:45.220282663 +0200
@@ -11,9 +11,14 @@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
@@ -590886,9 +569269,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6/soun
snd_dmaengine_pcm_unregister(&pdev->dev);
}
+EXPORT_SYMBOL_GPL(imx_pcm_dma_exit);
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm-fiq.c linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-fiq.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm-fiq.c linux-solidrun/sound/soc/fsl/imx-pcm-fiq.c
--- linux-3.10.36/sound/soc/fsl/imx-pcm-fiq.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-fiq.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-pcm-fiq.c 2014-04-24 07:58:45.220282663 +0200
@@ -230,6 +230,22 @@
return 0;
}
@@ -591006,9 +569389,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm-fiq.c linux-linaro-stable-mx6/soun
+ snd_soc_unregister_platform(&pdev->dev);
+}
+EXPORT_SYMBOL_GPL(imx_pcm_fiq_exit);
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm.h linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm.h linux-solidrun/sound/soc/fsl/imx-pcm.h
--- linux-3.10.36/sound/soc/fsl/imx-pcm.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-pcm.h 2014-04-24 07:58:45.220282663 +0200
@@ -18,13 +18,17 @@
/*
* Do not change this as the FIQ handler depends on this size
@@ -591065,9 +569448,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-pcm.h linux-linaro-stable-mx6/sound/so
#endif
#endif /* _IMX_PCM_H */
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-sgtl5000.c linux-linaro-stable-mx6/sound/soc/fsl/imx-sgtl5000.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-sgtl5000.c linux-solidrun/sound/soc/fsl/imx-sgtl5000.c
--- linux-3.10.36/sound/soc/fsl/imx-sgtl5000.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-sgtl5000.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-sgtl5000.c 2014-04-24 07:58:45.220282663 +0200
@@ -149,7 +149,7 @@
data->dai.codec_dai_name = "sgtl5000";
data->dai.codec_of_node = codec_np;
@@ -591077,9 +569460,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-sgtl5000.c linux-linaro-stable-mx6/sou
data->dai.init = &imx_sgtl5000_dai_init;
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM;
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-si476x.c linux-linaro-stable-mx6/sound/soc/fsl/imx-si476x.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-si476x.c linux-solidrun/sound/soc/fsl/imx-si476x.c
--- linux-3.10.36/sound/soc/fsl/imx-si476x.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-si476x.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-si476x.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -591276,9 +569659,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-si476x.c linux-linaro-stable-mx6/sound
+MODULE_DESCRIPTION("ALSA SoC i.MX si476x");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-tuner-si476x");
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-spdif.c linux-linaro-stable-mx6/sound/soc/fsl/imx-spdif.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-spdif.c linux-solidrun/sound/soc/fsl/imx-spdif.c
--- linux-3.10.36/sound/soc/fsl/imx-spdif.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-spdif.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-spdif.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -591431,9 +569814,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-spdif.c linux-linaro-stable-mx6/sound/
+MODULE_DESCRIPTION("Freescale i.MX S/PDIF machine driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:imx-spdif");
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-ssi.c linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-ssi.c linux-solidrun/sound/soc/fsl/imx-ssi.c
--- linux-3.10.36/sound/soc/fsl/imx-ssi.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-ssi.c 2014-04-24 07:58:45.220282663 +0200
@@ -590,41 +590,22 @@
goto failed_register;
}
@@ -591500,9 +569883,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-ssi.c linux-linaro-stable-mx6/sound/so
snd_soc_unregister_component(&pdev->dev);
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-ssi.h linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.h
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-ssi.h linux-solidrun/sound/soc/fsl/imx-ssi.h
--- linux-3.10.36/sound/soc/fsl/imx-ssi.h 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.h 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-ssi.h 2014-04-24 07:58:45.220282663 +0200
@@ -211,9 +211,6 @@
struct imx_dma_data filter_data_rx;
@@ -591513,9 +569896,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-ssi.h linux-linaro-stable-mx6/sound/so
};
#endif /* _IMX_SSI_H */
-diff -Nur linux-3.10.36/sound/soc/fsl/imx-wm8962.c linux-linaro-stable-mx6/sound/soc/fsl/imx-wm8962.c
+diff -Nur linux-3.10.36/sound/soc/fsl/imx-wm8962.c linux-solidrun/sound/soc/fsl/imx-wm8962.c
--- linux-3.10.36/sound/soc/fsl/imx-wm8962.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-wm8962.c 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/imx-wm8962.c 2014-04-24 07:58:45.220282663 +0200
@@ -0,0 +1,575 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -592092,9 +570475,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/imx-wm8962.c linux-linaro-stable-mx6/sound
+MODULE_DESCRIPTION("Freescale i.MX WM8962 ASoC machine driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:imx-wm8962");
-diff -Nur linux-3.10.36/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound/soc/fsl/Kconfig
+diff -Nur linux-3.10.36/sound/soc/fsl/Kconfig linux-solidrun/sound/soc/fsl/Kconfig
--- linux-3.10.36/sound/soc/fsl/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/Kconfig 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/Kconfig 2014-04-24 07:58:45.216282649 +0200
@@ -1,6 +1,18 @@
config SND_SOC_FSL_SSI
tristate
@@ -592215,9 +570598,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound/soc/
+ SI476x module.
+
endif # SND_IMX_SOC
-diff -Nur linux-3.10.36/sound/soc/fsl/Makefile linux-linaro-stable-mx6/sound/soc/fsl/Makefile
+diff -Nur linux-3.10.36/sound/soc/fsl/Makefile linux-solidrun/sound/soc/fsl/Makefile
--- linux-3.10.36/sound/soc/fsl/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/Makefile 2014-04-21 13:50:43.610732845 +0200
++++ linux-solidrun/sound/soc/fsl/Makefile 2014-04-24 07:58:45.216282649 +0200
@@ -10,11 +10,21 @@
snd-soc-p1022-rdk-objs := p1022_rdk.o
obj-$(CONFIG_SND_SOC_P1022_RDK) += snd-soc-p1022-rdk.o
@@ -592285,9 +570668,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/Makefile linux-linaro-stable-mx6/sound/soc
obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
+obj-$(CONFIG_SND_SOC_IMX_HDMI) += snd-soc-imx-hdmi.o
+obj-$(CONFIG_SND_SOC_IMX_SI476X) += snd-soc-imx-si476x.o
-diff -Nur linux-3.10.36/sound/soc/fsl/mx27vis-aic32x4.c linux-linaro-stable-mx6/sound/soc/fsl/mx27vis-aic32x4.c
+diff -Nur linux-3.10.36/sound/soc/fsl/mx27vis-aic32x4.c linux-solidrun/sound/soc/fsl/mx27vis-aic32x4.c
--- linux-3.10.36/sound/soc/fsl/mx27vis-aic32x4.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/mx27vis-aic32x4.c 2014-04-21 13:50:43.614732861 +0200
++++ linux-solidrun/sound/soc/fsl/mx27vis-aic32x4.c 2014-04-24 07:58:45.220282663 +0200
@@ -161,7 +161,7 @@
.name = "tlv320aic32x4",
.stream_name = "TLV320AIC32X4",
@@ -592297,9 +570680,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/mx27vis-aic32x4.c linux-linaro-stable-mx6/
.codec_name = "tlv320aic32x4.0-0018",
.cpu_dai_name = "imx-ssi.0",
.ops = &mx27vis_aic32x4_snd_ops,
-diff -Nur linux-3.10.36/sound/soc/fsl/phycore-ac97.c linux-linaro-stable-mx6/sound/soc/fsl/phycore-ac97.c
+diff -Nur linux-3.10.36/sound/soc/fsl/phycore-ac97.c linux-solidrun/sound/soc/fsl/phycore-ac97.c
--- linux-3.10.36/sound/soc/fsl/phycore-ac97.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/phycore-ac97.c 2014-04-21 13:50:43.614732861 +0200
++++ linux-solidrun/sound/soc/fsl/phycore-ac97.c 2014-04-24 07:58:45.220282663 +0200
@@ -33,7 +33,7 @@
.codec_dai_name = "wm9712-hifi",
.codec_name = "wm9712-codec",
@@ -592309,9 +570692,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/phycore-ac97.c linux-linaro-stable-mx6/sou
.ops = &imx_phycore_hifi_ops,
},
};
-diff -Nur linux-3.10.36/sound/soc/fsl/wm1133-ev1.c linux-linaro-stable-mx6/sound/soc/fsl/wm1133-ev1.c
+diff -Nur linux-3.10.36/sound/soc/fsl/wm1133-ev1.c linux-solidrun/sound/soc/fsl/wm1133-ev1.c
--- linux-3.10.36/sound/soc/fsl/wm1133-ev1.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/wm1133-ev1.c 2014-04-21 13:50:43.614732861 +0200
++++ linux-solidrun/sound/soc/fsl/wm1133-ev1.c 2014-04-24 07:58:45.220282663 +0200
@@ -245,7 +245,7 @@
.stream_name = "Audio",
.cpu_dai_name = "imx-ssi.0",
@@ -592321,9 +570704,9 @@ diff -Nur linux-3.10.36/sound/soc/fsl/wm1133-ev1.c linux-linaro-stable-mx6/sound
.codec_name = "wm8350-codec.0-0x1a",
.init = wm1133_ev1_init,
.ops = &wm1133_ev1_ops,
-diff -Nur linux-3.10.36/sound/soc/soc-compress.c linux-linaro-stable-mx6/sound/soc/soc-compress.c
+diff -Nur linux-3.10.36/sound/soc/soc-compress.c linux-solidrun/sound/soc/soc-compress.c
--- linux-3.10.36/sound/soc/soc-compress.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/soc-compress.c 2014-04-21 13:50:43.626732912 +0200
++++ linux-solidrun/sound/soc/soc-compress.c 2014-04-24 07:58:45.236282720 +0200
@@ -149,8 +149,9 @@
SND_SOC_DAPM_STREAM_STOP);
} else {
@@ -592336,9 +570719,9 @@ diff -Nur linux-3.10.36/sound/soc/soc-compress.c linux-linaro-stable-mx6/sound/s
}
} else {
/* capture streams can be powered down now */
-diff -Nur linux-3.10.36/sound/soc/soc-generic-dmaengine-pcm.c linux-linaro-stable-mx6/sound/soc/soc-generic-dmaengine-pcm.c
+diff -Nur linux-3.10.36/sound/soc/soc-generic-dmaengine-pcm.c linux-solidrun/sound/soc/soc-generic-dmaengine-pcm.c
--- linux-3.10.36/sound/soc/soc-generic-dmaengine-pcm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/soc-generic-dmaengine-pcm.c 2014-04-21 13:50:43.630732928 +0200
++++ linux-solidrun/sound/soc/soc-generic-dmaengine-pcm.c 2014-04-24 07:58:45.236282720 +0200
@@ -163,7 +163,7 @@
}
@@ -592348,9 +570731,9 @@ diff -Nur linux-3.10.36/sound/soc/soc-generic-dmaengine-pcm.c linux-linaro-stabl
dmaengine_dma_dev(pcm, substream),
config->prealloc_buffer_size,
config->pcm_hardware->buffer_bytes_max);
-diff -Nur linux-3.10.36/sound/soc/soc-jack.c linux-linaro-stable-mx6/sound/soc/soc-jack.c
+diff -Nur linux-3.10.36/sound/soc/soc-jack.c linux-solidrun/sound/soc/soc-jack.c
--- linux-3.10.36/sound/soc/soc-jack.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/soc-jack.c 2014-04-21 13:50:43.630732928 +0200
++++ linux-solidrun/sound/soc/soc-jack.c 2014-04-24 07:58:45.236282720 +0200
@@ -263,7 +263,7 @@
if (device_may_wakeup(dev))
pm_wakeup_event(dev, gpio->debounce_time + 50);
@@ -592360,9 +570743,9 @@ diff -Nur linux-3.10.36/sound/soc/soc-jack.c linux-linaro-stable-mx6/sound/soc/s
msecs_to_jiffies(gpio->debounce_time));
return IRQ_HANDLED;
-diff -Nur linux-3.10.36/sound/soc/soc-pcm.c linux-linaro-stable-mx6/sound/soc/soc-pcm.c
+diff -Nur linux-3.10.36/sound/soc/soc-pcm.c linux-solidrun/sound/soc/soc-pcm.c
--- linux-3.10.36/sound/soc/soc-pcm.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/soc-pcm.c 2014-04-21 13:50:43.630732928 +0200
++++ linux-solidrun/sound/soc/soc-pcm.c 2014-04-24 07:58:45.236282720 +0200
@@ -408,8 +408,9 @@
} else {
/* start delayed pop wq here for playback streams */
@@ -592393,9 +570776,9 @@ diff -Nur linux-3.10.36/sound/soc/soc-pcm.c linux-linaro-stable-mx6/sound/soc/so
list->widgets[i]->name);
continue;
}
-diff -Nur linux-3.10.36/sound/usb/Kconfig linux-linaro-stable-mx6/sound/usb/Kconfig
+diff -Nur linux-3.10.36/sound/usb/Kconfig linux-solidrun/sound/usb/Kconfig
--- linux-3.10.36/sound/usb/Kconfig 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/usb/Kconfig 2014-04-21 13:50:43.638732963 +0200
++++ linux-solidrun/sound/usb/Kconfig 2014-04-24 07:58:45.244282747 +0200
@@ -14,7 +14,6 @@
select SND_HWDEP
select SND_RAWMIDI
@@ -592404,9 +570787,9 @@ diff -Nur linux-3.10.36/sound/usb/Kconfig linux-linaro-stable-mx6/sound/usb/Kcon
help
Say Y here to include support for USB audio and USB MIDI
devices.
-diff -Nur linux-3.10.36/sound/usb/mixer.c linux-linaro-stable-mx6/sound/usb/mixer.c
+diff -Nur linux-3.10.36/sound/usb/mixer.c linux-solidrun/sound/usb/mixer.c
--- linux-3.10.36/sound/usb/mixer.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/usb/mixer.c 2014-04-21 13:50:43.642732980 +0200
++++ linux-solidrun/sound/usb/mixer.c 2014-04-24 07:58:45.248282761 +0200
@@ -883,7 +883,6 @@
}
break;
@@ -592415,9 +570798,9 @@ diff -Nur linux-3.10.36/sound/usb/mixer.c linux-linaro-stable-mx6/sound/usb/mixe
case USB_ID(0x046d, 0x0808):
case USB_ID(0x046d, 0x0809):
case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */
-diff -Nur linux-3.10.36/sound/usb/mixer_maps.c linux-linaro-stable-mx6/sound/usb/mixer_maps.c
+diff -Nur linux-3.10.36/sound/usb/mixer_maps.c linux-solidrun/sound/usb/mixer_maps.c
--- linux-3.10.36/sound/usb/mixer_maps.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/usb/mixer_maps.c 2014-04-21 13:50:43.642732980 +0200
++++ linux-solidrun/sound/usb/mixer_maps.c 2014-04-24 07:58:45.248282761 +0200
@@ -322,11 +322,6 @@
{ 0 } /* terminator */
};
@@ -592441,9 +570824,9 @@ diff -Nur linux-3.10.36/sound/usb/mixer_maps.c linux-linaro-stable-mx6/sound/usb
{ 0 } /* terminator */
};
-diff -Nur linux-3.10.36/tools/gator/daemon/Android.mk linux-linaro-stable-mx6/tools/gator/daemon/Android.mk
+diff -Nur linux-3.10.36/tools/gator/daemon/Android.mk linux-solidrun/tools/gator/daemon/Android.mk
--- linux-3.10.36/tools/gator/daemon/Android.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Android.mk 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Android.mk 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,52 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
@@ -592497,9 +570880,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Android.mk linux-linaro-stable-mx6/to
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_EXECUTABLE)
-diff -Nur linux-3.10.36/tools/gator/daemon/Buffer.cpp linux-linaro-stable-mx6/tools/gator/daemon/Buffer.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Buffer.cpp linux-solidrun/tools/gator/daemon/Buffer.cpp
--- linux-3.10.36/tools/gator/daemon/Buffer.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Buffer.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Buffer.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,228 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -592729,9 +571112,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Buffer.cpp linux-linaro-stable-mx6/to
+bool Buffer::isDone () const {
+ return done && readPos == commitPos && commitPos == writePos;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Buffer.h linux-linaro-stable-mx6/tools/gator/daemon/Buffer.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Buffer.h linux-solidrun/tools/gator/daemon/Buffer.h
--- linux-3.10.36/tools/gator/daemon/Buffer.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Buffer.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Buffer.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,66 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -592799,9 +571182,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Buffer.h linux-linaro-stable-mx6/tool
+};
+
+#endif // BUFFER_H
-diff -Nur linux-3.10.36/tools/gator/daemon/CapturedXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/CapturedXML.cpp linux-solidrun/tools/gator/daemon/CapturedXML.cpp
--- linux-3.10.36/tools/gator/daemon/CapturedXML.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/CapturedXML.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,134 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -592937,9 +571320,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/CapturedXML.cpp linux-linaro-stable-m
+
+ return(NULL);
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/CapturedXML.h linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.h
+diff -Nur linux-3.10.36/tools/gator/daemon/CapturedXML.h linux-solidrun/tools/gator/daemon/CapturedXML.h
--- linux-3.10.36/tools/gator/daemon/CapturedXML.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/CapturedXML.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,26 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -592967,9 +571350,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/CapturedXML.h linux-linaro-stable-mx6
+const char * mxmlWhitespaceCB(mxml_node_t *node, int where);
+
+#endif //__CAPTURED_XML_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/Child.cpp linux-linaro-stable-mx6/tools/gator/daemon/Child.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Child.cpp linux-solidrun/tools/gator/daemon/Child.cpp
--- linux-3.10.36/tools/gator/daemon/Child.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Child.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Child.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,409 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -593380,9 +571763,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Child.cpp linux-linaro-stable-mx6/too
+ delete collector;
+ delete localCapture;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Child.h linux-linaro-stable-mx6/tools/gator/daemon/Child.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Child.h linux-solidrun/tools/gator/daemon/Child.h
--- linux-3.10.36/tools/gator/daemon/Child.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Child.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Child.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -593419,9 +571802,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Child.h linux-linaro-stable-mx6/tools
+};
+
+#endif //__CHILD_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/Collector.cpp linux-linaro-stable-mx6/tools/gator/daemon/Collector.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Collector.cpp linux-solidrun/tools/gator/daemon/Collector.cpp
--- linux-3.10.36/tools/gator/daemon/Collector.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Collector.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Collector.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,221 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -593644,9 +572027,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Collector.cpp linux-linaro-stable-mx6
+ }
+ return 0;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Collector.h linux-linaro-stable-mx6/tools/gator/daemon/Collector.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Collector.h linux-solidrun/tools/gator/daemon/Collector.h
--- linux-3.10.36/tools/gator/daemon/Collector.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Collector.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Collector.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,38 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -593686,9 +572069,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Collector.h linux-linaro-stable-mx6/t
+};
+
+#endif //__COLLECTOR_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/common.mk linux-linaro-stable-mx6/tools/gator/daemon/common.mk
+diff -Nur linux-3.10.36/tools/gator/daemon/common.mk linux-solidrun/tools/gator/daemon/common.mk
--- linux-3.10.36/tools/gator/daemon/common.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/common.mk 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/common.mk 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,50 @@
+# -g produces debugging information
+# -O3 maximum optimization
@@ -593740,9 +572123,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/common.mk linux-linaro-stable-mx6/too
+
+clean:
+ rm -f *.d *.o mxml/*.d mxml/*.o libsensors/*.d libsensors/*.o $(TARGET) escape events.xml events_xml.h configuration_xml.h
-diff -Nur linux-3.10.36/tools/gator/daemon/configuration.xml linux-linaro-stable-mx6/tools/gator/daemon/configuration.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/configuration.xml linux-solidrun/tools/gator/daemon/configuration.xml
--- linux-3.10.36/tools/gator/daemon/configuration.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/configuration.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/configuration.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configurations revision="3">
@@ -593801,9 +572184,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/configuration.xml linux-linaro-stable
+ <configuration counter="Linux_power_cpu_freq"/>
+ <configuration counter="L2C-310_cnt0" event="0x1"/>
+</configurations>
-diff -Nur linux-3.10.36/tools/gator/daemon/ConfigurationXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/ConfigurationXML.cpp linux-solidrun/tools/gator/daemon/ConfigurationXML.cpp
--- linux-3.10.36/tools/gator/daemon/ConfigurationXML.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/ConfigurationXML.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,209 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -594014,9 +572397,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/ConfigurationXML.cpp linux-linaro-sta
+ }
+ logg->logMessage("Invalid configuration.xml file detected and removed");
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/ConfigurationXML.h linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.h
+diff -Nur linux-3.10.36/tools/gator/daemon/ConfigurationXML.h linux-solidrun/tools/gator/daemon/ConfigurationXML.h
--- linux-3.10.36/tools/gator/daemon/ConfigurationXML.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/ConfigurationXML.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,38 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -594056,9 +572439,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/ConfigurationXML.h linux-linaro-stabl
+};
+
+#endif // COUNTERS_H
-diff -Nur linux-3.10.36/tools/gator/daemon/Counter.h linux-linaro-stable-mx6/tools/gator/daemon/Counter.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Counter.h linux-solidrun/tools/gator/daemon/Counter.h
--- linux-3.10.36/tools/gator/daemon/Counter.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Counter.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Counter.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,61 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -594121,9 +572504,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Counter.h linux-linaro-stable-mx6/too
+};
+
+#endif // COUNTER_H
-diff -Nur linux-3.10.36/tools/gator/daemon/Driver.cpp linux-linaro-stable-mx6/tools/gator/daemon/Driver.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Driver.cpp linux-solidrun/tools/gator/daemon/Driver.cpp
--- linux-3.10.36/tools/gator/daemon/Driver.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Driver.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Driver.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,15 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -594140,9 +572523,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Driver.cpp linux-linaro-stable-mx6/to
+Driver::Driver() : next(head) {
+ head = this;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Driver.h linux-linaro-stable-mx6/tools/gator/daemon/Driver.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Driver.h linux-solidrun/tools/gator/daemon/Driver.h
--- linux-3.10.36/tools/gator/daemon/Driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Driver.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Driver.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,48 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -594192,9 +572575,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Driver.h linux-linaro-stable-mx6/tool
+};
+
+#endif // DRIVER_H
-diff -Nur linux-3.10.36/tools/gator/daemon/escape.c linux-linaro-stable-mx6/tools/gator/daemon/escape.c
+diff -Nur linux-3.10.36/tools/gator/daemon/escape.c linux-solidrun/tools/gator/daemon/escape.c
--- linux-3.10.36/tools/gator/daemon/escape.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/escape.c 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/escape.c 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,75 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -594271,9 +572654,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/escape.c linux-linaro-stable-mx6/tool
+
+ return EXIT_SUCCESS;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/events-ARM11MPCore.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11MPCore.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-ARM11MPCore.xml linux-solidrun/tools/gator/daemon/events-ARM11MPCore.xml
--- linux-3.10.36/tools/gator/daemon/events-ARM11MPCore.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11MPCore.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-ARM11MPCore.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,26 @@
+ <counter_set name="ARM_ARM11MPCore_cnt" count="3"/>
+ <category name="ARM11MPCore" counter_set="ARM_ARM11MPCore_cnt" per_cpu="yes">
@@ -594301,9 +572684,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-ARM11MPCore.xml linux-linaro-s
+ <event event="0x14" title="Write Buffer" name="Write Merges" description="Buffered write merged in a store buffer slot"/>
+ <event event="0xFF" title="Core" name="Cycle counter" description="An increment each cycle"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-ARM11.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-ARM11.xml linux-solidrun/tools/gator/daemon/events-ARM11.xml
--- linux-3.10.36/tools/gator/daemon/events-ARM11.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-ARM11.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,39 @@
+ <counter_set name="ARM_ARM11_cnt" count="3"/>
+ <category name="ARM11" counter_set="ARM_ARM11_cnt" per_cpu="yes">
@@ -594344,9 +572727,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-ARM11.xml linux-linaro-stable-
+ <event event="0x37" title="Procedure" name="Return address misprediction" description="Procedure return address popped off the return stack has been incorrectly predicted by the PFU (ARM1156 only)"/>
+ <event event="0x38" title="Cache" name="Data dirty parity error" description="Data cache Dirty RAM parity error (ARM1156 only)"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-CCI-400.xml linux-linaro-stable-mx6/tools/gator/daemon/events-CCI-400.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-CCI-400.xml linux-solidrun/tools/gator/daemon/events-CCI-400.xml
--- linux-3.10.36/tools/gator/daemon/events-CCI-400.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-CCI-400.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-CCI-400.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,107 @@
+ <counter_set name="cci-400_cnt" count="4"/>
+ <category name="CCI-400" counter_set="cci-400_cnt" per_cpu="no" supports_event_based_sampling="yes">
@@ -594455,9 +572838,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-CCI-400.xml linux-linaro-stabl
+ <event event="0x10" option_set="Master" title="CCI-400" name="Write Stall: VN" description="A write request is stalled for a cycle while it was waiting for a QVN token on VN"/>
+ <event event="0x11" option_set="Master" title="CCI-400" name="WriteUnique or WriteLineUnique Stall" description="A WriteUnique or WriteLineUnique request is stalled for a cycle because of an address hazard"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-CCN-504.xml linux-linaro-stable-mx6/tools/gator/daemon/events-CCN-504.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-CCN-504.xml linux-solidrun/tools/gator/daemon/events-CCN-504.xml
--- linux-3.10.36/tools/gator/daemon/events-CCN-504.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-CCN-504.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-CCN-504.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,122 @@
+ <counter_set name="CCN-504_cnt" count="4"/>
+ <category name="CCN-504" counter_set="CCN-504_cnt">
@@ -594581,9 +572964,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-CCN-504.xml linux-linaro-stabl
+ <event event="0x100A" option_set="SBAS_Region" title="CCN-504" name="Replayed TXREQ Flits" description="Replayed TXREQ Flits."/>
+
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A12.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A12.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A12.xml linux-solidrun/tools/gator/daemon/events-Cortex-A12.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A12.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A12.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A12.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,86 @@
+ <counter_set name="ARM_Cortex-A12_cnt" count="6"/>
+ <category name="Cortex-A12" counter_set="ARM_Cortex-A12_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -594671,9 +573054,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A12.xml linux-linaro-st
+ <event event="0xea" title="Cache" name="L2 TLB access" description="Level 2 TLB access"/>
+ <event event="0xeb" title="Cache" name="L2 TLB miss" description="Level 2 TLB miss"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A15.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A15.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A15.xml linux-solidrun/tools/gator/daemon/events-Cortex-A15.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A15.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A15.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A15.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,68 @@
+ <counter_set name="ARM_Cortex-A15_cnt" count="6"/>
+ <category name="Cortex-A15" counter_set="ARM_Cortex-A15_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -594743,9 +573126,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A15.xml linux-linaro-st
+ <event event="0x7d" title="Instruction" name="DSB" description="Barrier speculatively executed - DSB"/>
+ <event event="0x7e" title="Instruction" name="DMB" description="Barrier speculatively executed - DMB"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A53.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A53.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A53.xml linux-solidrun/tools/gator/daemon/events-Cortex-A53.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A53.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A53.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A53.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,171 @@
+ <counter_set name="ARM_Cortex-A53_cnt" count="6"/>
+ <category name="Cortex-A53" counter_set="ARM_Cortex-A53_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -594918,9 +573301,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A53.xml linux-linaro-st
+ <!-- 0x91 RC_ST_SPEC - Release consistency instruction speculatively executed - Store Release -->
+ <event event="0x91" title="Release Consistency" name="Store" description="Release consistency instruction speculatively executed - Store Release"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A57.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A57.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A57.xml linux-solidrun/tools/gator/daemon/events-Cortex-A57.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A57.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A57.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A57.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,171 @@
+ <counter_set name="ARM_Cortex-A57_cnt" count="6"/>
+ <category name="Cortex-A57" counter_set="ARM_Cortex-A57_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -595093,9 +573476,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A57.xml linux-linaro-st
+ <!-- 0x91 RC_ST_SPEC - Release consistency instruction speculatively executed - Store Release -->
+ <event event="0x91" title="Release Consistency" name="Store" description="Release consistency instruction speculatively executed - Store Release"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A5.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A5.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A5.xml linux-solidrun/tools/gator/daemon/events-Cortex-A5.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A5.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A5.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A5.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,36 @@
+ <counter_set name="ARM_Cortex-A5_cnt" count="2"/>
+ <category name="Cortex-A5" counter_set="ARM_Cortex-A5_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -595133,9 +573516,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A5.xml linux-linaro-sta
+ <event event="0xC8" title="ETM" name="ETM Ext Out[1]" description="ETM - ETM Ext Out[1]"/>
+ <event event="0xC9" title="Instruction" name="Pipeline stall" description="Data Write operation that stalls the pipeline because the store buffer is full"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A7.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A7.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A7.xml linux-solidrun/tools/gator/daemon/events-Cortex-A7.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A7.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A7.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A7.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,43 @@
+ <counter_set name="ARM_Cortex-A7_cnt" count="4"/>
+ <category name="Cortex-A7" counter_set="ARM_Cortex-A7_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -595180,9 +573563,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A7.xml linux-linaro-sta
+ <event event="0xC9" title="Instruction" name="Pipeline stall" description="Data Write operation that stalls the pipeline because the store buffer is full"/>
+ <event event="0xCA" title="Memory" name="Snoop" description="Data snooped from other processor. This event counts memory-read operations that read data from another processor within the local cluster, rather than accessing the L2 cache or issuing an external read."/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A8.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A8.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A8.xml linux-solidrun/tools/gator/daemon/events-Cortex-A8.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A8.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A8.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A8.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,52 @@
+ <counter_set name="ARM_Cortex-A8_cnt" count="4"/>
+ <category name="Cortex-A8" counter_set="ARM_Cortex-A8_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -595236,9 +573619,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A8.xml linux-linaro-sta
+ <event event="0x71" title="External" name="PMUEXTIN[1]" description="Counts any event from external input source PMUEXTIN[1]"/>
+ <event event="0x72" title="External" name="PMUEXTIN[0,1]" description="Counts any event from both external input sources PMUEXTIN[0] and PMUEXTIN[1]"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A9.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A9.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A9.xml linux-solidrun/tools/gator/daemon/events-Cortex-A9.xml
--- linux-3.10.36/tools/gator/daemon/events-Cortex-A9.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A9.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Cortex-A9.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,65 @@
+ <counter_set name="ARM_Cortex-A9_cnt" count="6"/>
+ <category name="Cortex-A9" counter_set="ARM_Cortex-A9_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -595305,20 +573688,20 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Cortex-A9.xml linux-linaro-sta
+ <event event="0xA4" title="PLE" name="FIFO overflow" description="Counts the number of PLE FIFO flush overflowed"/>
+ <event event="0xA5" title="PLE" name="Request programmed" description="Counts the number of PLE FIFO flush program requests"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events_footer.xml linux-linaro-stable-mx6/tools/gator/daemon/events_footer.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events_footer.xml linux-solidrun/tools/gator/daemon/events_footer.xml
--- linux-3.10.36/tools/gator/daemon/events_footer.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events_footer.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events_footer.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1 @@
+</events>
-diff -Nur linux-3.10.36/tools/gator/daemon/events_header.xml linux-linaro-stable-mx6/tools/gator/daemon/events_header.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events_header.xml linux-solidrun/tools/gator/daemon/events_header.xml
--- linux-3.10.36/tools/gator/daemon/events_header.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events_header.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events_header.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<events>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Krait-architected.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Krait-architected.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Krait-architected.xml linux-solidrun/tools/gator/daemon/events-Krait-architected.xml
--- linux-3.10.36/tools/gator/daemon/events-Krait-architected.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Krait-architected.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Krait-architected.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,22 @@
+ <counter_set name="Krait_cnt" count="4"/>
+ <category name="Krait" counter_set="Krait_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -595342,9 +573725,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Krait-architected.xml linux-li
+ <event event="0x10" title="Branch" name="Mispredicted" description="Branch mispredicted or not predicted"/>
+ <event event="0x12" title="Branch" name="Potential prediction" description="Branch or other change in program flow that could have been predicted by the branch prediction resources of the processor"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-L2C-310.xml linux-linaro-stable-mx6/tools/gator/daemon/events-L2C-310.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-L2C-310.xml linux-solidrun/tools/gator/daemon/events-L2C-310.xml
--- linux-3.10.36/tools/gator/daemon/events-L2C-310.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-L2C-310.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-L2C-310.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,18 @@
+ <counter_set name="L2C-310_cnt" count="2"/>
+ <category name="L2C-310" counter_set="L2C-310_cnt" per_cpu="no">
@@ -595364,9 +573747,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-L2C-310.xml linux-linaro-stabl
+ <event event="0xe" title="L2 Cache" name="SRCONF" description="Speculative read confirmed"/>
+ <event event="0xf" title="L2 Cache" name="EPFRCVD" description="Prefetch hint received"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Linux.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Linux.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Linux.xml linux-solidrun/tools/gator/daemon/events-Linux.xml
--- linux-3.10.36/tools/gator/daemon/events-Linux.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Linux.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Linux.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,17 @@
+ <category name="Linux">
+ <event counter="Linux_irq_softirq" title="Interrupts" name="SoftIRQ" per_cpu="yes" description="Linux SoftIRQ taken"/>
@@ -595385,9 +573768,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Linux.xml linux-linaro-stable-
+ <event counter="Linux_cpu_wait_io" title="CPU I/O" name="Wait" per_cpu="no" display="average" derived="yes" rendering_type="bar" average_selection="yes" percentage="yes" modifier="10000" description="Thread waiting on I/O resource"/>
+ </category>
+
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-4xx.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-4xx.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-4xx.xml linux-solidrun/tools/gator/daemon/events-Mali-4xx.xml
--- linux-3.10.36/tools/gator/daemon/events-Mali-4xx.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-4xx.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Mali-4xx.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,251 @@
+ <counter_set name="ARM_Mali-4xx_VP_0_cnt" count="2"/>
+ <counter_set name="ARM_Mali-4xx_SW_cnt" count="0"/>
@@ -595640,9 +574023,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-4xx.xml linux-linaro-stab
+ <event counter="ARM_Mali-4xx_SW_39" title="Geometry Statistics" name="Strip Lines" description="Number of lines passed to GLES using the mode GL_LINE_STRIP."/>
+ <event counter="ARM_Mali-4xx_SW_40" title="Geometry Statistics" name="Loop Lines" description="Number of lines passed to GLES using the mode GL_LINE_LOOP."/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-T6xx_hw.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx_hw.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-T6xx_hw.xml linux-solidrun/tools/gator/daemon/events-Mali-T6xx_hw.xml
--- linux-3.10.36/tools/gator/daemon/events-Mali-T6xx_hw.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx_hw.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Mali-T6xx_hw.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,116 @@
+
+ <category name="Mali-T6xx-JobManager" per_cpu="no">
@@ -595760,9 +574143,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-T6xx_hw.xml linux-linaro-
+ <event counter="ARM_Mali-T6xx_L2_EXT_W_STALL" title="Mali L2 Cache" name="External bus stalls (W)" description="Number of cycles a valid write data (W channel) is stalled by the external interconnect"/>
+
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-T6xx.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-T6xx.xml linux-solidrun/tools/gator/daemon/events-Mali-T6xx.xml
--- linux-3.10.36/tools/gator/daemon/events-Mali-T6xx.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Mali-T6xx.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,48 @@
+
+ <category name="Mali-T6xx-SW-counters" per_cpu="no">
@@ -595812,9 +574195,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Mali-T6xx.xml linux-linaro-sta
+ </option_set>
+ <event event="0x0400" option_set="fs" title="ARM Mali-T6xx" name="Filmstrip" description="Scaled framebuffer"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-ScorpionMP.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ScorpionMP.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-ScorpionMP.xml linux-solidrun/tools/gator/daemon/events-ScorpionMP.xml
--- linux-3.10.36/tools/gator/daemon/events-ScorpionMP.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-ScorpionMP.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-ScorpionMP.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,90 @@
+ <counter_set name="ScorpionMP_cnt" count="4"/>
+ <category name="ScorpionMP" counter_set="ScorpionMP_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -595906,9 +574289,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-ScorpionMP.xml linux-linaro-st
+ <event event="0x8e" title="ScorpionMP" name="NUM_BARRIERS" description="Barriers"/>
+ <event event="0x8f" title="ScorpionMP" name="BARRIER_CYCLES" description="Barrier cycles"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/events-Scorpion.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Scorpion.xml
+diff -Nur linux-3.10.36/tools/gator/daemon/events-Scorpion.xml linux-solidrun/tools/gator/daemon/events-Scorpion.xml
--- linux-3.10.36/tools/gator/daemon/events-Scorpion.xml 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Scorpion.xml 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/events-Scorpion.xml 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,107 @@
+ <counter_set name="Scorpion_cnt" count="4"/>
+ <category name="Scorpion" counter_set="Scorpion_cnt" per_cpu="yes" supports_event_based_sampling="yes">
@@ -596017,9 +574400,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/events-Scorpion.xml linux-linaro-stab
+ <event event="0x9f" title="Scorpion" name="BANK_CD_NON_CASTOUT" description="fills and castouts bank C/D non-castout writes to bus"/>
+ <event event="0xa0" title="Scorpion" name="BANK_CD_L2_CASTOUT" description="fills and castouts bank C/D L2 castouts (granules)"/>
+ </category>
-diff -Nur linux-3.10.36/tools/gator/daemon/EventsXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/EventsXML.cpp linux-solidrun/tools/gator/daemon/EventsXML.cpp
--- linux-3.10.36/tools/gator/daemon/EventsXML.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/EventsXML.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,70 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -596091,9 +574474,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/EventsXML.cpp linux-linaro-stable-mx6
+
+ free(buf);
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/EventsXML.h linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.h
+diff -Nur linux-3.10.36/tools/gator/daemon/EventsXML.h linux-solidrun/tools/gator/daemon/EventsXML.h
--- linux-3.10.36/tools/gator/daemon/EventsXML.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/EventsXML.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,18 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -596113,9 +574496,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/EventsXML.h linux-linaro-stable-mx6/t
+};
+
+#endif // EVENTS_XML
-diff -Nur linux-3.10.36/tools/gator/daemon/Fifo.cpp linux-linaro-stable-mx6/tools/gator/daemon/Fifo.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Fifo.cpp linux-solidrun/tools/gator/daemon/Fifo.cpp
--- linux-3.10.36/tools/gator/daemon/Fifo.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Fifo.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Fifo.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,130 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -596247,9 +574630,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Fifo.cpp linux-linaro-stable-mx6/tool
+
+ return &mBuffer[mRead];
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Fifo.h linux-linaro-stable-mx6/tools/gator/daemon/Fifo.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Fifo.h linux-solidrun/tools/gator/daemon/Fifo.h
--- linux-3.10.36/tools/gator/daemon/Fifo.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Fifo.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Fifo.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,48 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -596299,9 +574682,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Fifo.h linux-linaro-stable-mx6/tools/
+};
+
+#endif //__FIFO_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/Hwmon.cpp linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Hwmon.cpp linux-solidrun/tools/gator/daemon/Hwmon.cpp
--- linux-3.10.36/tools/gator/daemon/Hwmon.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Hwmon.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,330 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -596633,9 +575016,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Hwmon.cpp linux-linaro-stable-mx6/too
+ buffer->event(counter->getKey(), counter->read());
+ }
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Hwmon.h linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Hwmon.h linux-solidrun/tools/gator/daemon/Hwmon.h
--- linux-3.10.36/tools/gator/daemon/Hwmon.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Hwmon.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -596680,9 +575063,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Hwmon.h linux-linaro-stable-mx6/tools
+};
+
+#endif // HWMON_H
-diff -Nur linux-3.10.36/tools/gator/daemon/KMod.cpp linux-linaro-stable-mx6/tools/gator/daemon/KMod.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/KMod.cpp linux-solidrun/tools/gator/daemon/KMod.cpp
--- linux-3.10.36/tools/gator/daemon/KMod.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/KMod.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/KMod.cpp 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,102 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -596786,9 +575169,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/KMod.cpp linux-linaro-stable-mx6/tool
+ }
+ closedir(dir);
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/KMod.h linux-linaro-stable-mx6/tools/gator/daemon/KMod.h
+diff -Nur linux-3.10.36/tools/gator/daemon/KMod.h linux-solidrun/tools/gator/daemon/KMod.h
--- linux-3.10.36/tools/gator/daemon/KMod.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/KMod.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/KMod.h 2014-04-24 07:58:45.252282774 +0200
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) ARM Limited 2013. All rights reserved.
@@ -596817,9 +575200,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/KMod.h linux-linaro-stable-mx6/tools/
+};
+
+#endif // KMOD_H
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/access.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/access.c linux-solidrun/tools/gator/daemon/libsensors/access.c
--- linux-3.10.36/tools/gator/daemon/libsensors/access.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/access.c 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,561 @@
+/*
+ access.c - Part of libsensors, a Linux library for reading sensor data.
@@ -597382,9 +575765,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/access.c linux-linaro-stab
+ }
+ return res;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/access.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/access.h linux-solidrun/tools/gator/daemon/libsensors/access.h
--- linux-3.10.36/tools/gator/daemon/libsensors/access.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/access.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,33 @@
+/*
+ access.h - Part of libsensors, a Linux library for reading sensor data.
@@ -597419,9 +575802,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/access.h linux-linaro-stab
+int sensors_chip_name_has_wildcards(const sensors_chip_name *chip);
+
+#endif /* def LIB_SENSORS_ACCESS_H */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf.h linux-solidrun/tools/gator/daemon/libsensors/conf.h
--- linux-3.10.36/tools/gator/daemon/libsensors/conf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/conf.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,34 @@
+/*
+ conf.h - Part of libsensors, a Linux library for reading sensor data.
@@ -597457,9 +575840,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf.h linux-linaro-stable
+int sensors_yyparse(void);
+
+#endif /* LIB_SENSORS_CONF_H */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.c linux-solidrun/tools/gator/daemon/libsensors/conf-lex.c
--- linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/conf-lex.c 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,2881 @@
+
+#line 3 "<stdout>"
@@ -600342,9 +578725,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.c linux-linaro-st
+}
+
+
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.l linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.l
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.l linux-solidrun/tools/gator/daemon/libsensors/conf-lex.l
--- linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.l 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.l 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/conf-lex.l 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,372 @@
+%{
+/*
@@ -600718,9 +579101,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-lex.l linux-linaro-st
+#endif
+}
+
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.c linux-solidrun/tools/gator/daemon/libsensors/conf-parse.c
--- linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/conf-parse.c 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,2042 @@
+/* A Bison parser, made by GNU Bison 2.5. */
+
@@ -602764,9 +581147,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.c linux-linaro-
+ return res;
+}
+
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.h linux-solidrun/tools/gator/daemon/libsensors/conf-parse.h
--- linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/conf-parse.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,84 @@
+/* A Bison parser, made by GNU Bison 2.5. */
+
@@ -602852,9 +581235,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.h linux-linaro-
+extern YYSTYPE sensors_yylval;
+
+
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.y linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.y
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.y linux-solidrun/tools/gator/daemon/libsensors/conf-parse.y
--- linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.y 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.y 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/conf-parse.y 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,347 @@
+%{
+/*
@@ -603203,9 +581586,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/conf-parse.y linux-linaro-
+ sensors_fatal_error(__func__, "Allocating a new expression");
+ return res;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/COPYING.LGPL linux-linaro-stable-mx6/tools/gator/daemon/libsensors/COPYING.LGPL
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/COPYING.LGPL linux-solidrun/tools/gator/daemon/libsensors/COPYING.LGPL
--- linux-3.10.36/tools/gator/daemon/libsensors/COPYING.LGPL 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/COPYING.LGPL 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/COPYING.LGPL 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
@@ -603709,9 +582092,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/COPYING.LGPL linux-linaro-
+ Ty Coon, President of Vice
+
+That's all there is to it!
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/data.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/data.c linux-solidrun/tools/gator/daemon/libsensors/data.c
--- linux-3.10.36/tools/gator/daemon/libsensors/data.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/data.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,278 @@
+/*
+ data.c - Part of libsensors, a Linux library for reading sensor data.
@@ -603991,9 +582374,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/data.c linux-linaro-stable
+ sensors_config_chips_subst = sensors_config_chips_count;
+ return res;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/data.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/data.h linux-solidrun/tools/gator/daemon/libsensors/data.h
--- linux-3.10.36/tools/gator/daemon/libsensors/data.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/data.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,184 @@
+/*
+ data.h - Part of libsensors, a Linux library for reading sensor data.
@@ -604179,9 +582562,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/data.h linux-linaro-stable
+int sensors_parse_bus_id(const char *name, sensors_bus_id *bus);
+
+#endif /* def LIB_SENSORS_DATA_H */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/error.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/error.c linux-solidrun/tools/gator/daemon/libsensors/error.c
--- linux-3.10.36/tools/gator/daemon/libsensors/error.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/error.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,92 @@
+/*
+ error.c - Part of libsensors, a Linux library for reading sensor data.
@@ -604275,9 +582658,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/error.c linux-linaro-stabl
+ fprintf(stderr, "Fatal error in `%s': %s\n", proc, err);
+ exit(1);
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/error.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/error.h linux-solidrun/tools/gator/daemon/libsensors/error.h
--- linux-3.10.36/tools/gator/daemon/libsensors/error.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/error.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,74 @@
+/*
+ error.h - Part of libsensors, a Linux library for reading sensor data.
@@ -604353,9 +582736,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/error.h linux-linaro-stabl
+#endif /* __cplusplus */
+
+#endif /* def LIB_SENSORS_ERROR_H */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/general.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/general.c linux-solidrun/tools/gator/daemon/libsensors/general.c
--- linux-3.10.36/tools/gator/daemon/libsensors/general.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/general.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,85 @@
+/*
+ general.c - Part of libsensors, a Linux library for reading sensor data.
@@ -604442,9 +582825,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/general.c linux-linaro-sta
+ memcpy(((char *)*my_list) + *num_el * el_size, els, el_size * nr_els);
+ *num_el += nr_els;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/general.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/general.h linux-solidrun/tools/gator/daemon/libsensors/general.h
--- linux-3.10.36/tools/gator/daemon/libsensors/general.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/general.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,39 @@
+/*
+ general.h - Part of libsensors, a Linux library for reading sensor data.
@@ -604485,9 +582868,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/general.h linux-linaro-sta
+#define ARRAY_SIZE(arr) (int)(sizeof(arr) / sizeof((arr)[0]))
+
+#endif /* LIB_SENSORS_GENERAL */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/init.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/init.c linux-solidrun/tools/gator/daemon/libsensors/init.c
--- linux-3.10.36/tools/gator/daemon/libsensors/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/init.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,341 @@
+/*
+ init.c - Part of libsensors, a Linux library for reading sensor data.
@@ -604830,9 +583213,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/init.c linux-linaro-stable
+ sensors_config_files = NULL;
+ sensors_config_files_count = sensors_config_files_max = 0;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/init.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/init.h linux-solidrun/tools/gator/daemon/libsensors/init.h
--- linux-3.10.36/tools/gator/daemon/libsensors/init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/init.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,28 @@
+/*
+ init.h - Part of libsensors, a Linux library for reading sensor data.
@@ -604862,9 +583245,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/init.h linux-linaro-stable
+void sensors_free_expr(sensors_expr *expr);
+
+#endif /* def LIB_SENSORS_INIT_H */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/scanner.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/scanner.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/scanner.h linux-solidrun/tools/gator/daemon/libsensors/scanner.h
--- linux-3.10.36/tools/gator/daemon/libsensors/scanner.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/scanner.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/scanner.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,32 @@
+/*
+ scanner.h - Part of libsensors, a Linux library for reading sensor data.
@@ -604898,9 +583281,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/scanner.h linux-linaro-sta
+
+#endif
+
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sensors.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sensors.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sensors.h linux-solidrun/tools/gator/daemon/libsensors/sensors.h
--- linux-3.10.36/tools/gator/daemon/libsensors/sensors.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sensors.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/sensors.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,311 @@
+/*
+ sensors.h - Part of libsensors, a Linux library for reading sensor data.
@@ -605213,9 +583596,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sensors.h linux-linaro-sta
+#endif /* __cplusplus */
+
+#endif /* def LIB_SENSORS_ERROR_H */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sysfs.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.c
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sysfs.c linux-solidrun/tools/gator/daemon/libsensors/sysfs.c
--- linux-3.10.36/tools/gator/daemon/libsensors/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/sysfs.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,926 @@
+/*
+ sysfs.c - Part of libsensors, a library for reading Linux sensor data
@@ -606143,9 +584526,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sysfs.c linux-linaro-stabl
+
+ return 0;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sysfs.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sysfs.h linux-solidrun/tools/gator/daemon/libsensors/sysfs.h
--- linux-3.10.36/tools/gator/daemon/libsensors/sysfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/sysfs.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,43 @@
+/*
+ sysfs.h - part of libsensors, a library for reading Linux sensor data
@@ -606190,14 +584573,14 @@ diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/sysfs.h linux-linaro-stabl
+ double value);
+
+#endif /* !SENSORS_LIB_SYSFS_H */
-diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/version.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/version.h
+diff -Nur linux-3.10.36/tools/gator/daemon/libsensors/version.h linux-solidrun/tools/gator/daemon/libsensors/version.h
--- linux-3.10.36/tools/gator/daemon/libsensors/version.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/version.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/libsensors/version.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1 @@
+#define LM_VERSION "3.3.2"
-diff -Nur linux-3.10.36/tools/gator/daemon/LocalCapture.cpp linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/LocalCapture.cpp linux-solidrun/tools/gator/daemon/LocalCapture.cpp
--- linux-3.10.36/tools/gator/daemon/LocalCapture.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/LocalCapture.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,129 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -606328,9 +584711,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/LocalCapture.cpp linux-linaro-stable-
+ ptr = ptr->next;
+ }
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/LocalCapture.h linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.h
+diff -Nur linux-3.10.36/tools/gator/daemon/LocalCapture.h linux-solidrun/tools/gator/daemon/LocalCapture.h
--- linux-3.10.36/tools/gator/daemon/LocalCapture.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/LocalCapture.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,26 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -606358,9 +584741,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/LocalCapture.h linux-linaro-stable-mx
+};
+
+#endif //__LOCAL_CAPTURE_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/Logging.cpp linux-linaro-stable-mx6/tools/gator/daemon/Logging.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Logging.cpp linux-solidrun/tools/gator/daemon/Logging.cpp
--- linux-3.10.36/tools/gator/daemon/Logging.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Logging.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Logging.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,78 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -606440,9 +584823,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Logging.cpp linux-linaro-stable-mx6/t
+ MUTEX_UNLOCK();
+ }
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Logging.h linux-linaro-stable-mx6/tools/gator/daemon/Logging.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Logging.h linux-solidrun/tools/gator/daemon/Logging.h
--- linux-3.10.36/tools/gator/daemon/Logging.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Logging.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Logging.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -606491,9 +584874,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Logging.h linux-linaro-stable-mx6/too
+extern void handleException() __attribute__ ((noreturn));
+
+#endif //__LOGGING_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/main.cpp linux-linaro-stable-mx6/tools/gator/daemon/main.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/main.cpp linux-solidrun/tools/gator/daemon/main.cpp
--- linux-3.10.36/tools/gator/daemon/main.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/main.cpp 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/main.cpp 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,485 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -606980,9 +585363,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/main.cpp linux-linaro-stable-mx6/tool
+ cleanUp();
+ return 0;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Makefile linux-linaro-stable-mx6/tools/gator/daemon/Makefile
+diff -Nur linux-3.10.36/tools/gator/daemon/Makefile linux-solidrun/tools/gator/daemon/Makefile
--- linux-3.10.36/tools/gator/daemon/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Makefile 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Makefile 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,25 @@
+#
+# Makefile for ARM Streamline - Gator Daemon
@@ -607009,9 +585392,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Makefile linux-linaro-stable-mx6/tool
+endif
+
+include common.mk
-diff -Nur linux-3.10.36/tools/gator/daemon/Makefile_aarch64 linux-linaro-stable-mx6/tools/gator/daemon/Makefile_aarch64
+diff -Nur linux-3.10.36/tools/gator/daemon/Makefile_aarch64 linux-solidrun/tools/gator/daemon/Makefile_aarch64
--- linux-3.10.36/tools/gator/daemon/Makefile_aarch64 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Makefile_aarch64 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Makefile_aarch64 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,15 @@
+#
+# Makefile for ARM Streamline - Gator Daemon
@@ -607028,9 +585411,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Makefile_aarch64 linux-linaro-stable-
+GCC = $(CROSS_COMPILE)gcc
+
+include common.mk
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/config.h linux-linaro-stable-mx6/tools/gator/daemon/mxml/config.h
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/config.h linux-solidrun/tools/gator/daemon/mxml/config.h
--- linux-3.10.36/tools/gator/daemon/mxml/config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/config.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/config.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,96 @@
+/* config.h. Generated from config.h.in by configure. */
+/*
@@ -607128,9 +585511,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/config.h linux-linaro-stable-mx6
+/*
+ * End of "$Id: config.h.in 408 2010-09-19 05:26:46Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/COPYING linux-linaro-stable-mx6/tools/gator/daemon/mxml/COPYING
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/COPYING linux-solidrun/tools/gator/daemon/mxml/COPYING
--- linux-3.10.36/tools/gator/daemon/mxml/COPYING 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/COPYING 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/COPYING 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,507 @@
+ Mini-XML License
+ September 18, 2010
@@ -607639,9 +586022,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/COPYING linux-linaro-stable-mx6/
+ Ty Coon, President of Vice
+
+That's all there is to it!
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-attr.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-attr.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-attr.c linux-solidrun/tools/gator/daemon/mxml/mxml-attr.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-attr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-attr.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-attr.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,319 @@
+/*
+ * "$Id: mxml-attr.c 408 2010-09-19 05:26:46Z mike $"
@@ -607962,9 +586345,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-attr.c linux-linaro-stable-
+/*
+ * End of "$Id: mxml-attr.c 408 2010-09-19 05:26:46Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-entity.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-entity.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-entity.c linux-solidrun/tools/gator/daemon/mxml/mxml-entity.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-entity.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-entity.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-entity.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,460 @@
+/*
+ * "$Id: mxml-entity.c 408 2010-09-19 05:26:46Z mike $"
@@ -608426,9 +586809,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-entity.c linux-linaro-stabl
+/*
+ * End of "$Id: mxml-entity.c 408 2010-09-19 05:26:46Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-file.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-file.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-file.c linux-solidrun/tools/gator/daemon/mxml/mxml-file.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-file.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-file.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,3082 @@
+/*
+ * "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $"
@@ -611512,9 +589895,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-file.c linux-linaro-stable-
+/*
+ * End of "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-get.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-get.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-get.c linux-solidrun/tools/gator/daemon/mxml/mxml-get.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-get.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-get.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-get.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,471 @@
+/*
+ * "$Id: mxml-get.c 427 2011-01-03 02:03:29Z mike $"
@@ -611987,9 +590370,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-get.c linux-linaro-stable-m
+/*
+ * End of "$Id: mxml-get.c 427 2011-01-03 02:03:29Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml.h linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml.h
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml.h linux-solidrun/tools/gator/daemon/mxml/mxml.h
--- linux-3.10.36/tools/gator/daemon/mxml/mxml.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,329 @@
+/*
+ * "$Id: mxml.h 427 2011-01-03 02:03:29Z mike $"
@@ -612320,9 +590703,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml.h linux-linaro-stable-mx6/t
+/*
+ * End of "$Id: mxml.h 427 2011-01-03 02:03:29Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-index.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-index.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-index.c linux-solidrun/tools/gator/daemon/mxml/mxml-index.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-index.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-index.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-index.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,662 @@
+/*
+ * "$Id: mxml-index.c 426 2011-01-01 23:42:17Z mike $"
@@ -612986,9 +591369,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-index.c linux-linaro-stable
+/*
+ * End of "$Id: mxml-index.c 426 2011-01-01 23:42:17Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-node.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-node.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-node.c linux-solidrun/tools/gator/daemon/mxml/mxml-node.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-node.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-node.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-node.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,807 @@
+/*
+ * "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $"
@@ -613797,9 +592180,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-node.c linux-linaro-stable-
+/*
+ * End of "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-private.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-private.c linux-solidrun/tools/gator/daemon/mxml/mxml-private.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-private.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-private.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,331 @@
+/*
+ * "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $"
@@ -614132,9 +592515,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-private.c linux-linaro-stab
+/*
+ * End of "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-private.h linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.h
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-private.h linux-solidrun/tools/gator/daemon/mxml/mxml-private.h
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-private.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.h 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-private.h 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,50 @@
+/*
+ * "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $"
@@ -614186,9 +592569,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-private.h linux-linaro-stab
+/*
+ * End of "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-search.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-search.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-search.c linux-solidrun/tools/gator/daemon/mxml/mxml-search.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-search.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-search.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-search.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,287 @@
+/*
+ * "$Id: mxml-search.c 427 2011-01-03 02:03:29Z mike $"
@@ -614477,9 +592860,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-search.c linux-linaro-stabl
+/*
+ * End of "$Id: mxml-search.c 427 2011-01-03 02:03:29Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-set.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-set.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-set.c linux-solidrun/tools/gator/daemon/mxml/mxml-set.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-set.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-set.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-set.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,349 @@
+/*
+ * "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $"
@@ -614830,9 +593213,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-set.c linux-linaro-stable-m
+/*
+ * End of "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-string.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-string.c
+diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-string.c linux-solidrun/tools/gator/daemon/mxml/mxml-string.c
--- linux-3.10.36/tools/gator/daemon/mxml/mxml-string.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-string.c 2014-04-21 13:50:43.650733013 +0200
++++ linux-solidrun/tools/gator/daemon/mxml/mxml-string.c 2014-04-24 07:58:45.260282804 +0200
@@ -0,0 +1,476 @@
+/*
+ * "$Id: mxml-string.c 424 2010-12-25 16:21:50Z mike $"
@@ -615310,9 +593693,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/mxml/mxml-string.c linux-linaro-stabl
+/*
+ * End of "$Id: mxml-string.c 424 2010-12-25 16:21:50Z mike $".
+ */
-diff -Nur linux-3.10.36/tools/gator/daemon/OlySocket.cpp linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/OlySocket.cpp linux-solidrun/tools/gator/daemon/OlySocket.cpp
--- linux-3.10.36/tools/gator/daemon/OlySocket.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/OlySocket.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,268 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -615582,9 +593965,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/OlySocket.cpp linux-linaro-stable-mx6
+
+ return bytes_received;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/OlySocket.h linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.h
+diff -Nur linux-3.10.36/tools/gator/daemon/OlySocket.h linux-solidrun/tools/gator/daemon/OlySocket.h
--- linux-3.10.36/tools/gator/daemon/OlySocket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/OlySocket.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,36 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -615622,9 +594005,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/OlySocket.h linux-linaro-stable-mx6/t
+};
+
+#endif //__OLY_SOCKET_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/OlyUtility.cpp linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/OlyUtility.cpp linux-solidrun/tools/gator/daemon/OlyUtility.cpp
--- linux-3.10.36/tools/gator/daemon/OlyUtility.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/OlyUtility.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,227 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -615853,9 +594236,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/OlyUtility.cpp linux-linaro-stable-mx
+
+ return (path);
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/OlyUtility.h linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.h
+diff -Nur linux-3.10.36/tools/gator/daemon/OlyUtility.h linux-solidrun/tools/gator/daemon/OlyUtility.h
--- linux-3.10.36/tools/gator/daemon/OlyUtility.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/OlyUtility.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,42 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -615899,9 +594282,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/OlyUtility.h linux-linaro-stable-mx6/
+extern OlyUtility* util;
+
+#endif // OLY_UTILITY_H
-diff -Nur linux-3.10.36/tools/gator/daemon/Sender.cpp linux-linaro-stable-mx6/tools/gator/daemon/Sender.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/Sender.cpp linux-solidrun/tools/gator/daemon/Sender.cpp
--- linux-3.10.36/tools/gator/daemon/Sender.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Sender.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Sender.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,135 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -616038,9 +594421,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Sender.cpp linux-linaro-stable-mx6/to
+
+ pthread_mutex_unlock(&mSendMutex);
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/Sender.h linux-linaro-stable-mx6/tools/gator/daemon/Sender.h
+diff -Nur linux-3.10.36/tools/gator/daemon/Sender.h linux-solidrun/tools/gator/daemon/Sender.h
--- linux-3.10.36/tools/gator/daemon/Sender.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/Sender.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/Sender.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,42 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -616084,9 +594467,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/Sender.h linux-linaro-stable-mx6/tool
+};
+
+#endif //__SENDER_H__
-diff -Nur linux-3.10.36/tools/gator/daemon/SessionData.cpp linux-linaro-stable-mx6/tools/gator/daemon/SessionData.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/SessionData.cpp linux-solidrun/tools/gator/daemon/SessionData.cpp
--- linux-3.10.36/tools/gator/daemon/SessionData.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionData.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/SessionData.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,150 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -616238,9 +594621,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/SessionData.cpp linux-linaro-stable-m
+ key += 2;
+ return ret;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/SessionData.h linux-linaro-stable-mx6/tools/gator/daemon/SessionData.h
+diff -Nur linux-3.10.36/tools/gator/daemon/SessionData.h linux-solidrun/tools/gator/daemon/SessionData.h
--- linux-3.10.36/tools/gator/daemon/SessionData.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionData.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/SessionData.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,75 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -616317,9 +594700,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/SessionData.h linux-linaro-stable-mx6
+int getEventKey();
+
+#endif // SESSION_DATA_H
-diff -Nur linux-3.10.36/tools/gator/daemon/SessionXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/SessionXML.cpp linux-solidrun/tools/gator/daemon/SessionXML.cpp
--- linux-3.10.36/tools/gator/daemon/SessionXML.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/SessionXML.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,109 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -616430,9 +594813,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/SessionXML.cpp linux-linaro-stable-mx
+ image->next = parameters.images;
+ parameters.images = image;
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/SessionXML.h linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.h
+diff -Nur linux-3.10.36/tools/gator/daemon/SessionXML.h linux-solidrun/tools/gator/daemon/SessionXML.h
--- linux-3.10.36/tools/gator/daemon/SessionXML.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/SessionXML.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,42 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -616476,9 +594859,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/SessionXML.h linux-linaro-stable-mx6/
+};
+
+#endif // SESSION_XML_H
-diff -Nur linux-3.10.36/tools/gator/daemon/StreamlineSetup.cpp linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.cpp
+diff -Nur linux-3.10.36/tools/gator/daemon/StreamlineSetup.cpp linux-solidrun/tools/gator/daemon/StreamlineSetup.cpp
--- linux-3.10.36/tools/gator/daemon/StreamlineSetup.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.cpp 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/StreamlineSetup.cpp 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,272 @@
+/**
+ * Copyright (C) ARM Limited 2011-2013. All rights reserved.
@@ -616752,9 +595135,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/StreamlineSetup.cpp linux-linaro-stab
+ handleException();
+ }
+}
-diff -Nur linux-3.10.36/tools/gator/daemon/StreamlineSetup.h linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.h
+diff -Nur linux-3.10.36/tools/gator/daemon/StreamlineSetup.h linux-solidrun/tools/gator/daemon/StreamlineSetup.h
--- linux-3.10.36/tools/gator/daemon/StreamlineSetup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.h 2014-04-21 13:50:43.646732996 +0200
++++ linux-solidrun/tools/gator/daemon/StreamlineSetup.h 2014-04-24 07:58:45.256282789 +0200
@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) ARM Limited 2010-2013. All rights reserved.
@@ -616803,9 +595186,9 @@ diff -Nur linux-3.10.36/tools/gator/daemon/StreamlineSetup.h linux-linaro-stable
+};
+
+#endif //__STREAMLINE_SETUP_H__
-diff -Nur linux-3.10.36/tools/lib/lk/Makefile linux-linaro-stable-mx6/tools/lib/lk/Makefile
+diff -Nur linux-3.10.36/tools/lib/lk/Makefile linux-solidrun/tools/lib/lk/Makefile
--- linux-3.10.36/tools/lib/lk/Makefile 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/tools/lib/lk/Makefile 2014-04-21 13:50:43.654733030 +0200
++++ linux-solidrun/tools/lib/lk/Makefile 2014-04-24 07:58:45.260282804 +0200
@@ -1,5 +1,8 @@
include ../../scripts/Makefile.include
@@ -616815,9 +595198,9 @@ diff -Nur linux-3.10.36/tools/lib/lk/Makefile linux-linaro-stable-mx6/tools/lib/
# guard against environment variables
LIB_H=
LIB_OBJS=
-diff -Nur linux-3.10.36/virt/kvm/coalesced_mmio.c linux-linaro-stable-mx6/virt/kvm/coalesced_mmio.c
+diff -Nur linux-3.10.36/virt/kvm/coalesced_mmio.c linux-solidrun/virt/kvm/coalesced_mmio.c
--- linux-3.10.36/virt/kvm/coalesced_mmio.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/virt/kvm/coalesced_mmio.c 2014-04-21 13:50:43.698733215 +0200
++++ linux-solidrun/virt/kvm/coalesced_mmio.c 2014-04-24 07:58:46.908288608 +0200
@@ -154,13 +154,17 @@
list_add_tail(&dev->list, &kvm->coalesced_zones);
mutex_unlock(&kvm->slots_lock);
@@ -616838,9 +595221,9 @@ diff -Nur linux-3.10.36/virt/kvm/coalesced_mmio.c linux-linaro-stable-mx6/virt/k
}
int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
-diff -Nur linux-3.10.36/virt/kvm/kvm_main.c linux-linaro-stable-mx6/virt/kvm/kvm_main.c
+diff -Nur linux-3.10.36/virt/kvm/kvm_main.c linux-solidrun/virt/kvm/kvm_main.c
--- linux-3.10.36/virt/kvm/kvm_main.c 2014-04-03 21:01:22.000000000 +0200
-+++ linux-linaro-stable-mx6/virt/kvm/kvm_main.c 2014-04-21 13:50:43.702733232 +0200
++++ linux-solidrun/virt/kvm/kvm_main.c 2014-04-24 07:58:46.908288608 +0200
@@ -105,12 +105,12 @@
if (pfn_valid(pfn)) {
int reserved;
diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i2ultra
index 21f9d6ded..442536aab 100644
--- a/target/arm/kernel/cubox-i2ultra
+++ b/target/arm/kernel/cubox-i2ultra
@@ -6,7 +6,6 @@ CONFIG_ARCH_MXC=y
CONFIG_ARCH_MX6=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
-CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_LOCAL_TIMERS=y
CONFIG_MXC_DEBUG_BOARD=y
CONFIG_KUSER_HELPERS=y
@@ -19,3 +18,9 @@ CONFIG_OF=y
CONFIG_PCI_IMX6=y
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=y
+CONFIG_PHYLIB=y
+CONFIG_AT803X_PHY=y
+CONFIG_ATAGS=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/cubox-i4pro b/target/arm/kernel/cubox-i4pro
index 21f9d6ded..442536aab 100644
--- a/target/arm/kernel/cubox-i4pro
+++ b/target/arm/kernel/cubox-i4pro
@@ -6,7 +6,6 @@ CONFIG_ARCH_MXC=y
CONFIG_ARCH_MX6=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
-CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_LOCAL_TIMERS=y
CONFIG_MXC_DEBUG_BOARD=y
CONFIG_KUSER_HELPERS=y
@@ -19,3 +18,9 @@ CONFIG_OF=y
CONFIG_PCI_IMX6=y
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=y
+CONFIG_PHYLIB=y
+CONFIG_AT803X_PHY=y
+CONFIG_ATAGS=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/config/Config.in b/target/config/Config.in
index 09fff28da..71b2f98fc 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -653,7 +653,7 @@ config ADK_TARGET_CFLAGS
config ADK_TARGET_CMDLINE
string
default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
- default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I
+ default "console=ttymxc0,115200 console=tty0 video=mxcfb0:dev=hdmi consoleblank=0" if ADK_TARGET_SYSTEM_CUBOX_I
default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 3a8e18b25..a2d90781f 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -49,6 +49,12 @@ config ADK_KERNEL_FB_SM501
select ADK_KERNEL_MFD_SM501
boolean
+config ADK_KERNEL_FB_MXC_SYNC_PANEL
+ boolean
+
+config ADK_KERNEL_FB_MXC_HDMI
+ boolean
+
config ADK_KERNEL_DRM
boolean
@@ -58,6 +64,9 @@ config ADK_KERNEL_DRM_I915
config ADK_KERNEL_DRM_I915_KMS
boolean
+config ADK_KERNEL_DRM_VIVANTE
+ boolean
+
config ADK_KERNEL_AGP
boolean
@@ -93,6 +102,21 @@ config ADK_KERNEL_FB_VESA
help
Framebuffer support for VirtualBox Emulator.
+config ADK_KERNEL_FB_MXS
+ prompt "................................ Framebuffer support for Cubox-i"
+ tristate
+ select ADK_KERNEL_FB
+ select ADK_KERNEL_FRAMEBUFFER_CONSOLE
+ select ADK_KERNEL_FB_MXC_SYNC_PANEL
+ select ADK_KERNEL_FB_MXC_HDMI
+ select ADK_KERNEL_DRM
+ select ADK_KERNEL_DRM_VIVANTE
+ default y if ADK_TARGET_SYSTEM_CUBOX_I
+ default n
+ depends on ADK_TARGET_SYSTEM_CUBOX_I
+ help
+ Framebuffer support for Cubox-i.
+
config ADK_KERNEL_FB_PXA
prompt "................................ Framebuffer support for Sharp Zaurus"
tristate
diff --git a/target/linux/config/Config.in.regulator b/target/linux/config/Config.in.regulator
index eb4de388a..86726afa5 100644
--- a/target/linux/config/Config.in.regulator
+++ b/target/linux/config/Config.in.regulator
@@ -60,10 +60,5 @@ config ADK_TARGET_CUBOX_REGULATOR
select ADK_KERNEL_REGULATOR
select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
select ADK_KERNEL_REGULATOR_ANATOP
- select ADK_KERNEL_REGULATOR_MC13XXX_CORE
- select ADK_KERNEL_REGULATOR_DA9052
- select ADK_KERNEL_REGULATOR_MC13783
- select ADK_KERNEL_REGULATOR_MC13892
- select ADK_KERNEL_REGULATOR_PFUZE100
default y if ADK_TARGET_SYSTEM_CUBOX_I
default n
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 00:56:34 +0000