U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: William Zhang <william.zhang@broadcom.com>
To: anand.gore@broadcom.com, kursad.oney@broadcom.com,
	U-Boot Mailing List <u-boot@lists.denx.de>,
	noltari@gmail.com, philippe.reynes@softathome.com,
	tomer.yacoby@broadcom.com, dregan@mail.com
Cc: William Zhang <william.zhang@broadcom.com>,
	joel.peshkin@broadcom.com, dan.beygelman@broadcom.com,
	Simon Glass <sjg@chromium.org>,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH v2 3/9] arm64: dts: broadcom: bcmbca: Add spi controller node
Date: Tue,  2 May 2023 11:58:10 -0700	[thread overview]
Message-ID: <20230502185817.374951-4-william.zhang@broadcom.com> (raw)
In-Reply-To: <20230502185817.374951-1-william.zhang@broadcom.com>

Add support for HSSPI controller in ARMv8 chip dts files.

Port from linux patch:
Link: https://lore.kernel.org/r/20230207065826.285013-5-william.zhang@broadcom.com

Signed-off-by: William Zhang <william.zhang@broadcom.com>
---

Changes in v2: None

 arch/arm/dts/bcm4908.dtsi  | 17 +++++++++++++++++
 arch/arm/dts/bcm4912.dtsi  | 20 ++++++++++++++++++++
 arch/arm/dts/bcm63146.dtsi | 19 +++++++++++++++++++
 arch/arm/dts/bcm63158.dtsi | 15 ++++++---------
 arch/arm/dts/bcm6813.dtsi  | 20 ++++++++++++++++++++
 arch/arm/dts/bcm6856.dtsi  | 23 ++++++++++-------------
 arch/arm/dts/bcm6858.dtsi  | 23 ++++++++++-------------
 arch/arm/dts/bcm94908.dts  |  4 ++++
 arch/arm/dts/bcm94912.dts  |  4 ++++
 arch/arm/dts/bcm963146.dts |  4 ++++
 arch/arm/dts/bcm963158.dts |  4 ++++
 arch/arm/dts/bcm96813.dts  |  4 ++++
 arch/arm/dts/bcm96856.dts  |  4 ++++
 arch/arm/dts/bcm96858.dts  |  4 ++++
 14 files changed, 130 insertions(+), 35 deletions(-)

diff --git a/arch/arm/dts/bcm4908.dtsi b/arch/arm/dts/bcm4908.dtsi
index 0be5cfeeffa9..fc9874623b18 100644
--- a/arch/arm/dts/bcm4908.dtsi
+++ b/arch/arm/dts/bcm4908.dtsi
@@ -106,6 +106,12 @@
 			clock-frequency = <50000000>;
 			clock-output-names = "periph";
 		};
+
+		hsspi_pll: hsspi-pll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <400000000>;
+		};
 	};
 
 	bus@ff800000 {
@@ -123,5 +129,16 @@
 			status = "disabled";
 		};
 
+		hsspi: spi@1000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "brcm,bcm4908-hsspi", "brcm,bcmbca-hsspi-v1.0";
+			reg = <0x1000 0x600>;
+			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&hsspi_pll &hsspi_pll>;
+			clock-names = "hsspi", "pll";
+			num-cs = <8>;
+			status = "disabled";
+		};
 	};
 };
diff --git a/arch/arm/dts/bcm4912.dtsi b/arch/arm/dts/bcm4912.dtsi
index 3d016c2ce675..b10a0ae06187 100644
--- a/arch/arm/dts/bcm4912.dtsi
+++ b/arch/arm/dts/bcm4912.dtsi
@@ -78,6 +78,7 @@
 			#clock-cells = <0>;
 			clock-frequency = <200000000>;
 		};
+
 		uart_clk: uart-clk {
 			compatible = "fixed-factor-clock";
 			#clock-cells = <0>;
@@ -85,6 +86,12 @@
 			clock-div = <4>;
 			clock-mult = <1>;
 		};
