diff --git a/arch/arm64/boot/dts/apple/t6001-pmgr.dtsi b/arch/arm64/boot/dts/apple/t6001-pmgr.dtsi index 641d0ea0a4fa..96424ee63010 100644 --- a/arch/arm64/boot/dts/apple/t6001-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t6001-pmgr.dtsi @@ -1118,6 +1118,7 @@ ps_mca1: power-controller@290 { #reset-cells = <0>; label = "mca1"; power-domains = <&ps_audio_p>, <&ps_sio_adma>; + apple,always-on; /* HACK */ }; ps_mca2: power-controller@298 { @@ -1127,6 +1128,7 @@ ps_mca2: power-controller@298 { #reset-cells = <0>; label = "mca2"; power-domains = <&ps_audio_p>, <&ps_sio_adma>; + apple,always-on; /* HACK */ }; ps_mca3: power-controller@2a0 { @@ -1136,6 +1138,7 @@ ps_mca3: power-controller@2a0 { #reset-cells = <0>; label = "mca3"; power-domains = <&ps_audio_p>, <&ps_sio_adma>; + apple,always-on; /* HACK */ }; ps_dpa0: power-controller@2a8 { diff --git a/arch/arm64/boot/dts/apple/t6001.dtsi b/arch/arm64/boot/dts/apple/t6001.dtsi index 91bb234d816c..efc6d4ecd685 100644 --- a/arch/arm64/boot/dts/apple/t6001.dtsi +++ b/arch/arm64/boot/dts/apple/t6001.dtsi @@ -127,6 +127,13 @@ clk_200m: clock-200m { clock-output-names = "clk_200m"; }; + clk_1068m: clock-1068m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <1068000000>; + clock-output-names = "clk_1068m"; + }; + soc { compatible = "simple-bus"; #address-cells = <2>; @@ -135,6 +142,14 @@ soc { ranges; nonposted-mmio; + nco: nco@28e03c000 { + compatible = "apple,t6000-nco", "apple,nco"; + reg = <0x2 0x8e03c000 0x0 0x14000>; + clocks = <&clk_1068m>; + #clock-cells = <1>; + apple,nchannels = <5>; + }; + pmgr: power-management@28e080000 { compatible = "apple,t6000-pmgr", "apple,pmgr", "syscon", "simple-mfd"; #address-cells = <1>; @@ -275,6 +290,24 @@ ans2: nvme@393cc0000 { power-domains = <&ps_ans2>; }; + dart_sio_0: iommu@39b004000 { + compatible = "apple,t6000-dart", "apple,dart"; + reg = <0x3 0x9b004000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + power-domains = <&ps_sio_cpu>; + }; + + dart_sio_1: iommu@39b008000 { + compatible = "apple,t6000-dart", "apple,dart"; + reg = <0x3 0x9b008000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + power-domains = <&ps_sio_cpu>; + }; + pinctrl_ap: pinctrl@39b028000 { compatible = "apple,t8103-pinctrl", "apple,pinctrl"; reg = <0x3 0x9b028000 0x0 0x4000>; @@ -456,7 +489,48 @@ serial0: serial@39b200000 { power-domains = <&ps_uart0>; status = "disabled"; }; + + admac_sio: dma-controller@39b400000 { + compatible = "apple,t8103-admac", "apple,admac"; + reg = <0x3 0x9b400000 0x0 0x34000>; + dma-channels = <8>; + interrupt-parent = <&aic>; + interrupts = ; + #dma-cells = <1>; + iommus = <&dart_sio_0 2>, <&dart_sio_1 2>; + power-domains = <&ps_sio_adma>; + }; + + mca: mca@39b600000 { + compatible = "apple,t6000-mca", "apple,mca"; + reg = <0x3 0x9b600000 0x0 0x10000>, + <0x3 0x9b500000 0x0 0x20000>; + reg-names = "clusters", "switch"; + clocks = <&nco 0>, <&nco 1>, <&nco 2>, <&nco 3>; + power-domains = <&ps_mca0>; //, <&ps_mca1>, <&ps_mca2>, <&ps_mca3>; + resets = <&ps_mca0>, <&ps_mca1>, <&ps_mca2>, <&ps_mca3>; + + #sound-dai-cells = <1>; + apple,nclusters = <4>; + apple,mclk-range = <2600000 25000000>; + /* + route { + dmas = <&admac_sio 0>; + dma-names = "tx"; + apple,serdes = <1>; + sound-dai = <&mca 0>; + }; + */ + + route1 { + dmas = <&admac_sio 4>; + dma-names = "tx"; + apple,serdes = <2>; + sound-dai = <&mca 2>; + }; + }; + pcie0_dart_0: dart@581008000 { compatible = "apple,t6000-dart"; reg = <0x5 0x81008000 0x0 0x4000>; diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi index 397dc3af8533..4883377e9c91 100644 --- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi @@ -130,6 +130,22 @@ hpm5: usb-pd@3a { }; }; +&i2c2 { + status = "okay"; + + clock-frequency = <50000>; + + jack_codec: codec@4b { + compatible = "cirrus,cs42l83", "cirrus,cs42l42"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 4 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&pinctrl_ap>; + interrupts = <180 IRQ_TYPE_LEVEL_LOW>; + #sound-dai-cells = <0>; + cirrus,ts-inv = <1>; + }; +}; + &spi1 { status = "ok"; @@ -212,3 +228,31 @@ &dwc3_3_dart_1 { &dwc3_3 { status = "disabled"; }; + +/ { + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "MacBook Pro integrated audio"; + #address-cells = <1>; + #size-cells = <0>; + + simple-audio-card,dai-link@0 { + bitclock-inversion; + frame-inversion; + reg = <1>; + format = "i2s"; + mclk-fs = <64>; + tdm-slot-width = <32>; + + link1_cpu: cpu { + sound-dai = <&mca 2>; + bitclock-master; + frame-master; + }; + + link1_codec: codec { + sound-dai = <&jack_codec>; + }; + }; + }; +};