From patchwork Tue Sep 9 06:07:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 4866071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5BFEBC0338 for ; Tue, 9 Sep 2014 06:11:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8750620160 for ; Tue, 9 Sep 2014 06:11:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF97E20145 for ; Tue, 9 Sep 2014 06:11:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XREcC-0002B8-B8; Tue, 09 Sep 2014 06:09:20 +0000 Received: from mail-pa0-f54.google.com ([209.85.220.54]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XREc1-0001b1-7U for linux-arm-kernel@lists.infradead.org; Tue, 09 Sep 2014 06:09:09 +0000 Received: by mail-pa0-f54.google.com with SMTP id lj1so5512952pab.27 for ; Mon, 08 Sep 2014 23:08:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=23GK/hMNF6lbmKnl9CUE9kmPsAFg8OgjSYKIqipwvUE=; b=Kw5I25mPFOww9Dzk6/wjVU2WliRRODyBc1IiVNhVspXZ5qWRiQQKq/SyzbDqNNOlDv U3amo5GSgYBzcYJLUHGhAB9/WjepRynSvLjV3FVkUnOUAkR3MJgaNM7U9cwO3cRtVaMM tSIWcgO1lqMmnhOTHczWSXXr/uGdnOCb7Mdtn2iDCm6Ioew14CgVQ8q2WRikU2M6NtWN 4ANdGCyzpogGrgtb+C6sCfVSDuzbsIiDqJT2wqtA1VuCJAh90P+pBFriCOzrOndeKKxc fbD2STY2sbDFRuYEZP5qVZMH+Mm7fWwhzkYXfP6MUE0krdPUQan6mJDY7BOBPRPFKCWg Xbuw== X-Gm-Message-State: ALoCoQlwRcyJNUToe9CBAPwYx45Hdu5dVQ1ayVo8sS6jJkl4u8pVdMsVP9xz2uxwxV0d/g/Qg6gv X-Received: by 10.70.133.170 with SMTP id pd10mr12732416pdb.140.1410242927970; Mon, 08 Sep 2014 23:08:47 -0700 (PDT) Received: from quantum.home (pool-108-47-66-231.lsanca.fios.verizon.net. [108.47.66.231]) by mx.google.com with ESMTPSA id aj3sm10440306pbc.92.2014.09.08.23.08.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Sep 2014 23:08:47 -0700 (PDT) From: Mike Turquette To: rjw@rjwysocki.net, tomeu.vizoso@collabora.com Subject: [PATCH 1/2] acpi: lpss: convert from struct clk to struct clk_core Date: Mon, 8 Sep 2014 23:07:47 -0700 Message-Id: <1410242868-14750-2-git-send-email-mturquette@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410242868-14750-1-git-send-email-mturquette@linaro.org> References: <1410242868-14750-1-git-send-email-mturquette@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140908_230909_317365_2E244107 X-CRM114-Status: GOOD ( 16.34 ) X-Spam-Score: -0.7 (/) Cc: Mike Turquette , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Looks like this driver was missed during the original mass driver rework[0]. This patch converts the LPSS driver to the new clock provider data type (struct clk_core). If there are no objections I propose to roll this patch into a rebase of that patch[0] in my tree. [0] http://lkml.kernel.org/r/<1409758317-20564-1-git-send-email-tomeu.vizoso@collabora.com> Signed-off-by: Mike Turquette --- drivers/acpi/acpi_lpss.c | 6 +++--- include/linux/platform_data/clk-lpss.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index 9dfec48..454179f 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -57,7 +57,7 @@ ACPI_MODULE_NAME("acpi_lpss"); struct lpss_shared_clock { const char *name; unsigned long rate; - struct clk *clk; + struct clk_core *clk; }; struct lpss_private_data; @@ -83,7 +83,7 @@ static struct lpss_device_desc lpss_dma_desc = { struct lpss_private_data { void __iomem *mmio_base; resource_size_t mmio_size; - struct clk *clk; + struct clk_core *clk; const struct lpss_device_desc *dev_desc; u32 prv_reg_ctx[LPSS_PRV_REG_COUNT]; }; @@ -278,7 +278,7 @@ static int register_device_clock(struct acpi_device *adev, const struct lpss_device_desc *dev_desc = pdata->dev_desc; struct lpss_shared_clock *shared_clock = dev_desc->shared_clock; const char *devname = dev_name(&adev->dev); - struct clk *clk = ERR_PTR(-ENODEV); + struct clk_core *clk = ERR_PTR(-ENODEV); struct lpss_clk_data *clk_data; const char *parent, *clk_name; void __iomem *prv_base; diff --git a/include/linux/platform_data/clk-lpss.h b/include/linux/platform_data/clk-lpss.h index 2390199..3c3237c 100644 --- a/include/linux/platform_data/clk-lpss.h +++ b/include/linux/platform_data/clk-lpss.h @@ -15,7 +15,7 @@ struct lpss_clk_data { const char *name; - struct clk *clk; + struct clk_core *clk; }; extern int lpt_clk_init(void);