Skip to content

Commit 9e0dabb

Browse files
arndbarndb
committed
Merge tag 'arm-soc/for-6.4/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM64-based SoCs Device Tree changes for 6.4, please pull the following: - Rob fixes the GICv3 ITS node name for the Stingray platforms - William adds the new-style High Speed SPI controller nodes to the BCA SocS - Rafal fixes the NAND controller interrupt name for BCM4908, LED node(s) and procmon for BCM4908. He also adds support for the USB ports, and declares USB triggered LEDs for the Netgear R8000P and TP-Link C2300. * tag 'arm-soc/for-6.4/devicetree-arm64' of https://github.com/Broadcom/stblinux: arm64: dts: broadcom: bcmbca: bcm4908: add TP-Link C2300 USB LED triggers arm64: dts: broadcom: bcmbca: bcm4908: add Netgear R8000P USB LED triggers arm64: dts: broadcom: bcmbca: bcm4908: add on-SoC USB ports arm64: dts: broadcom: bcmbca: bcm4908: fix procmon nodename arm64: dts: broadcom: bcmbca: bcm4908: fix LED nodenames arm64: dts: broadcom: bcmbca: bcm4908: fix NAND interrupt name arm64: dts: broadcom: bcmbca: Add spi controller node arm64: dts: broadcom: stringray: Fix GICv3 ITS node name Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 0b3751d + e6d356b commit 9e0dabb

18 files changed

+216
-9
lines changed

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,16 @@
5858
function = "usb2";
5959
color = <LED_COLOR_ID_WHITE>;
6060
gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
61+
trigger-sources = <&ohci_port1>, <&ehci_port1>;
62+
linux,default-trigger = "usbport";
6163
};
6264

6365
led-usb3 {
6466
function = "usb3";
6567
color = <LED_COLOR_ID_WHITE>;
6668
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
69+
trigger-sources = <&ohci_port2>, <&ehci_port2>, <&xhci_port2>;
70+
linux,default-trigger = "usbport";
6771
};
6872

6973
led-wifi {

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,16 @@
6464
function = "usb2";
6565
color = <LED_COLOR_ID_BLUE>;
6666
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
67+
trigger-sources = <&ohci_port1>, <&ehci_port1>;
68+
linux,default-trigger = "usbport";
6769
};
6870

6971
led-usb3 {
70-
function = "usbd3";
72+
function = "usb3";
7173
color = <LED_COLOR_ID_BLUE>;
7274
gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
75+
trigger-sources = <&ohci_port2>, <&ehci_port2>, <&xhci_port2>;
76+
linux,default-trigger = "usbport";
7377
};
7478

7579
led-brightness {

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
};
121121

122122
&leds {
123-
led-power@11 {
123+
led@11 {
124124
reg = <0x11>;
125125
function = LED_FUNCTION_POWER;
126126
color = <LED_COLOR_ID_WHITE>;
@@ -130,7 +130,7 @@
130130
pinctrl-0 = <&pins_led_17_a>;
131131
};
132132

133-
led-wan-red@12 {
133+
led@12 {
134134
reg = <0x12>;
135135
function = LED_FUNCTION_WAN;
136136
color = <LED_COLOR_ID_RED>;
@@ -139,7 +139,7 @@
139139
pinctrl-0 = <&pins_led_18_a>;
140140
};
141141

142-
led-wps@14 {
142+
led@14 {
143143
reg = <0x14>;
144144
function = LED_FUNCTION_WPS;
145145
color = <LED_COLOR_ID_WHITE>;
@@ -148,7 +148,7 @@
148148
pinctrl-0 = <&pins_led_20_a>;
149149
};
150150

151-
led-wan-white@15 {
151+
led@15 {
152152
reg = <0x15>;
153153
function = LED_FUNCTION_WAN;
154154
color = <LED_COLOR_ID_WHITE>;
@@ -157,7 +157,7 @@
157157
pinctrl-0 = <&pins_led_21_a>;
158158
};
159159

160-
led-lan@19 {
160+
led@19 {
161161
reg = <0x19>;
162162
function = LED_FUNCTION_LAN;
163163
color = <LED_COLOR_ID_WHITE>;

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@
107107
clock-frequency = <50000000>;
108108
clock-output-names = "periph";
109109
};
110+
111+
hsspi_pll: hsspi-pll {
112+
compatible = "fixed-clock";
113+
#clock-cells = <0>;
114+
clock-frequency = <400000000>;
115+
};
110116
};
111117

112118
soc {
@@ -142,6 +148,19 @@
142148
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
143149
phys = <&usb_phy PHY_TYPE_USB2>;
144150
status = "disabled";
151+
152+
#address-cells = <1>;
153+
#size-cells = <0>;
154+
155+
ehci_port1: port@1 {
156+
reg = <1>;
157+
#trigger-source-cells = <0>;
158+
};
159+
160+
ehci_port2: port@2 {
161+
reg = <2>;
162+
#trigger-source-cells = <0>;
163+
};
145164
};
146165

147166
ohci: usb@c400 {
@@ -150,6 +169,19 @@
150169
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
151170
phys = <&usb_phy PHY_TYPE_USB2>;
152171
status = "disabled";
172+
173+
#address-cells = <1>;
174+
#size-cells = <0>;
175+
176+
ohci_port1: port@1 {
177+
reg = <1>;
178+
#trigger-source-cells = <0>;
179+
};
180+
181+
ohci_port2: port@2 {
182+
reg = <2>;
183+
#trigger-source-cells = <0>;
184+
};
153185
};
154186

155187
xhci: usb@d000 {
@@ -158,6 +190,19 @@
158190
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
159191
phys = <&usb_phy PHY_TYPE_USB3>;
160192
status = "disabled";
193+
194+
#address-cells = <1>;
195+
#size-cells = <0>;
196+
197+
xhci_port1: port@1 {
198+
reg = <1>;
199+
#trigger-source-cells = <0>;
200+
};
201+
202+
xhci_port2: port@2 {
203+
reg = <2>;
204+
#trigger-source-cells = <0>;
205+
};
161206
};
162207

163208
bus@80000 {
@@ -254,7 +299,7 @@
254299
};
255300
};
256301

257-
procmon: syscon@280000 {
302+
procmon: bus@280000 {
258303
compatible = "simple-bus";
259304
reg = <0x280000 0x1000>;
260305
ranges;
@@ -531,14 +576,26 @@
531576
#size-cells = <0>;
532577
};
533578

579+
hsspi: spi@1000{
580+
#address-cells = <1>;
581+
#size-cells = <0>;
582+
compatible = "brcm,bcm4908-hsspi", "brcm,bcmbca-hsspi-v1.0";
583+
reg = <0x1000 0x600>;
584+
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
585+
clocks = <&hsspi_pll &hsspi_pll>;
586+
clock-names = "hsspi", "pll";
587+
num-cs = <8>;
588+
status = "disabled";
589+
};
590+
534591
nand-controller@1800 {
535592
#address-cells = <1>;
536593
#size-cells = <0>;
537594
compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.1", "brcm,brcmnand";
538595
reg = <0x1800 0x600>, <0x2000 0x10>;
539596
reg-names = "nand", "nand-int-base";
540597
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
541-
interrupt-names = "nand";
598+
interrupt-names = "nand_ctlrdy";
542599
status = "okay";
543600

544601
nandcs: nand@0 {

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,20 @@
7979
#clock-cells = <0>;
8080
clock-frequency = <200000000>;
8181
};
82+
8283
uart_clk: uart-clk {
8384
compatible = "fixed-factor-clock";
8485
#clock-cells = <0>;
8586
clocks = <&periph_clk>;
8687
clock-div = <4>;
8788
clock-mult = <1>;
8889
};
90+
91+
hsspi_pll: hsspi-pll {
92+
compatible = "fixed-clock";
93+
#clock-cells = <0>;
94+
clock-frequency = <200000000>;
95+
};
8996
};
9097

9198
psci {
@@ -117,6 +124,19 @@
117124
#size-cells = <1>;
118125
ranges = <0x0 0x0 0xff800000 0x800000>;
119126

127+
hsspi: spi@1000 {
128+
#address-cells = <1>;
129+
#size-cells = <0>;
130+
compatible = "brcm,bcm4912-hsspi", "brcm,bcmbca-hsspi-v1.1";
131+
reg = <0x1000 0x600>, <0x2610 0x4>;
132+
reg-names = "hsspi", "spim-ctrl";
133+
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
134+
clocks = <&hsspi_pll &hsspi_pll>;
135+
clock-names = "hsspi", "pll";
136+
num-cs = <8>;
137+
status = "disabled";
138+
};
139+
120140
uart0: serial@12000 {
121141
compatible = "arm,pl011", "arm,primecell";
122142
reg = <0x12000 0x1000>;

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,20 @@
6060
#clock-cells = <0>;
6161
clock-frequency = <200000000>;
6262
};
63+
6364
uart_clk: uart-clk {
6465
compatible = "fixed-factor-clock";
6566
#clock-cells = <0>;
6667
clocks = <&periph_clk>;
6768
clock-div = <4>;
6869
clock-mult = <1>;
6970
};
71+
72+
hsspi_pll: hsspi-pll {
73+
compatible = "fixed-clock";
74+
#clock-cells = <0>;
75+
clock-frequency = <200000000>;
76+
};
7077
};
7178

7279
psci {
@@ -99,6 +106,18 @@
99106
#size-cells = <1>;
100107
ranges = <0x0 0x0 0xff800000 0x800000>;
101108

109+
hsspi: spi@1000 {
110+
#address-cells = <1>;
111+
#size-cells = <0>;
112+
compatible = "brcm,bcm63146-hsspi", "brcm,bcmbca-hsspi-v1.0";
113+
reg = <0x1000 0x600>;
114+
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
115+
clocks = <&hsspi_pll &hsspi_pll>;
116+
clock-names = "hsspi", "pll";
117+
num-cs = <8>;
118+
status = "disabled";
119+
};
120+
102121
uart0: serial@12000 {
103122
compatible = "arm,pl011", "arm,primecell";
104123
reg = <0x12000 0x1000>;

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,20 @@
7979
#clock-cells = <0>;
8080
clock-frequency = <200000000>;
8181
};
82+
8283
uart_clk: uart-clk {
8384
compatible = "fixed-factor-clock";
8485
#clock-cells = <0>;
8586
clocks = <&periph_clk>;
8687
clock-div = <4>;
8788
clock-mult = <1>;
8889
};
90+
91+
hsspi_pll: hsspi-pll {
92+
compatible = "fixed-clock";
93+
#clock-cells = <0>;
94+
clock-frequency = <400000000>;
95+
};
8996
};
9097

9198
psci {
@@ -117,6 +124,18 @@
117124
#size-cells = <1>;
118125
ranges = <0x0 0x0 0xff800000 0x800000>;
119126

127+
hsspi: spi@1000 {
128+
#address-cells = <1>;
129+
#size-cells = <0>;
130+
compatible = "brcm,bcm63158-hsspi", "brcm,bcmbca-hsspi-v1.0";
131+
reg = <0x1000 0x600>;
132+
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
133+
clocks = <&hsspi_pll &hsspi_pll>;
134+
clock-names = "hsspi", "pll";
135+
num-cs = <8>;
136+
status = "disabled";
137+
};
138+
120139
uart0: serial@12000 {
121140
compatible = "arm,pl011", "arm,primecell";
122141
reg = <0x12000 0x1000>;

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,20 @@
7979
#clock-cells = <0>;
8080
clock-frequency = <200000000>;
8181
};
82+
8283
uart_clk: uart-clk {
8384
compatible = "fixed-factor-clock";
8485
#clock-cells = <0>;
8586
clocks = <&periph_clk>;
8687
clock-div = <4>;
8788
clock-mult = <1>;
8889
};
90+
91+
hsspi_pll: hsspi-pll {
92+
compatible = "fixed-clock";
93+
#clock-cells = <0>;
94+
clock-frequency = <200000000>;
95+
};
8996
};
9097

9198
psci {
@@ -117,6 +124,19 @@
117124
#size-cells = <1>;
118125
ranges = <0x0 0x0 0xff800000 0x800000>;
119126

127+
hsspi: spi@1000 {
128+
#address-cells = <1>;
129+
#size-cells = <0>;
130+
compatible = "brcm,bcm6813-hsspi", "brcm,bcmbca-hsspi-v1.1";
131+
reg = <0x1000 0x600>, <0x2610 0x4>;
132+
reg-names = "hsspi", "spim-ctrl";
133+
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
134+
clocks = <&hsspi_pll &hsspi_pll>;
135+
clock-names = "hsspi", "pll";
136+
num-cs = <8>;
137+
status = "disabled";
138+
};
139+
120140
uart0: serial@12000 {
121141
compatible = "arm,pl011", "arm,primecell";
122142
reg = <0x12000 0x1000>;

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
#clock-cells = <0>;
6161
clock-frequency = <200000000>;
6262
};
63+
64+
hsspi_pll: hsspi-pll {
65+
compatible = "fixed-clock";
66+
#clock-cells = <0>;
67+
clock-frequency = <400000000>;
68+
};
6369
};
6470

6571
psci {
@@ -100,5 +106,17 @@
100106
clock-names = "refclk";
101107
status = "disabled";
102108
};
109+
110+
hsspi: spi@1000 {
111+
#address-cells = <1>;
112+
#size-cells = <0>;
113+
compatible = "brcm,bcm6856-hsspi", "brcm,bcmbca-hsspi-v1.0";
114+
reg = <0x1000 0x600>;
115+
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
116+
clocks = <&hsspi_pll &hsspi_pll>;
117+
clock-names = "hsspi", "pll";
118+
num-cs = <8>;
119+
status = "disabled";
120+
};
103121
};
104122
};

0 commit comments

Comments
 (0)