Message ID | 20190213085930.31578-9-tudor.ambarus@microchip.com |
---|---|
State | Not Applicable |
Delegated to: | Miquel Raynal |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AfgZXL0f"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="tzpS4sph"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ztpF5rZTz9s4Z for <incoming@patchwork.ozlabs.org>; Wed, 13 Feb 2019 20:02:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=v43DDsKF5yy5U7iTVyhGYJuftopg5z4ssE/hlNuZkIg=; b=AfgZXL0fRLqqRz M+oqavmHvjkb7GOpnGTgERvo7YEyyzk1omcd+PRnCuftHg7yONDwvoVn2IPep32m2YaBIRt/wJ09t zb7PTpwWg4DnrlsqWEnTPVyB9vDpJ7OPuA5wUbfUVdaxX7MaPHX0y3kM9EVOvWkIyAQnGoHyG7P6Y 729vi9NvmBQl/MwmClxBrPvymYl7m5QeWnnZVAfuv9eIj+Br9ZygnSiViBR7aot5FzEUAqKI1VXLb tnN1Qrgg1DM0L8fDvCmj8zQNHfP3RNpJYa5jICEebGF9h2MpbcBZmb9PGOQkF2qKNAYZr+VOSNe2n GSDd3xZIfxZ5C3QC6KWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtqRB-0001xF-T6; Wed, 13 Feb 2019 09:02:37 +0000 Received: from esa1.microchip.iphmx.com ([68.232.147.91]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtqOq-0006JB-QR; Wed, 13 Feb 2019 09:00:54 +0000 X-IronPort-AV: E=Sophos;i="5.58,365,1544511600"; d="scan'208";a="27631565" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Feb 2019 02:00:11 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.38) with Microsoft SMTP Server (TLS) id 14.3.352.0; Wed, 13 Feb 2019 02:00:11 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=po1+Rmo5LsZDDrBE5/UwLhyrYNZ5bKrwc0UeryHkhKc=; b=tzpS4sphTe/yuaYrJzwtXx26up8AR5+/neND2R8n+Z3f7ClffCzlVxH5Ur9N68kPqyEQ+/ONTtnmgEB6QGHrAKra/vNtWdX9NB5mHW4vBqRBXQYPuo0hhhd3r2oXd/fXERoBcp5qIyOw6j4MnRBCl4t5hRlcJGkpWHd2Y9gQtSc= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB0019.namprd11.prod.outlook.com (10.161.155.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.16; Wed, 13 Feb 2019 09:00:08 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1601.023; Wed, 13 Feb 2019 09:00:08 +0000 From: <Tudor.Ambarus@microchip.com> To: <robh+dt@kernel.org>, <mark.rutland@arm.com>, <Nicolas.Ferre@microchip.com>, <alexandre.belloni@bootlin.com>, <Ludovic.Desroches@microchip.com>, <dwmw2@infradead.org>, <computersforpeace@gmail.com>, <bbrezillon@kernel.org>, <marek.vasut@gmail.com>, <richard@nod.at>, <miquel.raynal@bootlin.com>, <lee.jones@linaro.org> Subject: [PATCH 08/11] memory: atmel-ebi: move NUM_CS definition inside atmel-ebi Thread-Topic: [PATCH 08/11] memory: atmel-ebi: move NUM_CS definition inside atmel-ebi Thread-Index: AQHUw3qEx2ObER7HjEmtDvVIpHB7CA== Date: Wed, 13 Feb 2019 09:00:08 +0000 Message-ID: <20190213085930.31578-9-tudor.ambarus@microchip.com> References: <20190213085930.31578-1-tudor.ambarus@microchip.com> In-Reply-To: <20190213085930.31578-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR08CA0085.eurprd08.prod.outlook.com (2603:10a6:800:d3::11) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5654c66d-a890-4576-81b6-08d69191a70d x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:BN6PR11MB0019; x-ms-traffictypediagnostic: BN6PR11MB0019: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; BN6PR11MB0019; 23:sGyCwV0KwoWFOe1noLaeSKHx3VJJZuVelVdAWCI?= =?iso-8859-1?q?DsHT9JJ49WZUWCxL58VVbZP5c?= =?iso-8859-1?q?/3OquYpiRZ8dDpZJiLTLO0jMG7hZMAyvElPokPyqa3DbsKCM2fv?= =?iso-8859-1?q?3DJrbjIwPGiOXn4vNOdM+0LWtxsQYbL1dIehFWJ00zmbEMiuhAF?= =?iso-8859-1?q?4tLR0aeyMoIpki1G4XlOr7dQ47E8quvW8V6uCcUadPj5QFOU5Pw?= =?iso-8859-1?q?NlKaFE8nu9kaMGHW6IeWLextbnbwNvvQxKjUFknMk95Jt5zxWh4?= =?iso-8859-1?q?YMok21lsugDYWEcG1YSEWaHoMjeHYVljtsQDsexjvENwdG/VOSV?= =?iso-8859-1?q?mPYX3ZdQs8bf0dHbTNkZ/ONxLtS6hGOZfCzAW9wOcMyvNcl82zZ?= =?iso-8859-1?q?zJ7qbPs8UntH+KY39tjaupI3MrK6dcwdciD7t2aSryDg5PXFwtz?= =?iso-8859-1?q?DY0rl7tVcAVw5Y4atGN3sgwfN7DFSTk8rmc6PpbS+Th08QUK74Q?= =?iso-8859-1?q?B/3Os6OJ8F/VdoBQlf5cWNVCKM5pV89VU9ErO3EravesA1wJUrn?= =?iso-8859-1?q?puMBfgpSAjiHjSInldBDRR3DCPr7b0uIY3tQb7BiS2fyvA6Np0J?= =?iso-8859-1?q?Qpi3pPCnQ9iVqMltp1Pkyiy6spuKx35ObkCZtGeadHn/syssLfz?= =?iso-8859-1?q?3qujl3Q10GbJEV3odpNbxhrsQVN9+rp1IAZUXXUbSyfkTcYL17m?= =?iso-8859-1?q?F2q9cOVhtC0GLNpMPHJWfP4hyKqofsjNBnfqv22HaMdaSVVSU1j?= =?iso-8859-1?q?SfRZKlHnxTIRwly/RKNgqC6ygE23xV7zi2V7QFJjsA/2jRJM5tU?= =?iso-8859-1?q?RsxwcQqhLxVj73VbJmKYHtb6IKWrsaWLD3oTK8EnTzppEEEnOAo?= =?iso-8859-1?q?ZMkcrGljLRGbIhNOY23aHxJhlHaHEaWuP2mH2orI0t6eIG2eEug?= =?iso-8859-1?q?AKXBr3A/gcdCAt/X1RqLTGIt5UNuPxDK30DISxRAHNcQAKrppSJ?= =?iso-8859-1?q?K8UghHHm/524HLYk/r7/oGICoQjetrTUibVuJ+wxeQlHhNCsHzt?= =?iso-8859-1?q?2mrt2vwPDiJ1zR0u5AytXtbbK4XAM/t0CX2m7F/X//iWjk3Ft5f?= =?iso-8859-1?q?EAVesoTS7LGJXW0FEiwEgqnjgU4vyXSt3fNGWJsUIYPfUwUAEVg?= =?iso-8859-1?q?3JbCte8qVNCuXsLoq7FZu2C4eu1OVeKjHcqvDFJOHn9at5jEafc?= =?iso-8859-1?q?JHQZt/lm9eyAPv5LFgC0Vw8wTuH62O7iX1G8FATXsRHBdSCGNcG?= =?iso-8859-1?q?rAbz/NP5ilzDB8XKyOZrDChAungPZCsvXWCijb6AGwISgG1n3OM?= =?iso-8859-1?q?NHf1GQNojn3XQW44RBahdSBOyOMMjXIwFHKzu8Hbzux4WV3mZ4X?= =?iso-8859-1?q?4VQvxTi6tEsnZphAsCGkHbmz5wMIAb7Y4SA=3D?= x-microsoft-antispam-prvs: <BN6PR11MB0019C9DAEB4832FAB739E39EF0660@BN6PR11MB0019.namprd11.prod.outlook.com> x-forefront-prvs: 094700CA91 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(366004)(136003)(376002)(39860400002)(189003)(199004)(81166006)(50226002)(106356001)(7416002)(6436002)(54906003)(2201001)(1076003)(81156014)(26005)(110136005)(476003)(102836004)(107886003)(8936002)(6512007)(6486002)(4326008)(446003)(2616005)(316002)(8676002)(105586002)(99286004)(66066001)(486006)(6116002)(3846002)(186003)(11346002)(86362001)(2906002)(72206003)(71190400001)(14454004)(76176011)(53936002)(71200400001)(478600001)(68736007)(6506007)(386003)(2501003)(52116002)(97736004)(7736002)(305945005)(256004)(25786009)(36756003)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR11MB0019; H:BN6PR11MB1842.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Piq9LueXa1PTnTLYJnrjhst3fRxPYJRunDW7lneP6XDCR4pvwt94iHa++vwpjBJuUGOZBgDPTa64Vjza13APR6KIMtKiBUOPJsby+UfzKp+WRjLE2U5PcZiC55ZPCnwA3C7fh/TCS0LU+O3l5A6gyaoV3LYWYUtkSb3a+dPkPkCd/bGoI9aCS7g+Hj47PRp2M5xVvRBl1KhDJANopJDUIMcaErkSimuGhyV7/td9TxR0FMEAsG5+b527SXyvAOiE+VPmIM76hC7XihOwxs7yECJ8GDddQHqk+IhPlx7XsLyEJZXHjXixZe5oK3kMf7IkVhz2CXHv0deXCyfDZvw8AeZxEYL+OUuP9fOYxC9H3o7aY8YiZIQZljJJS8nemILnFN61FnlfBc7UEWTEiAJGwCwzksc5s89E0j2AUANhxy4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5654c66d-a890-4576-81b6-08d69191a70d X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2019 09:00:05.3779 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB0019 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190213_010013_687768_A6F41DE4 X-CRM114-Status: GOOD ( 10.72 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [68.232.147.91 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: devicetree@vger.kernel.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tudor.Ambarus@microchip.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
add support for sam9x60 nand controller
|
expand
|
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c index 0322df9dc249..8515196c2b03 100644 --- a/drivers/memory/atmel-ebi.c +++ b/drivers/memory/atmel-ebi.c @@ -19,6 +19,8 @@ #include <linux/regmap.h> #include <soc/at91/atmel-sfr.h> +#define AT91_EBI_NUM_CS 8 + struct atmel_ebi_dev_config { int cs; struct atmel_smc_cs_conf smcconf; @@ -314,7 +316,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np, if (ret) return ret; - if (cs >= AT91_MATRIX_EBI_NUM_CS || + if (cs >= AT91_EBI_NUM_CS || !(ebi->caps->available_cs & BIT(cs))) { dev_err(dev, "invalid reg property in %pOF\n", np); return -EINVAL; @@ -344,7 +346,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np, apply = true; i = 0; - for_each_set_bit(cs, &cslines, AT91_MATRIX_EBI_NUM_CS) { + for_each_set_bit(cs, &cslines, AT91_EBI_NUM_CS) { ebid->configs[i].cs = cs; if (apply) { diff --git a/include/linux/mfd/syscon/atmel-matrix.h b/include/linux/mfd/syscon/atmel-matrix.h index 8293c3e2a82a..1e2cd118e4e3 100644 --- a/include/linux/mfd/syscon/atmel-matrix.h +++ b/include/linux/mfd/syscon/atmel-matrix.h @@ -110,7 +110,6 @@ #define AT91_MATRIX_DDR_IOSR BIT(18) #define AT91_MATRIX_NFD0_SELECT BIT(24) #define AT91_MATRIX_DDR_MP_EN BIT(25) -#define AT91_MATRIX_EBI_NUM_CS 8 #define AT91_MATRIX_USBPUCR_PUON BIT(30)