summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRobin Gong <b38343@freescale.com>2014-01-07 17:38:37 +0800
committerRobin Gong <b38343@freescale.com>2014-01-08 11:38:41 +0800
commit6da29fa3dd16dbc0cbffcbd10b69b865858c820f (patch)
tree3b42b42eb3d03e616991d825df7dd1abe494ac89 /arch
parent18f364f8718348205426e6add68431e888dbac28 (diff)
ENGR00294026-2 ARM: dts: imx: add viim device node in dts
Enable viim device node in dts and enable in defconfig Signed-off-by: Robin Gong <b38343@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi6
-rw-r--r--arch/arm/boot/dts/imx6sl.dtsi6
-rw-r--r--arch/arm/configs/imx_v7_defconfig1
3 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index ee098286a728..8ccdeb10a581 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -68,6 +68,12 @@
compatible = "fsl,imx6-dummy-pureg"; /* only used in ldo-bypass */
};
+ mxs_viim {
+ compatible = "fsl,mxs_viim";
+ reg = <0x02098000 0x1000>, /* GPT base */
+ <0x021bc000 0x1000>; /* OCOTP base */
+ };
+
soc {
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 13927b4ceaea..af45d0a36810 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -89,6 +89,12 @@
compatible = "fsl,imx6-dummy-pureg"; /* only used in ldo-bypass */
};
+ mxs_viim {
+ compatible = "fsl,mxs_viim";
+ reg = <0x02098000 0x1000>, /* GPT base */
+ <0x021bc000 0x1000>; /* OCOTP base */
+ };
+
soc {
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index b308a0c27e39..1a6fdc3ccef9 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -146,6 +146,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_FSL_LPUART=y
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
CONFIG_FSL_OTP=y
+CONFIG_MXS_VIIM=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_HELPER_AUTO is not set