From patchwork Tue Feb 11 17:52:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 24489 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B0EB6203F3 for ; Tue, 11 Feb 2014 17:53:46 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 131sf23846742ykp.1 for ; Tue, 11 Feb 2014 09:53:45 -0800 (PST) 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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ipJ+qSj7AHQkphAcGlzKU9uv8LeWtaYAq2HifW8HAiw=; b=E980X4t2abCr5hEg4S1Veb1j//rRknb34BduQGYT9QhXaBtvKHiFysfADaMun8KZ2w URa+A791ZHnu0qCQ/nHgP8+RMLbiDCoa7AVWk9OJq4hQauwOa7gtfeCrSdK0W/K9QhLq uP4ZLTBqTb9kfmdT8/sckhzcGp9dI34IqIBIPl/ATymYROe0KTwhiPisM+lx0OPV0co2 ih5miE8vm221d4tIQj56iODeFKFAuaAEQ52gB2Bl7Ldd5PksmiqmY3cu+A+tMZyoQfIb guKEVyVq0LW1FCyamoaWUZuKCGph0BzADpv1lrsQpLOekaiRchoX7wZ+wDDYU1+ICuEg DW8A== X-Gm-Message-State: ALoCoQkfZuT4Zf7GKLeI4CCjb0ocCBrclUDGpG2XGiWM5O0dVBC+MHR8LSemwKXX4fcv/DQIEDdd X-Received: by 10.236.119.112 with SMTP id m76mr283943yhh.2.1392141225837; Tue, 11 Feb 2014 09:53:45 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.134 with SMTP id i6ls2589921qge.2.gmail; Tue, 11 Feb 2014 09:53:45 -0800 (PST) X-Received: by 10.52.63.233 with SMTP id j9mr227074vds.69.1392141225426; Tue, 11 Feb 2014 09:53:45 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id p9si6168973vdv.109.2014.02.11.09.53.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 09:53:45 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id p5so6052235vbn.2 for ; Tue, 11 Feb 2014 09:53:45 -0800 (PST) X-Received: by 10.52.248.138 with SMTP id ym10mr24659399vdc.18.1392141225345; Tue, 11 Feb 2014 09:53:45 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp265148vcz; Tue, 11 Feb 2014 09:53:42 -0800 (PST) X-Received: by 10.68.143.34 with SMTP id sb2mr45794441pbb.135.1392141221969; Tue, 11 Feb 2014 09:53:41 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i4si19705248pad.228.2014.02.11.09.53.41; Tue, 11 Feb 2014 09:53:41 -0800 (PST) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752207AbaBKRxe (ORCPT + 27 others); Tue, 11 Feb 2014 12:53:34 -0500 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:56020 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751694AbaBKRwt (ORCPT ); Tue, 11 Feb 2014 12:52:49 -0500 Received: from hornet.Cambridge.Arm.com (hornet.cambridge.arm.com [10.2.201.45]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 31E7414005F; Tue, 11 Feb 2014 11:52:48 -0600 (CST) From: Pawel Moll To: Lee Jones , Samuel Ortiz Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pawel Moll Subject: [PATCH v2 2/2] mfd: vexpress-sysreg: Add syscon labels as platform data Date: Tue, 11 Feb 2014 17:52:45 +0000 Message-Id: <1392141165-14338-2-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1392141165-14338-1-git-send-email-pawel.moll@arm.com> References: <20140211174829.GJ15081@lee--X1> <1392141165-14338-1-git-send-email-pawel.moll@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pawel.moll@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds platform data with label names for syscon registers in the relevant MFD cells. Signed-off-by: Pawel Moll Acked-by: Lee Jones --- drivers/mfd/vexpress-sysreg.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index ece5ac8..952df84 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -132,6 +133,10 @@ void __init vexpress_sysreg_early_init(void __iomem *base) /* The sysreg block is just a random collection of various functions... */ +static struct syscon_platform_data vexpress_sysreg_sys_id_pdata = { + .label = "sys_id", +}; + static struct bgpio_pdata vexpress_sysreg_sys_led_pdata = { .label = "sys_led", .base = -1, @@ -150,6 +155,14 @@ static struct bgpio_pdata vexpress_sysreg_sys_flash_pdata = { .ngpio = 1, }; +static struct syscon_platform_data vexpress_sysreg_sys_misc_pdata = { + .label = "sys_misc", +}; + +static struct syscon_platform_data vexpress_sysreg_sys_procid_pdata = { + .label = "sys_procid", +}; + static struct mfd_cell vexpress_sysreg_cells[] = { { .name = "syscon", @@ -157,6 +170,8 @@ static struct mfd_cell vexpress_sysreg_cells[] = { .resources = (struct resource []) { DEFINE_RES_MEM(SYS_ID, 0x4), }, + .platform_data = &vexpress_sysreg_sys_id_pdata, + .pdata_size = sizeof(vexpress_sysreg_sys_id_pdata), }, { .name = "basic-mmio-gpio", .of_compatible = "arm,vexpress-sysreg,sys_led", @@ -190,12 +205,16 @@ static struct mfd_cell vexpress_sysreg_cells[] = { .resources = (struct resource []) { DEFINE_RES_MEM(SYS_MISC, 0x4), }, + .platform_data = &vexpress_sysreg_sys_misc_pdata, + .pdata_size = sizeof(vexpress_sysreg_sys_misc_pdata), }, { .name = "syscon", .num_resources = 1, .resources = (struct resource []) { DEFINE_RES_MEM(SYS_PROCID0, 0x8), }, + .platform_data = &vexpress_sysreg_sys_procid_pdata, + .pdata_size = sizeof(vexpress_sysreg_sys_procid_pdata), }, { .name = "vexpress-syscfg", .num_resources = 1,