Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757667Ab2FUGpr (ORCPT ); Thu, 21 Jun 2012 02:45:47 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:58471 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754509Ab2FUGpq (ORCPT ); Thu, 21 Jun 2012 02:45:46 -0400 From: Michal Simek To: linux-watchdog@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, Wim Van Sebroeck , Grant Likely , Rob Herring , linux-kernel@vger.kernel.org, Michal Simek Subject: [PATCH] watchdog: xilinx: Read clock frequency directly from DT node Date: Thu, 21 Jun 2012 08:45:40 +0200 Message-Id: <1340261140-10166-1-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 948 Lines: 29 Do not use clock-frequency property from parent node. Use it from watchdog node. Signed-off-by: Michal Simek --- drivers/watchdog/of_xilinx_wdt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index 55d2f66..294fb4e 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) { -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/