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 @@ -20,6 +20,7 @@ properties:
- enum:
- apple,abbey-pmic
- apple,baku-pmic
- apple,chapel-pmic
- apple,maverick-pmic
- apple,sera-pmic
- apple,stowe-pmic
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/apple/t6041-j616c.dts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@
status = "okay";
};

&mcc {
status = "okay";
};

&smc_hwmon {
temperature-TCMz {
apple,key-id = "TCMz";
Expand Down
84 changes: 80 additions & 4 deletions arch/arm64/boot/dts/apple/t6041.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,56 @@
/delete-property/ power-domain-names;
};

/*
* The main PMIC is a Chapel at 0xb (ADT nub-spmi0 spmi-chapelL1-b), not the
* J616s's Abbey at 0xe. Its nvmem cells and RTC alarm registers are at the
* Abbey offsets (ADT info-rtc_alarm_*).
*/
&nub_spmi0 {
/delete-property/ interrupt-controller;
/delete-property/ #interrupt-cells;
/delete-property/ interrupt-parent;
/delete-property/ interrupts;
/delete-node/ pmic@e;

pmic@b {
compatible = "apple,chapel-pmic", "apple,spmi-nvmem";
reg = <0xb SPMI_USID>;

pmu_rtc: rtc {
compatible = "apple,t6041-pmu-rtc";
interrupt-parent = <&nub_spmi0>;
interrupts = <2 IRQ_TYPE_EDGE_RISING>;
nvmem-cells = <&rtc_offset>;
nvmem-cell-names = "rtc_offset";
wakeup-source;
};

nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;

rtc_offset: rtc-offset@2100 {
reg = <0x2100 0x6>;
};

boot_stage: boot-stage@f801 {
reg = <0xf801 0x1>;
};

boot_error_count: boot-error-count@f802,0 {
reg = <0xf802 0x1>;
bits = <0 4>;
};

panic_count: panic-count@f802,4 {
reg = <0xf802 0x1>;
bits = <4 4>;
};

shutdown_flag: shutdown-flag@f80f,3 {
reg = <0xf80f 0x1>;
bits = <3 1>;
};
};
};
};

&usb_drd0_dart_0 {
Expand Down Expand Up @@ -588,3 +633,34 @@
apple,always-on;
apple,no-auto-pm;
};

/*
* Four cache planes per AMCC, eight AMCCs on the full part and six on the
* binned one (ADT amcc-enable-mask 0x3f). List the six every T6041 has.
*/
&mcc {
reg = <0x2 0x20000000 0x0 0x4000>,
<0x2 0x20040000 0x0 0x4000>,
<0x2 0x20080000 0x0 0x4000>,
<0x2 0x200c0000 0x0 0x4000>,
<0x2 0x22000000 0x0 0x4000>,
<0x2 0x22040000 0x0 0x4000>,
<0x2 0x22080000 0x0 0x4000>,
<0x2 0x220c0000 0x0 0x4000>,
<0x2 0x24000000 0x0 0x4000>,
<0x2 0x24040000 0x0 0x4000>,
<0x2 0x24080000 0x0 0x4000>,
<0x2 0x240c0000 0x0 0x4000>,
<0x2 0x26000000 0x0 0x4000>,
<0x2 0x26040000 0x0 0x4000>,
<0x2 0x26080000 0x0 0x4000>,
<0x2 0x260c0000 0x0 0x4000>,
<0x2 0x28000000 0x0 0x4000>,
<0x2 0x28040000 0x0 0x4000>,
<0x2 0x28080000 0x0 0x4000>,
<0x2 0x280c0000 0x0 0x4000>,
<0x2 0x2a000000 0x0 0x4000>,
<0x2 0x2a040000 0x0 0x4000>,
<0x2 0x2a080000 0x0 0x4000>,
<0x2 0x2a0c0000 0x0 0x4000>;
};