From: Michal Simek Date: Thu, 21 Jun 2012 06:45:40 +0000 (+0200) Subject: watchdog: xilinx: Read clock frequency directly from DT node X-Git-Tag: v3.6-rc1~121^2~8 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=90fe6c608f8d46e5bb3f31c2d5e1c90475253f79;p=~emulex%2Finfiniband.git watchdog: xilinx: Read clock frequency directly from DT node Do not use clock-frequency property from parent node. Use it from watchdog node. Signed-off-by: Michal Simek Acked-By: Alejandro Cabrera Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index 55d2f66dbea..294fb4e0052 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c @@ -297,7 +297,7 @@ static int __devinit xwdt_probe(struct platform_device *pdev) no_timeout = 0; - pfreq = (u32 *)of_get_property(pdev->dev.of_node->parent, + pfreq = (u32 *)of_get_property(pdev->dev.of_node, "clock-frequency", NULL); if (pfreq == NULL) {