From patchwork Sat Sep 16 08:58:55 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: 13388267 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 D208ECD37B7 for ; Sat, 16 Sep 2023 08:59:39 +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=G+LO/28Iq4TzaY85Um+HpYjgUySjwd8pivpOSYUuJEE=; b=Qsap7SLog3fAx8 TkjsziSbLTBoLyAeQUyJEDYvphrwzXAEBVTV3xCi4bQShgNyknH8oG9g5aXfEU0meRWiu/AUTajEY SWJwDG6Q3DWsRZsf5b1a/nNfUqCLv+tewRxly6b7QgrdI6/74pL7w+pkqAtdYxNl5ysLBZHd/ol3d GuPAY+LaOpZ3toORq+013+2r7pVwyHqtExn+PKxeSrOgKq5XEupAM2O98yZfAspHPuvbUJAp19xkH znrfCophWLWcEv4vHVA+TFpfL5UCkMJNID+yrtwKm1rbqwyrNJUahEKW+RmEqvFybPhRoY3ORKMGz Sbc8RCUF2NdxOERbwE1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qhR8u-00CDSh-0k; Sat, 16 Sep 2023 08:59:08 +0000 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qhR8r-00CDSA-0H for linux-arm-kernel@lists.infradead.org; Sat, 16 Sep 2023 08:59:06 +0000 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2bcd7a207f7so46400471fa.3 for ; Sat, 16 Sep 2023 01:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694854742; x=1695459542; 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=3u2vbto1umek1f24RIrtSGDaz5f+TY32is7IlWxMZj8=; b=MKxzoUdboZMeQ1K9VIEbdElIGj/kPF68vQWV95MVdDINbNgds5GVzx/UAbtJqhlpb3 NJrkMoiawmLaVAG9S6FJKTDCTNDk/g+7RGQT72k1Ie3RF7CNSZF8MP7ppcvYxS231Lh0 m+NYc91udbfLlCbyVnPjc/6IGFLwEz+6tbRv2+HXMYFV+GR7qAcykLm24BGbkr9+rnOS RyVpALrffaItvhEfhhtE4n0PKTJgcIEhVLADOE7+vEIbuUFoG0+zqU/XuJ8DyLJNxDCF IUvfVcFzzkzAqgtcbuV8JUAUwzsav7sfKLteRz2UqIDS7zjkohaWEUlWHiexLe46Yu5V jx2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694854742; x=1695459542; 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=3u2vbto1umek1f24RIrtSGDaz5f+TY32is7IlWxMZj8=; b=mhVlMp6nihshFFiBCl0HujAm+7aZwcvLAnCnGoto/4N3F116lN5TqgYgC6KfM8a1uL tt5eVfB6mSDJRerzUzCNsS3WAtW9HpeylYw293okbjvENSJmWqW/1Gg0voXTqr1bSXXA fTNdofLcozamqiKZtSYebHGVpa913s3KYYrGbgHZGXrHjeOM9Bop8pKBvugK0FVQWR81 UheeP6y+hRahwLdDMiYnQPUHA7LMeBSBUFzvvZkoXRbVUA5VAqI2HEJAfAzUTJgigJiH fQvqpagjWAZ6g0NXUI8cADXzkRnTQpUCrZsWnBK5Uh+ZITVj9Ws+itfQRLbcJt4LBXth KYaw== X-Gm-Message-State: AOJu0Yyu/zGzk7O7OR9qZxkEglLFMC/HiSX4i5NU9UbtFrGksrGOYnCT obSfYqBdP8IEVbPvG5UFEl8= X-Google-Smtp-Source: AGHT+IHrEkmigwtbLJ+2r8gOCe1tW24WBREnf2iuZz+emRztSCYED7QoueakO09oGbXaqq+qFx42kw== X-Received: by 2002:a05:6512:318f:b0:503:3cc:cd39 with SMTP id i15-20020a056512318f00b0050303cccd39mr1129268lfe.8.1694854742075; Sat, 16 Sep 2023 01:59:02 -0700 (PDT) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id b23-20020ac25637000000b004ff96c09b47sm942843lff.260.2023.09.16.01.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Sep 2023 01:59:01 -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?= , Vivek Unune Subject: [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT Date: Sat, 16 Sep 2023 10:58:55 +0200 Message-Id: <20230916085855.28375-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_015905_147375_D809CE1D X-CRM114-Status: GOOD ( 14.41 ) 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 Vivek 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 37f6130ec39f ("ARM: dts: BCM5301X: Make USB 3.0 PHY use MDIO PHY driver"). Cc: Vivek Unune Signed-off-by: Rafał Miłecki Acked-by: Vivek Unune --- Vivek: can you send your Acked-by for this patch, please? --- arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 27 ++++++++++++++++++++++++ arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 27 ------------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi index f0f3a718c413..d0d5f7e52a91 100644 --- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi @@ -327,6 +327,29 @@ mdio: mdio@18003000 { #address-cells = <1>; }; + mdio-mux@18003000 { + compatible = "mdio-mux-mmioreg", "mdio-mux"; + mdio-parent-bus = <&mdio>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x18003000 0x4>; + mux-mask = <0x200>; + + mdio@0 { + reg = <0x0>; + #address-cells = <1>; + #size-cells = <0>; + + usb3_phy: usb3-phy@10 { + compatible = "brcm,ns-ax-usb3-phy"; + reg = <0x10>; + usb3-dmp-syscon = <&usb3_dmp>; + #phy-cells = <0>; + status = "disabled"; + }; + }; + }; + rng: rng@18004000 { compatible = "brcm,bcm5301x-rng"; reg = <0x18004000 0x14>; @@ -467,6 +490,10 @@ nand_controller: nand-controller@18028000 { brcm,nand-has-wp; }; + usb3_dmp: syscon@18105000 { + reg = <0x18105000 0x1000>; + }; + thermal-zones { cpu_thermal: cpu-thermal { polling-delay-passive = <0>; diff --git a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi index de46dbd5b876..f06a178a9240 100644 --- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi @@ -62,33 +62,6 @@ periph_clk: periph_clk { }; }; - mdio-mux@18003000 { - compatible = "mdio-mux-mmioreg", "mdio-mux"; - mdio-parent-bus = <&mdio>; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x18003000 0x4>; - mux-mask = <0x200>; - - mdio@0 { - reg = <0x0>; - #address-cells = <1>; - #size-cells = <0>; - - usb3_phy: usb3-phy@10 { - compatible = "brcm,ns-ax-usb3-phy"; - reg = <0x10>; - usb3-dmp-syscon = <&usb3_dmp>; - #phy-cells = <0>; - status = "disabled"; - }; - }; - }; - - usb3_dmp: syscon@18105000 { - reg = <0x18105000 0x1000>; - }; - i2c0: i2c@18009000 { compatible = "brcm,iproc-i2c"; reg = <0x18009000 0x50>;