linux-surface/kernel/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts.rej
2017-09-04 22:31:27 -04:00

21 lines
572 B
Plaintext

--- scripts/dtc/include-prefixes/arm/imx6sx-nitrogen6sx.dts 2017-08-30 04:32:30.000000000 -0400
+++ scripts/dtc/include-prefixes/arm/imx6sx-nitrogen6sx.dts 2017-09-03 16:56:17.000000000 -0400
@@ -296,7 +296,7 @@
&pcie {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pcie>;
- reset-gpio = <&gpio4 10 GPIO_ACTIVE_HIGH>;
+ reset-gpio = <&gpio4 10 GPIO_ACTIVE_LOW>;
status = "okay";
};
@@ -374,7 +374,7 @@
cap-sdio-irq;
status = "okay";
- brcmf: bcrmf@1 {
+ brcmf: wifi@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
interrupt-parent = <&gpio7>;