From c749d79c70ab4133baa33092513be5ef8ad0abf6 Mon Sep 17 00:00:00 2001
From: Xiubo Li
Date: Tue, 3 Jun 2014 14:38:05 +0800
Subject: watchdog: imx2_wdt: adds big endianness support.
This watchdog driver will be working on IMX2+, Vybrid, LS1, LS2+
platforms, and will be in different endianness mode in those SoCs:
SoCs WDT endian mode
------------------------------------
IMX2+ LE
Vybird LE
LS1 BE
LS2 LE
Signed-off-by: Xiubo Li
Reviewed-by: Guenter Roeck
Signed-off-by: Wim Van Sebroeck
---
This patch is pulled back from upstream:
commit f728f4bfc495a588abda4661c09595112677be25
Change-Id: I679a13328e7ee02fbc23dad99a3e672c6186fc4c
Reviewed-on: http://git.am.freescale.net:8181/19717
Tested-by: Review Code-CDREVIEW
Reviewed-by: Zhengxiong Jin
diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
index 2144af1..e52ba2d 100644
--- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
@@ -5,10 +5,15 @@ Required properties:
- reg : Should contain WDT registers location and length
- interrupts : Should contain WDT interrupt
+Optional property:
+- big-endian: If present the watchdog device's registers are implemented
+ in big endian mode, otherwise in little mode.
+
Examples:
wdt@73f98000 {
compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
reg = <0x73f98000 0x4000>;
interrupts = <58>;
+ big-endian;
};
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index f5d33d9..73b58bb 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -263,10 +264,14 @@ static struct regmap_config imx2_wdt_regmap_config = {
static int __init imx2_wdt_probe(struct platform_device *pdev)
{
+ struct device_node *np = pdev->dev.of_node;
struct resource *res;
void __iomem *base;
int ret;
+ if (of_property_read_bool(np, "big-endian"))
+ imx2_wdt_regmap_config.val_format_endian = REGMAP_ENDIAN_BIG;
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
--
cgit v0.10.2