From patchwork Mon Jul 23 11:02:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todor Tomov X-Patchwork-Id: 142598 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5913049ljj; Mon, 23 Jul 2018 04:07:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpecEGUgXgls8ZS2HpZ48HZFRiLzMi+XDGxqtycWr60ZChVoS95oiZxV5km8jc1Fol75/Sew X-Received: by 2002:a17:902:1566:: with SMTP id b35-v6mr12427462plh.135.1532344051889; Mon, 23 Jul 2018 04:07:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532344051; cv=none; d=google.com; s=arc-20160816; b=bLSc/HSNBXbKjn63DIr/W/BmZA1RUsgqZEFXGWxFHhcVCScDLvufzu4rthPubY/U7L e8XwH0N6lZm7m+6jYV2B0lOWEGi9s011Owf8x0Fjzqnz9bSK0oY3SR+PjyL3PQ5yEcXY segSWIL88GW1ql8dWXSgfjvJoesJ3iGh5QgH7esOm050btSUfBnojm9f81YqWF0LzAGV hqR5wcAiUbXZiMQuHk/Xk77KqTHONZv+kBsEIjhawf9D2yZnuxXL4Ohgxn+QfLwFk5wb LRgpxutgLyGHnpdxeQ1yHLJusZF1To/nov3jq00pLatQ1W3eNSztrwKSLyam04kHLzk5 1lsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Avw1tX9RujqP8IkCMxhNm4DETuMdwIKedpEda4d93Vw=; b=VKUVjrMHf+jWiam/ibmOlSuDy8S0PO/lCImVbfWlbuO/XnrmlTCb3ZnZchVTkH7HcU q4KFxDtfyV+thTov1QNqJo3NZdKfqq95QK9QMOkJ7u5oKXS7v+m5cYvja3LjVOhxiNNm BfBJaM0AvWt2C49YrXZXEeRdDkWuE4DLxAK6I7As+2CZ9pvTSAT+bB/r82ETogefjX74 /sZ1xPKLxs63+bT4K1gBTDX/cpBdKygpf6XJYK8OBY5CNYmiKntqZtMdoY2ws1ze0Tt4 foBxfzbXS1cEkmTf5Dm3V/RZoJKFwBXjHu0YyfmMIe+G7y8VTZpqmxqKQCNDnhTV/Fh3 0gWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d66-v6si8955426pfa.186.2018.07.23.04.07.31; Mon, 23 Jul 2018 04:07:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388531AbeGWMID (ORCPT + 31 others); Mon, 23 Jul 2018 08:08:03 -0400 Received: from ns.mm-sol.com ([37.157.136.199]:39917 "EHLO extserv.mm-sol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388064AbeGWMEo (ORCPT ); Mon, 23 Jul 2018 08:04:44 -0400 Received: from mms-0439.qualcomm.mm-sol.com (unknown [37.157.136.206]) by extserv.mm-sol.com (Postfix) with ESMTPSA id 6C88BCD58; Mon, 23 Jul 2018 14:04:02 +0300 (EEST) From: Todor Tomov To: mchehab@kernel.org, sakari.ailus@linux.intel.com, hans.verkuil@cisco.com, laurent.pinchart+renesas@ideasonboard.com, linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Todor Tomov Subject: [PATCH v3 09/35] media: camss: Unify the clock names Date: Mon, 23 Jul 2018 14:02:26 +0300 Message-Id: <1532343772-27382-10-git-send-email-todor.tomov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532343772-27382-1-git-send-email-todor.tomov@linaro.org> References: <1532343772-27382-1-git-send-email-todor.tomov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use more logical clock names - similar to the names in documentation. This will allow better handling of the clocks in the driver when support for more hardware versions is added - equivalent clocks on different hardware versions will have the same name. Signed-off-by: Todor Tomov --- drivers/media/platform/qcom/camss/camss.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index abf6184..0b663e0 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -32,8 +32,7 @@ static const struct resources csiphy_res[] = { /* CSIPHY0 */ { .regulator = { NULL }, - .clock = { "camss_top_ahb", "ispif_ahb", - "camss_ahb", "csiphy0_timer" }, + .clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy0_timer" }, .clock_rate = { { 0 }, { 0 }, { 0 }, @@ -45,8 +44,7 @@ static const struct resources csiphy_res[] = { /* CSIPHY1 */ { .regulator = { NULL }, - .clock = { "camss_top_ahb", "ispif_ahb", - "camss_ahb", "csiphy1_timer" }, + .clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy1_timer" }, .clock_rate = { { 0 }, { 0 }, { 0 }, @@ -60,8 +58,7 @@ static const struct resources csid_res[] = { /* CSID0 */ { .regulator = { "vdda" }, - .clock = { "camss_top_ahb", "ispif_ahb", - "csi0_ahb", "camss_ahb", + .clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb", "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" }, .clock_rate = { { 0 }, { 0 }, @@ -78,8 +75,7 @@ static const struct resources csid_res[] = { /* CSID1 */ { .regulator = { "vdda" }, - .clock = { "camss_top_ahb", "ispif_ahb", - "csi1_ahb", "camss_ahb", + .clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb", "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" }, .clock_rate = { { 0 }, { 0 }, @@ -96,10 +92,10 @@ static const struct resources csid_res[] = { static const struct resources_ispif ispif_res = { /* ISPIF */ - .clock = { "camss_top_ahb", "camss_ahb", "ispif_ahb", + .clock = { "top_ahb", "ahb", "ispif_ahb", "csi0", "csi0_pix", "csi0_rdi", "csi1", "csi1_pix", "csi1_rdi" }, - .clock_for_reset = { "camss_vfe_vfe", "camss_csi_vfe" }, + .clock_for_reset = { "vfe0", "csi_vfe0" }, .reg = { "ispif", "csi_clk_mux" }, .interrupt = "ispif" @@ -108,8 +104,8 @@ static const struct resources_ispif ispif_res = { static const struct resources vfe_res = { /* VFE0 */ .regulator = { NULL }, - .clock = { "camss_top_ahb", "camss_vfe_vfe", "camss_csi_vfe", - "iface", "bus", "camss_ahb" }, + .clock = { "top_ahb", "vfe0", "csi_vfe0", + "vfe_ahb", "vfe_axi", "ahb" }, .clock_rate = { { 0 }, { 50000000, 80000000, 100000000, 160000000, 177780000, 200000000, 266670000, 320000000,