Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -48,6 +48,8 @@ properties:
reg:
maxItems: 1

nonposted-mmio: true

apple,fast-die-effort:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: |
Expand Down
14 changes: 14 additions & 0 deletions Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,20 @@ properties:
additionalProperties: false
description: The trackpad accelerometer.

tp-accel:
type: object
additionalProperties: false
description:
The trackpad accelerometer, under the name that the T6041 coprocessor
firmware announces.

mtp:
type: object
additionalProperties: false
description:
A vendor HID interface of the coprocessor, announced by the T6041
firmware.

required:
- compatible
- reg
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/power/apple,pmc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ properties:
- const: rails
- const: voters

nonposted-mmio: true

power-domains:
maxItems: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ properties:
reg:
maxItems: 1

nonposted-mmio: true

power-domains:
maxItems: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ properties:
minItems: 1
maxItems: 16

nonposted-mmio: true

apple,boot-dma-devices:
$ref: /schemas/types.yaml#/definitions/phandle-array
items:
Expand Down
18 changes: 18 additions & 0 deletions Documentation/devicetree/bindings/sound/apple,macaudio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,24 @@ patternProperties:
required:
- sound-dai

patternProperties:
"^dai-tdm-idle-mode-[0-7]$":
description: |
How the CODEC at this index of the codec sound-dai list drives the
TDM transmit slots it leaves idle. The index counts the CODECs of
the link in list order, across both CPU-side DAIs.
$ref: /schemas/types.yaml#/definitions/string
enum:
- zero
- pulldown

"^dai-tdm-slot-tx-idle-mask-[0-7]$":
description: |
Transmit slots of the CODEC at the same index that are idle and
driven as dai-tdm-idle-mode-<n> says, one bit per slot with slot 0
in the LSB. Only used together with dai-tdm-idle-mode-<n>.
$ref: /schemas/types.yaml#/definitions/uint32

required:
- reg
- cpu
Expand Down
5 changes: 4 additions & 1 deletion Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ required:
- compatible
- reg

additionalProperties: false
allOf:
- $ref: dai-common.yaml#

unevaluatedProperties: false

examples:
- |
Expand Down
12 changes: 8 additions & 4 deletions Documentation/devicetree/bindings/sound/ti,tas27xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@ allOf:

properties:
compatible:
enum:
- ti,tas2764
- ti,tas2780
- ti,sn012776 # Apple variant of TAS2764
oneOf:
- enum:
- ti,tas2764
- ti,tas2780
- ti,sn012776 # Apple variant of TAS2764
- items:
- const: ti,sn012776
- const: ti,tas2764

reg:
maxItems: 1
Expand Down
13 changes: 7 additions & 6 deletions arch/arm64/boot/dts/apple/t6040-j616s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
&pinctrl {
status = "okay";

wifi_clkreq: wifi-clkreq {
wifi_clkreq_pins: wifi-clkreq-pins {
pinmux = <APPLE_PINMUX(0, 1)>;
};
};
Expand Down Expand Up @@ -523,10 +523,9 @@
};

/*
* Wi-Fi and Bluetooth (BCM4388). The boot loader adds the per-unit
* calibration and Bluetooth address to these nodes, and its Bluetooth
* admission depends on this node exactly as it is; it is kept as the
* booted tree has it.
* Wi-Fi and Bluetooth (BCM4388). The boot loader finds these nodes by
* the paths in the wifi0 and bluetooth0 aliases and adds the per-unit
* calibration, the antenna SKU and the addresses to them.
*/
/ {
pcie0: pcie@1cb0000000 {
Expand All @@ -546,7 +545,7 @@
"phy0", "phy1", "phy2", "phy3";
ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_clkreq>;
pinctrl-0 = <&wifi_clkreq_pins>;
#size-cells = <2>;
#address-cells = <3>;
bus-range = <0 1>;
Expand Down Expand Up @@ -576,6 +575,8 @@
bluetooth@0,1 {
compatible = "pci14e4,5f72";
reg = <0x100 0 0 0 0>;
/* To be filled by the loader */
local-bd-address = [00 00 00 00 00 00];
brcm,board-type = "apple,hostomel";
status = "okay";
};
Expand Down