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 @@ -25,12 +25,16 @@ properties:
oneOf:
- items:
- enum:
- apple,t6000-aop-accel
- apple,t6041-aop-accel
- apple,t8112-aop-accel
- apple,t8132-aop-accel
- const: apple,aop-accel
- items:
- enum:
- apple,t6000-aop-gyro
- apple,t6041-aop-gyro
- apple,t8112-aop-gyro
- apple,t8132-aop-gyro
- const: apple,aop-gyro

Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ properties:
- apple,baku-pmic
- apple,chapel-pmic
- apple,maverick-pmic
- apple,monaco-pmic
- apple,sera-pmic
- apple,stowe-pmic
- apple,vale-pmic
- const: apple,spmi-nvmem

reg:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/sound/apple,t6000-dpaudio.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Apple T6000 and T6020 DisplayPort audio
title: Apple T6000, T6020 and T8112 DisplayPort audio

maintainers:
- Ryan Murray <ryan@aurorasilicon.org>
Expand All @@ -22,6 +22,7 @@ select:
enum:
- apple,t6000-dpaudio
- apple,t6020-dpaudio
- apple,t8112-dpaudio
required:
- compatible

Expand All @@ -31,6 +32,7 @@ properties:
- enum:
- apple,t6000-dpaudio
- apple,t6020-dpaudio
- apple,t8112-dpaudio
- const: apple,dpaudio

reg:
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/spi/apple,spi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ properties:
oneOf:
- items:
- enum:
- apple,t6000-spi
- apple,t6020-spi
- apple,t6030-spi
- apple,t6031-spi
- apple,t6041-spi
- apple,t8112-spi
- apple,t8122-spi
- apple,t8132-spi
- apple,t8140-spi
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/spmi/apple,spmi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ properties:
oneOf:
- items:
- enum:
- apple,t6000-spmi
- apple,t6020-spmi
- apple,t6030-spmi
- apple,t6031-spmi
- apple,t6041-spmi
- apple,t8012-spmi
- apple,t8015-spmi
- apple,t8112-spmi
- apple,t8122-spmi
- apple,t8132-spmi
- apple,t8140-spmi
Expand Down
48 changes: 48 additions & 0 deletions arch/arm64/boot/dts/apple/t6000-j316s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,54 @@
apple,machine-kind = "MacBook Pro";
};

&aop {
accel {
compatible = "apple,t6000-aop-accel", "apple,aop-accel";
status = "disabled";
};

gyro {
compatible = "apple,t6000-aop-gyro", "apple,aop-gyro";
status = "disabled";
};
};

&nub_spmi1 {
pmic@e {
compatible = "apple,maverick-pmic", "apple,spmi-nvmem";
reg = <0xe SPMI_USID>;
read-only;
status = "disabled";
};
};

&clvr_spmi0 {
pmic@f {
compatible = "apple,monaco-pmic", "apple,spmi-nvmem";
reg = <0xf SPMI_USID>;
read-only;
status = "disabled";
};
};

&clvr_spmi1 {
pmic@f {
compatible = "apple,monaco-pmic", "apple,spmi-nvmem";
reg = <0xf SPMI_USID>;
read-only;
status = "disabled";
};
};

&clvr_spmi2 {
pmic@f {
compatible = "apple,monaco-pmic", "apple,spmi-nvmem";
reg = <0xf SPMI_USID>;
read-only;
status = "disabled";
};
};

&sound {
compatible = "apple,j316-macaudio", "apple,macaudio";
model = "MacBook Pro J316";
Expand Down
60 changes: 60 additions & 0 deletions arch/arm64/boot/dts/apple/t600x-die0.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,30 @@
status = "disabled";
};

