From patchwork Fri May 26 19:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Jakubek X-Patchwork-Id: 13257300 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 46542C77B7A for ; Fri, 26 May 2023 19:29:51 +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:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MGFgTgKbOtJ7JonJNF1+Vg7lAmM6hu4XBdg2JS3utGI=; b=3y9IrPbSd0np3Y 3TR9dIakL+7siu6VAL96HApYy0DP1/fNAIN+PLDFu6w5zkjJzRZL3+6vnP5550GJwhv2Uie/bp4LT IG1PaSoqlixDw0Crkg0/KnaUH6zw26ss+52KJ5dXKAo2YcK/7r9lssH6+rvHIt9Gtw8ZdoEHFt2wL Zs/Jd5eTGpZjRhqZCWPLip4BRdVipLxngbzgMdS9uAskqSvADJBoR1CKzhnSQYgudMaWXe3C83VqD FQPCXHKjCSmHauG/bL93M52URTiqF5UexkFlUBzYQt1mQLjrjUqPSNxgQlZ33SXmXm7MV+kQtcl6M z7RGxdrMZB5015g+CB3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2d7x-003ebR-2b; Fri, 26 May 2023 19:29:29 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2d7v-003eZo-0i for linux-arm-kernel@lists.infradead.org; Fri, 26 May 2023 19:29:28 +0000 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-30adb83aa69so580961f8f.2 for ; Fri, 26 May 2023 12:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685129363; x=1687721363; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=vqZSsN91VZtcZCPTbwZ9Z6XKTZlAiaWgWZMS5nw69AU=; b=L8NSh5p7r3xqnjGfoYAcikP7KRGUnF+w12JTEczg6zfAzUYssWmg5ZmpCntu0K0gfM n6PycZ94xYB/1uiAEcDHk48ZknWbcyP2vfG8RA58jrpahSF3haXk2a0ht1T+XOYRzehG fs8kyMyEcHvlI8EUBQSMzLE2zDOZVp/J0HctkQCiIBsV+uMb5ejxLDyLHBUfghcAo96O WxjaydubvFvG4FavNoo02qUc9+XmcsgfTn2PgfGZKLvMbpBzekkWC1G890sKm6PzVRjf jlN9vPtX9WzlXydm+b9B4tJ+0xub3GUq8WMSbuW9I2HV94yvQ3LKg3CtJRmFBMDCWehn 9uWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685129363; x=1687721363; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vqZSsN91VZtcZCPTbwZ9Z6XKTZlAiaWgWZMS5nw69AU=; b=lzYD8MMdUjvo/hGydaRGD5pjFf20vRrxxLpTzosMzKbZOtH323ZBhh14v8xLDTn+S/ TfTF5c6CazKyNcM2KybVnPY3yZb34keulmrBR3e7czVIkaEqoLM+kSFNLihScJ91sd5i EPILaKwok0eDqVkbQe7aLo3zv/9p6sC8p4sIJnPALhwMnPh1y8nBti6g69BL/MLDLvMB HZeWTRuED9DuU3pNpBsfxUxaBZFILso5aNho2qto99JgqzlJfmr20UPE0V1HRW1Nx6J+ rni2hT8Sr46rbBEZL+gAgrEg8DSn9h3KwW7crAA/Qkp32SVHXVBoI9EgxGT8/Al/vAxy YpWg== X-Gm-Message-State: AC+VfDxNOxiBwQgCtidAecP9WawCSO70B4VS8kJLB38OKkjsMzP+lKGY rQ2p1doE60DcUpSlSSkMbVs= X-Google-Smtp-Source: ACHHUZ5KUQQ8Zx9EqPAyo80KH5Tt3YadlbiQoXfnS4piMdC/m5E5Chb3n42XVecm3vqVXZwxhpvHIg== X-Received: by 2002:a5d:43c3:0:b0:309:1c89:c61b with SMTP id v3-20020a5d43c3000000b003091c89c61bmr2484280wrr.29.1685129363382; Fri, 26 May 2023 12:29:23 -0700 (PDT) Received: from standask-GA-A55M-S2HP ([188.123.113.247]) by smtp.gmail.com with ESMTPSA id o4-20020a5d4744000000b003062675d4c9sm5981882wrs.39.2023.05.26.12.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 12:29:23 -0700 (PDT) Date: Fri, 26 May 2023 21:29:21 +0200 From: Stanislav Jakubek To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden Cc: bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] ARM: dts: bcm21664/23550: use CCU compatibles directly Message-ID: <65c54bd4076d646623d2a2f518631435522dc628.1685127525.git.stano.jakubek@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230526_122927_264368_74B35F96 X-CRM114-Status: GOOD ( 14.14 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org BCM21664 and BCM23550 DTs for some reason use constants from a header file for their CCU node compatibles. Change these to use the strings directly. Signed-off-by: Stanislav Jakubek --- arch/arm/boot/dts/bcm21664.dtsi | 8 ++++---- arch/arm/boot/dts/bcm23550.dtsi | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/bcm21664.dtsi b/arch/arm/boot/dts/bcm21664.dtsi index 2a426125f9fe..19ade84e42c1 100644 --- a/arch/arm/boot/dts/bcm21664.dtsi +++ b/arch/arm/boot/dts/bcm21664.dtsi @@ -285,21 +285,21 @@ var_156m_clk: var_156m { }; root_ccu: root_ccu@35001000 { - compatible = BCM21664_DT_ROOT_CCU_COMPAT; + compatible = "brcm,bcm21664-root-ccu"; reg = <0x35001000 0x0f00>; #clock-cells = <1>; clock-output-names = "frac_1m"; }; aon_ccu: aon_ccu@35002000 { - compatible = BCM21664_DT_AON_CCU_COMPAT; + compatible = "brcm,bcm21664-aon-ccu"; reg = <0x35002000 0x0f00>; #clock-cells = <1>; clock-output-names = "hub_timer"; }; master_ccu: master_ccu@3f001000 { - compatible = BCM21664_DT_MASTER_CCU_COMPAT; + compatible = "brcm,bcm21664-master-ccu"; reg = <0x3f001000 0x0f00>; #clock-cells = <1>; clock-output-names = "sdio1", @@ -313,7 +313,7 @@ master_ccu: master_ccu@3f001000 { }; slave_ccu: slave_ccu@3e011000 { - compatible = BCM21664_DT_SLAVE_CCU_COMPAT; + compatible = "brcm,bcm21664-slave-ccu"; reg = <0x3e011000 0x0f00>; #clock-cells = <1>; clock-output-names = "uartb", diff --git a/arch/arm/boot/dts/bcm23550.dtsi b/arch/arm/boot/dts/bcm23550.dtsi index 424c818d7a1b..ed3ce2fabca6 100644 --- a/arch/arm/boot/dts/bcm23550.dtsi +++ b/arch/arm/boot/dts/bcm23550.dtsi @@ -371,21 +371,21 @@ var_156m_clk: var_156m { }; root_ccu: root_ccu@35001000 { - compatible = BCM21664_DT_ROOT_CCU_COMPAT; + compatible = "brcm,bcm21664-root-ccu"; reg = <0x35001000 0x0f00>; #clock-cells = <1>; clock-output-names = "frac_1m"; }; aon_ccu: aon_ccu@35002000 { - compatible = BCM21664_DT_AON_CCU_COMPAT; + compatible = "brcm,bcm21664-aon-ccu"; reg = <0x35002000 0x0f00>; #clock-cells = <1>; clock-output-names = "hub_timer"; }; slave_ccu: slave_ccu@3e011000 { - compatible = BCM21664_DT_SLAVE_CCU_COMPAT; + compatible = "brcm,bcm21664-slave-ccu"; reg = <0x3e011000 0x0f00>; #clock-cells = <1>; clock-output-names = "uartb", @@ -398,7 +398,7 @@ slave_ccu: slave_ccu@3e011000 { }; master_ccu: master_ccu@3f001000 { - compatible = BCM21664_DT_MASTER_CCU_COMPAT; + compatible = "brcm,bcm21664-master-ccu"; reg = <0x3f001000 0x0f00>; #clock-cells = <1>; clock-output-names = "sdio1",