Repository navigation
Apple M6 (T8152) audio plumbing: ADMAC and AOP hardware config (on top of #191) #194
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
joshuaswarren
wants to merge
12
commits into
omacom:integration/aurora
Choose a base branch
from
joshuaswarren:m6-audio-l1
base: integration/aurora
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
1780386
pinctrl: apple: Add the T8152 compatible
joshuaswarren 4f833b2
soc: apple: sart: Add the SARTv4 register layout
joshuaswarren 8024caf
nvme: apple: Add T8152 ANS support
joshuaswarren 24d1bb1
pmdomain: apple: Add T8152 PSD service slot power domains
joshuaswarren e123886
phy: apple: Add a T8152 fixed-host USB2 PHY driver
joshuaswarren 5763038
usb: core: hub: Disable autosuspend for the 05ac:800f hub
joshuaswarren b871c3a
arm64: dts: apple: t8152-j873g: Add the peripherals that have drivers
joshuaswarren 781ef18
iommu/apple-dart: Add the T8152 Gen3 DART
joshuaswarren 48cbf4a
usb: dwc3: apple: Add the T8152 fixed-role USB2 controller
joshuaswarren 9fbb356
arm64: dts: apple: t8152-j873g: Add the PMGR domains and the USB nodes
joshuaswarren 1045b8d
dma: apple-admac: add T8152 (admac-evolution) support
joshuaswarren 7d52ab5
soc: apple: aop: add the T8152 (Mac mini) hardware config
joshuaswarren File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
Documentation/devicetree/bindings/phy/apple,t8152-usb2-phy.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/phy/apple,t8152-usb2-phy.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Apple T8152 USB2 PHY | ||
|
|
||
| maintainers: | ||
| - Joshua Warren <816217+joshuaswarren@users.noreply.github.com> | ||
|
|
||
| description: | | ||
| The USB2 and eUSB2 register banks support a fixed host or fixed peripheral | ||
| connection independently of the ATC USB3 and USB4 lanes. Firmware supplies | ||
| device-specific calibration. Both independent USB power domains must stay | ||
| active while the PHY runs. | ||
|
|
||
| $defs: | ||
| tunable: | ||
| $ref: /schemas/types.yaml#/definitions/uint32-matrix | ||
| description: | | ||
| Register offset, clear mask, and set value triples for the usb2 bank. | ||
| The bootloader supplies these at boot; they are not part of the board file. | ||
| items: | ||
| items: | ||
| - description: Aligned byte offset within the usb2 register bank | ||
| - description: Bits to clear | ||
| - description: Bits to set | ||
|
|
||
| properties: | ||
| compatible: | ||
| const: apple,t8152-usb2-phy | ||
|
|
||
| reg: | ||
| items: | ||
| - description: USB2 PHY register bank | ||
| - description: eUSB2 PHY register bank | ||
|
|
||
| reg-names: | ||
| items: | ||
| - const: usb2 | ||
| - const: eusb2 | ||
|
|
||
| '#phy-cells': | ||
| const: 0 | ||
|
|
||
| power-domains: | ||
| items: | ||
| - description: USB always-on domain | ||
| - description: USB controller domain | ||
|
|
||
| power-domain-names: | ||
| items: | ||
| - const: usb-aon | ||
| - const: usb | ||
|
|
||
| apple,tunable-usb2phy-dflt: | ||
| $ref: '#/$defs/tunable' | ||
| description: Default calibration, applied before the role calibration. | ||
|
|
||
| apple,tunable-usb2phy-host: | ||
| $ref: '#/$defs/tunable' | ||
| description: Host calibration, applied before the PHY leaves reset. | ||
|
|
||
| apple,tunable-usb2phy-dev: | ||
| $ref: '#/$defs/tunable' | ||
| description: | | ||
| Device-mode calibration, applied before the PHY leaves reset in peripheral | ||
| mode. | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - reg-names | ||
| - '#phy-cells' | ||
| - power-domains | ||
| - power-domain-names | ||
|
|
||
| additionalProperties: false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
Documentation/devicetree/bindings/power/apple,t8152-psd.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/power/apple,t8152-psd.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Apple T8152 PSD service slot power domain | ||
|
|
||
| maintainers: | ||
| - Joshua Warren <816217+joshuaswarren@users.noreply.github.com> | ||
|
|
||
| allOf: | ||
| - $ref: power-domain.yaml# | ||
|
|
||
| description: | | ||
| The T8152 (M6) power state director (PSD) gates some blocks, among them the | ||
| USB controllers and their DARTs, behind a per-port service slot. Each | ||
| slot has a 0x100 byte register window at the PSD base plus (slot << 8) with | ||
| the status (0x80), request (0x90), diagnostic (0xa0) and valid (0xbc) | ||
| registers. A consumer must power the parent PMGR domains of the block | ||
| first, then request state 0 (running) and wait for the acknowledge. This | ||
| node models that as a power domain: the PMGR domains are its parents | ||
| (power-domains), powering it on writes the request. Power-off requests | ||
| state 6 (off). | ||
|
|
||
| A "apple,t8152-psd-group" node covers several slots that are brought up | ||
| together: one reg window per slot, requested in reg order with the active | ||
| state given by apple,psd-states, and put back to state 6 in reverse order. | ||
|
|
||
| properties: | ||
| compatible: | ||
| enum: | ||
| - apple,t8152-psd | ||
| - apple,t8152-psd-group | ||
|
|
||
| reg: | ||
| minItems: 1 | ||
| maxItems: 3 | ||
|
|
||
| "#power-domain-cells": | ||
| const: 0 | ||
|
|
||
| power-domains: | ||
| description: | ||
| Parent PMGR power domains, powered before the slot request. Absent when | ||
| the block has no PMGR power state. | ||
| minItems: 1 | ||
| maxItems: 4 | ||
|
|
||
| label: | ||
| description: Name of the power domain. | ||
|
|
||
| apple,psd-states: | ||
| $ref: /schemas/types.yaml#/definitions/uint32-array | ||
| minItems: 1 | ||
| maxItems: 3 | ||
| description: | ||
| Active PSD state requested for each reg window, in reg order (default | ||
| 0, running). Each value is 0 to 5. | ||
|
|
||
| apple,psd-timeout-ms: | ||
| description: Acknowledge timeout in milliseconds (default 1000). | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - "#power-domain-cells" | ||
|
|
||
| unevaluatedProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| soc { | ||
| #address-cells = <2>; | ||
| #size-cells = <2>; | ||
|
|
||
| ps_usb_aon: power-controller-aon { | ||
| #power-domain-cells = <0>; | ||
| }; | ||
|
|
||
| ps_usb: power-controller-usb { | ||
| #power-domain-cells = <0>; | ||
| }; | ||
|
|
||
| power-controller@1000 { | ||
| compatible = "apple,t8152-psd"; | ||
| reg = <0x0 0x1000 0x0 0x100>; | ||
| #power-domain-cells = <0>; | ||
| power-domains = <&ps_usb_aon>, <&ps_usb>; | ||
| label = "psd_example"; | ||
| }; | ||
| }; | ||
| - | | ||
| soc { | ||
| #address-cells = <2>; | ||
| #size-cells = <2>; | ||
|
|
||
| power-controller@2000 { | ||
| compatible = "apple,t8152-psd-group"; | ||
| reg = <0x0 0x2000 0x0 0x100>, | ||
| <0x0 0x2100 0x0 0x100>, | ||
| <0x0 0x2200 0x0 0x100>; | ||
| apple,psd-states = <0 2 2>; | ||
| #power-domain-cells = <0>; | ||
| label = "psd_group_example"; | ||
| }; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.