From patchwork Mon Jun 5 06:10:49 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: 13266948 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 081CFC7EE2A for ; Mon, 5 Jun 2023 06:11:52 +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=CiJlhUPLRMDqfxtrjvX3Uz9r/c0JO1k3GmMSeCUdYQY=; b=e3FYw2l36MlmBF PeZsnhBJYSJfYeeJ4Bz890YzFmtPjreo60IU2FSoU48w37RHWW3zZnncSuyql/8ySqiT4KcLT1kVh g7wosmv7cgZMcEYq5xYREXnyYAsBRy8XFF/6v1XBVqrucgPmsyotHuTlLsetQ56I5Tk5E0ew9TtUw J0c3XEOrLlmu95lcr4YJe5nMTf8hYkKbZyd+d3A2iEWbNSKu6cSTI2IOImWVcVbg+wH4UJQcSRjxU yaIC3mCB90bR/z4B5EveB8a1NAnBmIKbyFe97+47h8KCWaDW6xV92hrSiphprrpZ9D7LKUa1aOvu/ bG9GzCYsq852+1bZB69w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q63R3-00EIC3-1u; Mon, 05 Jun 2023 06:11:21 +0000 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q63Qx-00EIBD-0e for linux-arm-kernel@lists.infradead.org; Mon, 05 Jun 2023 06:11:19 +0000 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2af2db78b38so54730721fa.3 for ; Sun, 04 Jun 2023 23:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685945472; x=1688537472; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=v7BLH6cbhWXqLiz7l0KXmxD4+0MvlCE4iDNA20WYaLY=; b=ZjkjfeciV7W2+XQdX2MjC1fT91pn4bA6OuMH6f9GRZIBCFow1wN7ewQXbjGm6kj6CX rPraEiUYJ0yVHlHWzIvymNjXovWE3AaJdPLZ1nWzii4Qv7QsPfJ5i4t3R8tGaEdmN75g VtLAxTq8r+WqhXBg35ZGJjYXBZW8XwTvTdgew/oCqC2QZzndn2cO84W+jLfWJ2001K6X cnVX8+zJXgrNhjtv6maASdMcFXwZ3CIxh/cMidPIA1i3cW0rP6Jr6pqPdc7VYGiHkNHP n5Yc+N2Tttd0mbCUlZkXOYR8ZKKehvwn32Qy6nycfD56nqdF0BEBv9RrhMANeFITRaYG xWKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685945472; x=1688537472; 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=v7BLH6cbhWXqLiz7l0KXmxD4+0MvlCE4iDNA20WYaLY=; b=I5rqaio7IF+ImdGOwt8ap5BXCcQw5tREXOJ6jSksJ4mUqNrS7gUJ4Fw7baxpQQQWoG hqqk7s3ohw4e9QD19tuYoyTI3lKqEGaPZjhyfWHb1QaGU2rjASXAKrZ0QCHpFMAcByEw NC0UX8RWg7NAZ2K/siVQ7OvhcmmFhkD+2BfPg53qpahstnIaAPISBVzyhHkCKsVy9pgt h4vLsKtH442RObvLxxy+qmzkk0KgcDYhlg45r4yNS6WsEfVIWUykGtFwsIn5JeymmeJV iwekfw2QUZ++fzDGImoPW/d3oh2uvC1AXu9v1uIku61LCLh7LvMbxHiphLyNjOTKx8x1 Xruw== X-Gm-Message-State: AC+VfDyjYJ8rSC1VPb2yu5QumC2LjVky0VyWCQ1IhfIDEPm3v6o/TKlC ucmQ6td1A3UQUxFFeuYAdI8= X-Google-Smtp-Source: ACHHUZ4aOnw1F1bFlaIHMsvynm5HA9+GuEZhuh5Lw+5yXbSxJy6dpKXn+UwIrbdN/+vbF/6U3q+xwg== X-Received: by 2002:a2e:a0c7:0:b0:2b1:ead6:9f58 with SMTP id f7-20020a2ea0c7000000b002b1ead69f58mr62768ljm.32.1685945471626; Sun, 04 Jun 2023 23:11:11 -0700 (PDT) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id d4-20020a2e8904000000b002b1bb9a3febsm934889lji.74.2023.06.04.23.11.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jun 2023 23:11:11 -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?= , Christian Lamparter Subject: [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT Date: Mon, 5 Jun 2023 08:10:49 +0200 Message-Id: <20230605061049.16136-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-20230604_231115_236701_9F9F2464 X-CRM114-Status: GOOD ( 13.47 ) 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 Christian to the bcm-ns.dtsi which uses dual licensing. That syncs more Northstar code to be based on the same licensing schema. Cc: Christian Lamparter Signed-off-by: Rafał Miłecki Acked-by: Christian Lamparter --- Florian: we need to ask & wait for Christian's Acked-by before applying this one. --- arch/arm/boot/dts/bcm-ns.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 23 ----------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/arch/arm/boot/dts/bcm-ns.dtsi b/arch/arm/boot/dts/bcm-ns.dtsi index 793891f1f260..d9455b33adee 100644 --- a/arch/arm/boot/dts/bcm-ns.dtsi +++ b/arch/arm/boot/dts/bcm-ns.dtsi @@ -182,6 +182,10 @@ pcie1: pcie@13000 { reg = <0x00013000 0x1000>; }; + pcie2: pcie@14000 { + reg = <0x00014000 0x1000>; + }; + usb2: usb2@21000 { reg = <0x00021000 0x1000>; @@ -274,6 +278,14 @@ gmac3: ethernet@27000 { }; }; + pwm: pwm@18002000 { + compatible = "brcm,iproc-pwm"; + reg = <0x18002000 0x28>; + clocks = <&osc>; + #pwm-cells = <3>; + status = "disabled"; + }; + mdio: mdio@18003000 { compatible = "brcm,iproc-mdio"; reg = <0x18003000 0x8>; @@ -299,6 +311,15 @@ ports { }; }; + uart2: serial@18008000 { + compatible = "ns16550a"; + reg = <0x18008000 0x20>; + clocks = <&iprocslow>; + interrupts = ; + reg-shift = <2>; + status = "disabled"; + }; + dmu-bus@1800c000 { compatible = "simple-bus"; ranges = <0 0x1800c000 0x1000>; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 0f40812eb5a4..600a1b54f2ae 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -69,20 +69,6 @@ periph_clk: periph_clk { }; }; - axi@18000000 { - pcie2: pcie@14000 { - reg = <0x00014000 0x1000>; - }; - }; - - pwm: pwm@18002000 { - compatible = "brcm,iproc-pwm"; - reg = <0x18002000 0x28>; - clocks = <&osc>; - #pwm-cells = <3>; - status = "disabled"; - }; - mdio-mux@18003000 { compatible = "mdio-mux-mmioreg", "mdio-mux"; mdio-parent-bus = <&mdio>; @@ -110,15 +96,6 @@ usb3_dmp: syscon@18105000 { reg = <0x18105000 0x1000>; }; - uart2: serial@18008000 { - compatible = "ns16550a"; - reg = <0x18008000 0x20>; - clocks = <&iprocslow>; - interrupts = ; - reg-shift = <2>; - status = "disabled"; - }; - i2c0: i2c@18009000 { compatible = "brcm,iproc-i2c"; reg = <0x18009000 0x50>;