{"id":2228187,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228187/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260425-imx8m-of-upstream-v1-7-07527be92e5d@nxp.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.1/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260425-imx8m-of-upstream-v1-7-07527be92e5d@nxp.com>","date":"2026-04-25T00:36:59","name":"[07/13] imx8mm: mx8menlo: Switch OF_UPSTREAM","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"aeb0dc742900314f029a92ac64fab782322d09b5","submitter":{"id":80723,"url":"http://patchwork.ozlabs.org/api/1.1/people/80723/?format=json","name":"Peng Fan (OSS)","email":"peng.fan@oss.nxp.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260425-imx8m-of-upstream-v1-7-07527be92e5d@nxp.com/mbox/","series":[{"id":501451,"url":"http://patchwork.ozlabs.org/api/1.1/series/501451/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=501451","date":"2026-04-25T00:37:04","name":"iMX8M: Covert to OF_UPSTREAM","version":1,"mbox":"http://patchwork.ozlabs.org/series/501451/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228187/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228187/checks/","tags":{},"headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com\n header.a=rsa-sha256 header.s=selector1-NXP1-onmicrosoft-com\n header.b=PkjFHu4o;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=oss.nxp.com","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com\n header.b=\"PkjFHu4o\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=oss.nxp.com","phobos.denx.de;\n spf=pass smtp.mailfrom=peng.fan@oss.nxp.com","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=oss.nxp.com;"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g2vpV5Gvpz1yHv\n\tfor <incoming@patchwork.ozlabs.org>; Sun, 26 Apr 2026 02:06:42 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 9B0B584144;\n\tSat, 25 Apr 2026 18:06:40 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 2193884137; Sat, 25 Apr 2026 18:06:39 +0200 (CEST)","from MRWPR03CU001.outbound.protection.outlook.com\n (mail-francesouthazlp170110003.outbound.protection.outlook.com\n [IPv6:2a01:111:f403:c207::3])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 2DDE484011\n for <u-boot@lists.denx.de>; Sat, 25 Apr 2026 18:06:36 +0200 (CEST)","from DU0PR04MB9370.eurprd04.prod.outlook.com (2603:10a6:10:359::20)\n by PR3PR04MB7243.eurprd04.prod.outlook.com (2603:10a6:102:8c::7) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17; Sat, 25 Apr\n 2026 11:58:01 +0000","from AM8PR04MB7876.eurprd04.prod.outlook.com (2603:10a6:20b:240::22)\n by DU0PR04MB9370.eurprd04.prod.outlook.com (2603:10a6:10:359::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.22; Sat, 25 Apr\n 2026 09:00:09 +0000","from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15)\n by AM8PR04MB7876.eurprd04.prod.outlook.com (2603:10a6:20b:240::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.23; Fri, 24 Apr\n 2026 23:21:05 +0000","from PAXPR04MB8459.eurprd04.prod.outlook.com\n ([fe80::4972:7eaa:b9f6:7b5e]) by PAXPR04MB8459.eurprd04.prod.outlook.com\n ([fe80::4972:7eaa:b9f6:7b5e%3]) with mapi id 15.20.9846.021; Fri, 24 Apr 2026\n 23:21:05 +0000"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,FORGED_SPF_HELO,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,\n T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2","ARC-Seal":"i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=rbe9d4zUzJM64Be9YS9gJiS8nOSRcpIYQbthOC9cn4TavSDoar6uPDyZSnLnp/JiTDbL5n/0qzRjSIuzSkHWn2K7yWDKVsFzB0KcBS+26oo/+Umppc3kObi4s83zyILyycgN7qmFlCGVCgDTQiYbCXg2DSE1WiQhHIyVV/W0Bkh1ckxiSSjt/TD0Waw1DSbJNMiYdeAQZ9UxPjWUNKpx7Au188xLouALXMJ86FpP9GEEB7RdsWWxoXoHnQtqbnZA42RtIrbI6rJ46TWneis3GWq2e8l5Ongj5CRw/04Y3BmCJbG1mFC3oqYtybzf/qh+9cwlEQI6Dn7iugPYvXawoQ==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=gAE7Yc5ywoSoDqpVSHvEn805aFO12T/R+5S21hbZM0k=;\n b=ME8LCSn0NC/xTW5Ox6ORYEpbOx3TSM6E7DtpL2zyBSfiuY9xmDQOkyPDSyc9x46xFUNHQPiWbtKX6Z7SJnznndPRF1F0nZNcTOgEM2n8hpfm8XpNWkTdi9DCkZr1rEW3sRFTlx5nDmgqi5GGIMcBJVnzZ8kaK9e3mZeqk41GKXHo3uy0QXXVGdABU68wtSB58URRteXMw/B9TjKJPzk1zOO3Jjao8icS36pFCkZbA83PVtOKZPF5MSY5g3ePAyspvRab9x8ClWiy54bF8Ak/3yxEPEfWw0Y7cVZcpd38ARKUHFsXNJL1Y3ND6DeLjP6qh5mu7h4zckH8iCHgA76pWA==","ARC-Authentication-Results":"i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com;\n dkim=pass header.d=oss.nxp.com; arc=none","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com;\n s=selector1-NXP1-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=gAE7Yc5ywoSoDqpVSHvEn805aFO12T/R+5S21hbZM0k=;\n b=PkjFHu4oIsXWehRy0jgx+ql4rJl1tsOeMXG/bzkHK/LvauqaPnXLaL2PGXL2ig9jty+eEjqXwCG9f1R/zWuwck9Cq6sfMpbVt9Qu+lj6/NVAA8GVHOO9ihywQheSXBNWD7KsHZvcnhohEL5tk0HV0V7TfoohRWYXONR+YOeapcEPzREmpHE66Ex6AzvozRXpvlQGcr9gldJ7wZbuXWxJmyxI4qp4eSWY0PLFFCcfNImk5LRDSmIQA2a/VNENUac4vaqsM3PcGN0eOvomgfHyNnA0hoVkPCutu4kuj6eieqTWcT32pR9TmFCDoLBQqDxbASnSMEhEyiEmpvH6mwEHLw==","From":"\"Peng Fan (OSS)\" <peng.fan@oss.nxp.com>","Date":"Sat, 25 Apr 2026 08:36:59 +0800","Subject":"[PATCH 07/13] imx8mm: mx8menlo: Switch OF_UPSTREAM","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20260425-imx8m-of-upstream-v1-7-07527be92e5d@nxp.com>","References":"<20260425-imx8m-of-upstream-v1-0-07527be92e5d@nxp.com>","In-Reply-To":"<20260425-imx8m-of-upstream-v1-0-07527be92e5d@nxp.com>","To":"\"NXP i.MX U-Boot Team\" <uboot-imx@nxp.com>, u-boot@lists.denx.de,\n kernel@puri.sm, u-boot@dh-electronics.com","Cc":"Stefano Babic <sbabic@nabladev.com>, Fabio Estevam <festevam@gmail.com>,\n Tom Rini <trini@konsulko.com>, \"Lukas F. Hartmann\" <lukas@mntre.com>,\n Patrick Wildt <patrick@blueri.se>, Ye Li <ye.li@nxp.com>,\n Frieder Schrempf <frieder.schrempf@kontron.de>,\n Benjamin Hahn <B.Hahn@phytec.de>, Alice Guo <alice.guo@nxp.com>,\n Marek Vasut <marek.vasut+renesas@mailbox.org>,\n Marco Franchi <marcofrk@gmail.com>, Alifer Moraes <alifer.wsdm@gmail.com>,\n Angus Ainslie <angus@akkea.ca>, Heiko Thiery <heiko.thiery@gmail.com>,\n Olaf Mandel <o.mandel@menlosystems.com>,\n Jagan Teki <jagan@amarulasolutions.com>,\n Matteo Lisi <matteo.lisi@engicam.com>,\n Manoj Sai <abbaraju.manojsai@amarulasolutions.com>,\n Emanuele Ghidoli <emanuele.ghidoli@toradex.com>,\n Parth Pancholi <parth.pancholi@toradex.com>, Peng Fan <peng.fan@nxp.com>","X-Mailer":"b4 0.14.3","X-ClientProxiedBy":"SI2PR01CA0020.apcprd01.prod.exchangelabs.com\n (2603:1096:4:192::6) To PAXPR04MB8459.eurprd04.prod.outlook.com\n (2603:10a6:102:1da::15)","MIME-Version":"1.0","X-MS-Exchange-MessageSentRepresentingType":"1","X-MS-PublicTrafficType":"Email","X-MS-TrafficTypeDiagnostic":"\n PAXPR04MB8459:EE_|AM8PR04MB7876:EE_|DU0PR04MB9370:EE_|PR3PR04MB7243:EE_","X-MS-Office365-Filtering-Correlation-Id":"eebdc8f7-3f8a-416e-0da1-08dea2582894","X-MS-Exchange-SharedMailbox-RoutingAgent-Processed":"True","X-LD-Processed":"686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr","X-MS-Exchange-SenderADCheck":"1","X-MS-Exchange-AntiSpam-Relay":"0","X-Microsoft-Antispam":"BCL:0;\n ARA:13230040|7416014|376014|52116014|1800799024|19092799006|366016|56012099003|18002099003|22082099003|38350700014;","X-Microsoft-Antispam-Message-Info":"\n lAy3P1y9EKu5cUUSbraSHd9DnpopZCtZE+S2EgzHkj5LnwsFZXXqoY1tgxWcjbb9Ey/LF9iB+nsZavblbwyFwFtWUhSpgNqV/umlyO/wWjtiARWmzsEDQqs391ow7FiGynpAWXkwYWphmjg0Kc7BuovV5WcCNeVUIWPoE92dKM4/S3FKBZs2vohTVSbVFygnSYrPgxjVF+r9rKRPat7/c9oj+Nv5RDklMvjQc/ac/Pj8LGtDH/mRxnPy/tYGBK8MHIhELhbx9RfIr3bg+iybdJYZSxiIX775LxeYMOIbIrOOt7SbjMihoyjA/MF60A6Rh5aPVgf0CP2ZcRXr1yPpClIbOW7z9uIjRfL8mXqWGwohDLDtSmxvTMHXKtlkZ7HJV6ySzh+3gXVGYYJzE650QKckNElUF+E+COKdJexNjunyH231mRkSQ37SA+HRWJbvHXbK4T4kVi1FIL+AqNmTziF/KhWKLYu92mYk0X+Q6FOwHE2olWKxcY4gKSR8+XKkQBQ/00uBIIk895qkHBN46w0sLUTfB0BTqCARabwaxUdXl6r62Jv1sHVq6maJPugE2dzPsm7yyNSIi+pxwJH41C9RjCpcl5ytvQ+JW7Gdb8tA4NsFHs0ISRYkVh/AcawEhmvRI7Y0GiheL/fsJ9ghe1mIxU6uRv0JsFryhyS/TbTpf5fHLO1PlYmiOuBhfLXtP8MOMFcVxP0dwYlvw1EJ9cliSNAD/rx4cNR4hfNJRGlkVs19CdE/K/Yh9NHULjRv3za7BrjsNAAizfXi+grEdZD5ORd3mStVh9R0fafR4aU=","X-Forefront-Antispam-Report":"CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PAXPR04MB8459.eurprd04.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(7416014)(376014)(52116014)(1800799024)(19092799006)(366016)(56012099003)(18002099003)(22082099003)(38350700014);\n DIR:OUT; SFP:1101;","X-MS-Exchange-AntiSpam-MessageData-ChunkCount":"1","X-MS-Exchange-AntiSpam-MessageData-0":"=?utf-8?q?aG6A+BnZ9TssaGSYh1nmqJLK7YTP?=\n\t=?utf-8?q?ka/3meCTCgND+OPxsOE2HZKyqHTIGmOZkBwkw8l2Nd4RtKCrDDlOREBbgGWt8YZML?=\n\t=?utf-8?q?+HNer3QdrqlNVFNgmZTOtMT4iHpqXDpy3AgNazEktW5HLRPveEsMM6XWYDGfsEtAS?=\n\t=?utf-8?q?5AeVwv8iL9nL5EzyBKh2c8xuE8dz2e9O6tEYs1DNwuFP0SgShtgdApNcww/swqYc4?=\n\t=?utf-8?q?6HWFwPPUCYoYZ7WPITCpII0SMJoEnV35lNu3n9jErKA0Y6VdJRheEXst3g0rTQD9V?=\n\t=?utf-8?q?WP1RNmMAuxWdQCUmggCc6lmQGZAFsimRirSTLMsqGbHTTNGy1pFlUx7FAH5mUYnDt?=\n\t=?utf-8?q?MyP2mmlkeyWJ/TLPgOrcCkS/R/TUqU6/3JQiIs7mMy7H35H61flYQfEMYcr4fxwS9?=\n\t=?utf-8?q?iEgCyCspgxobt7/fUBEX1g4T4AxJvpAc//OEbCmqFatP4WT2UuCOZ5KnxlX7RkbeF?=\n\t=?utf-8?q?tCm1ceM2pkQZlaSYsJc2CAlisoTlCsD2w2neznYM0AYYD5NRqePtTQC3+54cjKljX?=\n\t=?utf-8?q?raVKxvZxeXSz/nDhDhUs/zsIvHg8KXfWBzIq4fh4cY1OMlGUzJJbVs6kK4KzOkaF+?=\n\t=?utf-8?q?bps0QmQ4SH2Uc7CZWaKaDWAuoWvhjLZEsP67HU038RycxBZCGVd6yv2L6Ok3xd46u?=\n\t=?utf-8?q?Ea3urWMLSTSNv42/7Qf8CfYr7RbRlAjqawR1E4tqiaFVQoV0dB+dGw/eeHWqOkvDQ?=\n\t=?utf-8?q?2ZgWU6lyLKylBX+z4uD7k8rGC0ltDLYXJ5GU5zSCY14BSNKqGz2IMWE1NqiHkl6Ss?=\n\t=?utf-8?q?5R2OMoxjD8qaGEQpMAwIdW+z9A/eKNqwAdga0NCELQXUfm/9weq2KSH1DzxmvB8IQ?=\n\t=?utf-8?q?SvGdKjJo3vLAIThXiKn8ZSfQA7AFPkICZjmP62fy3uQrmo/EhYe9p5p6nerB+bDCC?=\n\t=?utf-8?q?dBNsRSPU+Ss5DPi5VROfWJkiQ8KV8mku2zzq6jHhkq9Jc8qXKUMzCI4Un2/XOk61k?=\n\t=?utf-8?q?OhKkWR1GKfZy/F84tJrm1S2SXRzek58N42a/sHVlXONUHf2Qi08kqyyxN2GWZGxlH?=\n\t=?utf-8?q?+qf2/qJPYKJe98XPAXp8hnYVyyI2vnsRWEaGwdREr5/+xb1sBKxq3RuK1ajbhZIzT?=\n\t=?utf-8?q?1jxCGzFUBLB4NYoTsmppzrtk98U2zrdne+tJRPZ9zdHEnPJNiv/9KPEcXmPW+tH7r?=\n\t=?utf-8?q?jYoFqtK7Mf6YEvIGvOrGJc9aZHiLPLWZzoVY/fWK+ws6WxOHGxe6wGZoen7PhMar4?=\n\t=?utf-8?q?fi0ia7DecP0XdB9G+mP3LveiRoQ4FkQie/vHatBndmWl6Coy59QqEzPpZk4N+8H2i?=\n\t=?utf-8?q?CMZbBZqgTW0as3zJMRoTaA/4xwEBHnRd5VeV5JtpfJgfMdduskfm6TiFbqR0tbCBQ?=\n\t=?utf-8?q?30dppibvXE/7W9isazPIk3ni+K79hGGu4gs66d1TkzfHYupUvc9HrSUgXgFCNgD1O?=\n\t=?utf-8?q?mFQaAuyUuPEzxG4NcRHRmgGAc6E4d3GTtHdNQdw/f4NhT2h94Zd88E0fehCI36/pW?=\n\t=?utf-8?q?jij5YUamK5PyIl5Xbmdl8ZM87YlZrtjJe8EVQ6ByzLmWovv52orNxzxMg4/v9OSlA?=\n\t=?utf-8?q?CvJnXAJJCfusdjhAJxpFgVpIdrrGhMAQVr7yNB484P935JBgu0Sd0AsHore2dkfJA?=\n\t=?utf-8?q?5ytHCQ2/+qFdIpgYlYilSW5tfWc75efBlFBItv7LzSriwdgjPe0+hBfCOKkySMSKw?=\n\t=?utf-8?q?rWODgTJNF6G+svyH5BY0fkTjULwuaPmQ=3D=3D?=","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n eebdc8f7-3f8a-416e-0da1-08dea2582894","X-MS-Exchange-CrossTenant-AuthSource":"PAXPR04MB8459.eurprd04.prod.outlook.com","X-MS-Exchange-CrossTenant-AuthAs":"Internal","X-MS-Exchange-CrossTenant-OriginalArrivalTime":"24 Apr 2026 23:21:05.6389 (UTC)","X-MS-Exchange-CrossTenant-FromEntityHeader":"Hosted","X-MS-Exchange-CrossTenant-Id":"686ea1d3-bc2b-4c6f-a92c-d99c5c301635","X-MS-Exchange-CrossTenant-MailboxType":"HOSTED","X-MS-Exchange-CrossTenant-UserPrincipalName":"\n WhD0a5pxsUUcThuH/oY6oZpmetC7FND/31S/Np1HFtXAlZS5ovHFNpXg9b6U/YRBUFXWqiaMd4MkoM0T0a2iqw==","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"AM8PR04MB7876","X-OriginatorOrg":"oss.nxp.com","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<https://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"From: Peng Fan <peng.fan@nxp.com>\n\narch/arm/dts/imx8mm-mx8menlo.dts is almost same as upstream Linux dts,\nso switch to OF_UPSTREAM by dropping the U-Boot copy of the dts,\nenabling OF_UPSTREAM and updating CONFIG_DEFAULT_DEVICE_TREE.\n\nSigned-off-by: Peng Fan <peng.fan@nxp.com>\n---\n arch/arm/dts/Makefile             |   1 -\n arch/arm/dts/imx8mm-mx8menlo.dts  | 335 --------------------------------------\n arch/arm/mach-imx/imx8m/Kconfig   |   1 +\n configs/imx8mm-mx8menlo_defconfig |   2 +-\n 4 files changed, 2 insertions(+), 337 deletions(-)","diff":"diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile\nindex c4360390984..dff05dd5888 100644\n--- a/arch/arm/dts/Makefile\n+++ b/arch/arm/dts/Makefile\n@@ -876,7 +876,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \\\n \timx8mm-data-modul-edm-sbc.dtb \\\n \timx8mm-icore-mx8mm-ctouch2.dtb \\\n \timx8mm-icore-mx8mm-edimm2.2.dtb \\\n-\timx8mm-mx8menlo.dtb \\\n \timx8mm-phg.dtb \\\n \timx8mq-cm.dtb \\\n \timx8mp-data-modul-edm-sbc.dtb \\\ndiff --git a/arch/arm/dts/imx8mm-mx8menlo.dts b/arch/arm/dts/imx8mm-mx8menlo.dts\ndeleted file mode 100644\nindex 0b123a84018..00000000000\n--- a/arch/arm/dts/imx8mm-mx8menlo.dts\n+++ /dev/null\n@@ -1,335 +0,0 @@\n-// SPDX-License-Identifier: GPL-2.0+ OR MIT\n-/*\n- * Copyright 2021-2022 Marek Vasut <marex@denx.de>\n- */\n-\n-/dts-v1/;\n-\n-#include \"imx8mm-verdin.dtsi\"\n-\n-/ {\n-\tmodel = \"MENLO MX8MM EMBEDDED DEVICE\";\n-\tcompatible = \"menlo,mx8menlo\",\n-\t\t     \"toradex,verdin-imx8mm-nonwifi\",\n-\t\t     \"toradex,verdin-imx8mm\",\n-\t\t     \"fsl,imx8mm\";\n-\n-\t/delete-node/ gpio-keys;\n-\n-\tleds {\n-\t\tcompatible = \"gpio-leds\";\n-\t\tpinctrl-names = \"default\";\n-\t\tpinctrl-0 = <&pinctrl_led>;\n-\n-\t\tled-1 {\n-\t\t\tlabel = \"TestLed601\";\n-\t\t\tgpios = <&gpio4 18 GPIO_ACTIVE_HIGH>;\n-\t\t\tlinux,default-trigger = \"mmc0\";\n-\t\t};\n-\n-\t\tled-2 {\n-\t\t\tlabel = \"TestLed602\";\n-\t\t\tgpios = <&gpio4 10 GPIO_ACTIVE_HIGH>;\n-\t\t\tlinux,default-trigger = \"heartbeat\";\n-\t\t};\n-\t};\n-\n-\tbeeper {\n-\t\tcompatible = \"gpio-beeper\";\n-\t\tpinctrl-names = \"default\";\n-\t\tpinctrl-0 = <&pinctrl_beeper>;\n-\t\tgpios = <&gpio5 3 GPIO_ACTIVE_HIGH>;\n-\t};\n-\n-\t/* Fixed clock dedicated to SPI CAN on carrier board */\n-\tclk_xtal20: clk-xtal20 {\n-\t\tcompatible = \"fixed-clock\";\n-\t\t#clock-cells = <0>;\n-\t\tclock-frequency = <20000000>;\n-\t};\n-};\n-\n-&ecspi1 {\n-\t#address-cells = <1>;\n-\t#size-cells = <0>;\n-\tpinctrl-names = \"default\";\n-\tpinctrl-0 = <&pinctrl_ecspi1>;\n-\tcs-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>;\n-\tstatus = \"okay\";\n-\n-\t/* CAN controller on the baseboard */\n-\tcanfd: can@0 {\n-\t\tcompatible = \"microchip,mcp2518fd\";\n-\t\tclocks = <&clk_xtal20>;\n-\t\tinterrupt-parent = <&gpio1>;\n-\t\tinterrupts = <8 IRQ_TYPE_EDGE_FALLING>;\n-\t\treg = <0>;\n-\t\tspi-max-frequency = <2000000>;\n-\t};\n-\n-};\n-\n-&ecspi2 {\n-\tpinctrl-0 = <&pinctrl_ecspi2 &pinctrl_gpio1>;\n-\tcs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>, <&gpio3 4 GPIO_ACTIVE_LOW>;\n-\tstatus = \"okay\";\n-\n-\tspidev@0 {\n-\t\tcompatible = \"menlo,m53cpld\";\n-\t\treg = <0>;\n-\t\tspi-max-frequency = <25000000>;\n-\t};\n-\n-\tspidev@1 {\n-\t\tcompatible = \"menlo,m53cpld\";\n-\t\treg = <1>;\n-\t\tspi-max-frequency = <25000000>;\n-\t};\n-\n-};\n-\n-&ethphy0 {\n-\tmax-speed = <100>;\n-};\n-\n-&fec1 {\n-\tstatus = \"okay\";\n-};\n-\n-&flexspi {\n-\tstatus = \"okay\";\n-\n-\tflash@0 {\n-\t\treg = <0>;\n-\t\t#address-cells = <1>;\n-\t\t#size-cells = <1>;\n-\t\tcompatible = \"jedec,spi-nor\";\n-\t\tspi-max-frequency = <66000000>;\n-\t\tspi-rx-bus-width = <4>;\n-\t\tspi-tx-bus-width = <4>;\n-\t};\n-};\n-\n-&gpio1 {\n-\tgpio-line-names =\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\";\n-};\n-\n-&gpio2 {\n-\tgpio-line-names =\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\";\n-};\n-\n-&gpio3 {\n-\tgpio-line-names =\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"DISP_reset\", \"KBD_intI\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\";\n-};\n-\n-&gpio4 {\n-\t/*\n-\t * CPLD_D[n] is ARM_CPLD[n] in schematic\n-\t * CPLD_int is SA_INTERRUPT in schematic\n-\t * CPLD_reset is RESET_SOFT in schematic\n-\t */\n-\tgpio-line-names =\n-\t\t\"CPLD_D[6]\", \"CPLD_int\", \"CPLD_reset\", \"\",\n-\t\t\"\", \"CPLD_D[7]\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"CPLD_D[5]\",\n-\t\t\"CPLD_D[4]\", \"CPLD_D[3]\", \"CPLD_D[2]\", \"CPLD_D[1]\",\n-\t\t\"CPLD_D[0]\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"KBD_intK\",\n-\t\t\"\", \"\", \"\", \"\";\n-};\n-\n-&gpio5 {\n-\tgpio-line-names =\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\",\n-\t\t\"\", \"\", \"\", \"\";\n-};\n-\n-&gpio_expander_21 {\n-\tstatus = \"okay\";\n-};\n-\n-&hwmon {\n-\tstatus = \"okay\";\n-};\n-\n-&i2c3 {\n-\tstatus = \"okay\";\n-};\n-\n-&i2c4 {\n-\t/* None of this is present on the SoM. */\n-\t/delete-node/ bridge@2c;\n-\t/delete-node/ hdmi@48;\n-\t/delete-node/ touch@4a;\n-\t/delete-node/ sensor@4f;\n-\t/delete-node/ eeprom@50;\n-\t/delete-node/ eeprom@57;\n-};\n-\n-&iomuxc {\n-\tpinctrl-0 = <&pinctrl_gpio7>, <&pinctrl_gpio_hog1>,\n-\t\t    <&pinctrl_gpio_hog2>, <&pinctrl_gpio_hog3>;\n-\n-\tpinctrl_beeper: beepergrp {\n-\t\tfsl,pins = <\n-\t\t\tMX8MM_IOMUXC_SPDIF_TX_GPIO5_IO3\t\t\t0x1c4\n-\t\t>;\n-\t};\n-\n-\tpinctrl_ecspi1: ecspi1grp {\n-\t\tfsl,pins = <\n-\t\t\tMX8MM_IOMUXC_ECSPI1_SCLK_ECSPI1_SCLK\t\t0x4\n-\t\t\tMX8MM_IOMUXC_ECSPI1_MOSI_ECSPI1_MOSI\t\t0x4\n-\t\t\tMX8MM_IOMUXC_ECSPI1_MISO_ECSPI1_MISO\t\t0x1c4\n-\t\t\tMX8MM_IOMUXC_ECSPI1_SS0_GPIO5_IO9\t\t0x1c4\n-\t\t>;\n-\t};\n-\n-\tpinctrl_led: ledgrp {\n-\t\tfsl,pins = <\n-\t\t\tMX8MM_IOMUXC_SAI1_TXD6_GPIO4_IO18\t\t0x1c4\n-\t\t\tMX8MM_IOMUXC_SAI1_TXFS_GPIO4_IO10\t\t0x1c4\n-\t\t>;\n-\t};\n-\n-\tpinctrl_uart4_rts: uart4rtsgrp {\n-\t\tfsl,pins = <\n-\t\t\t/* SODIMM 222 */\n-\t\t\tMX8MM_IOMUXC_GPIO1_IO09_GPIO1_IO9\t\t0x184\n-\t\t>;\n-\t};\n-};\n-\n-&pinctrl_gpio1 {\n-\tfsl,pins = <\n-\t\t/* SODIMM 206 */\n-\t\tMX8MM_IOMUXC_NAND_CE3_B_GPIO3_IO4\t\t\t0x1c4\n-\t>;\n-};\n-\n-&pinctrl_gpio_hog1 {\n-\tfsl,pins = <\n-\t\t/* SODIMM 88 */\n-\t\tMX8MM_IOMUXC_SAI1_MCLK_GPIO4_IO20\t\t\t0x1c4\n-\t\t/* CPLD_int */\n-\t\tMX8MM_IOMUXC_SAI1_RXC_GPIO4_IO1\t\t\t\t0x1c4\n-\t\t/* CPLD_reset */\n-\t\tMX8MM_IOMUXC_SAI1_RXD0_GPIO4_IO2\t\t\t0x1c4\n-\t\t/* SODIMM 94 */\n-\t\tMX8MM_IOMUXC_SAI1_RXD1_GPIO4_IO3\t\t\t0x1c4\n-\t\t/* SODIMM 96 */\n-\t\tMX8MM_IOMUXC_SAI1_RXD2_GPIO4_IO4\t\t\t0x1c4\n-\t\t/* CPLD_D[7] */\n-\t\tMX8MM_IOMUXC_SAI1_RXD3_GPIO4_IO5\t\t\t0x184\n-\t\t/* CPLD_D[6] */\n-\t\tMX8MM_IOMUXC_SAI1_RXFS_GPIO4_IO0\t\t\t0x184\n-\t\t/* CPLD_D[5] */\n-\t\tMX8MM_IOMUXC_SAI1_TXC_GPIO4_IO11\t\t\t0x184\n-\t\t/* CPLD_D[4] */\n-\t\tMX8MM_IOMUXC_SAI1_TXD0_GPIO4_IO12\t\t\t0x184\n-\t\t/* CPLD_D[3] */\n-\t\tMX8MM_IOMUXC_SAI1_TXD1_GPIO4_IO13\t\t\t0x184\n-\t\t/* CPLD_D[2] */\n-\t\tMX8MM_IOMUXC_SAI1_TXD2_GPIO4_IO14\t\t\t0x184\n-\t\t/* CPLD_D[1] */\n-\t\tMX8MM_IOMUXC_SAI1_TXD3_GPIO4_IO15\t\t\t0x184\n-\t\t/* CPLD_D[0] */\n-\t\tMX8MM_IOMUXC_SAI1_TXD4_GPIO4_IO16\t\t\t0x184\n-\t\t/* KBD_intK */\n-\t\tMX8MM_IOMUXC_SAI2_MCLK_GPIO4_IO27\t\t\t0x1c4\n-\t\t/* DISP_reset */\n-\t\tMX8MM_IOMUXC_SAI5_RXD1_GPIO3_IO22\t\t\t0x1c4\n-\t\t/* KBD_intI */\n-\t\tMX8MM_IOMUXC_SAI5_RXD2_GPIO3_IO23\t\t\t0x1c4\n-\t\t/* SODIMM 46 */\n-\t\tMX8MM_IOMUXC_SAI5_RXD3_GPIO3_IO24\t\t\t0x1c4\n-\t>;\n-};\n-\n-&pinctrl_uart1 {\n-\tfsl,pins = <\n-\t\t/* SODIMM 149 */\n-\t\tMX8MM_IOMUXC_SAI2_RXFS_UART1_DCE_TX\t\t\t0x1c4\n-\t\t/* SODIMM 147 */\n-\t\tMX8MM_IOMUXC_SAI2_RXC_UART1_DCE_RX\t\t\t0x1c4\n-\t\t/* SODIMM 210 */\n-\t\tMX8MM_IOMUXC_UART3_RXD_UART1_DTE_RTS_B\t\t\t0x1c4\n-\t\t/* SODIMM 212 */\n-\t\tMX8MM_IOMUXC_UART3_TXD_UART1_DTE_CTS_B\t\t\t0x1c4\n-\t>;\n-};\n-\n-&reg_usb_otg1_vbus {\n-\t/delete-property/ enable-active-high;\n-\tgpio = <&gpio1 12 GPIO_ACTIVE_LOW>;\n-};\n-\n-&reg_usb_otg2_vbus {\n-\t/delete-property/ enable-active-high;\n-\tgpio = <&gpio1 14 GPIO_ACTIVE_LOW>;\n-};\n-\n-&sai2 {\n-\tstatus = \"disabled\";\n-};\n-\n-&uart1 {\n-\tuart-has-rtscts;\n-\tstatus = \"okay\";\n-};\n-\n-&uart2 {\n-\tstatus = \"okay\";\n-};\n-\n-&uart4 {\n-\tpinctrl-0 = <&pinctrl_uart4 &pinctrl_uart4_rts>;\n-\tlinux,rs485-enabled-at-boot-time;\n-\trts-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;\n-\tstatus = \"okay\";\n-};\n-\n-&usbotg1 {\n-\tdr_mode = \"peripheral\";\n-\tstatus = \"okay\";\n-};\n-\n-&usbotg2 {\n-\tdr_mode = \"host\";\n-\tstatus = \"okay\";\n-};\n-\n-&usdhc2 {\n-\tstatus = \"okay\";\n-};\ndiff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig\nindex 0e885f97e63..fbabd17288f 100644\n--- a/arch/arm/mach-imx/imx8m/Kconfig\n+++ b/arch/arm/mach-imx/imx8m/Kconfig\n@@ -132,6 +132,7 @@ config TARGET_IMX8MM_MX8MENLO\n \tselect IMX8MM\n \tselect SUPPORT_SPL\n \tselect IMX8M_LPDDR4\n+\timply OF_UPSTREAM\n \n config TARGET_IMX8MM_PHG\n \tbool \"i.MX8MM PHG board\"\ndiff --git a/configs/imx8mm-mx8menlo_defconfig b/configs/imx8mm-mx8menlo_defconfig\nindex 097425399b3..55614bd946e 100644\n--- a/configs/imx8mm-mx8menlo_defconfig\n+++ b/configs/imx8mm-mx8menlo_defconfig\n@@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y\n CONFIG_ENV_SIZE=0x2000\n CONFIG_ENV_OFFSET=0xFFFFDE00\n CONFIG_DM_GPIO=y\n-CONFIG_DEFAULT_DEVICE_TREE=\"imx8mm-mx8menlo\"\n+CONFIG_DEFAULT_DEVICE_TREE=\"freescale/imx8mm-mx8menlo\"\n CONFIG_TARGET_IMX8MM_MX8MENLO=y\n CONFIG_OF_LIBFDT_OVERLAY=y\n CONFIG_SYS_MONITOR_LEN=524288\n","prefixes":["07/13"]}