diff options
| -rw-r--r-- | arch/arm/boot/dts/bcm-nsp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm958623hr.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm958625hr.dts | 4 |
4 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 528b9e3bc1da..dcc55aa84583 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi | |||
| @@ -85,7 +85,7 @@ | |||
| 85 | timer@20200 { | 85 | timer@20200 { |
| 86 | compatible = "arm,cortex-a9-global-timer"; | 86 | compatible = "arm,cortex-a9-global-timer"; |
| 87 | reg = <0x20200 0x100>; | 87 | reg = <0x20200 0x100>; |
| 88 | interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; | 88 | interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>; |
| 89 | clocks = <&periph_clk>; | 89 | clocks = <&periph_clk>; |
| 90 | }; | 90 | }; |
| 91 | 91 | ||
| @@ -93,7 +93,7 @@ | |||
| 93 | compatible = "arm,cortex-a9-twd-timer"; | 93 | compatible = "arm,cortex-a9-twd-timer"; |
| 94 | reg = <0x20600 0x20>; | 94 | reg = <0x20600 0x20>; |
| 95 | interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | | 95 | interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | |
| 96 | IRQ_TYPE_LEVEL_HIGH)>; | 96 | IRQ_TYPE_EDGE_RISING)>; |
| 97 | clocks = <&periph_clk>; | 97 | clocks = <&periph_clk>; |
| 98 | }; | 98 | }; |
| 99 | 99 | ||
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 013431e3d7c3..dcde93c85c2d 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi | |||
| @@ -639,5 +639,6 @@ | |||
| 639 | 639 | ||
| 640 | usbphy: phy { | 640 | usbphy: phy { |
| 641 | compatible = "usb-nop-xceiv"; | 641 | compatible = "usb-nop-xceiv"; |
| 642 | #phy-cells = <0>; | ||
| 642 | }; | 643 | }; |
| 643 | }; | 644 | }; |
diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index 3bc50849d013..b8bde13de90a 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts | |||
| @@ -141,10 +141,6 @@ | |||
| 141 | status = "okay"; | 141 | status = "okay"; |
| 142 | }; | 142 | }; |
| 143 | 143 | ||
| 144 | &sata { | ||
| 145 | status = "okay"; | ||
| 146 | }; | ||
| 147 | |||
| 148 | &qspi { | 144 | &qspi { |
| 149 | bspi-sel = <0>; | 145 | bspi-sel = <0>; |
| 150 | flash: m25p80@0 { | 146 | flash: m25p80@0 { |
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index d94d14b3c745..6a44b8021702 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts | |||
| @@ -177,10 +177,6 @@ | |||
| 177 | status = "okay"; | 177 | status = "okay"; |
| 178 | }; | 178 | }; |
| 179 | 179 | ||
| 180 | &sata { | ||
| 181 | status = "okay"; | ||
| 182 | }; | ||
| 183 | |||
| 184 | &srab { | 180 | &srab { |
| 185 | compatible = "brcm,bcm58625-srab", "brcm,nsp-srab"; | 181 | compatible = "brcm,bcm58625-srab", "brcm,nsp-srab"; |
| 186 | status = "okay"; | 182 | status = "okay"; |
