From patchwork Thu Jun 24 09:07:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12341609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT,WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 442D2C48BDF for ; Thu, 24 Jun 2021 09:09:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0FB3D61380 for ; Thu, 24 Jun 2021 09:09:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FB3D61380 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=G3TGav9IFKAdXf3zMufofUJtIetFZs4WzgS7laf1wHA=; b=fvD1Xfam4uZY16 azS01p1azoy+cG99bTj/VL0CI+8H7NJxrB4LiSP9ksuvRdrhlKuRZWz3COQt3j+6paYfQxnKqEjdw JQj1sZijuyUXHALlPnmsoe5TkgWlP6Kej0AHWMwlBZ5b5bbz6vBohjkvGO3WawjQmytH3uRWaWQaU MjH4nFbwlsibp3EsAA42KVnkQkmLbvg28D7IW0OqeD8TBlN8433uUUBJZGw191n2l+CDme+MaUZ+m f0iZjS7kJIyLIq1wMWhmm2s6xulPqhauAq9ZFyYXidsJ8s/8rTKTOeruIsRnsI89FkeFbj0XyyTyu D3Q7CtYD0xCbWSVMJCqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwLL2-00DeMJ-J2; Thu, 24 Jun 2021 09:07:56 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwLKy-00DeLD-4I for linux-arm-kernel@lists.infradead.org; Thu, 24 Jun 2021 09:07:53 +0000 Received: by mail-pl1-x635.google.com with SMTP id i4so2604493plt.12 for ; Thu, 24 Jun 2021 02:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ej5iCXQ9ktVbmo+o158yS99S5YC4dqQm21FGO2x4lio=; b=sBZaVsFhRAtOiOIPpxvrv+iKFxHD3xLmyQ7yvyEPzATLbiJ65JYyRZnb3r0VxwPHhq aODR6Eg+2aRK4PiB+fZA2PF2IUy37+JUp55PITPYI0rjGblQ94e7skInvjaGA/8xnVcW b1j4hS3BoFUnjSfRVNjVA4hqQgvQ/Fma8ks7YRYWFZixSMjpH0o6TC+1dak2+lcJh9Mh AQD+hu8por/NYZKWdMx/1jJ5pDqBT6bOXR0JoR489gp2PsIhA8ILrCL2UmaAm1a0TKPE GChfR3viCYCs+H+cYnJlmFsflzRwFx3kuuH/0OSnwT9HlTwxlMSGpOeLxB0SjAVvZCfw vvig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version:content-transfer-encoding; bh=ej5iCXQ9ktVbmo+o158yS99S5YC4dqQm21FGO2x4lio=; b=NGeFHgufnyrT3NyJh6M7FTIMrB9OgPrJ9/xBjONVY2hfpyXnPmuIbkaz9tOO6qZcec osU824n6C4OAeurckbemS6GhDo5vPnivDk1FiRHSrZ5vcAX0As4zwhmkThsRZPZvkWyg GszJf0h7cHPeoeLgyplovg4/NA9R9r49uceBOjeeQJnYSJna6M35o+bDYkbC7tPD96w7 qqKMnHjnrdCS07rLLCH4vjeYmIBQgXDRCof9AORhMg3qtVVMleblGzs2jAY1H8MygQt9 wtQZLPgAv+ZhAPCwegaCWpfvTfP7cg67p1TDMFrZJrP0s2T6aMCdaMd88AtUGGzq7xLK TWLg== X-Gm-Message-State: AOAM530zaAWQAW/iZN5ixteg2KBYf4y8hIdO4fDu2GE8LXJfujlQSJ/i J/EtlgxYL4xsGFZ60w33PY8= X-Google-Smtp-Source: ABdhPJwYbeBj+5DwoAsPsQDbOgqKn6lQee6hwcKc0kA8F+71khW3Vi/bwtVcqJhZ+kpmTG6xa6ryKg== X-Received: by 2002:a17:902:7103:b029:124:72fd:fbd1 with SMTP id a3-20020a1709027103b029012472fdfbd1mr3757386pll.64.1624525670711; Thu, 24 Jun 2021 02:07:50 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id b5sm1784667pgh.41.2021.06.24.02.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 02:07:49 -0700 (PDT) From: Joel Stanley To: Andrew Geissler , linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery Subject: [PATCH] ARM: dts: aspeed: Fix AST2600 machines line names Date: Thu, 24 Jun 2021 18:37:42 +0930 Message-Id: <20210624090742.56640-1-joel@jms.id.au> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210624_020752_234355_9C4DEA6E X-CRM114-Status: GOOD ( 10.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Tacoma and Rainier both have a line-names array that is too long: gpio gpiochip0: gpio-line-names is length 232 but should be at most length 208 This was probably copied from an AST2500 device tree that did have more GPIOs on the controller. Fixes: e9b24b55ca4f ("ARM: dts: aspeed: rainier: Add gpio line names") Fixes: 2f68e4e7df67 ("ARM: dts: aspeed: tacoma: Add gpio line names") Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 5 +---- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts index 941c0489479a..481d0ee1f85f 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts @@ -280,10 +280,7 @@ &gpio0 { /*W0-W7*/ "","","","","","","","", /*X0-X7*/ "","","","","","","","", /*Y0-Y7*/ "","","","","","","","", - /*Z0-Z7*/ "","","","","","","","", - /*AA0-AA7*/ "","","","","","","","", - /*AB0-AB7*/ "","","","","","","","", - /*AC0-AC7*/ "","","","","","","",""; + /*Z0-Z7*/ "","","","","","","",""; pin_mclr_vpp { gpio-hog; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index e863ec088970..48038b2ef3df 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -136,10 +136,7 @@ &gpio0 { /*W0-W7*/ "","","","","","","","", /*X0-X7*/ "","","","","","","","", /*Y0-Y7*/ "","","","","","","","", - /*Z0-Z7*/ "","","","","","","","", - /*AA0-AA7*/ "","","","","","","","", - /*AB0-AB7*/ "","","","","","","","", - /*AC0-AC7*/ "","","","","","","",""; + /*Z0-Z7*/ "","","","","","","",""; }; &fmc {