Skip to content

Commit 61ed756

Browse files
committed
Merge branch 'next/fixes' into for-next
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2 parents 6de23f8 + 1af997c commit 61ed756

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
};
180180

181181
&pcie {
182-
reset-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
182+
reset-gpios = <&gpio4 4 GPIO_ACTIVE_LOW>;
183183
vpcie-supply = <&reg_pcie>;
184184
status = "okay";
185185
};

arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
#address-cells = <1>;
123123
#size-cells = <1>;
124124
ranges = <0x0 0x0 0xf0000000 0x10000000>;
125+
dma-ranges = <0x0 0x0 0x0 0x40000000>;
125126

126127
crg: clock-reset-controller@8a22000 {
127128
compatible = "hisilicon,hi3798cv200-crg", "syscon", "simple-mfd";

0 commit comments

Comments
 (0)