From nobody Tue Dec 2 01:51:18 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91B3E312820 for ; Thu, 20 Nov 2025 21:38:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763674690; cv=none; b=ifzLY/noHA9FKRH4tw9eQ5OKz4I1WbLuVTah0SpKJiBGm+pcdsGwN5YR+04vPMmBSl69aUUMq82GsRjbOPzzJfh2hDY+Bh0GLNpECIyl5IlOipp3URrl4C6T3aIX9RMagxnluIUb2zllO5VvAcKl7zJoRwlz9ENJo56sfsWlt6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763674690; c=relaxed/simple; bh=AffBdJpBJNkMq6q+gab85JaLyJuW8lq6N0V1nRo4XCs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DeWV41Kh3bLlbjXO9JXSwhYvEmqmFDTO/cKAON8atqQk99rIU0XS87dkU8HdyksOwh7FcfjL2dtRktZxXARuFyAFSW0ut5PA3Cxiev2DKWOpIzaN5wYDLDJsJo3965o11viUrfDNJLWrEG6pr8ksGOhl/EiVLGNKyvQx0qhLc/A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bj8mutab; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Bj8mutab" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC99AC4CEF1; Thu, 20 Nov 2025 21:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763674689; bh=AffBdJpBJNkMq6q+gab85JaLyJuW8lq6N0V1nRo4XCs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Bj8mutabVPHyktTyLd9TY5vo/A8XPwZ6BREa1Usx2c8WN6k7j6Jkc0qfXaPWMUpiX MAkKwwCXMgPpkNxJGCvEBOeSL3XaXD3HhpGnjhtIkppzOFik2EMCPB+BOGzrwSLAEg aJsNaGxWn+5sznzZ856zKaYLJVveTVeQ6xH6IhNU/5ZGBKPDD/He5sFpZNEAIo47m8 8yM2tX5cMp6DTyakQtZ/eeM2Qo1v5Ga9ewWG+7lQcBcGBGZTxlrZekWO0FylPy9g+Y frAzCbHSMPD4+J0DzoScvnlJPTRUnCnALHyOeKe/I/zDvRtMG3ngmWaKQZuhUJhiBr /WQLkhWnatK+Q== From: "Rob Herring (Arm)" Date: Thu, 20 Nov 2025 15:37:50 -0600 Subject: [PATCH v2 1/3] mtd: nand: atmel: Defer probe if SRAM is missing Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251120-at91-probe-v2-1-8c8592f02e8e@kernel.org> References: <20251120-at91-probe-v2-0-8c8592f02e8e@kernel.org> In-Reply-To: <20251120-at91-probe-v2-0-8c8592f02e8e@kernel.org> To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Russell King Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev The Atmel NAND controller driver depends on an SRAM pool and has an implicit assumption that the SRAM pool has already been created. Changing the initcall ordering can break this. Unfortunately, fw_devlink can't save us here as there's not a standard property to track the dependency. So it's up to deferring probe to save us. Signed-off-by: Rob Herring (Arm) --- drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nan= d/raw/atmel/nand-controller.c index 83ba4ebd02d4..e60998eb754b 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -2306,7 +2306,7 @@ atmel_hsmc_nand_controller_init(struct atmel_hsmc_nan= d_controller *nc) "atmel,nfc-sram", 0); if (!nc->sram.pool) { dev_err(nc->base.dev, "Missing SRAM\n"); - return -ENOMEM; + return -EPROBE_DEFER; } =20 nc->sram.virt =3D (void __iomem *)gen_pool_dma_alloc(nc->sram.pool, --=20 2.51.0 From nobody Tue Dec 2 01:51:18 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D8B13242A1 for ; Thu, 20 Nov 2025 21:38:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763674691; cv=none; b=f7qYWrrt2HXsN6GT21Y+rvOPTi8ficqnaHeo88jkv6c1iEVWExHyvqQNAvJ2c4KqrU1FKHjwji50SpLwhkveWoijFEzRZOloD6ZSjJ7tqGxTI9GPoCE9ep90UlfVsWstX1d7B1zJGZglVHyZpcbjq8WW4OPjWDuHLsDIKwJDWZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763674691; c=relaxed/simple; bh=p2iRB5gfTfQy7rwmQVb2AFipzBjlvzKpAdPbAlIUpu8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=boZ3+2p9giZXgVcxwpEFL63sueFVsAnpGK+vIas2Hj3ftsakj3KWdhiOsVeJLNMco7brn3uNbXvfsBXMzJxSmFlCLZB/0qjrtdkTRdIs/sUI3SeIOoV5PvlyIKkMToS/VKTefsO06WCi3H0ywQQ2moWoojBEiBHT4JiSciiqtBM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cfmjRpXe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cfmjRpXe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F383C116C6; Thu, 20 Nov 2025 21:38:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763674690; bh=p2iRB5gfTfQy7rwmQVb2AFipzBjlvzKpAdPbAlIUpu8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cfmjRpXeGlAZDGSFmeIFet3T3R7BeErhUWa8Q2dw6uU3UbqXiytoyyzY4BFDsd9Ez VbC0DZM9/DgTwrI5+E0xPoL5GMu9eQ8N3PQAxRUrsDxT2C8qRV2UQT/TDzWzOoaXzO wR5Qh5fH7dvf6cP9UnZ+2UxzJsCmB3dbC4a+k4RrRnASU31LGBTuLL5RDLYoQ/wo5D wQnlWWic/eQ0c0OLKCEwLHRpomheE6q8xO/qDdWsbCAuqjC6Zrsf7uQ4/hB63QfFeN P9PGNSqOHnkqBPq5ah1D8n3dvpe/wB0P98+l/dDzlfGHmcjfG1N0oSJPAqCuTNCKMP UNjZhq0gYE/TQ== From: Rob Herring Date: Thu, 20 Nov 2025 15:37:51 -0600 Subject: [PATCH v2 2/3] ARM: at91: Move PM init functions to .init_late hook Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251120-at91-probe-v2-2-8c8592f02e8e@kernel.org> References: <20251120-at91-probe-v2-0-8c8592f02e8e@kernel.org> In-Reply-To: <20251120-at91-probe-v2-0-8c8592f02e8e@kernel.org> To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Russell King Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev Move the AT91 PM init functions to .init_late hook to ensure driver dependencies have probed. Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Rob Herring (Arm) --- v2: - new patch --- arch/arm/mach-at91/at91rm9200.c | 3 +-- arch/arm/mach-at91/at91sam9.c | 3 +-- arch/arm/mach-at91/sam9x60.c | 3 +-- arch/arm/mach-at91/sam9x7.c | 3 +-- arch/arm/mach-at91/sama5.c | 2 +- arch/arm/mach-at91/sama7.c | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm920= 0.c index 4f8186211619..2ac564eb8bbb 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -17,8 +17,6 @@ static void __init at91rm9200_dt_device_init(void) { of_platform_default_populate(NULL, NULL, NULL); - - at91rm9200_pm_init(); } =20 static const char *const at91rm9200_dt_board_compat[] __initconst =3D { @@ -27,6 +25,7 @@ static const char *const at91rm9200_dt_board_compat[] __i= nitconst =3D { }; =20 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200") + .init_late =3D at91rm9200_pm_init, .init_machine =3D at91rm9200_dt_device_init, .dt_compat =3D at91rm9200_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c index 7e572189a5eb..cf07cba4ee5d 100644 --- a/arch/arm/mach-at91/at91sam9.c +++ b/arch/arm/mach-at91/at91sam9.c @@ -17,8 +17,6 @@ static void __init at91sam9_init(void) { of_platform_default_populate(NULL, NULL, NULL); - - at91sam9_pm_init(); } =20 static const char *const at91_dt_board_compat[] __initconst =3D { @@ -28,6 +26,7 @@ static const char *const at91_dt_board_compat[] __initcon= st =3D { =20 DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9") /* Maintainer: Atmel */ + .init_late =3D at91sam9_pm_init, .init_machine =3D at91sam9_init, .dt_compat =3D at91_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/sam9x60.c b/arch/arm/mach-at91/sam9x60.c index d8c739d25458..a31beaaeffcd 100644 --- a/arch/arm/mach-at91/sam9x60.c +++ b/arch/arm/mach-at91/sam9x60.c @@ -18,8 +18,6 @@ static void __init sam9x60_init(void) { of_platform_default_populate(NULL, NULL, NULL); - - sam9x60_pm_init(); } =20 static const char *const sam9x60_dt_board_compat[] __initconst =3D { @@ -29,6 +27,7 @@ static const char *const sam9x60_dt_board_compat[] __init= const =3D { =20 DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60") /* Maintainer: Microchip */ + .init_late =3D sam9x60_pm_init, .init_machine =3D sam9x60_init, .dt_compat =3D sam9x60_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/sam9x7.c b/arch/arm/mach-at91/sam9x7.c index e1ff30b5b09b..0c73f7fefd4f 100644 --- a/arch/arm/mach-at91/sam9x7.c +++ b/arch/arm/mach-at91/sam9x7.c @@ -17,8 +17,6 @@ static void __init sam9x7_init(void) { of_platform_default_populate(NULL, NULL, NULL); - - sam9x7_pm_init(); } =20 static const char * const sam9x7_dt_board_compat[] __initconst =3D { @@ -28,6 +26,7 @@ static const char * const sam9x7_dt_board_compat[] __init= const =3D { =20 DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7") /* Maintainer: Microchip */ + .init_late =3D sam9x7_pm_init, .init_machine =3D sam9x7_init, .dt_compat =3D sam9x7_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c index bf2b5c6a18c6..efae697ce29c 100644 --- a/arch/arm/mach-at91/sama5.c +++ b/arch/arm/mach-at91/sama5.c @@ -33,7 +33,6 @@ static void __init sama5_secure_cache_init(void) static void __init sama5_dt_device_init(void) { of_platform_default_populate(NULL, NULL, NULL); - sama5_pm_init(); } =20 static const char *const sama5_dt_board_compat[] __initconst =3D { @@ -43,6 +42,7 @@ static const char *const sama5_dt_board_compat[] __initco= nst =3D { =20 DT_MACHINE_START(sama5_dt, "Atmel SAMA5") /* Maintainer: Atmel */ + .init_late =3D sama5_pm_init, .init_machine =3D sama5_dt_device_init, .dt_compat =3D sama5_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/sama7.c b/arch/arm/mach-at91/sama7.c index bd43733ede18..3e28727f2a8e 100644 --- a/arch/arm/mach-at91/sama7.c +++ b/arch/arm/mach-at91/sama7.c @@ -17,8 +17,6 @@ static void __init sama7_dt_device_init(void) { of_platform_default_populate(NULL, NULL, NULL); - sama7_pm_init(); -} =20 static const char *const sama7_dt_board_compat[] __initconst =3D { "microchip,sama7", @@ -27,6 +25,7 @@ static const char *const sama7_dt_board_compat[] __initco= nst =3D { =20 DT_MACHINE_START(sama7_dt, "Microchip SAMA7") /* Maintainer: Microchip */ + .init_late =3D sama7_pm_init, .init_machine =3D sama7_dt_device_init, .dt_compat =3D sama7_dt_board_compat, MACHINE_END --=20 2.51.0 From nobody Tue Dec 2 01:51:18 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 623AB33DEEB for ; Thu, 20 Nov 2025 21:38:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763674692; cv=none; b=SILZ7mbfT3PgzxYPp8aW0Mukz/W4OgUt/g9IIpedhrLUJH3mLFualdsKAiCO3Qd7GEebPWqTrOuIFsbKEP/PXBAoZuMXdQvd92AhLowdXZr5SVlZjpLfifg5hy4x5hEepo/Vktr6Z/U5QjHeM10mTNknsQgOhN7Y1DwfPTMeyeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763674692; c=relaxed/simple; bh=Cguyb6qhnCh7Fzl+WJWPnEA/oYhtORJ4ebfdxQdOqcY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TVaMkDCYq4/PFC92KCzFxSohICQKArXH9spQuwcaeDTULsGWTz1a5x55JU6qGgQmJ7MFj0m+8BuORvhaKP6JFPzsoOMcnbE/Jw7P5cQ1GXrpF4+z8bwX3g0vqdL9NAZ1bbXt7fMBnqjpoU9GYItOKsE+hP51c4VdIXHhCvL70JQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eEpbI1U2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eEpbI1U2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEC3AC116B1; Thu, 20 Nov 2025 21:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763674691; bh=Cguyb6qhnCh7Fzl+WJWPnEA/oYhtORJ4ebfdxQdOqcY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eEpbI1U2W4WXM51ycPTgdnoHrzq+1MV2SnKxBcRcKks72S+BM700hMgM7+OIO2etq U4oxsl163wCbabLy5hhZYYMFNRIoQRPZR747Dq1nO5lowbS87VTUDQ7/8mE5ZWoueU dsw28hTT092seMXttB1icy51ivaDlzcLklwhJ5VB5XBhDUNgimvmKKNK7GTp3GBj68 xHjyIzMojTmPChg8yq2XhUzEITSLRUC7hDNa1AFELcWA/I3LqDg94I0DDP21vpf35H eDpBruNQyo1vPTfX5r4Zuo3yK7EAnxwKlFZGqDSZmf7a31r/ufLP+RNyFEsTFUZfrH n0zMX20ZKe4ew== From: "Rob Herring (Arm)" Date: Thu, 20 Nov 2025 15:37:52 -0600 Subject: [PATCH v2 3/3] ARM: at91: remove unnecessary of_platform_default_populate calls Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251120-at91-probe-v2-3-8c8592f02e8e@kernel.org> References: <20251120-at91-probe-v2-0-8c8592f02e8e@kernel.org> In-Reply-To: <20251120-at91-probe-v2-0-8c8592f02e8e@kernel.org> To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Russell King Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev The DT core will call of_platform_default_populate, so it is not necessary for machine specific code to call it unless there are custom match entries, auxdata or parent device. Neither of those apply here, so remove the call. Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Rob Herring (Arm) --- v2: - Dust off and rebase to 6.18-rc1 - Add new platforms added since v1 --- arch/arm/mach-at91/at91rm9200.c | 9 --------- arch/arm/mach-at91/at91sam9.c | 9 --------- arch/arm/mach-at91/sam9x60.c | 9 --------- arch/arm/mach-at91/sam9x7.c | 9 --------- arch/arm/mach-at91/sama5.c | 19 ++----------------- arch/arm/mach-at91/sama7.c | 8 -------- 6 files changed, 2 insertions(+), 61 deletions(-) diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm920= 0.c index 2ac564eb8bbb..d15997fff5d7 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -7,18 +7,10 @@ * 2012 Joachim Eastwood */ =20 -#include -#include - #include =20 #include "generic.h" =20 -static void __init at91rm9200_dt_device_init(void) -{ - of_platform_default_populate(NULL, NULL, NULL); -} - static const char *const at91rm9200_dt_board_compat[] __initconst =3D { "atmel,at91rm9200", NULL @@ -26,6 +18,5 @@ static const char *const at91rm9200_dt_board_compat[] __i= nitconst =3D { =20 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200") .init_late =3D at91rm9200_pm_init, - .init_machine =3D at91rm9200_dt_device_init, .dt_compat =3D at91rm9200_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c index cf07cba4ee5d..b9d2909d1b65 100644 --- a/arch/arm/mach-at91/at91sam9.c +++ b/arch/arm/mach-at91/at91sam9.c @@ -6,19 +6,11 @@ * 2011 Nicolas Ferre */ =20 -#include -#include - #include #include =20 #include "generic.h" =20 -static void __init at91sam9_init(void) -{ - of_platform_default_populate(NULL, NULL, NULL); -} - static const char *const at91_dt_board_compat[] __initconst =3D { "atmel,at91sam9", NULL @@ -27,6 +19,5 @@ static const char *const at91_dt_board_compat[] __initcon= st =3D { DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9") /* Maintainer: Atmel */ .init_late =3D at91sam9_pm_init, - .init_machine =3D at91sam9_init, .dt_compat =3D at91_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/sam9x60.c b/arch/arm/mach-at91/sam9x60.c index a31beaaeffcd..744bab2cbb92 100644 --- a/arch/arm/mach-at91/sam9x60.c +++ b/arch/arm/mach-at91/sam9x60.c @@ -7,19 +7,11 @@ * Author: Claudiu Beznea */ =20 -#include -#include - #include #include =20 #include "generic.h" =20 -static void __init sam9x60_init(void) -{ - of_platform_default_populate(NULL, NULL, NULL); -} - static const char *const sam9x60_dt_board_compat[] __initconst =3D { "microchip,sam9x60", NULL @@ -28,6 +20,5 @@ static const char *const sam9x60_dt_board_compat[] __init= const =3D { DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60") /* Maintainer: Microchip */ .init_late =3D sam9x60_pm_init, - .init_machine =3D sam9x60_init, .dt_compat =3D sam9x60_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/sam9x7.c b/arch/arm/mach-at91/sam9x7.c index 0c73f7fefd4f..166c8625509d 100644 --- a/arch/arm/mach-at91/sam9x7.c +++ b/arch/arm/mach-at91/sam9x7.c @@ -7,18 +7,10 @@ * Author: Varshini Rajendran */ =20 -#include -#include - #include =20 #include "generic.h" =20 -static void __init sam9x7_init(void) -{ - of_platform_default_populate(NULL, NULL, NULL); -} - static const char * const sam9x7_dt_board_compat[] __initconst =3D { "microchip,sam9x7", NULL @@ -27,6 +19,5 @@ static const char * const sam9x7_dt_board_compat[] __init= const =3D { DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7") /* Maintainer: Microchip */ .init_late =3D sam9x7_pm_init, - .init_machine =3D sam9x7_init, .dt_compat =3D sam9x7_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c index efae697ce29c..e56022f00800 100644 --- a/arch/arm/mach-at91/sama5.c +++ b/arch/arm/mach-at91/sama5.c @@ -6,9 +6,6 @@ * 2013 Ludovic Desroches */ =20 -#include -#include - #include #include #include @@ -30,11 +27,6 @@ static void __init sama5_secure_cache_init(void) outer_cache.write_sec =3D sama5_l2c310_write_sec; } =20 -static void __init sama5_dt_device_init(void) -{ - of_platform_default_populate(NULL, NULL, NULL); -} - static const char *const sama5_dt_board_compat[] __initconst =3D { "atmel,sama5", NULL @@ -43,7 +35,6 @@ static const char *const sama5_dt_board_compat[] __initco= nst =3D { DT_MACHINE_START(sama5_dt, "Atmel SAMA5") /* Maintainer: Atmel */ .init_late =3D sama5_pm_init, - .init_machine =3D sama5_dt_device_init, .dt_compat =3D sama5_dt_board_compat, MACHINE_END =20 @@ -54,17 +45,11 @@ static const char *const sama5_alt_dt_board_compat[] __= initconst =3D { =20 DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5") /* Maintainer: Atmel */ - .init_machine =3D sama5_dt_device_init, + .init_late =3D sama5_pm_init, .dt_compat =3D sama5_alt_dt_board_compat, .l2c_aux_mask =3D ~0UL, MACHINE_END =20 -static void __init sama5d2_init(void) -{ - of_platform_default_populate(NULL, NULL, NULL); - sama5d2_pm_init(); -} - static const char *const sama5d2_compat[] __initconst =3D { "atmel,sama5d2", NULL @@ -72,8 +57,8 @@ static const char *const sama5d2_compat[] __initconst =3D= { =20 DT_MACHINE_START(sama5d2, "Atmel SAMA5") /* Maintainer: Atmel */ - .init_machine =3D sama5d2_init, .init_early =3D sama5_secure_cache_init, + .init_late =3D sama5d2_pm_init, .dt_compat =3D sama5d2_compat, .l2c_aux_mask =3D ~0UL, MACHINE_END diff --git a/arch/arm/mach-at91/sama7.c b/arch/arm/mach-at91/sama7.c index 3e28727f2a8e..f56828d61199 100644 --- a/arch/arm/mach-at91/sama7.c +++ b/arch/arm/mach-at91/sama7.c @@ -6,18 +6,11 @@ * */ =20 -#include -#include - #include #include =20 #include "generic.h" =20 -static void __init sama7_dt_device_init(void) -{ - of_platform_default_populate(NULL, NULL, NULL); - static const char *const sama7_dt_board_compat[] __initconst =3D { "microchip,sama7", NULL @@ -26,7 +19,6 @@ static const char *const sama7_dt_board_compat[] __initco= nst =3D { DT_MACHINE_START(sama7_dt, "Microchip SAMA7") /* Maintainer: Microchip */ .init_late =3D sama7_pm_init, - .init_machine =3D sama7_dt_device_init, .dt_compat =3D sama7_dt_board_compat, MACHINE_END =20 --=20 2.51.0