From patchwork Wed Sep 20 11:14:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 816153 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="s3+KtIu2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xxxy770yhz9ryT for ; Wed, 20 Sep 2017 21:16:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751599AbdITLQO (ORCPT ); Wed, 20 Sep 2017 07:16:14 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36394 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751840AbdITLQN (ORCPT ); Wed, 20 Sep 2017 07:16:13 -0400 Received: by mail-wm0-f67.google.com with SMTP id r136so2119397wmf.3; Wed, 20 Sep 2017 04:16: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=aoZqJe/zJsKqD6CDebjOGOq+Cjc7ASV8t1qCFib6cac=; b=s3+KtIu2W/1tt8ZCY4noZpgLx7eLclxZrZwAJO9oVj/3qpxHnETqpbOqbGsYTrZiSk Iu0fazp9VCX5H/XmXAu8Gr+P3tMgi4bs3O5JYv/9hxf7lN6M9ujSdSUSOnCjgqg2fina QBRtoU75TBmUJRwohj5z6YKi4vRuiwxyO1CyyIIcAyxljhHJF2L8Umny3zKPqdTqOVK7 R8j9ByT1FRxcSi/gzvPIS7uSk2N4so1hobPu+gojDBoXf2Qrmwi85nwDZymrKU+y1NAX Nmz7TRgDPtni0EK6uDl9u9614C5tjq/dmEbobveoe4E+KHr12a+4DViYwg5ydfsZsugw YOOg== 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=aoZqJe/zJsKqD6CDebjOGOq+Cjc7ASV8t1qCFib6cac=; b=MWHfA8CECYLqUqI/fr9FzMWjFOCJnS+CUvx43KB61aewAuOs62LHytRxt1VkdRAZyR UR+8PUw7J6gnMFpDpFxijqzjtkum0Vyasvb7tfbU23okmPksd0FMcnpZS1v1gZcrmDdQ Jk9uPRJJyPCJRzvfYqRaYq6xMzQgWt3D2I6WcZQdaauD0r2hcdVayNMBgncOOi0zsvkz 15BiQAgFI9DZw4D0FqlHZc5dafsi0ZaqxBMM8tRKHBnqW5QBqrJSdzfKopWfsd5ejkqP +f5MBAeBvKBzrlT0NuoOMonZBlr/TtLd8BnVUv5JOQFu/W3i5yzU1IUnAAhTE/YFs5Y7 cquw== X-Gm-Message-State: AHPjjUhxbhVui8eRoTnz4pMC/rmrclMgUyt+yIODDvwOhJxUEzOWge1c ZmigO9rcIA0ZVrZPQulD4eY= X-Google-Smtp-Source: AOwi7QAKV3xyf91HFB7r9ib7XtlLLbOzoLuVQYI0e3+jVyY44iSsWc4BZqjtfAzvrSZmzk8pMTMSnw== X-Received: by 10.80.206.11 with SMTP id y11mr4398662edi.94.1505906172634; Wed, 20 Sep 2017 04:16:12 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id s12sm884513edd.25.2017.09.20.04.16.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 04:16: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 Cc: Greg Kroah-Hartman , Rob Herring , Mark Rutland , Ralf Baechle , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Kevin Cernekee , Russell King Subject: [PATCH V2 4/8] tty/bcm63xx_uart: allow naming clock in device tree Date: Wed, 20 Sep 2017 13:14:04 +0200 Message-Id: <20170920111408.29711-5-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170920111408.29711-1-jonas.gorski@gmail.com> References: <20170920111408.29711-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). Acked-by: Rob Herring Acked-by: Greg Kroah-Hartman Reviewed-by: Florian Fainelli Signed-off-by: Jonas Gorski --- 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;