From patchwork Wed Aug 2 09:34:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 796578 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jp+Lcrge"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xMp2l1N47z9t0F for ; Wed, 2 Aug 2017 19:35:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbdHBJfQ (ORCPT ); Wed, 2 Aug 2017 05:35:16 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33814 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752801AbdHBJfO (ORCPT ); Wed, 2 Aug 2017 05:35:14 -0400 Received: by mail-wm0-f66.google.com with SMTP id x64so6440055wmg.1; Wed, 02 Aug 2017 02:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aRyFCoe117iGY9GNtxAzGRAcuRM5BCQSJyw4QdiD1ms=; b=jp+LcrgercB3195ZS9x6yb7nh426BHgbNyiI/uFVdmTaIoT/+d48UwS4c+vppmpaRc b1AOWTOOkEM1r6EaoVkysAHIeUZxstK/Y4fu44Gttu9lfbwBnBiaPQ1YA75wyw7VZnI1 xjXpNQPSFxdw1VDkaNkZ8fvogfF6Fwykvx1nyKB89LAREtRQcblLoVYGhDKy9kRNlwhZ U8rnJq/zjAxt4ogc+4dCfOI0AsumZi1PGWM1ExJ6enqcgdYrKYRQaH3U7Hzd7BL+k0zn zsESnZ92X0G4Fd8kTAMEWVgQowN57uPJSlKhrMCP6JYB0qAoJmhk7VqOPCly71cORlOC r8fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aRyFCoe117iGY9GNtxAzGRAcuRM5BCQSJyw4QdiD1ms=; b=pR/8N1eJ1UUj7cM36cUYZAFVv+a/Rwq8whppNCTNk0st6E0m/DuFxy9fJ5UWy0uUUF aHXIktHuRMLYxufTKkDrjQCmZBMRNpLd/H976AB0i/UX+tsr/jQO16K0GUJETn//Xdr4 K4UtMceCNFpzYmL+orSYKbeOUREX9x9/r6obdY3qc6PVq2KlJJEwMFL6UmYjGiCxnLp3 OE8jL2qSvQThLeLM8Yjivr7Anbc8dUxHqdE4FPXR6UQmtdBJtLQDHhQPWigdnlKADjVs 2jmcbTr9cwUHZwt5CSWGtw4qeLCesFwFjR6QlZ5uvSEnd061FqxxX9wS38lPre2VAsqh jy4Q== X-Gm-Message-State: AIVw111LrnNBagxAL2pdwesWL2PiYd71n0cj0SScV3IxKRvTec8gLBHt ejaQJpzKb4LmYQ== X-Received: by 10.28.105.210 with SMTP id z79mr3436259wmh.33.1501666512655; Wed, 02 Aug 2017 02:35:12 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 91sm32058876wrg.83.2017.08.02.02.35.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 02:35:12 -0700 (PDT) From: Jonas Gorski To: linux-mips@linux-mips.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: Greg Kroah-Hartman , Rob Herring , Mark Rutland , Ralf Baechle , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Kevin Cernekee , Jiri Slaby , "David S. Miller" , Russell King Subject: [PATCH 4/8] tty/bcm63xx_uart: allow naming clock in device tree Date: Wed, 2 Aug 2017 11:34:25 +0200 Message-Id: <20170802093429.12572-5-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170802093429.12572-1-jonas.gorski@gmail.com> References: <20170802093429.12572-1-jonas.gorski@gmail.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Codify using a named clock for the refclk of the uart. This makes it easier if we might need to add a gating clock (like present on the BCM6345). Signed-off-by: Jonas Gorski Acked-by: Rob Herring Acked-by: Greg Kroah-Hartman --- Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt | 6 ++++++ drivers/tty/serial/bcm63xx_uart.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt index 5c52e5eef16d..8b2b0460259a 100644 --- a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt +++ b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt @@ -11,6 +11,11 @@ Required properties: - clocks: Clock driving the hardware; used to figure out the baud rate divisor. + +Optional properties: + +- clock-names: Should be "refclk". + Example: uart0: serial@14e00520 { @@ -19,6 +24,7 @@ Example: interrupt-parent = <&periph_intc>; interrupts = <2>; clocks = <&periph_clk>; + clock-names = "refclk"; }; clocks { diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c index a2b9376ec861..f227eff28d3a 100644 --- a/drivers/tty/serial/bcm63xx_uart.c +++ b/drivers/tty/serial/bcm63xx_uart.c @@ -841,8 +841,10 @@ static int bcm_uart_probe(struct platform_device *pdev) if (!res_irq) return -ENODEV; - clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) : - clk_get(&pdev->dev, "refclk"); + clk = clk_get(&pdev->dev, "refclk"); + if (IS_ERR(clk) && pdev->dev.of_node) + clk = of_clk_get(pdev->dev.of_node, 0); + if (IS_ERR(clk)) return -ENODEV;