diff --git a/Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml b/Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml index 140b500a5f3aa..e2bbb6b4effc1 100644 --- a/Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml +++ b/Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml @@ -48,6 +48,8 @@ properties: reg: maxItems: 1 + nonposted-mmio: true + apple,fast-die-effort: $ref: /schemas/types.yaml#/definitions/phandle-array description: | diff --git a/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml b/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml index 07a0b8d1173ce..e039ebf276123 100644 --- a/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml +++ b/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml @@ -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 diff --git a/Documentation/devicetree/bindings/power/apple,pmc.yaml b/Documentation/devicetree/bindings/power/apple,pmc.yaml index feea57cf5a744..36ac4fe142ddb 100644 --- a/Documentation/devicetree/bindings/power/apple,pmc.yaml +++ b/Documentation/devicetree/bindings/power/apple,pmc.yaml @@ -48,6 +48,8 @@ properties: - const: rails - const: voters + nonposted-mmio: true + power-domains: maxItems: 1 diff --git a/Documentation/devicetree/bindings/power/apple,t8140-pmp-report.yaml b/Documentation/devicetree/bindings/power/apple,t8140-pmp-report.yaml index 7a12397d2df62..e8eac9e5411e3 100644 --- a/Documentation/devicetree/bindings/power/apple,t8140-pmp-report.yaml +++ b/Documentation/devicetree/bindings/power/apple,t8140-pmp-report.yaml @@ -27,6 +27,8 @@ properties: reg: maxItems: 1 + nonposted-mmio: true + power-domains: maxItems: 1 diff --git a/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml index ecc42990b5cc1..11f103732ef63 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml @@ -30,6 +30,8 @@ properties: minItems: 1 maxItems: 16 + nonposted-mmio: true + apple,boot-dma-devices: $ref: /schemas/types.yaml#/definitions/phandle-array items: diff --git a/Documentation/devicetree/bindings/sound/apple,macaudio.yaml b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml index a80f59e315196..fdf3d1883a99d 100644 --- a/Documentation/devicetree/bindings/sound/apple,macaudio.yaml +++ b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml @@ -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- says, one bit per slot with slot 0 + in the LSB. Only used together with dai-tdm-idle-mode-. + $ref: /schemas/types.yaml#/definitions/uint32 + required: - reg - cpu diff --git a/Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml b/Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml index 7f8338e8ae369..4c376062d6f2a 100644 --- a/Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml +++ b/Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml @@ -36,7 +36,10 @@ required: - compatible - reg -additionalProperties: false +allOf: + - $ref: dai-common.yaml# + +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml b/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml index f48d3f37501ae..99eebcfabbcba 100644 --- a/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml +++ b/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml @@ -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 diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 4594aa5f1817b..27aa13a9868c0 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -433,7 +433,7 @@ &pinctrl { status = "okay"; - wifi_clkreq: wifi-clkreq { + wifi_clkreq_pins: wifi-clkreq-pins { pinmux = ; }; }; @@ -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 { @@ -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>; @@ -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"; };