Skip to content

Commit 83d3651

Browse files
arndbarndb
committed
Merge tag 'amlogic-fixes-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes
Amlogic fixes for v5.0-rc, round 2 - several fixups for the GPIO cd-inverted change - IRQ trigger fixes for MAC IRQ * tag 'amlogic-fixes-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm64: dts: meson: Fix mmc cd-gpios polarity ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low ARM: dts: meson8b: ec100: mark the SD card detection GPIO active-low ARM: dts: meson8b: odroidc1: mark the SD card detection GPIO active-low arm: dts: meson: Fix IRQ trigger type for macirq Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 46edb8d + f29200c commit 83d3651

18 files changed

+18
-36
lines changed

‎arch/arm/boot/dts/meson.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
compatible = "amlogic,meson6-dwmac", "snps,dwmac";
275275
reg = <0xc9410000 0x10000
276276
0xc1108108 0x4>;
277-
interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
277+
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
278278
interrupt-names = "macirq";
279279
status = "disabled";
280280
};

‎arch/arm/boot/dts/meson8b-ec100.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@
205205
cap-sd-highspeed;
206206
disable-wp;
207207

208-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
209-
cd-inverted;
208+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
210209

211210
vmmc-supply = <&vcc_3v3>;
212211
};

‎arch/arm/boot/dts/meson8b-odroidc1.dts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@
221221
/* Realtek RTL8211F (0x001cc916) */
222222
eth_phy: ethernet-phy@0 {
223223
reg = <0>;
224-
eee-broken-1000t;
225224
interrupt-parent = <&gpio_intc>;
226225
/* GPIOH_3 */
227226
interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
@@ -273,8 +272,7 @@
273272
cap-sd-highspeed;
274273
disable-wp;
275274

276-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
277-
cd-inverted;
275+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
278276

279277
vmmc-supply = <&tflash_vdd>;
280278
vqmmc-supply = <&tf_io>;

‎arch/arm/boot/dts/meson8m2-mxiii-plus.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@
206206
cap-sd-highspeed;
207207
disable-wp;
208208

209-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
210-
cd-inverted;
209+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
211210

212211
vmmc-supply = <&vcc_3v3>;
213212
};

‎arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@
187187
max-frequency = <100000000>;
188188
disable-wp;
189189

190-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
191-
cd-inverted;
190+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
192191

193192
vmmc-supply = <&vddao_3v3>;
194193
vqmmc-supply = <&vddio_boot>;

‎arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@
305305
max-frequency = <200000000>;
306306
disable-wp;
307307

308-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
309-
cd-inverted;
308+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
310309

311310
vmmc-supply = <&vddio_ao3v3>;
312311
vqmmc-supply = <&vddio_tf>;

‎arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@
238238
max-frequency = <100000000>;
239239
disable-wp;
240240

241-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
242-
cd-inverted;
241+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
243242

244243
vmmc-supply = <&vddao_3v3>;
245244
vqmmc-supply = <&vddio_card>;

‎arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@
258258
max-frequency = <100000000>;
259259
disable-wp;
260260

261-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
262-
cd-inverted;
261+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
263262

264263
vmmc-supply = <&tflash_vdd>;
265264
vqmmc-supply = <&tf_io>;

‎arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@
196196
max-frequency = <100000000>;
197197
disable-wp;
198198

199-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
200-
cd-inverted;
199+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
201200

202201
vmmc-supply = <&vddao_3v3>;
203202
vqmmc-supply = <&vddio_card>;

‎arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@
154154
max-frequency = <100000000>;
155155
disable-wp;
156156

157-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
158-
cd-inverted;
157+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
159158

160159
vmmc-supply = <&vcc_3v3>;
161160
};

‎arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,7 @@
211211
max-frequency = <100000000>;
212212
disable-wp;
213213

214-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
215-
cd-inverted;
214+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
216215

217216
vmmc-supply = <&vddao_3v3>;
218217
vqmmc-supply = <&vcc_3v3>;

‎arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@
131131
max-frequency = <100000000>;
132132
disable-wp;
133133

134-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
135-
cd-inverted;
134+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
136135

137136
vmmc-supply = <&vddao_3v3>;
138137
vqmmc-supply = <&vddio_card>;

‎arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@
238238
max-frequency = <100000000>;
239239
disable-wp;
240240

241-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
242-
cd-inverted;
241+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
243242

244243
vmmc-supply = <&vcc_3v3>;
245244
vqmmc-supply = <&vcc_card>;

‎arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@
183183
max-frequency = <100000000>;
184184
disable-wp;
185185

186-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
187-
cd-inverted;
186+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
188187

189188
vmmc-supply = <&vddao_3v3>;
190189
vqmmc-supply = <&vddio_card>;

‎arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@
137137
max-frequency = <100000000>;
138138
disable-wp;
139139

140-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
141-
cd-inverted;
140+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
142141

143142
vmmc-supply = <&vddao_3v3>;
144143
vqmmc-supply = <&vddio_boot>;

‎arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,7 @@
356356
max-frequency = <100000000>;
357357
disable-wp;
358358

359-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
360-
cd-inverted;
359+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
361360

362361
vmmc-supply = <&vddao_3v3>;
363362
vqmmc-supply = <&vddio_boot>;

‎arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@
147147
max-frequency = <100000000>;
148148
disable-wp;
149149

150-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
151-
cd-inverted;
150+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
152151

153152
vmmc-supply = <&vddao_3v3>;
154153
vqmmc-supply = <&vddio_boot>;

‎arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@
170170
max-frequency = <100000000>;
171171
disable-wp;
172172

173-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
174-
cd-inverted;
173+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
175174

176175
vmmc-supply = <&vddao_3v3>;
177176
vqmmc-supply = <&vddio_boot>;

0 commit comments

Comments
 (0)