From nobody Sat Feb 7 05:01:27 2026 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 E5E8B2DC35C for ; Mon, 5 Jan 2026 21:06:51 +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=1767647212; cv=none; b=IbUN9JkzK9iFIiTQk2f91edTy+pKvD/+hT2bjgc+uPKAI+XK7e/QPxVexj9jY3b0gZqeaqNwDg+UdRXujQk+ebui+j5TrSU3HbK8rr1cQeS0PrCEymdTwOTF73+VDErEeA+zjoR0AbHUsdZry1n3mmE4yPPb0PGLsj8aCxk/7Tk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767647212; c=relaxed/simple; bh=SGqvyNbapL7DF9Ho4FGpHDUF7ldVAxZx9cM+6JpIZxE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DKEBX56H71oKnRk7iPwpyrTVY4uZMamp7v+DuqatyGQgfPNQS0qN3PZBAGFzi4+rAbS6Wo/AQHzAWTxnR3fsO078JR0e/0gWRlR5tibvubqdtVf1mNfCTFiAzJRktPDPgbPiJYWPkpR6kfyRybXuuzMRqU8PWP3RIxP2aM8knmo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BPRyBdJh; 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="BPRyBdJh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78641C16AAE; Mon, 5 Jan 2026 21:06:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767647211; bh=SGqvyNbapL7DF9Ho4FGpHDUF7ldVAxZx9cM+6JpIZxE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BPRyBdJhlShaF11A/HZfsOSVgD1I/OTDE5XtAhZU82hLcYzy9o10QI2LHCyM2fn+I nfj+rG13/TJFKMe41GOAmMmCsUk10Wvnr98E7g/UGNUo17Z2TNhyiFyimEL0df2b// 94MBGpaHHG2I7/nw2tcWtumtiAiJv4DMK42X1cocgxwzWWJ6FFuThNwRkISt5kMdkz AJjMBXIfvZ64e8knok5pbijfVagliZFihk4L7J8hBzteWnPYMMXDQduu56DYIZgfrv O9ucJePTGltILVSFki2XH0+YEAsY1vF8v7yb045/iwQNElDP4xrwhR92KF2RaXMqp/ qgAG0uBZFHipw== From: "Rob Herring (Arm)" Date: Mon, 05 Jan 2026 15:06:43 -0600 Subject: [PATCH v3 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: <20260105-at91-probe-v3-1-594013ff2965@kernel.org> References: <20260105-at91-probe-v3-0-594013ff2965@kernel.org> In-Reply-To: <20260105-at91-probe-v3-0-594013ff2965@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. Acked-by: Alexandre Belloni Tested-by: Alexandre Belloni Signed-off-by: Rob Herring (Arm) --- v3: - Use dev_err_probe() --- drivers/mtd/nand/raw/atmel/nand-controller.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nan= d/raw/atmel/nand-controller.c index 83ba4ebd02d4..e7fdf532c5fe 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -2304,10 +2304,8 @@ atmel_hsmc_nand_controller_init(struct atmel_hsmc_na= nd_controller *nc) =20 nc->sram.pool =3D of_gen_pool_get(nc->base.dev->of_node, "atmel,nfc-sram", 0); - if (!nc->sram.pool) { - dev_err(nc->base.dev, "Missing SRAM\n"); - return -ENOMEM; - } + if (!nc->sram.pool) + return dev_err_probe(nc->base.dev, -EPROBE_DEFER, "Missing SRAM\n"); =20 nc->sram.virt =3D (void __iomem *)gen_pool_dma_alloc(nc->sram.pool, ATMEL_NFC_SRAM_SIZE, --=20 2.51.0 From nobody Sat Feb 7 05:01:27 2026 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 F1A902DE6F8 for ; Mon, 5 Jan 2026 21:06:52 +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=1767647213; cv=none; b=Pen3V+sjvAlaFY9v9yyNNOzFIYFsaoe4m+2GaeNpGFDrYd+MZOcWuJl7rJaiU9CpgHMRc5FB82F1vYPn+D4J8SLoWd+jC3AqmWiXsXsS+83d1yIa1AMdknPZ+kSTi1K8i+A30vLWPc5i7lPUngVV//q+sXtHAO7BQ+cnYmmj+uE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767647213; c=relaxed/simple; bh=lWkeK6GxsB7JPSrlBWBTBnBGRtTyszh1kU8Zxb0tROM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DHhpNrzr5n6xPBuWFC7V/3D491GCnnOajFGmSf5HVfE7vIIdTM4wmK38mtUZXJ4G0+wWn85RtGjHgNv3d1EbklIwVQsLdgYu56hWdqlpeDTb/TiOqN1yeiAJ7PIrKRjsw7CvvrtQEXw0PVBonDbRsBGiGFFnPG7YSt9exulXM+Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TvlKP2lk; 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="TvlKP2lk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71CA1C19422; Mon, 5 Jan 2026 21:06:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767647212; bh=lWkeK6GxsB7JPSrlBWBTBnBGRtTyszh1kU8Zxb0tROM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TvlKP2lkzxBmUCUcoCIyBeR7akPDjhJ0aRsyDtqgdYs1dIMsR12VJB7Oz/eX5UnQF 0TaHX0twD1/wtlAXgAz0wfMVaezRcYRjju3TGZ3FVd115aOUkmRUEU4IR+EK64o5xg W2HlHJwc3j6DtfurFhaT75Mjb1+ks8kota/3xfREWGp49xynOwl6lK+X8fFqmEcwoO LnKq76lWu1AMhdpuvsfB4EPMBS4o6GdY6xsEu/zIOm9pRcoIzVr9khrYNnLlJoQ4nP RXI6hvJbcIkQ7Phowhz8eHNRuJo5TT68Nm/N9Opc9avIIg3CN/0IRW/fBF40637xOv rXoC5A/vYxncQ== From: "Rob Herring (Arm)" Date: Mon, 05 Jan 2026 15:06:44 -0600 Subject: [PATCH v3 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: <20260105-at91-probe-v3-2-594013ff2965@kernel.org> References: <20260105-at91-probe-v3-0-594013ff2965@kernel.org> In-Reply-To: <20260105-at91-probe-v3-0-594013ff2965@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. Acked-by: Alexandre Belloni Tested-by: Alexandre Belloni Signed-off-by: Rob Herring (Arm) --- v3: - Fix author name adding "(Arm)" - Fixup split between patch 2 and 3 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 | 5 +++-- arch/arm/mach-at91/sama7.c | 2 +- 6 files changed, 8 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..576654cba82d 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 @@ -55,6 +55,7 @@ static const char *const sama5_alt_dt_board_compat[] __in= itconst =3D { 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 @@ -62,7 +63,6 @@ MACHINE_END static void __init sama5d2_init(void) { of_platform_default_populate(NULL, NULL, NULL); - sama5d2_pm_init(); } =20 static const char *const sama5d2_compat[] __initconst =3D { @@ -74,6 +74,7 @@ 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 bd43733ede18..8bf57a020f1c 100644 --- a/arch/arm/mach-at91/sama7.c +++ b/arch/arm/mach-at91/sama7.c @@ -17,7 +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 { @@ -27,6 +26,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 Sat Feb 7 05:01:27 2026 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 08EE626F28A for ; Mon, 5 Jan 2026 21:06:53 +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=1767647214; cv=none; b=dhH3mWnptuopOKoSPBVPweiVZ8br1GNelD56YdrsYxt1zrtwMcqm00VR5IiOtb7Dt7O324XC2I3V5WCkiZkM4QEhGSu1bUg+ATNjgsfiVrqHIPGGPq1lIowpLzsWYE3cgv+iB2HjWgCQfJxsFxLvbdxbD5JR99M9xAq0KOO9MvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767647214; c=relaxed/simple; bh=xTzY1wDaAQkjeeTLkTSAa8tj3Kl+yUVQWDNwIYcpXnQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lB7avPMDs9z+gf0p5Hf6cCtN8jrQs2ohP/LAoQMZ2bK0/8ONj6KuAQEHhq9fmLlzwMOHtSh+M73GrdKj41tP/DFxuVI7D3KO2UZjEXJktSLQxDqh6WDObO+A3Gf0U3JT7dgQWKacCRmBNvW3grbnvNtuAE34bIn9b3STawrPfV0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YKNTIDH0; 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="YKNTIDH0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A8CEC116D0; Mon, 5 Jan 2026 21:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767647213; bh=xTzY1wDaAQkjeeTLkTSAa8tj3Kl+yUVQWDNwIYcpXnQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YKNTIDH0O5+FY20pBs59xQ4+kewAZwQzpPR3qyIBCNwGsJKZdNQEa4ozqA8kI4zko 3pqIpkSLkQ/whkiC4SGn/NWtG01qH0PqBaEF76DyC1hUgMczK0YvRZMiStaaeYfK85 wyHLx1Ff6bFVT/asXiHYMTWYx7g/LnUINAQGV/WRO8w30inA8VxcmIesekotm9dlJy jwVgg41CY8n4U9SvdsPJFlDhx82IYGP31TajLDaW4ecpKGEpBiei4TqF5ozLTDBpoK JeO7tXCPFHfSmGTmSQ2Qjt69FmB6Xw+0PgcC+UpiKY/M9M5wdfUS84vnbNCGBedL2q itbizmI/QO2kw== From: "Rob Herring (Arm)" Date: Mon, 05 Jan 2026 15:06:45 -0600 Subject: [PATCH v3 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: <20260105-at91-probe-v3-3-594013ff2965@kernel.org> References: <20260105-at91-probe-v3-0-594013ff2965@kernel.org> In-Reply-To: <20260105-at91-probe-v3-0-594013ff2965@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. Acked-by: Alexandre Belloni Tested-by: Alexandre Belloni Signed-off-by: Rob Herring (Arm) --- v3: - Fixup split between patch 2 and 3. 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 | 16 ---------------- arch/arm/mach-at91/sama7.c | 9 --------- 6 files changed, 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 576654cba82d..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); -} - static const char *const sama5d2_compat[] __initconst =3D { "atmel,sama5d2", NULL @@ -72,7 +57,6 @@ 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, diff --git a/arch/arm/mach-at91/sama7.c b/arch/arm/mach-at91/sama7.c index 8bf57a020f1c..f56828d61199 100644 --- a/arch/arm/mach-at91/sama7.c +++ b/arch/arm/mach-at91/sama7.c @@ -6,19 +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 @@ -27,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