linux-surface/kernel/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts.rej
2017-09-04 22:31:27 -04:00

21 lines
639 B
Plaintext

--- scripts/dtc/include-prefixes/arm/sun7i-a20-wits-pro-a20-dkt.dts 2017-08-30 04:32:30.000000000 -0400
+++ scripts/dtc/include-prefixes/arm/sun7i-a20-wits-pro-a20-dkt.dts 2017-09-03 16:56:17.000000000 -0400
@@ -120,7 +120,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
@@ -137,7 +137,7 @@
non-removable;
status = "okay";
- brcmf: bcrmf@1 {
+ brcmf: wifi@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
interrupt-parent = <&pio>;