From patchwork Mon Jul 16 20:39:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10527685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 103B9601D2 for ; Mon, 16 Jul 2018 20:39:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02BA328BFC for ; Mon, 16 Jul 2018 20:39:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAD1728C1F; Mon, 16 Jul 2018 20:39:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CB5228BFC for ; Mon, 16 Jul 2018 20:39:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730812AbeGPVIQ (ORCPT ); Mon, 16 Jul 2018 17:08:16 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46889 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731090AbeGPVIQ (ORCPT ); Mon, 16 Jul 2018 17:08:16 -0400 Received: by mail-wr1-f67.google.com with SMTP id s11-v6so33188327wra.13 for ; Mon, 16 Jul 2018 13:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jeMFc/VSYYcl0SR+YLkTypqiD/OgX/XYa/k4d/5p16g=; b=KbKp7GhHh2UPQvxe31nyih1VSMfOp/d04g7au45VwAua2OAf8lTFPCPik1PcxGeEbD mXR0DtJpNcEj61wInxcn0DkZttIQwECeaJsFjBW7FS6uWI2EyxCoz35sVv7d8+/5P/ri MZICa7Itp6bsaYY3i67rx1lHWUgYg/Zr2Y6JChp16majJZB11FGrzaH6kfkmouFBVvja uYwPOCXogaH8/a4OsTBbvt6Iep2kUyD6m9D9tlKUQxepKu4hDkv0rIY4n8y7rrnkKhnn RXEVGiXZxCHZgTKsWqtmVsSg2epVB6tp+EZnsjy0WSUYoqhr7yxmEKC5NqTPnbBVU/cH 8mLw== 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=jeMFc/VSYYcl0SR+YLkTypqiD/OgX/XYa/k4d/5p16g=; b=t00JBIom9ZMmbxIazhffP72hJgyghMaInHDSqSB/sZ39ubsOnUCXRFKG8Gb1dtB4Ol RJDxCmurPT9c38j4i/VG+uBHDbQoRV2IrmZBEnoAvSydMHHvLxbvFiq5NUw3IO+GvBnf 0OeJtRD/GfWkVkRrUnlYZ9dYrOtPklCnZ/Y5YPnwuhlrEfnhYAv1TcJ5A0EAS5pw+cFG pT7CzSECLLbeOO8AXncJLI8BK1p3BcQESp/ReKIP3K8vLymjqK7Du/Sn+ocgA+muFevR GxjUduCE897ETAZyGY1fUqV0CSM/pD/aKHfIigPsxyGwJ2hjiLRQekoRzIBt3H2KqSnp 7SZg== X-Gm-Message-State: AOUpUlGGM+rlWjN4iMjk+JI2GAjdxjZTL0YiEJ6PeBMXvzVMpGY4t3q+ 60nYUBesZC3mTSLV9tliR5aTdw== X-Google-Smtp-Source: AAOMgpeGU1o2MRFjeir1SlGD5Z+Cl8sBzOQRvssxeNf7/5vlgN9sRH0XZQfLrU6mHROVrSafixbuOw== X-Received: by 2002:adf:de84:: with SMTP id w4-v6mr13822973wrl.270.1531773550928; Mon, 16 Jul 2018 13:39:10 -0700 (PDT) Received: from bender.home (LFbn-MAR-1-570-38.w90-118.abo.wanadoo.fr. [90.118.15.38]) by smtp.gmail.com with ESMTPSA id j43-v6sm53533686wrj.1.2018.07.16.13.39.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jul 2018 13:39:10 -0700 (PDT) From: Neil Armstrong To: tony@atomide.com, daniel.lezcano@linaro.org Cc: Neil Armstrong , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, aford173@gmail.com, drivshin@awxrd.com Subject: [RFC PATCH 4/4] timer-ti-dm: Fix omap_dm_timer_of_set_source() Date: Mon, 16 Jul 2018 22:39:02 +0200 Message-Id: <1531773542-15736-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531773542-15736-1-git-send-email-narmstrong@baylibre.com> References: <1531773542-15736-1-git-send-email-narmstrong@baylibre.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With the move to clocksource, the omap_dm_timer_of_set_source() broke because the "fclk" clock is now defined in the DT. The omap_dm_timer_of_set_source() was using the first clock declared in the timer node, but now this clock must be named as "src" and clk_get() use "src" as clock name to permit specifiying the parent clock of the timer "fclk". Signed-off-by: Neil Armstrong --- drivers/clocksource/timer-ti-dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 4cce6b2..868bc78 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -150,7 +150,7 @@ static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer) if (!timer->fclk) return -ENODEV; - parent = clk_get(&timer->pdev->dev, NULL); + parent = clk_get(&timer->pdev->dev, "src"); if (IS_ERR(parent)) return -ENODEV;