Skip to content

trivial dts fixes for t6000/bringup-work #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcan merged 3 commits into from
Nov 23, 2021
Merged

trivial dts fixes for t6000/bringup-work #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8ba60a
fixup! arm64: dts: apple: Add initial t6000/t6001 DTs
jannau Nov 19, 2021
ab6372d
fixup! arm64: dts: apple: Add J314 and J316 devicetrees
jannau Nov 19, 2021
e6759bf
fixup! arm64: dts: apple: Add J314 and J316 devicetrees
jannau Nov 19, 2021
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
18 changes: 5 additions & 13 deletions arch/arm64/boot/dts/apple/t6001.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
};

i2c0: i2c@39b040000 {
compatible = "apple,t8103-i2c";
compatible = "apple,t6000-i2c", "apple,i2c";
reg = <0x3 0x9b040000 0x0 0x4000>;
clocks = <&clkref>, <&clkref>;
clock-names = "gate", "ref";
Expand Down Expand Up @@ -405,7 +405,7 @@
};

dwc3_0: usb@702280000 {
compatible = "apple,t6000,dwc3", "apple,dwc3", "snps,dwc3";
compatible = "apple,t6000-dwc3", "apple,dwc3", "snps,dwc3";
reg = <0x7 0x02280000 0x0 0x100000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1190 IRQ_TYPE_LEVEL_HIGH>;
Expand All @@ -414,8 +414,6 @@
role-switch-default-mode = "host";
iommus = <&dwc3_0_dart_0 0>, <&dwc3_0_dart_1 1>;
power-domains = <&ps_atc0_usb>;
#address-cells = <1>;
#size-cells = <0>;
};

dwc3_1_dart_0: iommu@b02f00000 {
Expand All @@ -437,7 +435,7 @@
};

dwc3_1: usb@b02280000 {
compatible = "apple,t6000,dwc3", "apple,dwc3", "snps,dwc3";
compatible = "apple,t6000-dwc3", "apple,dwc3", "snps,dwc3";
reg = <0xb 0x02280000 0x0 0x100000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1207 IRQ_TYPE_LEVEL_HIGH>;
Expand All @@ -446,8 +444,6 @@
role-switch-default-mode = "host";
iommus = <&dwc3_1_dart_0 0>, <&dwc3_1_dart_1 1>;
power-domains = <&ps_atc1_usb>;
#address-cells = <1>;
#size-cells = <0>;
};

dwc3_2_dart_0: iommu@f02f00000 {
Expand All @@ -469,7 +465,7 @@
};

dwc3_2: usb@f02280000 {
compatible = "apple,t6000,dwc3", "apple,dwc3", "snps,dwc3";
compatible = "apple,t6000-dwc3", "apple,dwc3", "snps,dwc3";
reg = <0xf 0x02280000 0x0 0x100000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1224 IRQ_TYPE_LEVEL_HIGH>;
Expand All @@ -478,8 +474,6 @@
role-switch-default-mode = "host";
iommus = <&dwc3_2_dart_0 0>, <&dwc3_2_dart_1 1>;
power-domains = <&ps_atc2_usb>;
#address-cells = <1>;
#size-cells = <0>;
};

dwc3_3_dart_0: iommu@1302f00000 {
Expand All @@ -501,7 +495,7 @@
};

dwc3_3: usb@1302280000 {
compatible = "apple,t6000,dwc3", "apple,dwc3", "snps,dwc3";
compatible = "apple,t6000-dwc3", "apple,dwc3", "snps,dwc3";
reg = <0x13 0x02280000 0x0 0x100000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1241 IRQ_TYPE_LEVEL_HIGH>;
Expand All @@ -510,8 +504,6 @@
role-switch-default-mode = "host";
iommus = <&dwc3_3_dart_0 0>, <&dwc3_3_dart_1 1>;
power-domains = <&ps_atc3_usb>;
#address-cells = <1>;
#size-cells = <0>;
};

ans2_mbox: mbox@38f408000 {
Expand Down
13 changes: 5 additions & 8 deletions arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
&port00 {
/* WLAN */
bus-range = <1 1>;
wifi0: pci@0,0 {
wifi0: ethernet@0,0 {
reg = <0x10000 0x0 0x0 0x0 0x0>;
/* To be filled by the loader */
local-mac-address = [00 10 18 00 00 10];
Expand All @@ -145,7 +145,7 @@
/* SD card reader */
bus-range = <2 2>;
max-link-speed = <1>;
sdhci0: pci@0,0 {
sdhci0: ethernet@0,0 {
reg = <0x20000 0x0 0x0 0x0 0x0>;
cd-inverted;
wp-inverted;
Expand All @@ -165,26 +165,23 @@

/* USB controllers */
&dwc3_0 {
port@0 {
reg = <0>;
port {
typec0_usb_hs: endpoint {
remote-endpoint = <&typec0_con_hs>;
};
};
};

&dwc3_1 {
port@0 {
reg = <0>;
port {
typec1_usb_hs: endpoint {
remote-endpoint = <&typec1_con_hs>;
};
};
};

&dwc3_2 {
port@0 {
reg = <0>;
port {
typec2_usb_hs: endpoint {
remote-endpoint = <&typec2_con_hs>;
};
Expand Down