From patchwork Tue Jan 24 06:16:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jeffery X-Patchwork-Id: 92283 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1569096qgi; Mon, 23 Jan 2017 22:17:54 -0800 (PST) X-Received: by 10.99.42.78 with SMTP id q75mr36832936pgq.144.1485238674598; Mon, 23 Jan 2017 22:17:54 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x69si17987241pgd.263.2017.01.23.22.17.54; Mon, 23 Jan 2017 22:17:54 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@aj.id.au; dkim=pass header.i=@messagingengine.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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750831AbdAXGRd (ORCPT + 25 others); Tue, 24 Jan 2017 01:17:33 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42688 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750703AbdAXGRb (ORCPT ); Tue, 24 Jan 2017 01:17:31 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 82E9B208C4; Tue, 24 Jan 2017 01:17:30 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Tue, 24 Jan 2017 01:17:30 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=aj.id.au; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=GIW FJmVHWIpLXu+p+r8yGkZhfvE=; b=Nu0Q9nanIHEYPjPSM520xlfjdWm1zdr6wj/ j1jqDAyMG22UZ07HfbNfkUv53Z2TnTDZj6/mbzzBsCKudsP7zpNCNaVqSoGh2NTG pVTI1U2Wz/b/wLZZoed+n2g1B7NNiJRvtv0UBUfi57Pkd5Z15HEjplibQmFzBEu6 3Y8ymRrw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=GIWFJmVHWIpLXu+p+r8yGkZhfvE=; b=IFu9H J9oueln39CvquTMsuJTzwo0OUwZaQcxfJfQoqJcddhILB+WOpoCDP5es2JTyq1o+ ucSW3YP8hw3xAh7ENjUTPYQqLxN5OKEmc9TxkmcqmDHU3L5ht+4Dm5WHgL3tpyxd +QrKwJXGil0BPKmLiZ5wEfVHoJxUZNffq7qtRo= X-ME-Sender: X-Sasl-enc: mpY4cI40LDbadijjcUCLzSboCmgwgN3UURMyBACAzWsu 1485238649 Received: from keelia.au.ibm.com (ppp203-122-213-247.static.internode.on.net [203.122.213.247]) by mail.messagingengine.com (Postfix) with ESMTPA id EC0FC24066; Tue, 24 Jan 2017 01:17:27 -0500 (EST) From: Andrew Jeffery To: Linus Walleij Cc: Joel Stanley , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, Andrew Jeffery Subject: [PATCH v2 1/2] gpio: aspeed: Make bank names strings Date: Tue, 24 Jan 2017 16:46:45 +1030 Message-Id: <20170124061646.9317-2-andrew@aj.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170124061646.9317-1-andrew@aj.id.au> References: <20170124061646.9317-1-andrew@aj.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joel Stanley The Aspeed SoCs have more GPIOs than can be represented with A-Z. The documentation uses two letter names such as AA and AB, so make the names a three-character array in the bank struct to accommodate this. Signed-off-by: Joel Stanley Signed-off-by: Andrew Jeffery --- drivers/gpio/gpio-aspeed.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.9.3 diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index 03a5925a423c..20f6f8ae4671 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -28,39 +28,39 @@ struct aspeed_gpio { struct aspeed_gpio_bank { uint16_t val_regs; uint16_t irq_regs; - const char names[4]; + const char names[4][3]; }; static const struct aspeed_gpio_bank aspeed_gpio_banks[] = { { .val_regs = 0x0000, .irq_regs = 0x0008, - .names = { 'A', 'B', 'C', 'D' }, + .names = { "A", "B", "C", "D" }, }, { .val_regs = 0x0020, .irq_regs = 0x0028, - .names = { 'E', 'F', 'G', 'H' }, + .names = { "E", "F", "G", "H" }, }, { .val_regs = 0x0070, .irq_regs = 0x0098, - .names = { 'I', 'J', 'K', 'L' }, + .names = { "I", "J", "K", "L" }, }, { .val_regs = 0x0078, .irq_regs = 0x00e8, - .names = { 'M', 'N', 'O', 'P' }, + .names = { "M", "N", "O", "P" }, }, { .val_regs = 0x0080, .irq_regs = 0x0118, - .names = { 'Q', 'R', 'S', 'T' }, + .names = { "Q", "R", "S", "T" }, }, { .val_regs = 0x0088, .irq_regs = 0x0148, - .names = { 'U', 'V', 'W', 'X' }, + .names = { "U", "V", "W", "X" }, }, /* * A bank exists for { 'Y', 'Z', "AA", "AB" }, but is not implemented.