From patchwork Thu Jun 16 08:13:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12883531 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 3C122C433EF for ; Thu, 16 Jun 2022 08:14:23 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=0FGu2cxYjPMyUifjhprlpP11+4jLGCzSKLEyvsvaLAQ=; b=mzpyhIN6lSz7YI bUEb7D2eGt5hDVUZR38GwcS85iGMYTvits1y67U5S5LvBcISjwdzzKARTixVdOC111gKDwZ4y2dw3 ZR0qWIlR5WOuICvZpjQBkZKZlOANZ8Q4/N6Cjrr3J0LmyMnYdx0FeIYLB0c69za8TczjKthXUOH9p RjxQRJSHxpCfw4Yaa3Pxksxy7vkxUJuBYBQyilQxBeAb7KI/wCwmVHqujw+Ad/1Cwo1U6JIRVH5yb 7/0LyUPrBBSgcSA1cvzKdERPrW5Ac3TipwB6Xz9gyvV9OJTUEemddn6jpDXq+3vCUM2Ky1hBZ6Rbb WYBDG4hhOzelxFOixr3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1kcp-001KnZ-Vk; Thu, 16 Jun 2022 08:13:13 +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 1o1kb1-001KC0-S4 for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2022 08:11:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1655367080; x=1686903080; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=jRcuF1uDD/XW4iPGapQV10Uvq9i/CiZCx2xNmbcpmls=; b=JMkcV5klAjnfmp+htPNThNDvEtOXV/VGVfBLLmc/F0gGReGZvp3IAc7g Po5oKOW6QszwennsZrAUh08zpWfo9hPkaMh+HTJRxu5Jf7yjsYMlOWyh/ /wJXoCb/KUntNkVonSW4Ac8bV+WIygl+tV1B5AYqYhhe67796Danr014f FaRr6nmmFvtxBZtyAuPXUu5TcDQui/HpSp2kf+/HocUjKinpu25MtJ7u+ dSCLkx5KTZACJqR18Swxiv8KANm/0rQ1KhEW98299vvW0Ub/YoucUjzB5 8PNq+rSPmZ4JR4C1TK1VQMkrEvUA23MAsLrxe/CUsl5mhQB5M4++5RDoK w==; X-IronPort-AV: E=Sophos;i="5.91,304,1647327600"; d="scan'208";a="160592810" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Jun 2022 01:11:18 -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; Thu, 16 Jun 2022 01:11:17 -0700 Received: from localhost.localdomain (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; Thu, 16 Jun 2022 01:11:15 -0700 From: Claudiu Beznea To: , , CC: , , Claudiu Beznea Subject: [PATCH] ARM: at91: fix soc detection for SAM9X60 SiPs Date: Thu, 16 Jun 2022 11:13:44 +0300 Message-ID: <20220616081344.1978664-1-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220616_011120_073744_66ED4B0F X-CRM114-Status: UNSURE ( 7.55 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mihai Sain Fix SoC detection for SAM9X60 SiPs: SAM9X60D5M SAM9X60D1G SAM9X60D6K Fixes: af3a10513cd6 ("drivers: soc: atmel: add per soc id and version match masks") Signed-off-by: Mihai Sain Signed-off-by: Claudiu Beznea --- drivers/soc/atmel/soc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index b2d365ae0282..dae8a2e0f745 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -91,14 +91,14 @@ static const struct at91_soc socs[] __initconst = { AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK, AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"), - AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D5M_EXID_MATCH, - AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH, + AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK, + AT91_CIDR_VERSION_MASK, SAM9X60_D5M_EXID_MATCH, "sam9x60 64MiB DDR2 SiP", "sam9x60"), - AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D1G_EXID_MATCH, - AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH, + AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK, + AT91_CIDR_VERSION_MASK, SAM9X60_D1G_EXID_MATCH, "sam9x60 128MiB DDR2 SiP", "sam9x60"), - AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D6K_EXID_MATCH, - AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH, + AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK, + AT91_CIDR_VERSION_MASK, SAM9X60_D6K_EXID_MATCH, "sam9x60 8MiB SDRAM SiP", "sam9x60"), #endif #ifdef CONFIG_SOC_SAMA5