diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 2793ee9..04efb1a 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -48,7 +48,7 @@
 
 config WATCHDOG_IMX
 	bool "i.MX watchdog"
-	depends on ARCH_IMX
+	depends on ARCH_IMX || ARCH_LAYERSCAPE
 	help
 	  Add support for watchdog found on Freescale i.MX SoCs.
 
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 69189ba..6c8d36c 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -7,6 +7,7 @@
 obj-$(CONFIG_WATCHDOG_DW) += dw_wdt.o
 obj-$(CONFIG_WATCHDOG_JZ4740) += jz4740.o
 obj-$(CONFIG_WATCHDOG_IMX_RESET_SOURCE) += imxwd.o
+obj-$(CONFIG_WATCHDOG_IMX) += imxwd.o
 obj-$(CONFIG_WATCHDOG_ORION) += orion_wdt.o
 obj-$(CONFIG_ARCH_BCM283X) += bcm2835_wdt.o
 obj-$(CONFIG_RAVE_SP_WATCHDOG) += rave-sp-wdt.o
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index e2c3b9f..77a3bd7 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -38,6 +38,7 @@
 	const struct imx_wd_ops *ops;
 	struct restart_handler restart;
 	bool ext_reset;
+	bool bigendian;
 };
 
 #define to_imx_wd(h) container_of(h, struct imx_wd, wd)
@@ -68,12 +69,18 @@
 
 static void imxwd_write(struct imx_wd *priv, int reg, uint16_t val)
 {
-	writew(val, priv->base + reg);
+	if (priv->bigendian)
+		out_be16(priv->base + reg, val);
+	else
+		writew(val, priv->base + reg);
 }
 
 static uint16_t imxwd_read(struct imx_wd *priv, int reg)
 {
-	return readw(priv->base + reg);
+	if (priv->bigendian)
+		return in_be16(priv->base + reg);
+	else
+		return readw(priv->base + reg);
 }
 
 static int imx1_watchdog_set_timeout(struct imx_wd *priv, unsigned timeout)
@@ -230,6 +237,7 @@
 	priv->wd.timeout_max = priv->ops->timeout_max;
 	priv->wd.hwdev = dev;
 	priv->dev = dev;
+	priv->bigendian = of_device_is_big_endian(dev->device_node);
 
 	priv->ext_reset = of_property_read_bool(dev->device_node,
 						"fsl,ext-reset-output");