Skip to content

Commit 8e11230

Browse files
committed
Merge branch 'at91-4.19-trunk/dt_sama5d2-icp' into linux-4.19-at91
2 parents 0d6120c + 7fd3350 commit 8e11230

1 file changed

Lines changed: 0 additions & 51 deletions

File tree

arch/arm/boot/dts/at91-sama5d2_icp.dts

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,6 @@
3939
};
4040
};
4141

42-
wifi_pwrseq: wifi_pwrseq {
43-
compatible = "mmc-pwrseq-wilc";
44-
reset-gpios = <&pioA 8 GPIO_ACTIVE_HIGH>;
45-
powerdown-gpios = <&pioA 78 GPIO_ACTIVE_LOW>;
46-
pinctrl-0 = <&pinctrl_wilc_pwrseq_default>;
47-
pinctrl-names = "default";
48-
status = "okay"; /* Conflict with qspi1. */
49-
};
50-
5142
ahb {
5243
usb0: gadget@300000 {
5344
atmel,vbus-gpio = <&pioA PIN_PD23 GPIO_ACTIVE_HIGH>;
@@ -76,26 +67,6 @@
7667
status = "okay";
7768
};
7869

79-
sdmmc1: sdio-host@b0000000 {
80-
pinctrl-names = "default";
81-
pinctrl-0 = <&pinctrl_sdmmc1_default>;
82-
bus-width = <4>;
83-
mmc-pwrseq = <&wifi_pwrseq>;
84-
#address-cells = <1>;
85-
#size-cells = <0>;
86-
no-1-8-v;
87-
non-removable;
88-
status = "okay";
89-
90-
wilc: wilc@1 {
91-
compatible = "microchip,wilc1000", "microchip,wilc3000";
92-
reg = <1>;
93-
bus-width = <4>;
94-
irq-gpios = <&pioA 77 0>;
95-
status = "okay";
96-
};
97-
};
98-
9970
apb {
10071
qspi1: spi@f0024000 {
10172
pinctrl-names = "default";
@@ -597,22 +568,6 @@
597568
};
598569
};
599570

600-
pinctrl_sdmmc1_default: sdmmc1_default {
601-
cmd_data {
602-
pinmux = <PIN_PA18__SDMMC1_DAT0>,
603-
<PIN_PA19__SDMMC1_DAT1>,
604-
<PIN_PA20__SDMMC1_DAT2>,
605-
<PIN_PA21__SDMMC1_DAT3>;
606-
bias-disable;
607-
};
608-
609-
ck_cd {
610-
pinmux = <PIN_PA22__SDMMC1_CK>,
611-
<PIN_PA28__SDMMC1_CMD>;
612-
bias-disable;
613-
};
614-
};
615-
616571
pinctrl_mikrobus_i2c: mikrobus_i2c {
617572
pinmux = <PIN_PD22__TWCK0>,
618573
<PIN_PD21__TWD0>;
@@ -784,12 +739,6 @@
784739
bias-disable;
785740
};
786741

787-
pinctrl_wilc_pwrseq_default: wilc_pwrseq_default {
788-
pinmux = <PIN_PA8__GPIO>,
789-
<PIN_PC15__GPIO>;
790-
bias-pull-up;
791-
};
792-
793742
pinctrl_flx2_default: flx2_default {
794743
pinmux = <PIN_PA6__FLEXCOM2_IO0>,
795744
<PIN_PA7__FLEXCOM2_IO1>,

0 commit comments

Comments
 (0)