diff options
| author | Liu Xiaowen <b37945@freescale.com> | 2014-02-20 16:51:56 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-21 22:35:41 -0500 |
| commit | 66ebf67d27c2b0891e1869af6c105fdef46282eb (patch) | |
| tree | be7741a8969053014a50f67138794ede62e36859 /arch | |
| parent | a8bbe32a06a14768888e6d0e0683889b18afbd87 (diff) | |
ENGR00300035 add ion function for Linux 3.10 kernel upgrade.
add ion function for Linux 3.10 kernel upgrade.
Signed-off-by: Liu Xiaowen <b37945@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v7_android_defconfig | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 32c2e67cca63..22537d530049 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -1036,6 +1036,12 @@ resets = <&src 2>; bypass_reset = <0>; }; + + imx_ion { + compatible = "fsl,mxc-ion"; + fsl,heap-id = <0>; + fsl,heap-cacheable = <1>; + }; }; }; diff --git a/arch/arm/configs/imx_v7_android_defconfig b/arch/arm/configs/imx_v7_android_defconfig index e762b5c99b1a..d719fc727300 100644 --- a/arch/arm/configs/imx_v7_android_defconfig +++ b/arch/arm/configs/imx_v7_android_defconfig @@ -3116,6 +3116,7 @@ CONFIG_SYNC=y CONFIG_SW_SYNC=y CONFIG_SW_SYNC_USER=y CONFIG_ION=y +CONFIG_ION_MXC=y # CONFIG_ION_TEST is not set # CONFIG_USB_WPAN_HCD is not set # CONFIG_WIMAX_GDM72XX is not set |