aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-08-18 04:12:50 -0400
committerWim Van Sebroeck <wim@iguana.be>2014-10-20 14:45:27 -0400
commit0461aea7ec379b00f4acb5d612bfb2f7a497eb92 (patch)
tree10ba2ff3fd0b2ffa4423f99483f4050f59104630
parent1f897a81915222310374cac1a85c0c7104f16249 (diff)
watchdog: imx2_wdt: Convert to use regmap framework's endianness method.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt3
-rw-r--r--drivers/watchdog/imx2_wdt.c6
2 files changed, 2 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
index e52ba2da868c..8dab6fd024aa 100644
--- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
@@ -7,7 +7,8 @@ Required properties:
7 7
8Optional property: 8Optional property:
9- big-endian: If present the watchdog device's registers are implemented 9- big-endian: If present the watchdog device's registers are implemented
10 in big endian mode, otherwise in little mode. 10 in big endian mode, otherwise in native mode(same with CPU), for more
11 detail please see: Documentation/devicetree/bindings/regmap/regmap.txt.
11 12
12Examples: 13Examples:
13 14
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 68c3d379ffa8..f37bb05e7ec0 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -191,12 +191,10 @@ static struct regmap_config imx2_wdt_regmap_config = {
191 191
192static int __init imx2_wdt_probe(struct platform_device *pdev) 192static int __init imx2_wdt_probe(struct platform_device *pdev)
193{ 193{
194 struct device_node *np = pdev->dev.of_node;
195 struct imx2_wdt_device *wdev; 194 struct imx2_wdt_device *wdev;
196 struct watchdog_device *wdog; 195 struct watchdog_device *wdog;
197 struct resource *res; 196 struct resource *res;
198 void __iomem *base; 197 void __iomem *base;
199 bool big_endian;
200 int ret; 198 int ret;
201 u32 val; 199 u32 val;
202 200
@@ -204,10 +202,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
204 if (!wdev) 202 if (!wdev)
205 return -ENOMEM; 203 return -ENOMEM;
206 204
207 big_endian = of_property_read_bool(np, "big-endian");
208 if (big_endian)
209 imx2_wdt_regmap_config.val_format_endian = REGMAP_ENDIAN_BIG;
210
211 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 205 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
212 base = devm_ioremap_resource(&pdev->dev, res); 206 base = devm_ioremap_resource(&pdev->dev, res);
213 if (IS_ERR(base)) 207 if (IS_ERR(base))