+
+		hsspi_pll: hsspi-pll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <200000000>;
+		};
 	};
 
 	psci {
@@ -116,6 +123,19 @@
 		#size-cells = <1>;
 		ranges = <0x0 0x0 0xff800000 0x800000>;
 
+		hsspi: spi@1000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "brcm,bcm4912-hsspi", "brcm,bcmbca-hsspi-v1.1";
+			reg = <0x1000 0x600>, <0x2610 0x4>;
+			reg-names = "hsspi", "spim-ctrl";
+			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&hsspi_pll &hsspi_pll>;
+			clock-names = "hsspi", "pll";
+			num-cs = <8>;
+			status = "disabled";
+		};
+
 		uart0: serial@12000 {
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0x12000 0x1000>;
diff --git a/arch/arm/dts/bcm63146.dtsi b/arch/arm/dts/bcm63146.dtsi
index 04de96bd0a03..48226cf1a7d4 100644
--- a/arch/arm/dts/bcm63146.dtsi
+++ b/arch/arm/dts/bcm63146.dtsi
@@ -59,6 +59,7 @@
 			#clock-cells = <0>;
 			clock-frequency = <200000000>;
 		};
+
 		uart_clk: uart-clk {
 			compatible = "fixed-factor-clock";
 			#clock-cells = <0>;
@@ -66,6 +67,12 @@
 			clock-div = <4>;
 			clock-mult = <1>;
 		};
+
+		hsspi_pll: hsspi-pll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <200000000>;
+		};
 	};
 
 	psci {
@@ -98,6 +105,18 @@
 		#size-cells = <1>;
 		ranges = <0x0 0x0 0xff800000 0x800000>;
 
+		hsspi: spi@1000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "brcm,bcm63146-hsspi", "brcm,bcmbca-hsspi-v1.0";
+			reg = <0x1000 0x600>;
+			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&hsspi_pll &hsspi_pll>;
+			clock-names = "hsspi", "pll";
+			num-cs = <8>;
+			status = "disabled";
+		};
+
 		uart0: serial@12000 {
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0x12000 0x1000>;
diff --git a/arch/arm/dts/bcm63158.dtsi b/arch/arm/dts/bcm63158.dtsi
index 4bed1f914a9b..ffb824fe600d 100644
--- a/arch/arm/dts/bcm63158.dtsi
+++ b/arch/arm/dts/bcm63158.dtsi
@@ -82,11 +82,9 @@
 		};
 
 		hsspi_pll: hsspi-pll {
-			compatible = "fixed-factor-clock";
+			compatible = "fixed-clock";
 			#clock-cells = <0>;
-			clocks = <&periph_clk>;
-			clock-mult = <2>;
-			clock-div = <1>;
+			clock-frequency = <400000000>;
 		};
 
 		uart_clk: uart-clk {
@@ -249,16 +247,15 @@
 			status = "disabled";
 		};
 
-		hsspi: spi-controller@1000 {
-			compatible = "brcm,bcm6328-hsspi";
+		hsspi: spi@1000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
+			compatible = "brcm,bcm63158-hsspi", "brcm,bcmbca-hsspi-v1.0";
 			reg = <0x1000 0x600>;
-			clocks = <&hsspi_pll>, <&hsspi_pll>;
+			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&hsspi_pll &hsspi_pll>;
 			clock-names = "hsspi", "pll";
-			spi-max-frequency = <100000000>;
 			num-cs = <8>;
-
 			status = "disabled";
 		};
 
diff --git a/arch/arm/dts/bcm6813.dtsi b/arch/arm/dts/bcm6813.dtsi
index c3e6197be808..eaa5ee889f51 100644
--- a/arch/arm/dts/bcm6813.dtsi
+++ b/arch/arm/dts/bcm6813.dtsi
@@ -78,6 +78,7 @@
 			#clock-cells = <0>;
 			clock-frequency = <200000000>;
 		};
+
 		uart_clk: uart-clk {
 			compatible = "fixed-factor-clock";
 			#clock-cells = <0>;
@@ -85,6 +86,12 @@
 			clock-div = <4>;
 			clock-mult = <1>;
 		};
