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>

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index ee098286a728a8a78f5039fbfc31e59313751ac4..8ccdeb10a581889cab17780ec00f7bbab0043677 100644 (file)
--- 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 13927b4ceaea7ba4374e3f6cafd57d0753a48089..af45d0a3681043d28ba4c6c3cd1effdc262ac86b 100644 (file)
--- 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 b308a0c27e3943d87ef8880da05da3061b95e5e3..1a6fdc3ccef9545a55461f9c0b2523b9ef26df32 100644 (file)
--- 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