From patchwork Sat Sep 16 08:30:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 13388264 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 E06E4CD37B7 for ; Sat, 16 Sep 2023 08:31:45 +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:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=BCM1Y3ZC5XbmEICl8ksYDslaOLdI4EDISABHNF3SOIk=; b=cU329xOZ4zrR1k HMU7LZF0JkLkzxAAhfOvCYa3kz6H22lr3yvjY0GrqxAnT48Vb6yke3Dl1CRWzd3NiVejII08rNxqG NRpYc0oxowLYgGAok1XrAA9G1fD80YzyiP69kzPrCyDsYyfpfCdTRFdX4wnsPmkjTeWi5v5XWx0ND Pn/GeI77NW3eHKa2WQ9+LK7tl8RiZxEdbu/rt/5yPxjHIabNNvbl1EYBfu1L6ZERcRjMci0vSNYNC a3+P0EpTxfHdtd3+2q//P58gTYIOJYtlxCcQP+Ff9TkcAZhPijfNmOEWU1l3XO5hifj76zwq7GFpo dJ9S7WaD/XX4n8GA6l8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qhQhx-00CCHI-2R; Sat, 16 Sep 2023 08:31:17 +0000 Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qhQhu-00CCGZ-30 for linux-arm-kernel@lists.infradead.org; Sat, 16 Sep 2023 08:31:16 +0000 Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2bfc14e6d03so34424851fa.1 for ; Sat, 16 Sep 2023 01:31:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694853070; x=1695457870; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5LGYWdB0DEixM6I5ZcVz5gZM0npJ3BPYjJVK1vjDgg0=; b=h04SkAuPzzZnU65KBqu6xlEmw/l9/omBT95+ex8H0sGhmAFhvJih2Sc0Ebw1BEK3cF fptPnCLmvD5meoBmpu7PLszIusQUIkiwhBgB7lZ6y4FrRfTjQfgL3oNkO4IJSki9hMiS h3nptIdBxsjuP4haqlnWL6i5BeXhMEy+481IHXe6uUNiUnSJhka8UjJbKCpjuXjgszEb 2QndITLVwysNCHXqW5n9MDxBnA+9x6IA87R0K2bOFW8UcVp6a1uZCTwu42OLhaCDhkiR c6fVmm2ZMmSUQf2WHPxOMGRl7UX6IxRstGJzQaU/a13XPXutXBpDQe2enJuZg99mp+EJ RFTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694853070; x=1695457870; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5LGYWdB0DEixM6I5ZcVz5gZM0npJ3BPYjJVK1vjDgg0=; b=sDI8DsOWmW73tTurRZwMSNED4XA8XV41dyijm6y5WrIlsaJuHMeLeeHsPp7g35xXmE H4W2AHspasK80hjK73XbkQ4GW4TwPZ++WTrDP+Erhd5vKoMk0oW3qLB18n9sHLPZrfn/ pJ63OFxtj5UKskjVcZaGNszJRaShayLlwCSjr/M/KS9kLU/d0r7BsdM61J6AndPHrlIw ZXNIfnvET83jYEvLpgxXkmhTGx7aBBeHOSVL4qmz43oE+o+BaJHNGMpqV9bOAN7n8qHQ SXAhMFmVLCUA6K3MXlxnO9+gvlYIoOi7dq9Ghkh+GMWfa3um2KSFL+NE0zEn74N+gm+E Fv8g== X-Gm-Message-State: AOJu0YxduxJVUwyRixu2vEanu5aSnPSK68Y5qIjDPYYnUN/+UCzWzpuf CmK41pURd+bjWDVIAERe900= X-Google-Smtp-Source: AGHT+IFeh2Tb0/CZmyVB8jlMqM01qQ3nX9Qp2zY5TBQ+AGZHmfYMsTgFbGUummMX51uR/nxk3jlJ2g== X-Received: by 2002:a05:651c:19ab:b0:2bf:f348:9f96 with SMTP id bx43-20020a05651c19ab00b002bff3489f96mr251848ljb.8.1694853069479; Sat, 16 Sep 2023 01:31:09 -0700 (PDT) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id o10-20020a2e0c4a000000b002b962ee0c14sm1059188ljd.23.2023.09.16.01.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Sep 2023 01:31:09 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Florian Fainelli Cc: Hauke Mehrtens , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Felix Fietkau Subject: [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT Date: Sat, 16 Sep 2023 10:30:57 +0200 Message-Id: <20230916083057.10458-1-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230916_013114_993469_424895A1 X-CRM114-Status: GOOD ( 13.84 ) 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 From: Rafał Miłecki Move code added by Felix to the bcm-ns.dtsi which uses dual licensing. That syncs more Northstar code to be based on the same licensing schema. This code was added in the commit 1ff80363524c ("ARM: BCM5301X: Add profiling support"). Cc: Felix Fietkau Signed-off-by: Rafał Miłecki Acked-by: Felix Fietkau --- Felix: can I get your Acked-by for this, please? I managed to cleanup most of Northstar licensing already. --- arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 7 +++++++ arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi index 88fda18af1f8..f0f3a718c413 100644 --- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi @@ -14,6 +14,13 @@ / { #address-cells = <1>; #size-cells = <1>; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupts = + , + ; + }; + chipcommon-a-bus@18000000 { compatible = "simple-bus"; ranges = <0x00000000 0x18000000 0x00001000>; diff --git a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi index 600a1b54f2ae..de46dbd5b876 100644 --- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi @@ -26,13 +26,6 @@ watchdog@20620 { }; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupts = - , - ; - }; - clocks { #address-cells = <1>; #size-cells = <1>;