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: 37023 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4666D2054D for ; Tue, 9 Sep 2014 06:08:50 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id rd3sf20951651pab.10 for ; Mon, 08 Sep 2014 23:08:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=23GK/hMNF6lbmKnl9CUE9kmPsAFg8OgjSYKIqipwvUE=; b=L+n+LSYIB00g5wnLGZHqNAxnbzRNccTKeo1dGiXOV00s/epDh/QxvvcKo/gdB3CJVt ECWHofqb62Butup6XHH54psSyLlPnMocJbLMQCLiGDG6zQUjLCPaHUaSTo8MZZqZaxzC /LsUQVtAR7CDWiLFZ749NI8amwkPwbmlIrGuspXFbcQ6Bmg0Ns0QCiYg1rMSX6Kjmecv GRblbco239oBhZnZjtfB+ChW1TwQXeJXKCfxJoap2JfGqWEDvN/mVukrJeW3SsBejCTD gvd9PgF0L4G+1+TaDm6i6Ad8OdGjppY0nmZi9dHtcoW2hlcXmsUpbbA2Z/7g48kBqhJJ 69Ug== X-Gm-Message-State: ALoCoQm6uWwdrxH2efx6qKaGC4vQKT0zk4h2u22hrDsHrCvLCEdi/1VjRsNOZ/0x5DvWHhWmoWNl X-Received: by 10.68.222.194 with SMTP id qo2mr11839203pbc.6.1410242929516; Mon, 08 Sep 2014 23:08:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.49 with SMTP id i46ls2021483qgd.10.gmail; Mon, 08 Sep 2014 23:08:49 -0700 (PDT) X-Received: by 10.52.128.104 with SMTP id nn8mr3468087vdb.50.1410242929421; Mon, 08 Sep 2014 23:08:49 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id x7si4878077vcs.31.2014.09.08.23.08.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Sep 2014 23:08:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so16437500vcb.2 for ; Mon, 08 Sep 2014 23:08:49 -0700 (PDT) X-Received: by 10.220.184.70 with SMTP id cj6mr28817252vcb.5.1410242929318; Mon, 08 Sep 2014 23:08:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp236272vcb; Mon, 8 Sep 2014 23:08:48 -0700 (PDT) X-Received: by 10.66.161.232 with SMTP id xv8mr52733834pab.81.1410242928357; Mon, 08 Sep 2014 23:08:48 -0700 (PDT) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by mx.google.com with ESMTPS id rn2si21441227pbc.48.2014.09.08.23.08.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Sep 2014 23:08:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mturquette@linaro.org designates 209.85.192.182 as permitted sender) client-ip=209.85.192.182; Received: by mail-pd0-f182.google.com with SMTP id w10so3414866pde.13 for ; Mon, 08 Sep 2014 23:08:48 -0700 (PDT) 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 Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org, Mike Turquette 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mturquette@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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);