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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 813CEC433EF for ; Fri, 24 Sep 2021 02:39:29 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A83446105A for ; Fri, 24 Sep 2021 02:39:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A83446105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4FE6B8341A; Fri, 24 Sep 2021 04:39:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="OlMX7XBx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C6088833CD; Fri, 24 Sep 2021 04:39:23 +0200 (CEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::609]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 66F2C8341A for ; Fri, 24 Sep 2021 04:39:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fqfBG58KAbT1X5f2ho6RKvMs7rZIQqrxetqOb/jmq1nF5OO4QCdh8SoKPAv+Tx0g5g1yX9tfVQfZLDF1ruOMBxnZ+R5CJiNedFZg+mmV2slDW2qpubk84jItPYkBYpzcW5plljGb7NGo6IMm/UjXIeke6v0paV9S/qK4EWikoTYiKAYRRabFhFBOSPUfUqqRgq1niVlk3Kc+6BaTfcLprwS91sBLg0QvM3qI2jfk3/627Ckfn0W5DMWZ31ZRG4jUPyjjhQccH5k5Q0JUX51C1EsHwCpnQfSrVSnExHC4jrkU4PtlDdZwUOTdTGkt1iD3baOfsPN6KGZHn+kQYIRwtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=01gP+5qh/Aq/a3ZY6WVcToQh12mptpJJ/6j57M/rdIk=; b=ctX1F7Y/SO3D3CfuVpLvV+vzbXAWmNVH3+Snfj33dm34lleoQtIRqUqrFsIWYefge+Z5VoX7tFRvKgTum7PUQBIWZk5BXCKAFrvfbDkFpV6JZDXSWgUcDLrg+2orhGETy8wqeMpjUjQB1M0DCZ21qF7hcJrkHxcCWYH1+020G+0CjzPdSsVXTBghTwrF/t0EAqQcZYMhWVg+ZTyEchGBFx7HVcBUj2I13IrTgCERMoS5qEaeuA5/hZ2Uhli9bK0p39QHYZbJGxSzPAFzVx4mDfl1tLKtOAAxc0WYrbi1YgpWu2AvCyIvqwj2G1U01ffl3lBy2hxtiMMXsc6xme4Pnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=01gP+5qh/Aq/a3ZY6WVcToQh12mptpJJ/6j57M/rdIk=; b=OlMX7XBxmnpbxa34rg5BytU5OkTh+w05+kKyTu1QppLF3XfCmvJMk6ifvU+CInihKmFrHzWI8LuOlfFDwpyCnJ/ya0G+tBz863A5+R6oD/vL4Oz4x7oyRSqIPuFQwDbUv8gNgNQG0T6kUbGhexr1qjmloGEI0qWwkkCrwhkL1II= Authentication-Results: konsulko.com; dkim=none (message not signed) header.d=none;konsulko.com; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DBAPR04MB7416.eurprd04.prod.outlook.com (2603:10a6:10:1b3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.15; Fri, 24 Sep 2021 02:39:17 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::4868:6843:a39f:aa53]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::4868:6843:a39f:aa53%4]) with mapi id 15.20.4523.023; Fri, 24 Sep 2021 02:39:17 +0000 Subject: Re: [PATCH] ARM: dts: imx: use generic name bus To: Oleksandr Suvorov , "u-boot@lists.denx.de" Cc: Fabio Estevam , dl-uboot-imx , Stefano Babic , Tom Rini References: <20210923201437.175242-1-oleksandr.suvorov@foundries.io> From: "Peng Fan (OSS)" Message-ID: <0ec756b9-f608-0f14-9901-24c09a03e7bb@oss.nxp.com> Date: Fri, 24 Sep 2021 10:39:06 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <20210923201437.175242-1-oleksandr.suvorov@foundries.io> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: SG2PR01CA0165.apcprd01.prod.exchangelabs.com (2603:1096:4:28::21) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [10.193.102.209] (119.31.174.71) by SG2PR01CA0165.apcprd01.prod.exchangelabs.com (2603:1096:4:28::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 02:39:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de982824-fdd9-42a3-586b-08d97f0480ea X-MS-TrafficTypeDiagnostic: DBAPR04MB7416: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:19; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q9utP3bh5mjK2kM8bHyTMcuVAKgAwVISjkAAB2DTQDUuZGLdjnnSuE/JYpjAZ61O5tSyKDeXBE8sP2+QfhueroqfFKclU384ddqFjgM8SoaREzmAzeG0dXcMHn0i6jZi34EXR5sdw5eNupvHlEx6ylB8tT0LMTr7heiSLLuVv5XiXfIMOeScoKoDTU4aOFTKW1Kcz7c6Eepyuj1B5B8AvOB+zZtI630NOBgeJzghLDXA5W2KxK4Vu/PadIpZTnLzVecEbfWaNENeqbTzV608vSiFB19NPjgKw4G74nzKfnEfTMnvNqCCBmENkSI/PJs4yN/jdozGxRPgh6KZgEr4DBn4xzBTnnPOVusjPvpFvE7PQRD53z3frY3vbi88hV5GdEh+4vBcu8F6lOWJPzh8Wx/RPFQFe7QjMvHTj1+jsBt//Xiy3lWeAn6SBM0GAzvwWPlE5WZgLbF2Y5HLraNh3UIFotOJdomdEK0zRa7MaJAzyy4ylS2OPqMOu8mLbr3/XTta3uHWqpd+EwqmU7SKBbxyyIWwModTFWeTGTa3uxPcjQvKIRXLtT6tb6ykYoOJ0qhUMqnHb29hU/1FROKMIGFO4WEMswlaWXXLFqQjGnqoCJ/51mDt3uxbkaVOv32gW9mo4J3E2nJ9eCWMuI/R16dWa+kWnmXJ9edGbzz9O119elfV62nitfIEt9ZZ4JnvmWc4DFuORyA2MViFwmk7pXInz52UOVfqA9WTUIWsUcOhi4xufTDCKhFLztS6pGniQOksM/ghB5+WFOrqsVRbvw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6666004)(6486002)(186003)(956004)(2616005)(86362001)(31686004)(110136005)(66556008)(5660300002)(52116002)(508600001)(8936002)(83380400001)(31696002)(54906003)(2906002)(66476007)(316002)(26005)(53546011)(8676002)(38100700002)(38350700002)(16576012)(66946007)(4326008)(41533002)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V0V2dWV3akFBeDRJckluNHY1Z3hBditpL0gzT0paKzB0cHVWRzFqd3RVYXdz?= =?utf-8?B?WVhCSG8xYmt1d2NoN2tURlBPV2gyMTVvRnd6NWtONytncTZ5aFNTQlBGZzFi?= =?utf-8?B?S0pCL05BZEc5enVZNFo0c24xZld1OFNLN2VLVWNCU3c0TG9BSUFkZXlJZEFJ?= =?utf-8?B?V2tkZGViNTJ0L3dRRldsMVRyWE13T0JPZjVnbWZBa3dIV0RWZUNjTGIrNTYw?= =?utf-8?B?ZTZJcmxSa2pUNWphSGdlc3dHRloxS3ZOMHJCTjB1ZkdWZnZSMWYzSVdnaER4?= =?utf-8?B?ckNXNEtkT0lwRHhSUHpmZjdSMzlPRnYvWkg0TGpoNXFoOGExK09BRnVCSFhO?= =?utf-8?B?aVM4NHlZeHQ2NGlaYWhWMm1sTW8wSjh4MkliY3FoNUMzWk1QRFcwSEhZY2dM?= =?utf-8?B?NTl3YTJ5d3l6T091bk9HcGk3aEdDb29IekFjbWJLUWFvYnRCL0wrSGZlVFBZ?= =?utf-8?B?aXljV3QwQkJUbDBLMHFMYVlQdHVteXBNeHBHZHplNXZDSFBSRUVLL1p6enhO?= =?utf-8?B?L0NsRzVtUFZpelVsdnoyRS8yQml3KzdsVWZMSFlpaWZJbUp6dE1JRlcrdFk3?= =?utf-8?B?dXFzQVI3aUtLV2ppOGNwZXdjV29ISEJSNHJRV2JtWWUvelRGM0tZVTdyNXBK?= =?utf-8?B?elFRNFVHcmFCVnQrOGh3amoya1k5c0dYeVBJVzJPc1VYbVBzRGF5ZXZWcnY4?= =?utf-8?B?d3RJL1hTMGFwVm9UVHROV2tZNlFZejVqTVlnYWY4akwrRGJmZEpZblJNbEd2?= =?utf-8?B?N1BGVVA1dC9SWUphYmwvYWlVZW1lMGJxMHNDcWNGd1MwbXpBQkdDQXZsdTVV?= =?utf-8?B?aEpYOWJJRW1PWXhVRGNVNWRtUVRJSDc1MHBDRUxCOXQ1akNlWDRxRXcvQ2pm?= =?utf-8?B?azUra2R0dHlqcG4xWlJDOGtJUWhBbUR2UkpKK1dVd0lVV1MvQ2duMUdOcXNZ?= =?utf-8?B?TVI3NkVCTC82MlA5VjhZc243OHR0Zm8wZmticHFWemdpOEJOZ3dFL0xwOW9W?= =?utf-8?B?cmF3Zy9EL0VpR081RG5HNTRFTUZubkhQYjZYdjErQno1VjI2M3hkL3ljM1NW?= =?utf-8?B?MnZTbjJMYkNOemlFeDNEd2Irazd1SHo3RzVLa2VXK2k3b3BaczV6d01VMkNX?= =?utf-8?B?d3hoMkkxbGI0MGFCUGVUaDFlSTBBRmIyR1pOU0pmZkJtUXlUZ2U4QkNtSnVF?= =?utf-8?B?VHdkVG5xdXJXVG5FMTlxUWFGTGZYdFFUSW1vT3B6QklNcTlNRFpMNXdObGNZ?= =?utf-8?B?bGZmUGlUZGJNNm54djkvR25qMHVRRjM1cEQ3bHZQemw1MVY0T3Y2SUE4V3Nk?= =?utf-8?B?M1ZyOUZtMnhkNTJweUd0ckordXNtYUthTmtxZ1gydTVxNHRjTUhveWo2RE90?= =?utf-8?B?WWZFWW1ycTVZeVdPZHdSeit2K3loMXVnaEpLeTFYSTFxWklCVVRVdzIyMUFs?= =?utf-8?B?bEdGbWJlSFRCV1c2S3FnLzlUSUEyOXlMbGNnUDN2ZjNpZHU1VG5RWFZSZUpw?= =?utf-8?B?VlFXVTlDMWlFWXYxUDdzOEVua25FZjFocHpYQ3RHZjhjRldWL1lEMVBML1ow?= =?utf-8?B?bElZN1hLNUxsOVVuc3ZJSXY4dXd6aFNKNkxwWC9vQW1nS05idGZsQTFDc0dB?= =?utf-8?B?QUU1ZkFjdGN1Z2xaVUh5cUdpZlU4RkNnOS9FOG9qMnFiUm5GSW9IbTZTQ29t?= =?utf-8?B?Q2VqYnF5bmNHbWU0TlRJU2lwL3FRSGxyTTZwbXlZSDNSdlN3di9NN1hrWWs2?= =?utf-8?Q?PQD4ct+9Lpt14ERqxhJwFhQftdUdkenVRFaSnIF?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: de982824-fdd9-42a3-586b-08d97f0480ea X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 02:39:17.1723 (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: LsPqdDF7nTCURGVINgdY80ypDFMPAaDcbDZZ1QxAX1PPg4ngRX2RazkXFzDfS9mm9KPUOWyVXq5QmsonDIGohQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7416 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On 2021/9/24 4:14, Oleksandr Suvorov wrote: > Synchronize the u-boot and kernel imx device trees, using tuned > script from commit c0157bdcafa1 ("ARM: dts: imx: use generic name bus") > > Per devicetree specification, generic names are recommended to be > used, such as bus. > > i.MX AIPS is an AHB - IP bridge bus, so we could use bus as node > name. > > Script: > sed -i "s/\ sed -i "s/\ sed -i "s/\ sed -i "s/\ > Signed-off-by: Oleksandr Suvorov > --- > > arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 2 +- > arch/arm/dts/imx53.dtsi | 4 ++-- > arch/arm/dts/imx6dl.dtsi | 4 ++-- > arch/arm/dts/imx6q-display5-u-boot.dtsi | 2 +- > arch/arm/dts/imx6q.dtsi | 2 +- > arch/arm/dts/imx6qdl-u-boot.dtsi | 4 ++-- > arch/arm/dts/imx6qdl.dtsi | 4 ++-- > arch/arm/dts/imx6qp.dtsi | 2 +- > arch/arm/dts/imx6sl.dtsi | 4 ++-- > arch/arm/dts/imx6sll.dtsi | 4 ++-- > arch/arm/dts/imx6sx.dtsi | 6 +++--- > arch/arm/dts/imx6ul.dtsi | 4 ++-- > arch/arm/dts/imx6ull.dtsi | 2 +- > arch/arm/dts/imx7s.dtsi | 6 +++--- > arch/arm/dts/vf.dtsi | 4 ++-- > 15 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi > index bc4b3483a6..869adb9dad 100644 > --- a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi > +++ b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi > @@ -7,7 +7,7 @@ > soc { > u-boot,dm-pre-reloc; > > - aips@50000000 { > + bus@50000000 { > u-boot,dm-pre-reloc; > }; > }; > diff --git a/arch/arm/dts/imx53.dtsi b/arch/arm/dts/imx53.dtsi > index ed341cfd9d..8536f59f59 100644 > --- a/arch/arm/dts/imx53.dtsi > +++ b/arch/arm/dts/imx53.dtsi > @@ -222,7 +222,7 @@ > clock-names = "core_clk", "mem_iface_clk"; > }; > > - aips@50000000 { /* AIPS1 */ > + bus@50000000 { /* AIPS1 */ > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -654,7 +654,7 @@ > }; > }; > > - aips@60000000 { /* AIPS2 */ > + bus@60000000 { /* AIPS2 */ > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/imx6dl.dtsi b/arch/arm/dts/imx6dl.dtsi > index f0607eb41d..ae5aad6b9e 100644 > --- a/arch/arm/dts/imx6dl.dtsi > +++ b/arch/arm/dts/imx6dl.dtsi > @@ -84,7 +84,7 @@ > clocks = <&clks IMX6QDL_CLK_OCRAM>; > }; > > - aips1: aips-bus@2000000 { > + aips1: bus@2000000 { > iomuxc: iomuxc@20e0000 { > compatible = "fsl,imx6dl-iomuxc"; > }; > @@ -100,7 +100,7 @@ > }; > }; > > - aips2: aips-bus@2100000 { > + aips2: bus@2100000 { > i2c4: i2c@21f8000 { > #address-cells = <1>; > #size-cells = <0>; > diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi > index aa660b5aeb..ced4dacc73 100644 > --- a/arch/arm/dts/imx6q-display5-u-boot.dtsi > +++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi > @@ -23,7 +23,7 @@ > soc { > u-boot,dm-pre-reloc; > > - aips-bus@2100000 { > + bus@2100000 { > u-boot,dm-pre-reloc; > }; > }; > diff --git a/arch/arm/dts/imx6q.dtsi b/arch/arm/dts/imx6q.dtsi > index 71543a4a68..c37484dce3 100644 > --- a/arch/arm/dts/imx6q.dtsi > +++ b/arch/arm/dts/imx6q.dtsi > @@ -162,7 +162,7 @@ > clocks = <&clks IMX6QDL_CLK_OCRAM>; > }; > > - aips-bus@2000000 { /* AIPS1 */ > + bus@2000000 { /* AIPS1 */ > spba-bus@2000000 { > ecspi5: spi@2018000 { > #address-cells = <1>; > diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi > index 1279cc2338..f74af6c423 100644 > --- a/arch/arm/dts/imx6qdl-u-boot.dtsi > +++ b/arch/arm/dts/imx6qdl-u-boot.dtsi > @@ -13,14 +13,14 @@ > u-boot,dm-spl; > u-boot,dm-pre-reloc; > > - aips-bus@2000000 { > + bus@2000000 { > u-boot,dm-spl; > spba-bus@2000000 { > u-boot,dm-spl; > }; > }; > > - aips-bus@2100000 { > + bus@2100000 { > u-boot,dm-spl; > }; > }; > diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi > index e4daf15088..1cdb498c72 100644 > --- a/arch/arm/dts/imx6qdl.dtsi > +++ b/arch/arm/dts/imx6qdl.dtsi > @@ -283,7 +283,7 @@ > status = "disabled"; > }; > > - aips-bus@2000000 { /* AIPS1 */ > + bus@2000000 { /* AIPS1 */ > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -913,7 +913,7 @@ > }; > }; > > - aips-bus@2100000 { /* AIPS2 */ > + bus@2100000 { /* AIPS2 */ > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi > index 5f51f8e5c1..93b89dc1f5 100644 > --- a/arch/arm/dts/imx6qp.dtsi > +++ b/arch/arm/dts/imx6qp.dtsi > @@ -18,7 +18,7 @@ > clocks = <&clks IMX6QDL_CLK_OCRAM>; > }; > > - aips-bus@2100000 { > + bus@2100000 { > pre1: pre@21c8000 { > compatible = "fsl,imx6qp-pre"; > reg = <0x021c8000 0x1000>; > diff --git a/arch/arm/dts/imx6sl.dtsi b/arch/arm/dts/imx6sl.dtsi > index cc9572ea28..37e341c6c3 100644 > --- a/arch/arm/dts/imx6sl.dtsi > +++ b/arch/arm/dts/imx6sl.dtsi > @@ -130,7 +130,7 @@ > interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>; > }; > > - aips1: aips-bus@02000000 { > + aips1: bus@02000000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -751,7 +751,7 @@ > }; > }; > > - aips2: aips-bus@02100000 { > + aips2: bus@02100000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/imx6sll.dtsi b/arch/arm/dts/imx6sll.dtsi > index 349c47a03a..ebc6d9d2c9 100644 > --- a/arch/arm/dts/imx6sll.dtsi > +++ b/arch/arm/dts/imx6sll.dtsi > @@ -176,7 +176,7 @@ > arm,data-latency = <4 2 3>; > }; > > - aips1: aips-bus@02000000 { > + aips1: bus@02000000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -682,7 +682,7 @@ > }; > }; > > - aips2: aips-bus@02100000 { > + aips2: bus@02100000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/imx6sx.dtsi b/arch/arm/dts/imx6sx.dtsi > index 531a52c1e9..8d2d396ad1 100644 > --- a/arch/arm/dts/imx6sx.dtsi > +++ b/arch/arm/dts/imx6sx.dtsi > @@ -235,7 +235,7 @@ > status = "disabled"; > }; > > - aips1: aips-bus@2000000 { > + aips1: bus@2000000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -830,7 +830,7 @@ > }; > }; > > - aips2: aips-bus@2100000 { > + aips2: bus@2100000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -1188,7 +1188,7 @@ > }; > }; > > - aips3: aips-bus@2200000 { > + aips3: bus@2200000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/imx6ul.dtsi b/arch/arm/dts/imx6ul.dtsi > index 5644b0f34d..ad9cb37db7 100644 > --- a/arch/arm/dts/imx6ul.dtsi > +++ b/arch/arm/dts/imx6ul.dtsi > @@ -206,7 +206,7 @@ > status = "disabled"; > }; > > - aips1: aips-bus@2000000 { > + aips1: bus@2000000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -763,7 +763,7 @@ > }; > }; > > - aips2: aips-bus@2100000 { > + aips2: bus@2100000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/imx6ull.dtsi b/arch/arm/dts/imx6ull.dtsi > index 22e4a307fa..f224e20bda 100644 > --- a/arch/arm/dts/imx6ull.dtsi > +++ b/arch/arm/dts/imx6ull.dtsi > @@ -44,7 +44,7 @@ > > / { > soc { > - aips3: aips-bus@2200000 { > + aips3: bus@2200000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi > index 967023fde1..483824fc06 100644 > --- a/arch/arm/dts/imx7s.dtsi > +++ b/arch/arm/dts/imx7s.dtsi > @@ -340,7 +340,7 @@ > <0x31006000 0x2000>; > }; > > - aips1: aips-bus@30000000 { > + aips1: bus@30000000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -647,7 +647,7 @@ > }; > }; > > - aips2: aips-bus@30400000 { > + aips2: bus@30400000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -739,7 +739,7 @@ > }; > }; > > - aips3: aips-bus@30800000 { > + aips3: bus@30800000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi > index 5f69d0fd6e..5ba13dc62b 100644 > --- a/arch/arm/dts/vf.dtsi > +++ b/arch/arm/dts/vf.dtsi > @@ -34,7 +34,7 @@ > compatible = "simple-bus"; > ranges; > > - aips0: aips-bus@40000000 { > + aips0: bus@40000000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -158,7 +158,7 @@ > }; > }; > > - aips1: aips-bus@40080000 { > + aips1: bus@40080000 { > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > Reviewed-by: Peng Fan