From patchwork Tue Mar 1 09:56:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 12764454 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 248E1C433FE for ; Tue, 1 Mar 2022 09:58:33 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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=bYU3V9Z1fqBJLBCOZg2JlQo2NCNg7bDVi3CfGvgeclA=; b=sElYiBhSCG00o2 nuBogeGjF5MpDgZBzjIquCOHB7HHylWv6D/DigGV11qq9eHOeIO1aSnwffsajltEDJuv9MnCey6IR CbIHRdT93OnhfYNxkV+pOcVNMaHSXS0jN+yeoKAmOGpOmTyR6cd1oA8ycoJPJokg5Ol6TT1mCIH/4 vdIYZ7G4Gkm5XtOdjz4zmSz3YsvAsTWu4oCyRxA8JB+pYOMPj5XuvfPrnXAKUXDVfSBbaQU3i4ljw qJcSdRd0aBxd7YANwOrmlYjHHuA7h7gvZLwlekUp1mwnREfXFhkwH6VgC1Q2UDCXEr/3DInxCqIgL Yu7fpfgpu0gDbbRSvfww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOzFz-00Fwme-PP; Tue, 01 Mar 2022 09:57:23 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOzFP-00Fwdc-Co; Tue, 01 Mar 2022 09:56:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1646128607; x=1677664607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gNF6iFjoLOMY/ds4qm6GXd4VBaZIAxXwG6j9UeqFsj0=; b=sZvJkGpugMuq6cpj3p6QQiiUVoZLL/rbZLs1lIgfv2nqe+FAAou6yoIF DyHSZUA57e2eunfaU/FfluUZ4b20WFzOi7+fRJCJJGGBjHpOP9CD/pAXR N3d/Fe1TWr4bMlnRYdhBQSTzVfJJq1SFEflYj0ECrG9KNm1p13pToVmaD UcyNJG27i4XMlCLQx2Bg3J0sJN4FnQ41S7LIuIXkTsvsipy9CmCQ0KDp+ K6rouUlSLSnUNb164iCTm4iVRxM4MM3suOeYX7IA4R4Xl3Xa+aLlx8a3C ZZm8HtW4dh/z27BtrSLx+xJzLQmdjZ0FOV91ZRlZs1IXfHTB05sHo0t7w w==; X-IronPort-AV: E=Sophos;i="5.90,145,1643698800"; d="scan'208";a="155241280" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Mar 2022 02:56:46 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 1 Mar 2022 02:56:46 -0700 Received: from ROB-ULT-M18064N.mchp-main.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Tue, 1 Mar 2022 02:56:44 -0700 From: Tudor Ambarus To: , , Subject: [PATCH 1/2] mtd: spi-nor: macronix: Move set_4byte_addr_mode() to late_init() Date: Tue, 1 Mar 2022 11:56:39 +0200 Message-ID: <20220301095640.313852-2-tudor.ambarus@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220301095640.313852-1-tudor.ambarus@microchip.com> References: <20220301095640.313852-1-tudor.ambarus@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220301_015647_462442_72189141 X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. 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: , Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Tudor Ambarus Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We'd like to get rid of the default_init() hooks to remove the spaghetti way of initializing the flash. set_4byte_addr_mode() is called after late_init(), it's safe to move where this method is set. Signed-off-by: Tudor Ambarus --- drivers/mtd/spi-nor/macronix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/mtd/spi-nor/macronix.c b/drivers/mtd/spi-nor/macronix.c index 45c2f2c50e56..3d0e34c9410c 100644 --- a/drivers/mtd/spi-nor/macronix.c +++ b/drivers/mtd/spi-nor/macronix.c @@ -147,11 +147,16 @@ static const struct flash_info macronix_nor_parts[] = { static void macronix_nor_default_init(struct spi_nor *nor) { nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable; +} + +static void macronix_nor_late_init(struct spi_nor *nor) +{ nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode; } static const struct spi_nor_fixups macronix_nor_fixups = { .default_init = macronix_nor_default_init, + .late_init = macronix_nor_late_init, }; const struct spi_nor_manufacturer spi_nor_macronix = { From patchwork Tue Mar 1 09:56:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 12764466 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C9680C433F5 for ; Tue, 1 Mar 2022 09:59:10 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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=fhq9NST8ygGeQ++xOt3/l9SDBdpoMghtJ+NQNxnKorQ=; b=BDQ4z8f5ExtdQE MQov1Q6xtYAqHbhi9uw79CYrheOjvkJtAsIl+c3f1AznG/ZYvfCrDqPBPovUEiWy2EGPu/KH9yHMl 0hDFveoDQRhNPDWy6k0E5mcCxNnKHgZ/Y8VNsrx6hehbuyNhDOOD//yuSH9Klsf0HXFnAMNL7HUT+ 6A3v1okxKnhvwE9H8z2MOVt15NvaNl4Ot4x7U+NTWQuMPrfP3a9drPGN04l/6BjKJFpC+s9m/0GXn vhYoEpLnRtymMVVJByYZ2Ph08cPtFTWyW4Vwv9IDiEKrgvZ8vOKaBzFbehAPwUfZl8CvjQgPRMFoq HJCsmm9LPx+fivzysNQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOzGX-00Fwz6-Nd; Tue, 01 Mar 2022 09:57:57 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOzFR-00FwdE-5q; Tue, 01 Mar 2022 09:56:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1646128608; x=1677664608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YYD4Ydks7S4RUSwEQCJo3IkJGKlxd1z1rrnN1HALZEE=; b=gMpz9HdBgTeKk1uX9ULp4ZzlREsCwM1EvZ36SsCPFf3P2v6akUeNHpUk LL+FnRCVAPP9job22Mnr9Adp0Tl5lOk3KiNG0ZIvcgCBhRylDxPMP0UhK Po5piVSbabn2a6ZTbaXnw0+D2x0xepybIZhSZwuuMCKp+PM59RyCm8MPh 3OS/2cr4rAutnpRKX9cXxyFLGEt/HXBt8G+NUdy88BOEI16tBW3DPim4W psP4ZuSVkpeZX/u5VacLam1D7RMn8kD2jvG9UgyHAemsrbcqhDX8a+PSd frEK52TfclFPpHfqlST8v0fHHU80Qe+diGE7E8WrQrLOLip+4YI5RrJN/ Q==; X-IronPort-AV: E=Sophos;i="5.90,145,1643698800"; d="scan'208";a="87367837" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Mar 2022 02:56:48 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 1 Mar 2022 02:56:48 -0700 Received: from ROB-ULT-M18064N.mchp-main.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Tue, 1 Mar 2022 02:56:46 -0700 From: Tudor Ambarus To: , , Subject: [PATCH 2/2] mtd: spi-nor: macronix: Use post_bfpt hook to fix quad_enable method for MX25L12835F Date: Tue, 1 Mar 2022 11:56:40 +0200 Message-ID: <20220301095640.313852-3-tudor.ambarus@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220301095640.313852-1-tudor.ambarus@microchip.com> References: <20220301095640.313852-1-tudor.ambarus@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220301_015649_307894_CBD4C9AA X-CRM114-Status: UNSURE ( 9.15 ) X-CRM114-Notice: Please train this message. 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: , Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Tudor Ambarus Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org MX25L12835F does not define BFPT[DWORD(15)], update the quad_enable method in a post_bfpt hook. Reported-by: Heiko Thiery Signed-off-by: Tudor Ambarus --- drivers/mtd/spi-nor/macronix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mtd/spi-nor/macronix.c b/drivers/mtd/spi-nor/macronix.c index 3d0e34c9410c..20fab9814b80 100644 --- a/drivers/mtd/spi-nor/macronix.c +++ b/drivers/mtd/spi-nor/macronix.c @@ -37,6 +37,9 @@ static int mx25l12805d_post_bfpt_fixups(struct spi_nor *nor, */ nor->name = "mx25l12835f"; + /* BFPT lacks information about the Quad Enable method, set it here. */ + nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable; + return 0; }