diff options
| author | Ke Qinghua <qinghua.ke@freescale.com> | 2014-04-22 15:51:35 +0800 |
|---|---|---|
| committer | Ke Qinghua <qinghua.ke@freescale.com> | 2014-04-22 15:51:35 +0800 |
| commit | 3ea84b6f1477cd27c732dbc76d0295a8130ce377 (patch) | |
| tree | 89e1852cffec5956f73615187460bd0d47270d5b /arch | |
| parent | f058ed6dfe1ab573c1106ee043bc42645653b3eb (diff) | |
ENGR00305254-10 imx6sx sarbesd board bring up
Add kernel 3.10.31 merge missing part.
Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6sl-evk-common.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v7_android_defconfig | 9 |
2 files changed, 16 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/imx6sl-evk-common.dtsi b/arch/arm/boot/dts/imx6sl-evk-common.dtsi index 38be901cbac2..8683bc2fdaa6 100644 --- a/arch/arm/boot/dts/imx6sl-evk-common.dtsi +++ b/arch/arm/boot/dts/imx6sl-evk-common.dtsi @@ -378,14 +378,14 @@ 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 */ + 0x00000073 /* KEY_VOLUMEUP */ + 0x00010072 /* KEY_VOLUMEDOWN */ + 0x0002006a /* KEY_RIGHT */ + 0x01000069 /* KEY_LEFT */ + 0x01010067 /* KEY_UP */ + 0x01020074 /* KEY_POWER */ + 0x0200009e /* KEY_BACK */ + 0x0201006c /* KEY_DOWN */ >; status = "okay"; }; diff --git a/arch/arm/configs/imx_v7_android_defconfig b/arch/arm/configs/imx_v7_android_defconfig index 5636e733a108..c69aa1e2c37c 100644 --- a/arch/arm/configs/imx_v7_android_defconfig +++ b/arch/arm/configs/imx_v7_android_defconfig @@ -322,6 +322,7 @@ CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y +CONFIG_SOC_IMX6SX=y CONFIG_SOC_VF610=y CONFIG_IMX_HAVE_PLATFORM_FEC=y CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y @@ -334,6 +335,8 @@ CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI=y CONFIG_IMX_HAVE_PLATFORM_MXC_NAND=y CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX=y CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y +CONFIG_MXC_REBOOT_ANDROID_CMD=y +CONFIG_MXC_REBOOT_MFGMODE=y # CONFIG_ARCH_OMAP2PLUS is not set # CONFIG_ARCH_SOCFPGA is not set # CONFIG_PLAT_SPEAR is not set @@ -1147,6 +1150,8 @@ CONFIG_MTD_NAND_GPMI_NAND=y # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ALAUDA is not set CONFIG_MTD_NAND_MXC=y +CONFIG_MTD_SPI_NOR_BASE=y +CONFIG_SPI_FSL_QUADSPI=y # CONFIG_MTD_ONENAND is not set # @@ -1852,6 +1857,7 @@ CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MAX732X=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_DA9052 is not set @@ -3204,7 +3210,8 @@ CONFIG_VF_PIT_TIMER=y # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set -# CONFIG_IIO is not set +CONFIG_IIO=y +CONFIG_VF610_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_IRQCHIP=y |