clvr_spmi0: spmi@28e501100 {
compatible = "apple,t6000-spmi", "apple,t8103-spmi";
reg = <0x2 0x8e501100 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

clvr_spmi1: spmi@28e509100 {
compatible = "apple,t6000-spmi", "apple,t8103-spmi";
reg = <0x2 0x8e509100 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

clvr_spmi2: spmi@28e511100 {
compatible = "apple,t6000-spmi", "apple,t8103-spmi";
reg = <0x2 0x8e511100 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

nco: clock-controller@28e03c000 {
compatible = "apple,t6000-nco", "apple,nco";
reg = <0x2 0x8e03c000 0x0 0x14000>;
Expand Down Expand Up @@ -435,6 +459,14 @@
};
};

nub_spmi1: spmi@2920a9300 {
compatible = "apple,t6000-spmi", "apple,t8103-spmi";
reg = <0x2 0x920a9300 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

wdt: watchdog@2922b0000 {
compatible = "apple,t6000-wdt", "apple,wdt";
reg = <0x2 0x922b0000 0x0 0x4000>;
Expand Down Expand Up @@ -466,6 +498,22 @@
status = "disabled";
};

aop_spmi0: spmi@293829300 {
compatible = "apple,t6000-spmi", "apple,t8103-spmi";
reg = <0x2 0x93829300 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

aop_spmi1: spmi@29382d300 {
compatible = "apple,t6000-spmi", "apple,t8103-spmi";
reg = <0x2 0x9382d300 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

aop_admac: dma-controller@293980000 {
compatible = "apple,t6000-admac", "apple,admac";
reg = <0x2 0x93980000 0x0 0x34000>;
Expand Down Expand Up @@ -787,6 +835,18 @@
status = "disabled";
};

spi4: spi@39b110000 {
compatible = "apple,t6000-spi", "apple,t8103-spi";
reg = <0x3 0x9b110000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1110 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkref>;
power-domains = <&ps_spi4>;
status = "disabled";
};

serial0: serial@39b200000 {
compatible = "apple,s5l-uart";
reg = <0x3 0x9b200000 0x0 0x1000>;
Expand Down
19 changes: 19 additions & 0 deletions arch/arm64/boot/dts/apple/t8112-j413.dts
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,16 @@

&aop {
status = "okay";

accel {
compatible = "apple,t8112-aop-accel", "apple,aop-accel";
status = "disabled";
};

gyro {
compatible = "apple,t8112-aop-gyro", "apple,aop-gyro";
status = "disabled";
};
};

&aop_audio {
Expand Down Expand Up @@ -292,3 +302,12 @@
&pmp_report_isp_sys {
status = "okay";
};

&nub_spmi1 {
pmic@e {
compatible = "apple,vale-pmic", "apple,spmi-nvmem";
reg = <0xe SPMI_USID>;
read-only;
status = "disabled";
};
};
38 changes: 36 additions & 2 deletions arch/arm64/boot/dts/apple/t8112.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,18 @@
status = "disabled"; /* only used in J493 */
};

spi4: spi@235110000 {
compatible = "apple,t8112-spi", "apple,t8103-spi";
reg = <0x2 0x35110000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 752 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkref>;
power-domains = <&ps_spi4>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};

serial0: serial@235200000 {
compatible = "apple,s5l-uart";
reg = <0x2 0x35200000 0x0 0x1000>;
Expand Down Expand Up @@ -1035,7 +1047,6 @@
dmas = <&sio 0x64>;
dma-names = "tx";
power-domains = <&ps_dpa0>;
reset-domains = <&ps_dpa0>;
status = "disabled";

ports {
Expand All @@ -1056,7 +1067,6 @@
dmas = <&sio 0x66>;
dma-names = "tx";
power-domains = <&ps_dpa1>;
reset-domains = <&ps_dpa1>;
status = "disabled";

ports {
Expand Down Expand Up @@ -1484,6 +1494,14 @@
};
};

nub_spmi1: spmi@23d794000 {
compatible = "apple,t8112-spmi", "apple,t8103-spmi";
reg = <0x2 0x3d794000 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

smc: smc@23e400000 {
compatible = "apple,t8112-smc", "apple,smc";
reg = <0x2 0x3e400000 0x0 0x4000>,
Expand Down Expand Up @@ -1602,6 +1620,22 @@
status = "disabled";
};

aop_spmi0: spmi@24a894000 {
compatible = "apple,t8112-spmi", "apple,t8103-spmi";
reg = <0x2 0x4a894000 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

aop_spmi1: spmi@24a8d4000 {
compatible = "apple,t8112-spmi", "apple,t8103-spmi";
reg = <0x2 0x4a8d4000 0x0 0x100>;
#address-cells = <2>;
#size-cells = <0>;
status = "disabled";
};

aop_admac: dma-controller@24a980000 {
compatible = "apple,t8112-admac", "apple,admac";
reg = <0x2 0x4a980000 0x0 0x34000>;
Expand Down
Loading