MIPS: BMIPS: Fix interrupt and remove needless properties

Fixes wrong bcm7425 SATA AHCI hardware interrupt property value with
periph_intc and SATA PHY unit address, and removes needless
brcm,broken-{ncq,phy} properties what are not used anywhere.

Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Dragan Stancevic <dragan.stancevic@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/13017/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm/bcm7346.dtsi
index 2a6efe6..ec95906 100644 (file)
--- a/arch/mips/boot/dts/brcm/bcm7346.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7346.dtsi
@@ -321,8 +321,6 @@
                        interrupts = <40>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       brcm,broken-ncq;
-                       brcm,broken-phy;
                        status = "disabled";
 
                        sata0: sata-port@0 {
@@ -336,7 +334,7 @@
                        };
                };
 
-               sata_phy: sata-phy@1800000 {
+               sata_phy: sata-phy@180100 {
                        compatible = "brcm,bcm7425-sata-phy", "brcm,phy-sata3";
                        reg = <0x180100 0x0eff>;
                        reg-names = "phy";

diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm/bcm7362.dtsi
index 4153e08..6b4713a 100644 (file)
--- a/arch/mips/boot/dts/brcm/bcm7362.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7362.dtsi
@@ -244,8 +244,6 @@
                        interrupts = <86>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       brcm,broken-ncq;
-                       brcm,broken-phy;
                        status = "disabled";
 
                        sata0: sata-port@0 {
@@ -259,7 +257,7 @@
                        };
                };
 
-               sata_phy: sata-phy@1800000 {
+               sata_phy: sata-phy@180100 {
                        compatible = "brcm,bcm7425-sata-phy", "brcm,phy-sata3";
                        reg = <0x180100 0x0eff>;
                        reg-names = "phy";

diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm/bcm7425.dtsi
index 8533979..c1c15ed 100644 (file)
--- a/arch/mips/boot/dts/brcm/bcm7425.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7425.dtsi
@@ -317,11 +317,9 @@
                        reg-names = "ahci", "top-ctrl";
                        reg = <0x181000 0xa9c>, <0x180020 0x1c>;
                        interrupt-parent = <&periph_intc>;
-                       interrupts = <40>;
+                       interrupts = <41>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       brcm,broken-ncq;
-                       brcm,broken-phy;
                        status = "disabled";
 
                        sata0: sata-port@0 {
@@ -335,7 +333,7 @@
                        };
                };
 
-               sata_phy: sata-phy@1800000 {
+               sata_phy: sata-phy@180100 {
                        compatible = "brcm,bcm7425-sata-phy", "brcm,phy-sata3";
                        reg = <0x180100 0x0eff>;
                        reg-names = "phy";