Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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 @@ -17,7 +17,9 @@ description:

properties:
compatible:
const: google,gs201-aoc-mbox
enum:
- google,gs201-aoc-mbox
- google,zumapro-aoc-mbox

reg:
maxItems: 1
Expand Down
108 changes: 87 additions & 21 deletions Documentation/devicetree/bindings/soc/google/google,gs201-aoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,48 @@
$id: http://devicetree.org/schemas/soc/google/google,gs201-aoc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Google gs201 AoC (Always-on Compute)
title: Google Tensor AoC (Always-on Compute)

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

description:
The AoC is the audio and sensor DSP of gs201. The AP loads its firmware
into a reserved carve-out, the GSA authenticates and starts it, and the
AoC reaches memory through its own System MMU.
The AoC is the audio and sensor DSP of Tensor SoCs. The AP loads its
firmware into a reserved carve-out and the GSA authenticates and starts
it. On gs201 the AoC reaches memory through its own System MMU, which
Linux sets up. On zumapro (Tensor G4) the authenticated firmware owns
the AoC's memory protection, so Linux touches neither its S2MPU nor its
System MMU.

properties:
compatible:
const: google,gs201-aoc
enum:
- google,gs201-aoc
- google,zumapro-aoc

reg:
minItems: 3
items:
- description: the AoC power request register (aoc_req) and its
acknowledge at +0x40
- description: the AoC's stage-2 MPU
- description: the chip id block, read for the firmware's boot
parameters
- description: the AoC power control unit (A32 reset control and
revision), in the AoC block
minItems: 2
maxItems: 4

reg-names:
minItems: 3
items:
- const: aoc_req
- const: s2mpu
- const: chipid
- const: pcu
minItems: 2
maxItems: 4

clocks:
description: the ACPM DVFS domains whose rates are read before each
firmware start
minItems: 1
maxItems: 17

firmware-name:
maxItems: 1
description: the signed AoC firmware image

sensor-1v8-supply:
description: the sensors' 1.8 V, turned on before the 3.3 V

sensor-3v3-supply:
description: the sensors' 3.3 V, turned off before the 1.8 V

interrupts:
maxItems: 1
Expand Down Expand Up @@ -69,16 +79,72 @@ properties:
$ref: /schemas/types.yaml#/definitions/uint32
description: board revision passed to the firmware

google,gnss-type:
$ref: /schemas/types.yaml#/definitions/uint32
description: the board's GNSS receiver, passed to the firmware
(kAOCGnssType)

required:
- compatible
- reg
- reg-names
- memory-region
- google,gsa
- google,sysmmu
- google,board-id
- google,board-rev

allOf:
- if:
properties:
compatible:
const: google,zumapro-aoc
then:
properties:
reg:
items:
- description: the AoC power request register (aoc_req) and its
acknowledge at +0x40
- description: the chip id block, read for the firmware's boot
parameters
reg-names:
items:
- const: aoc_req
- const: chipid
mboxes:
minItems: 48
google,sysmmu: false
required:
- firmware-name
- interrupts
- interrupt-names
- mboxes
- sensor-1v8-supply
- sensor-3v3-supply
else:
properties:
reg:
minItems: 3
items:
- description: the AoC power request register (aoc_req) and its
acknowledge at +0x40
- description: the AoC's stage-2 MPU
- description: the chip id block, read for the firmware's boot
parameters
- description: the AoC power control unit (A32 reset control and
revision), in the AoC block
reg-names:
minItems: 3
items:
- const: aoc_req
- const: s2mpu
- const: chipid
- const: pcu
clocks: false
sensor-1v8-supply: false
sensor-3v3-supply: false
required:
- google,sysmmu

additionalProperties: false

examples:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ description:

properties:
compatible:
const: google,gs201-gsa
enum:
- google,gs201-gsa
- google,zumapro-gsa

reg:
minItems: 1
Expand All @@ -42,6 +44,21 @@ required:
- reg
- interrupts

allOf:
- if:
properties:
compatible:
const: google,zumapro-gsa
then:
description:
On zumapro the GSA reads an image without Linux touching its
stage-2 MPU, so only the mailbox is described.
properties:
reg:
maxItems: 1
reg-names:
maxItems: 1

additionalProperties: false

examples:
Expand Down
4 changes: 1 addition & 3 deletions Documentation/devicetree/bindings/sound/ti,tas2781.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,7 @@ allOf:
- if:
properties:
compatible:
contains:
enum:
- ti,tas2781
const: ti,tas2781
then:
properties:
reg:
Expand Down
78 changes: 78 additions & 0 deletions arch/arm64/boot/dts/exynos/google/zumapro-tegu.dts
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,48 @@
};
};
};

pmic-2 {
compatible = "samsung,s2mpg15-pmic";

regulators {
sensor_3v3: ldo5s {
regulator-name = "sensor-3v3";
};

sensor_1v8: ldo7s {
regulator-name = "sensor-1v8";
};
};
};
};

/*
* The AoC's firmware is the board's own signed image; the board id and
* revision are stock's for this board, and GNSS type 2 is the modem's
* integrated receiver.
*/
&aoc {
memory-region = <&aoc_reserved>;
firmware-name = "aoc-tegu.bin";
google,board-id = <0x60b02>;
google,board-rev = <0x10000>;
google,gnss-type = <2>;
sensor-1v8-supply = <&sensor_1v8>;
sensor-3v3-supply = <&sensor_3v3>;
status = "okay";
};

&aoc_mbox_a32 {
status = "okay";
};

&aoc_mbox_f1 {
status = "okay";
};

&aoc_mbox_p6 {
status = "okay";
};

&ap2apm_mailbox {
Expand Down Expand Up @@ -363,6 +405,34 @@
status = "okay";
};

&gsa {
status = "okay";
};

/*
* The speaker amplifiers, two TAS2572s: top at 0x48 (reset gpp6-3) and
* bottom at 0x49 (reset gph2-1). One node each, since the tas2781 driver
* takes one register profile per node and TI's TAS2572 profiles cover one
* device. The AoC sound card names them Top and Bottom.
*/
&hsi2c19 {
status = "okay";

tas2572_top: amplifier@48 {
compatible = "ti,tas2572", "ti,tas2781";
reg = <0x48>;
reset-gpios = <&gpp6 3 GPIO_ACTIVE_HIGH>;
#sound-dai-cells = <0>;
};

tas2572_bottom: amplifier@49 {
compatible = "ti,tas2572", "ti,tas2781";
reg = <0x49>;
reset-gpios = <&gph2 1 GPIO_ACTIVE_HIGH>;
#sound-dai-cells = <0>;
};
};

/* The torch: a TI LM3644 flash driver, both LED outputs on one white LED. */
&hsi2c4 {
clock-frequency = <100000>;
Expand Down Expand Up @@ -610,6 +680,10 @@
status = "okay";
};

&trusty {
status = "okay";
};

/*
* Bluetooth: the BCM4383 on the APM's UART at 3 Mbaud, powered through
* BT_REG_ON (gpn8-0) behind its latch (ble-dbo on gpp24-3), with device wake
Expand Down Expand Up @@ -687,6 +761,10 @@
status = "okay";
};

&usi4_hsi0 {
status = "okay";
};

&usi6 {
status = "okay";
};
Expand Down
Loading