Skip to content

L
linux
Commit 4ea3f056 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'arm-soc/for-4.17/devicetree-arm64-fixes' of... 

Merge tag 'arm-soc/for-4.17/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into fixes

Pull "Broadcom devicetree-arm64 fixes for 4.17" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoCs Device Tree fixes
for 4.17, please pull the following:

- Srinath fixes the register base address of all SATA controllers on
  Stingray

* tag 'arm-soc/for-4.17/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux:
  arm64: dts: correct SATA addresses for Stingray
parents c12d7e9f 4555a502
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi
View file @ 4ea3f056
...@@ -36,11 +36,11 @@ sata { ...@@ -36,11 +36,11 @@ sata {
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x0 0x67d00000 0x00800000>; ranges = <0x0 0x0 0x67d00000 0x00800000>;
sata0: ahci@210000 { sata0: ahci@0 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00210000 0x1000>; reg = <0x00000000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -52,9 +52,9 @@ sata0_port0: sata-port@0 { ...@@ -52,9 +52,9 @@ sata0_port0: sata-port@0 {
}; };
}; };
sata_phy0: sata_phy@212100 { sata_phy0: sata_phy@2100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00212100 0x1000>; reg = <0x00002100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -66,11 +66,11 @@ sata0_phy0: sata-phy@0 { ...@@ -66,11 +66,11 @@ sata0_phy0: sata-phy@0 {
}; };
}; };
sata1: ahci@310000 { sata1: ahci@10000 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00310000 0x1000>; reg = <0x00010000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -82,9 +82,9 @@ sata1_port0: sata-port@0 { ...@@ -82,9 +82,9 @@ sata1_port0: sata-port@0 {
}; };
}; };
sata_phy1: sata_phy@312100 { sata_phy1: sata_phy@12100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00312100 0x1000>; reg = <0x00012100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -96,11 +96,11 @@ sata1_phy0: sata-phy@0 { ...@@ -96,11 +96,11 @@ sata1_phy0: sata-phy@0 {
}; };
}; };
sata2: ahci@120000 { sata2: ahci@20000 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00120000 0x1000>; reg = <0x00020000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -112,9 +112,9 @@ sata2_port0: sata-port@0 { ...@@ -112,9 +112,9 @@ sata2_port0: sata-port@0 {
}; };
}; };
sata_phy2: sata_phy@122100 { sata_phy2: sata_phy@22100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00122100 0x1000>; reg = <0x00022100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -126,11 +126,11 @@ sata2_phy0: sata-phy@0 { ...@@ -126,11 +126,11 @@ sata2_phy0: sata-phy@0 {
}; };
}; };
sata3: ahci@130000 { sata3: ahci@30000 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00130000 0x1000>; reg = <0x00030000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -142,9 +142,9 @@ sata3_port0: sata-port@0 { ...@@ -142,9 +142,9 @@ sata3_port0: sata-port@0 {
}; };
}; };
sata_phy3: sata_phy@132100 { sata_phy3: sata_phy@32100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00132100 0x1000>; reg = <0x00032100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -156,11 +156,11 @@ sata3_phy0: sata-phy@0 { ...@@ -156,11 +156,11 @@ sata3_phy0: sata-phy@0 {
}; };
}; };
sata4: ahci@330000 { sata4: ahci@100000 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00330000 0x1000>; reg = <0x00100000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -172,9 +172,9 @@ sata4_port0: sata-port@0 { ...@@ -172,9 +172,9 @@ sata4_port0: sata-port@0 {
}; };
}; };
sata_phy4: sata_phy@332100 { sata_phy4: sata_phy@102100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00332100 0x1000>; reg = <0x00102100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -186,11 +186,11 @@ sata4_phy0: sata-phy@0 { ...@@ -186,11 +186,11 @@ sata4_phy0: sata-phy@0 {
}; };
}; };
sata5: ahci@400000 { sata5: ahci@110000 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00400000 0x1000>; reg = <0x00110000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -202,9 +202,9 @@ sata5_port0: sata-port@0 { ...@@ -202,9 +202,9 @@ sata5_port0: sata-port@0 {
}; };
}; };
sata_phy5: sata_phy@402100 { sata_phy5: sata_phy@112100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00402100 0x1000>; reg = <0x00112100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -216,11 +216,11 @@ sata5_phy0: sata-phy@0 { ...@@ -216,11 +216,11 @@ sata5_phy0: sata-phy@0 {
}; };
}; };
sata6: ahci@410000 { sata6: ahci@120000 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00410000 0x1000>; reg = <0x00120000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -232,9 +232,9 @@ sata6_port0: sata-port@0 { ...@@ -232,9 +232,9 @@ sata6_port0: sata-port@0 {
}; };
}; };
sata_phy6: sata_phy@412100 { sata_phy6: sata_phy@122100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00412100 0x1000>; reg = <0x00122100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -246,11 +246,11 @@ sata6_phy0: sata-phy@0 { ...@@ -246,11 +246,11 @@ sata6_phy0: sata-phy@0 {
}; };
}; };
sata7: ahci@420000 { sata7: ahci@130000 {
compatible = "brcm,iproc-ahci", "generic-ahci"; compatible = "brcm,iproc-ahci", "generic-ahci";
reg = <0x00420000 0x1000>; reg = <0x00130000 0x1000>;
reg-names = "ahci"; reg-names = "ahci";
interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -262,9 +262,9 @@ sata7_port0: sata-port@0 { ...@@ -262,9 +262,9 @@ sata7_port0: sata-port@0 {
}; };
}; };
sata_phy7: sata_phy@422100 { sata_phy7: sata_phy@132100 {
compatible = "brcm,iproc-sr-sata-phy"; compatible = "brcm,iproc-sr-sata-phy";
reg = <0x00422100 0x1000>; reg = <0x00132100 0x1000>;
reg-names = "phy"; reg-names = "phy";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7