From patchwork Wed May 3 12:16:10 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: 13230132 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 8682EC77B75 for ; Wed, 3 May 2023 12:17: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: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=lzjGfFviGy/lSa2XLaFOX5lfXfJNiGtmHYfvWX1AuMY=; b=Dzf5nG5V9mxjvL JSZXbraVUGbg3wQTbYmktgHMq/mZLUkVFaV+vqu1pO6hklJwXxZAjhiRvyUNpMe0rigosC/Rg+Pt2 BFAs7ToFm90XKtynf5T550ch8oun271BU+adHYmREBbJ1ZMvZ/vAOVxGepMJw0NFW6WhRcX6QXv9i kws/UvQVEqXb4nc6JHICxdbuKmPsUqj7n7OaKnCXif18/+XifvItlDhMzv3QBkrkX9XuIw/f9v9jo IMRclWn+83bDC1Umc1TjhlWu3CxHHSofHM0O7j43TZWDgLR9Z0bDnnL1M2nMCL+qXdJ30p/+UhU/t +8MJHMmJv0A/6GRPWuCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1puBPc-004Wkw-0a; Wed, 03 May 2023 12:16:48 +0000 Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1puBPY-004WiV-2g for linux-arm-kernel@lists.infradead.org; Wed, 03 May 2023 12:16:46 +0000 Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-4efd6e26585so5933090e87.1 for ; Wed, 03 May 2023 05:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683116202; x=1685708202; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pu0vVxn9b3NA6G1OBOyBROf5q7TIXcM5lics/+8ewLM=; b=JQNwCdPzG4zu1i6isX6zxiXtzIoLWphOu8QFsYMCt6DbkaokR3WRjQUH9LRmrCkdoW 9Qe5sQV2jFCvuEwFYXNjGhVLa4rNqYtZFy6HtDqYCrl1tTHiFBS8B1rQ/V7Da2ElvZPo eNV9xkcR3dQL/zNT6/YFGHHmZwL1JYtQ3NLFRKdmL+NwjneOaTzwrRo+6ZqAazn8G86V OMvKW+4h/KriExinWLzfiKks4WroHhy9yOY3pv7PW9JM2QploJ61qGvkaoE5A7YCBG7B yFusCouXAYwlgyfR/JWdbWFSls7o+cM8p1acnidbmjiGmAUASAloPsiIecnk+uUKP7lX KTFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683116202; x=1685708202; 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=pu0vVxn9b3NA6G1OBOyBROf5q7TIXcM5lics/+8ewLM=; b=lj6T4bYsfRfTDv1rtdewryJGSoEcRBJmpfT6idicbXHfFBoz2nU+SnM7cUVxwDb0V1 SB41Hd2iUFUbDq92XtedzWo0b50OHt/MVh7yiRMG1U+MW4uGNbN5VoZijygdbaCqxROH TNqMyYUeVhZojh9UydBqgtzgWTCkjo/EulGWGCyO9w18QI3/2PLsqlq/gMOrsiWhrZTP yEuXMK4Uyt2r5teadE9iY/kGtl/AsqyMKSXJbmkh++/FXFmSRgpcFal/f8lQ7+yN6s7e Ypqa7sh0zRPY8cCpaa9zDYEU0/hriXZqayVq1W3AsWHEt66Qc5YNq2XmENd0wo1ixHc1 z+Sw== X-Gm-Message-State: AC+VfDzqocDhHbT7GzQTnQXe7A1Nx6FrcZ6/2RJYY/f8cUxmlrUNzcjM LnZd/cpVK8nNOU/qj10Y1/Q= X-Google-Smtp-Source: ACHHUZ456OC9cwwXmS/uivv7z/eXiDchBl7zySLGfgf92vMfdnMWb43Ep15RAgh4z4JyxkS/FEN6cQ== X-Received: by 2002:ac2:43b2:0:b0:4ee:dafa:cb00 with SMTP id t18-20020ac243b2000000b004eedafacb00mr722389lfl.60.1683116201813; Wed, 03 May 2023 05:16:41 -0700 (PDT) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id r8-20020a19ac48000000b004eff132a90csm4651069lfc.74.2023.05.03.05.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 05:16:41 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Florian Fainelli Cc: Hauke Mehrtens , Rob Herring , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH 1/2] =?utf-8?q?ARM=3A_dts=3A_BCM5301X=3A_Relicense_Rafa?= =?utf-8?q?=C5=82=27s_code_to_the_GPL_2=2E0+_/_MIT?= Date: Wed, 3 May 2023 14:16:10 +0200 Message-Id: <20230503121611.1629-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-20230503_051644_870487_A83D7C78 X-CRM114-Status: GOOD ( 19.42 ) 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 All BCM5301X device DTS files use dual licensing. Try the same for SoC. Introduce a new .dtsi file with a proper SPDX tag. Signed-off-by: Rafał Miłecki --- MAINTAINERS | 1 + arch/arm/boot/dts/bcm-ns.dtsi | 202 ++++++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 192 +----------------------------- 3 files changed, 205 insertions(+), 190 deletions(-) create mode 100644 arch/arm/boot/dts/bcm-ns.dtsi diff --git a/MAINTAINERS b/MAINTAINERS index a81ba8328704..35c2fe651081 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4001,6 +4001,7 @@ M: Rafał Miłecki R: Broadcom internal kernel review list L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: arch/arm/boot/dts/bcm-ns.dtsi F: arch/arm/boot/dts/bcm470* F: arch/arm/boot/dts/bcm5301* F: arch/arm/boot/dts/bcm953012* diff --git a/arch/arm/boot/dts/bcm-ns.dtsi b/arch/arm/boot/dts/bcm-ns.dtsi new file mode 100644 index 000000000000..21d672aba75a --- /dev/null +++ b/arch/arm/boot/dts/bcm-ns.dtsi @@ -0,0 +1,202 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include +#include +#include +#include +#include + +/ { + axi@18000000 { + compatible = "brcm,bus-axi"; + reg = <0x18000000 0x1000>; + ranges = <0x00000000 0x18000000 0x00100000>; + #address-cells = <1>; + #size-cells = <1>; + + chipcommon: chipcommon@0 { + reg = <0x00000000 0x1000>; + + gpio-controller; + #gpio-cells = <2>; + }; + + pcie0: pcie@12000 { + reg = <0x00012000 0x1000>; + }; + + pcie1: pcie@13000 { + reg = <0x00013000 0x1000>; + }; + + usb2: usb2@21000 { + reg = <0x00021000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + interrupt-parent = <&gic>; + + ehci: usb@21000 { + #usb-cells = <0>; + + compatible = "generic-ehci"; + reg = <0x00021000 0x1000>; + interrupts = ; + phys = <&usb2_phy>; + + #address-cells = <1>; + #size-cells = <0>; + + ehci_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; + + ehci_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; + }; + + ohci: usb@22000 { + #usb-cells = <0>; + + compatible = "generic-ohci"; + reg = <0x00022000 0x1000>; + interrupts = ; + + #address-cells = <1>; + #size-cells = <0>; + + ohci_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; + + ohci_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; + }; + }; + + usb3: usb3@23000 { + reg = <0x00023000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + interrupt-parent = <&gic>; + + xhci: usb@23000 { + #usb-cells = <0>; + + compatible = "generic-xhci"; + reg = <0x00023000 0x1000>; + interrupts = ; + phys = <&usb3_phy>; + phy-names = "usb"; + + #address-cells = <1>; + #size-cells = <0>; + + xhci_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; + }; + }; + }; + + mdio: mdio@18003000 { + compatible = "brcm,iproc-mdio"; + reg = <0x18003000 0x8>; + #size-cells = <0>; + #address-cells = <1>; + }; + + dmu-bus@1800c000 { + compatible = "simple-bus"; + ranges = <0 0x1800c000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + + cru-bus@100 { + compatible = "brcm,ns-cru", "simple-mfd"; + reg = <0x100 0x1a4>; + ranges; + #address-cells = <1>; + #size-cells = <1>; + + usb2_phy: phy@164 { + compatible = "brcm,ns-usb2-phy"; + reg = <0x164 0x4>; + brcm,syscon-clkset = <&cru_clkset>; + clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>; + clock-names = "phy-ref-clk"; + #phy-cells = <0>; + }; + + cru_clkset: syscon@180 { + compatible = "brcm,cru-clkset", "syscon"; + reg = <0x180 0x4>; + }; + + pinctrl: pinctrl@1c0 { + compatible = "brcm,bcm4708-pinmux"; + reg = <0x1c0 0x24>; + reg-names = "cru_gpio_control"; + + spi-pins { + groups = "spi_grp"; + function = "spi"; + }; + + pinmux_i2c: i2c-pins { + groups = "i2c_grp"; + function = "i2c"; + }; + + pinmux_pwm: pwm-pins { + groups = "pwm0_grp", "pwm1_grp", + "pwm2_grp", "pwm3_grp"; + function = "pwm"; + }; + + pinmux_uart1: uart1-pins { + groups = "uart1_grp"; + function = "uart1"; + }; + }; + + thermal: thermal@2c0 { + compatible = "brcm,ns-thermal"; + reg = <0x2c0 0x10>; + #thermal-sensor-cells = <0>; + }; + }; + }; + + thermal-zones { + cpu_thermal: cpu-thermal { + polling-delay-passive = <0>; + polling-delay = <1000>; + coefficients = <(-556) 418000>; + thermal-sensors = <&thermal>; + + trips { + cpu-crit { + temperature = <125000>; + hysteresis = <0>; + type = "critical"; + }; + }; + + cooling-maps { + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 5fc1b847f4aa..2aa3a9f09641 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -8,11 +8,7 @@ * Licensed under the GNU/GPL. See COPYING for details. */ -#include -#include -#include -#include -#include +#include "bcm-ns.dtsi" / { #address-cells = <1>; @@ -149,12 +145,6 @@ periph_clk: periph_clk { }; axi@18000000 { - compatible = "brcm,bus-axi"; - reg = <0x18000000 0x1000>; - ranges = <0x00000000 0x18000000 0x00100000>; - #address-cells = <1>; - #size-cells = <1>; - #interrupt-cells = <1>; interrupt-map-mask = <0x000fffff 0xffff>; interrupt-map = @@ -228,108 +218,15 @@ axi@18000000 { <0x00028000 6 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>, <0x00028000 7 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; - chipcommon: chipcommon@0 { - reg = <0x00000000 0x1000>; - - gpio-controller; - #gpio-cells = <2>; + chipcommon@0 { interrupt-controller; #interrupt-cells = <2>; }; - pcie0: pcie@12000 { - reg = <0x00012000 0x1000>; - }; - - pcie1: pcie@13000 { - reg = <0x00013000 0x1000>; - }; - pcie2: pcie@14000 { reg = <0x00014000 0x1000>; }; - usb2: usb2@21000 { - reg = <0x00021000 0x1000>; - - #address-cells = <1>; - #size-cells = <1>; - ranges; - - interrupt-parent = <&gic>; - - ehci: usb@21000 { - #usb-cells = <0>; - - compatible = "generic-ehci"; - reg = <0x00021000 0x1000>; - interrupts = ; - phys = <&usb2_phy>; - - #address-cells = <1>; - #size-cells = <0>; - - ehci_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - - ehci_port2: port@2 { - reg = <2>; - #trigger-source-cells = <0>; - }; - }; - - ohci: usb@22000 { - #usb-cells = <0>; - - compatible = "generic-ohci"; - reg = <0x00022000 0x1000>; - interrupts = ; - - #address-cells = <1>; - #size-cells = <0>; - - ohci_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - - ohci_port2: port@2 { - reg = <2>; - #trigger-source-cells = <0>; - }; - }; - }; - - usb3: usb3@23000 { - reg = <0x00023000 0x1000>; - - #address-cells = <1>; - #size-cells = <1>; - ranges; - - interrupt-parent = <&gic>; - - xhci: usb@23000 { - #usb-cells = <0>; - - compatible = "generic-xhci"; - reg = <0x00023000 0x1000>; - interrupts = ; - phys = <&usb3_phy>; - phy-names = "usb"; - - #address-cells = <1>; - #size-cells = <0>; - - xhci_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - }; - }; - gmac0: ethernet@24000 { reg = <0x24000 0x800>; }; @@ -355,13 +252,6 @@ pwm: pwm@18002000 { status = "disabled"; }; - mdio: mdio@18003000 { - compatible = "brcm,iproc-mdio"; - reg = <0x18003000 0x8>; - #size-cells = <0>; - #address-cells = <1>; - }; - mdio-mux@18003000 { compatible = "mdio-mux-mmioreg", "mdio-mux"; mdio-parent-bus = <&mdio>; @@ -409,18 +299,7 @@ i2c0: i2c@18009000 { }; dmu-bus@1800c000 { - compatible = "simple-bus"; - ranges = <0 0x1800c000 0x1000>; - #address-cells = <1>; - #size-cells = <1>; - cru-bus@100 { - compatible = "brcm,ns-cru", "simple-mfd"; - reg = <0x100 0x1a4>; - ranges; - #address-cells = <1>; - #size-cells = <1>; - lcpll0: clock-controller@100 { #clock-cells = <1>; compatible = "brcm,nsp-lcpll0"; @@ -440,53 +319,6 @@ genpll: clock-controller@140 { "usbclk", "iprocfast", "sata1", "sata2"; }; - - usb2_phy: phy@164 { - compatible = "brcm,ns-usb2-phy"; - reg = <0x164 0x4>; - brcm,syscon-clkset = <&cru_clkset>; - clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>; - clock-names = "phy-ref-clk"; - #phy-cells = <0>; - }; - - cru_clkset: syscon@180 { - compatible = "brcm,cru-clkset", "syscon"; - reg = <0x180 0x4>; - }; - - pinctrl: pinctrl@1c0 { - compatible = "brcm,bcm4708-pinmux"; - reg = <0x1c0 0x24>; - reg-names = "cru_gpio_control"; - - spi-pins { - groups = "spi_grp"; - function = "spi"; - }; - - pinmux_i2c: i2c-pins { - groups = "i2c_grp"; - function = "i2c"; - }; - - pinmux_pwm: pwm-pins { - groups = "pwm0_grp", "pwm1_grp", - "pwm2_grp", "pwm3_grp"; - function = "pwm"; - }; - - pinmux_uart1: uart1-pins { - groups = "uart1_grp"; - function = "uart1"; - }; - }; - - thermal: thermal@2c0 { - compatible = "brcm,ns-thermal"; - reg = <0x2c0 0x10>; - #thermal-sensor-cells = <0>; - }; }; }; @@ -558,24 +390,4 @@ partitions { }; }; }; - - thermal-zones { - cpu_thermal: cpu-thermal { - polling-delay-passive = <0>; - polling-delay = <1000>; - coefficients = <(-556) 418000>; - thermal-sensors = <&thermal>; - - trips { - cpu-crit { - temperature = <125000>; - hysteresis = <0>; - type = "critical"; - }; - }; - - cooling-maps { - }; - }; - }; };