+
+		hsspi_pll: hsspi-pll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <200000000>;
+		};
 	};
 
 	psci {
@@ -116,6 +123,19 @@
 		#size-cells = <1>;
 		ranges = <0x0 0x0 0xff800000 0x800000>;
 
+		hsspi: spi@1000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "brcm,bcm6813-hsspi", "brcm,bcmbca-hsspi-v1.1";
+			reg = <0x1000 0x600>, <0x2610 0x4>;
+			reg-names = "hsspi", "spim-ctrl";
+			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&hsspi_pll &hsspi_pll>;
+			clock-names = "hsspi", "pll";
+			num-cs = <8>;
+			status = "disabled";
+		};
+
 		uart0: serial@12000 {
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0x12000 0x1000>;
diff --git a/arch/arm/dts/bcm6856.dtsi b/arch/arm/dts/bcm6856.dtsi
index 38c88f8399bb..245a7d65cf1b 100644
--- a/arch/arm/dts/bcm6856.dtsi
+++ b/arch/arm/dts/bcm6856.dtsi
@@ -63,14 +63,6 @@
 			clock-frequency = <200000000>;
 		};
 
-		hsspi_pll: hsspi-pll {
-			compatible = "fixed-factor-clock";
-			#clock-cells = <0>;
-			clocks = <&periph_clk>;
-			clock-mult = <2>;
-			clock-div = <1>;
-		};
-
 		wdt_clk: wdt-clk {
 			compatible = "fixed-factor-clock";
 			#clock-cells = <0>;
@@ -78,6 +70,12 @@
 			clock-div = <4>;
 			clock-mult = <1>;
 		};
+
+		hsspi_pll: hsspi-pll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <400000000>;
+		};
 	};
 
 	psci {
@@ -224,16 +222,15 @@
 			status = "disabled";
 		};
 
-		hsspi: spi-controller@1000 {
-			compatible = "brcm,bcm6328-hsspi";
+		hsspi: spi@1000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
+			compatible = "brcm,bcm6856-hsspi", "brcm,bcmbca-hsspi-v1.0";
 			reg = <0x1000 0x600>;
-			clocks = <&hsspi_pll>, <&hsspi_pll>;
+			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&hsspi_pll &hsspi_pll>;
 			clock-names = "hsspi", "pll";
-			spi-max-frequency = <100000000>;
 			num-cs = <8>;
-
 			status = "disabled";
 		};
 
diff --git a/arch/arm/dts/bcm6858.dtsi b/arch/arm/dts/bcm6858.dtsi
index dc95047a2659..ba30f70f1a9b 100644
--- a/arch/arm/dts/bcm6858.dtsi
+++ b/arch/arm/dts/bcm6858.dtsi
@@ -82,14 +82,6 @@
 			clock-frequency = <200000000>;
 		};
 
-		hsspi_pll: hsspi-pll {
-			compatible = "fixed-factor-clock";
-			#clock-cells = <0>;
-			clocks = <&periph_clk>;
-			clock-mult = <2>;
-			clock-div = <1>;
-		};
-
 		wdt_clk: wdt-clk {
 			compatible = "fixed-factor-clock";
 			#clock-cells = <0>;
@@ -97,6 +89,12 @@
 			clock-div = <4>;
 			clock-mult = <1>;
 		};
+
+		hsspi_pll: hsspi-pll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <400000000>;
+		};
 	};
 
 	psci {
@@ -243,16 +241,15 @@
 			status = "disabled";
 		};
 
-		hsspi: spi-controller@1000 {
-			compatible = "brcm,bcm6328-hsspi";
+		hsspi: spi@1000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
+			compatible = "brcm,bcm6858-hsspi", "brcm,bcmbca-hsspi-v1.0";
 			reg = <0x1000 0x600>;
-			clocks = <&hsspi_pll>, <&hsspi_pll>;
+			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&hsspi_pll &hsspi_pll>;
 			clock-names = "hsspi", "pll";
-			spi-max-frequency = <100000000>;
 			num-cs = <8>;
-
 			status = "disabled";
 		};
 
