From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180228-2-2542011743051190768 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES daen, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180228; b=uehfa433hfi47d/8Ovt6EfDxt6RCfK2qaQlpyYxIowjx5J7 qm9rb6V5z7FkWpwpOC2s8a+AJru4xOWuULBtJW14tnIJ+S/V5KS77x1OZIgThV7p cQIlixFUrMUPY6VYpjoLekeAiRhUytr2EW/OUUJNfFrZm2eBewMWON+0tlAAMcz3 qjqldQve52zdu7yvGMk3EWLQIr9AGbSlu8+C5QaMN/stwFye+SOxHhMHMp539zbc T9ttw0EmmKTemsdgMlpr44+aGFzb2cFiKwBKyIDHGz6DI1u7Dd812hjzhL36GEBz W9AmX4yEYxvDFuZ/DRnW6JRodGiZtT0THjgfTEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180228; bh=roVrIj +KJTWbRJz7GYgN8m2OnTFEAhfZptvYiIrz2Gc=; b=AmHLep20tBkSUE7TrD8Ada Qur4gR6lbWIAhdr9sJO+U8NeAhUxc8TyJ7gp26f+SwEmWaXTth4cLavCIb3Ybule OJNf/46Wl+dtnq2+dwVngr3SufyjJm3UaXQuMGLG1ZdXmYwfFMSSfFYP7z4NHZnU X9t7oP2hAkxr99yIIYZqY7faChyS7rVMWbfuvffTX6gmVpcmykg5z/Nsf64MY9KW B/Y1ItpQmdjsUMSGGA0d96Ti3pQWHNeTvPzBK+GFggmcHF0wZpK6kLlB0e/SchAO EYAYzEsexlP9W6jWB9QYTRyGzFpPWyRlTIINtkf0r7Z6djSD1D4RzbcSq/cnekzg == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=oYkyBxaT x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=oYkyBxaT x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933071AbeA1W43 (ORCPT ); Sun, 28 Jan 2018 17:56:29 -0500 Received: from mail-by2nam03on0130.outbound.protection.outlook.com ([104.47.42.130]:20166 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932095AbeA1W21 (ORCPT ); Sun, 28 Jan 2018 17:28:27 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Adam Ford , Tony Lindgren , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.9 05/49] ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet Thread-Topic: [PATCH AUTOSEL for 4.9 05/49] ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet Thread-Index: AQHTmIc0wzatgUh8TUGkzgyGXUqsZQ== Date: Sun, 28 Jan 2018 22:27:38 +0000 Message-ID: <20180128222727.22404-5-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1017;6:+XopTlzYHqai2RB3JUeXquowuAsfgVLmExexTpkljVCtzivQeFrdjeT28+efBrJX3HGQNJ3Exur6/E8FCESHidpZuGTJLrlajV5pGczTeFKp0Ir0i1dlyd9qFqX4cT1btmJQxckU0CyffgViD88g4PypKlk2ZLIwHHOPl1JXn1fz/Zy8yC/UKf/QaSiskiKvsTUaPIHx5b8mYzglzcRrE7fOPo2Y2pujP1Z4O1bpu1IgFcHpZzKKJWyT9FlCSTmb/YQi7P0M+3gRtHzUnKcECeZKRv4WJzkeYYOrG2fb4KqLLK2YYUnOLV7pa4kJOXW5RHg7a+A98JrJ1gd1IinRVvL+ILMc2UCToUWLBIYoPSW2Sw1W66WNCyl6bq0cMs0X;5:t5+3tQCl6vBfL6W53fx5zKfuWDJ0GekoSSdVAOUiy0tTbNPIkbNW8zmj7to/ETG3r3J3AqsAFdgkXDkcdO60xMZs/vJYy1mSHa12ON73MVHp02buZgqNI0UN1ZUPmxIFmDadqTRFVlKIaeKhMaD5IChF/yBMFx1i23hp2nKPm7Y=;24:H+3TbFmIFyKmC39Di/Sh4pavqOi2NClAlTFvDZtwnsRDQ8nKiI8lixjA3sORCL/wNa2AjFiTihBFaaac48AtWi/vpTJITw5bL3eNOYeAmXQ=;7:QI3ozo7h0Ri0R8v6FpdH/R+Qd+iX7ZAT5LPKCWXjMHDbSYsUhCuD+ILigc80I3ZZL2HRKHebOhM2ungGmWzWKvtmsSXiI6bUcTdG34OxdPIlP2kWNnyxe2HdHwzaydEec6n4cGUNxjfQ5KNJlq0rJIH9gTcpM8vszwALYafpYEgzR6PtIi9ZaySaTXsZn96J3XHq0yWKvVF1QYAp1iNPeBSAfLGKYadgZI9xObfPdxFT1lEZTSSSQ7F+pDst9rMc x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: ae9a0e1c-4ea1-4341-884c-08d5669e7068 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1017; x-ms-traffictypediagnostic: MW2PR2101MB1017: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231101)(944501161)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB1017;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1017; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(39380400002)(366004)(346002)(376002)(189003)(199004)(81156014)(6666003)(305945005)(2900100001)(76176011)(68736007)(86612001)(3660700001)(8676002)(3280700002)(6506007)(102836004)(6116002)(105586002)(7736002)(2950100002)(3846002)(1076002)(106356001)(36756003)(5660300001)(2906002)(8936002)(66066001)(10090500001)(6486002)(6512007)(25786009)(53936002)(186003)(316002)(6436002)(86362001)(14454004)(478600001)(2501003)(5250100002)(72206003)(39060400002)(99286004)(97736004)(107886003)(4326008)(54906003)(81166006)(110136005)(26005)(10290500003)(22452003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1017;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: CJCgeJDznE61Xf/Ou7ub7oBkiGPwX0hiz0yxGr4/gopIsJ8PNtThfiVatpvRnA1cj6cV8h6KrrAS/U1A38BtEw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae9a0e1c-4ea1-4341-884c-08d5669e7068 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:38.7861 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1017 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Adam Ford [ Upstream commit 3c18bbf3d11d2005da08b57ff26f44ff1c2b12d0 ] This patch fixes and issue where the NAND and GPMC based ethernet controller stopped working. This also updates the GPMC settings to be consistent with the Logic PD Torpedo development from the commit listed above. Fixes: 44e4716499b8 ("ARM: dts: omap3: Fix NAND device nodes") Signed-off-by: Adam Ford Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 3 ++- arch/arm/boot/dts/logicpd-som-lv.dtsi | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/bo= ot/dts/logicpd-som-lv-37xx-devkit.dts index 38faa90007d7..2fa5eb4bd402 100644 --- a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts @@ -72,7 +72,8 @@ }; =20 &gpmc { - ranges =3D <1 0 0x08000000 0x1000000>; /* CS1: 16MB for LAN9221 */ + ranges =3D <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */ + 1 0 0x2c000000 0x1000000>; /* CS1: 16MB for LAN9221 */ =20 ethernet@gpmc { pinctrl-names =3D "default"; diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logi= cpd-som-lv.dtsi index 26cce4d18405..c5edc7fe4837 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -37,7 +37,7 @@ }; =20 &gpmc { - ranges =3D <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */ + ranges =3D <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */ =20 nand@0,0 { compatible =3D "ti,omap2-nand"; --=20 2.11.0