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: 99636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp707746vqr; Fri, 26 May 2023 12:36:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6PWfsPle2YmvWe7JjNILIagzaRvY3IwgcXc13l12wgiwcqPo5nLBi9bi1mEzjrQTnzw+SX X-Received: by 2002:a05:6a20:7d86:b0:ff:c184:7c76 with SMTP id v6-20020a056a207d8600b000ffc1847c76mr607649pzj.24.1685129777191; Fri, 26 May 2023 12:36:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685129777; cv=none; d=google.com; s=arc-20160816; b=DrilUGGAKzAvsF+3g87WbGUvjPaV9BkEeAmWbgX4KZZePk3zHiV0ha5T2WGvnkUFti Sk2K9bTTLp4Cev0/Ohc8NduLtn6cLruQJXDyGf49kSTHXtty3PjA3fsSvn0M7Ekdvly4 oTzPN0DUxaZNkZv9tOdutid+GEH1vib17cW30F92atR7Djd7kBc6Ud1osr5ldx8LCHPR HoN4XSK9eCZYLB46OtJ3CwyHKZNAFkwuH5sx8cRM6npXcKv5Gq6s4dpOKFUpsYMya3xw wvEw/RCDmYROdLISqr9CPz4EKqEYCJ5SqdKBdJxEAEop76Ss4JCJzK1fmVKPTu2cblTn w82A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=vqZSsN91VZtcZCPTbwZ9Z6XKTZlAiaWgWZMS5nw69AU=; b=oGIpEBqMTje6phAgxm8WXF9Q3C1soxoG0Y+A7EFgZOQL/CGXWVcwv/W4bIhO/iFjbd F9mnu2o4e8GKhXd3gMPHbaEHASu2j3cCQVrYR9guKLEr/i6TLrqO0XgFTxHvid+vrIPj GZNGrTzUWjzpsNhsrKPrkC/IUo2hVgS9FyFhV6bHOshrOHScHV3u2t3QfqJqecz16Ddv XOJ7cJ+aqYO3GKJpfgG8Nr337rW5mo+Nw2Zdin+pnreGXNJUY3+kJotg9ABKo4pwI1OL C2kOvWtti1q9N7jTYsuT3cxjauzbXCQqj8ku5FWX3U73bkg7EhVTNcLdgtFnt95sWVEP SLBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=L8NSh5p7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x24-20020a63db58000000b0051389efe297si4554023pgi.265.2023.05.26.12.35.58; Fri, 26 May 2023 12:36:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=L8NSh5p7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243223AbjEZT32 (ORCPT + 99 others); Fri, 26 May 2023 15:29:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230305AbjEZT30 (ORCPT ); Fri, 26 May 2023 15:29:26 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1890FA3; Fri, 26 May 2023 12:29:25 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-30adc69c0dbso533843f8f.1; Fri, 26 May 2023 12:29:25 -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=SdC7DaWfj1r9Ql2OXgTmr3ToRqI1wpnq84g5Xsa7cG7i6ITJsW2m8NKioCbybZ5+Lh VZNa1meHfIu9E7R7bZ5VEyTrxG8IdR99vGB839q+TOyenGcNpBQTIlRfpk2uB8Nfu2ku zZt/e+mXoBc+ePgnNAsYLRK9kkbPzB3wV+GwmJnTFTYqOfePBNeiu4nH2p2jVXo9oY36 rqnLSbQdySPwAfnkaVmTaXP16GNmfgqU+f3WgqpmvEImEwberEWJ0/46W0by35NRbKIy /GEiTUrt/T6/Ny3ljljZBTsjDfj0C0HHsOKXNo4erHw8pzm+21+hZG9GhIOcVn1fNZXD sX6A== X-Gm-Message-State: AC+VfDyg7M9GsDlZxn1DLtpY606ltdPk3H1xU3EyjvZIs163wwpIYn++ ZmGuWw8/t6cpSZ0Ibf/natI= 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766986641551304869?= X-GMAIL-MSGID: =?utf-8?q?1766986641551304869?= 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",