diff --git a/arch/arm/dts/bcm94908.dts b/arch/arm/dts/bcm94908.dts
index fcbd3c430ace..c4e6e71f6310 100644
--- a/arch/arm/dts/bcm94908.dts
+++ b/arch/arm/dts/bcm94908.dts
@@ -28,3 +28,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&hsspi {
+	status = "okay";
+};
diff --git a/arch/arm/dts/bcm94912.dts b/arch/arm/dts/bcm94912.dts
index a3623e6f6919..e69cd683211a 100644
--- a/arch/arm/dts/bcm94912.dts
+++ b/arch/arm/dts/bcm94912.dts
@@ -28,3 +28,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&hsspi {
+	status = "okay";
+};
diff --git a/arch/arm/dts/bcm963146.dts b/arch/arm/dts/bcm963146.dts
index e39f1e6d4774..db2c82d6dfd8 100644
--- a/arch/arm/dts/bcm963146.dts
+++ b/arch/arm/dts/bcm963146.dts
@@ -28,3 +28,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&hsspi {
+	status = "okay";
+};
diff --git a/arch/arm/dts/bcm963158.dts b/arch/arm/dts/bcm963158.dts
index eba07e0b1ca6..25c12bc63545 100644
--- a/arch/arm/dts/bcm963158.dts
+++ b/arch/arm/dts/bcm963158.dts
@@ -28,3 +28,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&hsspi {
+	status = "okay";
+};
diff --git a/arch/arm/dts/bcm96813.dts b/arch/arm/dts/bcm96813.dts
index af17091ae764..faba21f03120 100644
--- a/arch/arm/dts/bcm96813.dts
+++ b/arch/arm/dts/bcm96813.dts
@@ -28,3 +28,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&hsspi {
+	status = "okay";
+};
diff --git a/arch/arm/dts/bcm96856.dts b/arch/arm/dts/bcm96856.dts
index 032aeb75c983..9808331eede2 100644
--- a/arch/arm/dts/bcm96856.dts
+++ b/arch/arm/dts/bcm96856.dts
@@ -28,3 +28,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&hsspi {
+	status = "okay";
+};
diff --git a/arch/arm/dts/bcm96858.dts b/arch/arm/dts/bcm96858.dts
index 0cbf582f5d54..1f561c8e13b0 100644
--- a/arch/arm/dts/bcm96858.dts
+++ b/arch/arm/dts/bcm96858.dts
@@ -28,3 +28,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&hsspi {
+	status = "okay";
+};
-- 
2.37.3


  parent reply	other threads:[~2023-05-02 18:59 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-02 18:58 [PATCH v2 0/9] spi: bcm63xx-hsspi: driver and doc updates William Zhang
2023-05-02 18:58 ` [PATCH v2 1/9] dt-bindings: spi: Add bcm63xx-hsspi controller support William Zhang
2023-05-02 18:58 ` [PATCH v2 2/9] ARM: dts: broadcom: bcmbca: Add spi controller node William Zhang
2023-05-02 18:58 ` William Zhang [this message]
2023-05-02 18:58 ` [PATCH v2 4/9] spi: bcm63xx-hsspi: Enable SPI drivers by default William Zhang
2023-05-02 18:58 ` [PATCH v2 5/9] spi: bcm63xx-hsspi: Add new compatible string support William Zhang
2023-06-02  5:46   ` Jagan Teki
2023-05-02 18:58 ` [PATCH v2 6/9] spi: bcm63xx-hsspi: Fix multi-bit mode setting William Zhang
2023-06-02  5:47   ` Jagan Teki
2023-05-02 18:58 ` [PATCH v2 7/9] spi: bcm63xx-hsspi: Add prepend mode support William Zhang
2023-05-02 18:58 ` [PATCH v2 8/9] spi: bcmbca-hsspi: Add driver for newer HSSPI controller William Zhang
2023-06-02  5:54   ` Jagan Teki
2023-06-02 18:53     ` William Zhang
2023-05-02 18:58 ` [PATCH v2 9/9] MAINTAINERS: Add Broadcom Broadband SoC HS SPI drivers William Zhang
2023-06-01 23:52 ` [PATCH v2 0/9] spi: bcm63xx-hsspi: driver and doc updates William Zhang
2023-06-02  6:01 ` Jagan Teki
2023-06-02 18:56   ` William Zhang
2023-06-06 20:19     ` William Zhang
2023-06-07 20:05       ` Tom Rini
2023-06-07 20:31         ` William Zhang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230502185817.374951-4-william.zhang@broadcom.com \
    --to=william.zhang@broadcom.com \
    --cc=anand.gore@broadcom.com \
    --cc=dan.beygelman@broadcom.com \
    --cc=dregan@mail.com \
    --cc=f.fainelli@gmail.com \
    --cc=joel.peshkin@broadcom.com \
    --cc=kursad.oney@broadcom.com \
    --cc=noltari@gmail.com \
    --cc=philippe.reynes@softathome.com \
    --cc=sjg@chromium.org \
    --cc=tomer.yacoby@broadcom.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox