From mboxrd@z Thu Jan 1 00:00:00 1970 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 B6DEAC4167B for ; Fri, 8 Dec 2023 19:23:42 +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:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Of3Efg/Zer1kqYSDmArLE7lI8Xr/1eDkXxWZxebwPU0=; b=kTxNgtw8CvD3cJ c8xhAsn8lxAh14E6+L5ovxtsy8NC/+B+MJ+MR9yC2IpWqVLcEaeXfThcjQaQyIp4n0ryWNtPYAaK1 xSlzvrufdPeXEshyg0zbXOKzcrI1xK8PmBMlKUyKfUDaiHnSk+KPdAFBlXiZz7QMmD2OVd8p7ApaX 7xbTeciPIP66YI9xh6XCSB3e3qLdGP0oG+zwj3uu1hCNCDA4GCHnMilbSl3MbMdikivFLajI+rBMv s9l8NEdv7ujakwu7VrW5ecUDWyq5YNzSCFqTkvyxd2LcyFRWYvbDhxcloAJLyOh0r4aukmlRL8dWg wUhdMZv2v3VXs7QbaG6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rBgRS-00GNQq-2Y; Fri, 08 Dec 2023 19:23:18 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rBgRP-00GNPa-2m for linux-arm-kernel@lists.infradead.org; Fri, 08 Dec 2023 19:23:17 +0000 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a1e7971db2aso275302866b.3 for ; Fri, 08 Dec 2023 11:23:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1702063393; x=1702668193; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=nYer3k5AHgALqQa9MbWQNvQ/NvhzpotSwy0iRJYUHjg=; b=ApGM2cy0+mu2C9nXIqwWv/BaDkStT14fD4k8KC68nbm5KZHFzrIMXHGbMS54v3r39j dUqjvU8r/QXQTWy5QuGyCzrkioReSXX7EjFGfARWJkB4f3CY6/H1mZdGxmfkAb0G8D8E c6bxBv5gAy5PT1NzGHx2PK/yvQ4p8qESNAjOWptlr1VRwAypEd6C+JVtrbBgxP4CblHV eQE3kP1ySmPsAx7Pj3yCWBCT9CmBBYEsikdNczgXjrfoV34F1GyyangaxpcPH9D/VyfI JBdP/EBPIyzcVzv78ffb8FhVM+gC9y+Ykk1y9pZz6UK1FoWpV/F3p3EZfoCxn87txYgb 40dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702063393; x=1702668193; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nYer3k5AHgALqQa9MbWQNvQ/NvhzpotSwy0iRJYUHjg=; b=LNHS+kXQDZMfuI5Bu/dGm9W3Rimiq/y7SSNSrjjYzL8TNgyrP3tN4eUiR8zJsEbiZ6 sjyR9wWBYeWDW82sFaZLs5A+JEiPJ00U7hEhj9nkQc5nvnOYw+X98Jg33XlA0c1tn0eF c0Sz/A8fsNEw4tFR7u0zEti4mcas6dFwWGZ5YzaTIh5NOc5ZdK1Ng1WVsNJwxcCQzuuC wFHS41RoQ6udTCCWOow5+lvoubiEXFIpSa2WCsRVhJnEz1GNUt38Ga1vd4VoIOYycvSv 8aM5jYu8Ev1kgSqknNfedIqS4e0TyIR9pWpHjOmCG3Xefdb48vIf3Ke9eH5Ekex6hlSB 95tw== X-Gm-Message-State: AOJu0YwN/ADq7xFTrdCEW76MrjmM3eY33/ECZ9P4Twsayj44O6YxFIhl V0KN8Bx8RrXufl3hNOMa1KH8eA== X-Google-Smtp-Source: AGHT+IE9MSc735O8yJ+Sy59fmTbRrabH9hyXZet59qWEG0OGbjPGuhfmOnDpW6nkiL5l2/tKSm9Oow== X-Received: by 2002:a17:906:54:b0:a18:aa41:7c6f with SMTP id 20-20020a170906005400b00a18aa417c6fmr207587ejg.7.1702063393502; Fri, 08 Dec 2023 11:23:13 -0800 (PST) Received: from [192.168.50.4] ([82.78.167.22]) by smtp.gmail.com with ESMTPSA id vv6-20020a170907a68600b00a1dff479037sm1321205ejc.127.2023.12.08.11.23.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 Dec 2023 11:23:13 -0800 (PST) Message-ID: Date: Fri, 8 Dec 2023 21:23:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drivers: soc: atmel: Adjust defines to follow alphabetical order Content-Language: en-US To: Ryan.Wanner@microchip.com, nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20231208170230.551265-1-Ryan.Wanner@microchip.com> From: claudiu beznea In-Reply-To: <20231208170230.551265-1-Ryan.Wanner@microchip.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231208_112316_286604_DFD9FB20 X-CRM114-Status: GOOD ( 11.70 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Ryan, On 08.12.2023 19:02, Ryan.Wanner@microchip.com wrote: > From: Ryan Wanner > > Move the defines so that they are in aphabetical order based on SOC. > > Signed-off-by: Ryan Wanner This doesn't apply clean on top of v6.7-rc1. I guess it's related to SAM9X7 defines that are not yet in v6.7-rc1. Thank you, Claudiu Beznea > --- > drivers/soc/atmel/soc.h | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/soc/atmel/soc.h b/drivers/soc/atmel/soc.h > index 26dd26b4f179..9b2d31073b88 100644 > --- a/drivers/soc/atmel/soc.h > +++ b/drivers/soc/atmel/soc.h > @@ -39,13 +39,13 @@ at91_soc_init(const struct at91_soc *socs); > #define AT91SAM9261_CIDR_MATCH 0x019703a0 > #define AT91SAM9263_CIDR_MATCH 0x019607a0 > #define AT91SAM9G20_CIDR_MATCH 0x019905a0 > -#define AT91SAM9RL64_CIDR_MATCH 0x019b03a0 > #define AT91SAM9G45_CIDR_MATCH 0x019b05a0 > -#define AT91SAM9X5_CIDR_MATCH 0x019a05a0 > #define AT91SAM9N12_CIDR_MATCH 0x019a07a0 > +#define AT91SAM9RL64_CIDR_MATCH 0x019b03a0 > +#define AT91SAM9X5_CIDR_MATCH 0x019a05a0 > #define SAM9X60_CIDR_MATCH 0x019b35a0 > -#define SAMA7G5_CIDR_MATCH 0x00162100 > #define SAM9X7_CIDR_MATCH 0x09750020 > +#define SAMA7G5_CIDR_MATCH 0x00162100 > > #define AT91SAM9M11_EXID_MATCH 0x00000001 > #define AT91SAM9M10_EXID_MATCH 0x00000002 > @@ -62,19 +62,15 @@ at91_soc_init(const struct at91_soc *socs); > #define AT91SAM9N12_EXID_MATCH 0x00000006 > #define AT91SAM9CN11_EXID_MATCH 0x00000009 > > +#define AT91SAM9XE128_CIDR_MATCH 0x329973a0 > +#define AT91SAM9XE256_CIDR_MATCH 0x329a93a0 > +#define AT91SAM9XE512_CIDR_MATCH 0x329aa3a0 > + > #define SAM9X60_EXID_MATCH 0x00000000 > #define SAM9X60_D5M_EXID_MATCH 0x00000001 > #define SAM9X60_D1G_EXID_MATCH 0x00000010 > #define SAM9X60_D6K_EXID_MATCH 0x00000011 > > -#define SAMA7G51_EXID_MATCH 0x3 > -#define SAMA7G52_EXID_MATCH 0x2 > -#define SAMA7G53_EXID_MATCH 0x1 > -#define SAMA7G54_EXID_MATCH 0x0 > -#define SAMA7G54_D1G_EXID_MATCH 0x00000018 > -#define SAMA7G54_D2G_EXID_MATCH 0x00000020 > -#define SAMA7G54_D4G_EXID_MATCH 0x00000028 > - > #define SAM9X75_EXID_MATCH 0x00000000 > #define SAM9X72_EXID_MATCH 0x00000004 > #define SAM9X70_EXID_MATCH 0x00000005 > @@ -83,10 +79,6 @@ at91_soc_init(const struct at91_soc *socs); > #define SAM9X75_D1M_EXID_MATCH 0x00000003 > #define SAM9X75_D2G_EXID_MATCH 0x00000006 > > -#define AT91SAM9XE128_CIDR_MATCH 0x329973a0 > -#define AT91SAM9XE256_CIDR_MATCH 0x329a93a0 > -#define AT91SAM9XE512_CIDR_MATCH 0x329aa3a0 > - > #define SAMA5D2_CIDR_MATCH 0x0a5c08c0 > #define SAMA5D21CU_EXID_MATCH 0x0000005a > #define SAMA5D225C_D1M_EXID_MATCH 0x00000053 > @@ -122,6 +114,14 @@ at91_soc_init(const struct at91_soc *socs); > #define SAMA5D43_EXID_MATCH 0x00000003 > #define SAMA5D44_EXID_MATCH 0x00000004 > > +#define SAMA7G51_EXID_MATCH 0x3 > +#define SAMA7G52_EXID_MATCH 0x2 > +#define SAMA7G53_EXID_MATCH 0x1 > +#define SAMA7G54_EXID_MATCH 0x0 > +#define SAMA7G54_D1G_EXID_MATCH 0x00000018 > +#define SAMA7G54_D2G_EXID_MATCH 0x00000020 > +#define SAMA7G54_D4G_EXID_MATCH 0x00000028 > + > #define SAME70Q21_CIDR_MATCH 0x21020e00 > #define SAME70Q21_EXID_MATCH 0x00000002 > #define SAME70Q20_CIDR_MATCH 0x21020c00 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel