Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d69b18c
wifi: brcmfmac: pcie: support shared-memory version 9 firmware
W4HO-ham Oct 26, 2026
22eca7c
wifi: brcmfmac: add BCM4383 PCIe support
W4HO-ham Oct 26, 2026
1b17ba4
wifi: brcmfmac: pcie: bound the console read when the device reads al…
W4HO-ham Oct 26, 2026
af6b739
arm64: dts: exynos: google: zuma: add the HSI2 and FAR_ALIVE pin cont…
greenbrettmichael Oct 31, 2026
9bdc24c
soc: samsung: gs101-pmu: zuma: allow the Wi-Fi PCIe PHY's isolation r…
greenbrettmichael Oct 31, 2026
879fef9
dt-bindings: phy: Add the Google zuma PCIe Gen3 PHY
greenbrettmichael Oct 31, 2026
f5c783e
phy: samsung: Add the Google zuma PCIe Gen3 PHY driver
greenbrettmichael Oct 31, 2026
93382ab
dt-bindings: PCI: google,gs201-pcie: Add the zuma controller
greenbrettmichael Oct 31, 2026
1e82d22
PCI: dwc: gs201: Add zuma
greenbrettmichael Oct 31, 2026
3ca382f
arm64: dts: exynos: google: zuma: add the Wi-Fi PCIe controller and PHY
greenbrettmichael Oct 31, 2026
4059a93
wifi: brcmfmac: chip: support the NCI backplane
greenbrettmichael Oct 31, 2026
cf2f4e8
wifi: brcmfmac: msgbuf: give control buffers the lowest packet IDs
greenbrettmichael Oct 31, 2026
9168cf6
wifi: brcmfmac: msgbuf: wait for D2H items the firmware has finished
greenbrettmichael Oct 31, 2026
aaca1d4
wifi: brcmfmac: fall back to event_msgs_ext
greenbrettmichael Oct 31, 2026
de9e1a2
wifi: brcmfmac: cfg80211: make room for a third band
greenbrettmichael Oct 31, 2026
55f4124
wifi: brcmfmac: scan interface versions 3 and 4
greenbrettmichael Oct 31, 2026
70a3d00
wifi: brcmfmac: accept version 114 BSS info
greenbrettmichael Oct 31, 2026
4d84f8d
wifi: brcmfmac: add the BCM4398 chip id, RAM base and firmware name
greenbrettmichael Oct 31, 2026
cfc3ca9
wifi: brcmfmac: pcie: handle the BCM4398 like the BCM4389
greenbrettmichael Oct 31, 2026
5db7616
wifi: brcmfmac: pcie: wait for the BCM4398's boot interrupt
greenbrettmichael Oct 31, 2026
5b1c7c2
wifi: brcmfmac: pcie: make the BCM4398's firmware trap before release
greenbrettmichael Oct 31, 2026
fd0f630
wifi: brcmfmac: BCM4398 firmware quirks
greenbrettmichael Oct 31, 2026
4d61f66
wifi: brcmfmac: add BCM4398 PCIe support
greenbrettmichael Oct 31, 2026
7e720db
arm64: dts: exynos: google: zuma-husky: enable the BCM4398 Wi-Fi
greenbrettmichael Oct 31, 2026
f4537f4
dt-bindings: PCI: google,gs201-pcie: Add zumapro as a fallback of zuma
W4HO-ham Nov 1, 2026
b748300
dt-bindings: phy: google,zuma-pcie-phy: Add zumapro as a fallback of …
W4HO-ham Nov 1, 2026
bbdbad6
dt-bindings: net: wireless: brcm,bcm4329-fmac: add BCM4383 PCI ID
W4HO-ham Oct 31, 2026
bd7b0f6
phy: samsung: zuma-pcie: Mark the PHY configured, park its clock when…
W4HO-ham Nov 1, 2026
0d41c4d
PCI: dwc: gs201: Pulse the soft power reset before the zuma PHY power…
W4HO-ham Nov 1, 2026
5e7c8ed
arm64: dts: exynos: google: zumapro: Add PCIe channel 1 and its PHY
W4HO-ham Nov 1, 2026
bf0e6db
arm64: dts: exynos: google: zumapro-tegu: Add Wi-Fi
W4HO-ham Nov 1, 2026
f9ec12e
wifi: brcmfmac: pcie: reset the BCM4383 with an FLR too
W4HO-ham Nov 1, 2026
6d553cc
soc: samsung: gs101-pmu: zuma: allow the modem PCIe PHY's isolation r…
W4HO-ham Nov 2, 2026
aaa8432
dt-bindings: phy: google,zuma-pcie-phy: Add the zumapro two-lane PHY
W4HO-ham Nov 2, 2026
e692d02
phy: samsung: zuma-pcie: Add zumapro's two-lane PHY
W4HO-ham Nov 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ properties:
- pci14e4,4433 # BCM4387
- pci14e4,4434 # BCM4388
- pci14e4,4441 # BCM4389
- pci14e4,4449 # BCM4383
- pci14e4,449d # BCM43752

reg:
Expand Down
33 changes: 27 additions & 6 deletions Documentation/devicetree/bindings/pci/google,gs201-pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,47 @@
$id: http://devicetree.org/schemas/pci/google,gs201-pcie.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Google gs201 PCIe host controller
title: Google gs201 and zuma PCIe host controllers

maintainers:
- Derek Ross <derekross@gmail.com>

description:
The PCIe controllers of the Google gs201 (Tensor G2) SoC are Synopsys
DesignWare cores (IP version 0x984500) in a Samsung wrapper. The wrapper
The PCIe controllers of the Google gs201 (Tensor G2) and zuma (Tensor G3)
SoCs are Synopsys DesignWare cores (IP versions 0x984500 and 0x986500) in
a Samsung wrapper. The wrapper
adds a sub-control block (ELBI) with link training control and interrupt
status, and an I/A sequencer that re-locks the PHY clock-data recovery when
the link leaves L1.2. Legacy INTx interrupts are demultiplexed from the
controller interrupt by a child interrupt controller.
the link leaves L1.2. zuma's Wi-Fi controller runs without the I/A, as on
stock. zumapro's (Tensor G4) Wi-Fi controller is the same as zuma's, at
the same addresses and with the same register map, so it uses zuma's
compatible as a fallback. Legacy INTx interrupts are demultiplexed from
the controller interrupt by a child interrupt controller.

allOf:
- $ref: /schemas/pci/pci-host-bridge.yaml#
- $ref: /schemas/pci/snps,dw-pcie-common.yaml#
- if:
properties:
compatible:
contains:
const: google,zuma-pcie
then:
properties:
reg:
maxItems: 3
reg-names:
maxItems: 3

properties:
compatible:
const: google,gs201-pcie
oneOf:
- enum:
- google,gs201-pcie
- google,zuma-pcie
- items:
- const: google,zumapro-pcie
- const: google,zuma-pcie

reg:
minItems: 3
Expand Down
92 changes: 92 additions & 0 deletions Documentation/devicetree/bindings/phy/google,zuma-pcie-phy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/phy/google,zuma-pcie-phy.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Google zuma PCIe Gen3 PHY

maintainers:
- Brett-Michael Green <brett@bmgvisualtech.com>

description:
The one-lane PCIe Gen3 PHY of the Google zuma (Tensor G3) SoC's second
PCIe controller, which connects the Wi-Fi chip on Pixel 8 phones. Its
reference clock comes from an external PLL in the UDBG block, selected as
the PHY's input clock in the controller's SOC block. The PMU isolates the
PHY until it is released. zumapro (Tensor G4) has the same PHY for its
Wi-Fi controller, programmed with the same sequence, so it uses zuma's
compatible as a fallback.

zumapro's first PCIe controller, which connects the modem on the Pixel 9a,
has a two-lane Gen3 PHY with the same register blocks. It has its own
external PLL controls and power-down sequence and two lanes of PMA
registers, so it has a compatible of its own.

properties:
compatible:
oneOf:
- const: google,zuma-pcie-phy
- items:
- const: google,zumapro-pcie-phy
- const: google,zuma-pcie-phy
- const: google,zumapro-pcie-gen3x2-phy

reg:
items:
- description: PMA registers
- description: PCS registers
- description: PHY reset registers in the controller's sub-control space
- description: UDBG (external PLL) registers
- description: SOC (PHY input clock selection) registers

reg-names:
items:
- const: pma
- const: pcs
- const: rst
- const: udbg
- const: soc

"#phy-cells":
const: 0

samsung,pmu-syscon:
$ref: /schemas/types.yaml#/definitions/phandle-array
items:
- items:
- description: phandle of the PMU system controller
- description: offset of this PHY's control (isolation) register
description:
The PMU and the offset of this PHY's isolation control.

required:
- compatible
- reg
- reg-names
- "#phy-cells"
- samsung,pmu-syscon

additionalProperties: false

examples:
- |
phy@13160000 {
compatible = "google,zuma-pcie-phy";
reg = <0x13160000 0x3000>, <0x13140000 0x5000>,
<0x13121400 0x10>, <0x13150000 0xd000>,
<0x13130000 0x5000>;
reg-names = "pma", "pcs", "rst", "udbg", "soc";
samsung,pmu-syscon = <&pmu_system_controller 0x3ec8>;
#phy-cells = <0>;
};
- |
phy@12140000 {
compatible = "google,zumapro-pcie-gen3x2-phy";
reg = <0x12140000 0x3000>, <0x12120000 0x5000>,
<0x12101400 0x10>, <0x12130000 0xd000>,
<0x12110000 0x5000>;
reg-names = "pma", "pcs", "rst", "udbg", "soc";
samsung,pmu-syscon = <&pmu_system_controller 0x3ec4>;
#phy-cells = <0>;
};
2 changes: 2 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -11169,6 +11169,7 @@ F: Documentation/devicetree/bindings/clock/google,gs201-clock.yaml
F: Documentation/devicetree/bindings/clock/google,zuma-clock.yaml
F: Documentation/devicetree/bindings/clock/google,zumapro*
F: Documentation/devicetree/bindings/phy/google,lga-usb-phy.yaml
F: Documentation/devicetree/bindings/phy/google,zuma-pcie-phy.yaml
F: Documentation/devicetree/bindings/soc/google/google,gs101-dtzpc.yaml
F: Documentation/devicetree/bindings/soc/google/google,gs101-pmu.yaml
F: Documentation/devicetree/bindings/soc/google/google,gs101-pmu-intr-gen.yaml
Expand All @@ -11181,6 +11182,7 @@ F: drivers/clk/samsung/clk-zumapro.c
F: drivers/phy/phy-google-usb.c
F: drivers/soc/samsung/gs101-pmu.c
F: drivers/phy/samsung/phy-gs101-ufs.c
F: drivers/phy/samsung/phy-zuma-pcie.c
F: drivers/phy/samsung/phy-zumapro-ufs.c
F: drivers/thermal/samsung/gs101_acpm_tmu.c
F: drivers/usb/dwc3/dwc3-google.c
Expand Down
94 changes: 94 additions & 0 deletions arch/arm64/boot/dts/exynos/google/zuma-husky.dts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,24 @@
height-mm = <155>;
};

/*
* WL_REG_ON of the BCM4398 (gph3-4, stock's wl_reg_on). Modelled as
* the root port's supply so the PCI pwrctrl core switches it around
* link training; bcmdhd waits 200 ms after raising it. With pcie_1
* disabled nothing enables it, so the chip stays off.
*/
wlan_pwr: regulator-wlan {
compatible = "regulator-fixed";
regulator-name = "wlan-reg-on";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gph3 4 GPIO_ACTIVE_HIGH>;
enable-active-high;
startup-delay-us = <200000>;
pinctrl-0 = <&wlan_reg_on>;
pinctrl-names = "default";
};

chosen {
/*
* ABL requires bootargs to exist; it appends its own after these.
Expand Down Expand Up @@ -149,6 +167,19 @@
reg = <0x0 0xfac00000 (1344 * 2992 * 4)>;
no-map;
};

/*
* All of the Wi-Fi chip's DMA buffers come from this pool, below
* 4 GiB, as on the Pixel 7 Pro: it keeps driver bugs and stray
* pointers away from the rest of RAM. It does not confine the
* chip's own firmware.
*/
wifi_dma_pool: wifi-dma-pool {
compatible = "restricted-dma-pool";
size = <0x1000000>;
alignment = <0x0 0x200000>;
alloc-ranges = <0x0 0x80000000 0x80000000>;
};
};
};

Expand Down Expand Up @@ -176,6 +207,69 @@
};
};

/*
* Wi-Fi: the BCM4398 on pcie_1, one Gen3 lane as on stock. Its DMA
* buffers come from wifi_dma_pool.
*/
&pcie_1 {
pinctrl-0 = <&pcie1_clkreq>, <&pcie1_perst>, <&wlan_dev_wake>,
<&wlan_host_wake>;
status = "okay";

pcie@0,0 {
compatible = "pciclass,0604";
device_type = "pci";
reg = <0x0 0x0 0x0 0x0 0x0>;
bus-range = <0x01 0xff>;
#address-cells = <3>;
#size-cells = <2>;
ranges;
vpcie3v3-supply = <&wlan_pwr>;

wifi@0,0 {
compatible = "pci14e4,4444";
reg = <0x10000 0x0 0x0 0x0 0x0>;
brcm,board-type = "google,zuma-husky";
memory-region = <&wifi_dma_pool>;
};
};
};

&pcie_1_phy {
status = "okay";
};

&pinctrl_far_alive {
wlan_host_wake: wlan-host-wake-pins {
samsung,pins = "gpa5-1";
samsung,pin-function = <GS101_PIN_FUNC_EINT>;
samsung,pin-pud = <GS101_PIN_PULL_DOWN>;
samsung,pin-drv = <GS101_PIN_DRV_2_5_MA>;
samsung,pin-con-pdn = <GS101_PIN_PDN_PREV>;
samsung,pin-pud-pdn = <GS101_PIN_PULL_DOWN>;
};
};

&pinctrl_hsi2 {
wlan_reg_on: wlan-reg-on-pins {
samsung,pins = "gph3-4";
samsung,pin-function = <GS101_PIN_FUNC_OUTPUT>;
samsung,pin-pud = <GS101_PIN_PULL_NONE>;
samsung,pin-drv = <GS101_PIN_DRV_2_5_MA>;
samsung,pin-con-pdn = <GS101_PIN_PDN_PREV>;
samsung,pin-pud-pdn = <GS101_PIN_PULL_NONE>;
};

wlan_dev_wake: wlan-dev-wake-pins {
samsung,pins = "gph3-5";
samsung,pin-function = <GS101_PIN_FUNC_INPUT>;
samsung,pin-pud = <GS101_PIN_PULL_DOWN>;
samsung,pin-drv = <GS101_PIN_DRV_2_5_MA>;
samsung,pin-con-pdn = <GS101_PIN_PDN_PREV>;
samsung,pin-pud-pdn = <GS101_PIN_PULL_DOWN>;
};
};

&spi20 {
status = "okay";

Expand Down
51 changes: 51 additions & 0 deletions arch/arm64/boot/dts/exynos/google/zuma-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,24 @@
};
};

&pinctrl_far_alive {
gpa5: gpa5-gpio-bank {
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
};
};

&pinctrl_peric0 {
gpp0: gpp0-gpio-bank {
gpio-controller;
Expand Down Expand Up @@ -585,6 +603,39 @@
};
};

&pinctrl_hsi2 {
gph3: gph3-gpio-bank {
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};

gph4: gph4-gpio-bank {
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};

pcie1_clkreq: pcie1-clkreq-pins {
samsung,pins = "gph3-1";
samsung,pin-function = <GS101_PIN_FUNC_2>;
samsung,pin-pud = <GS101_PIN_PULL_UP>;
samsung,pin-drv = <GS101_PIN_DRV_10_MA>;
samsung,pin-con-pdn = <GS101_PIN_PDN_PREV>;
samsung,pin-pud-pdn = <GS101_PIN_PULL_UP>;
};

pcie1_perst: pcie1-perst-pins {
samsung,pins = "gph3-0";
samsung,pin-function = <GS101_PIN_FUNC_OUTPUT>;
samsung,pin-pud = <GS101_PIN_PULL_NONE>;
samsung,pin-drv = <GS101_PIN_DRV_10_MA>;
samsung,pin-con-pdn = <GS101_PIN_PDN_PREV>;
};
};

&pinctrl_hsi2ufs {
gph5: gph5-gpio-bank {
gpio-controller;
Expand Down
Loading