mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-11 21:14:07 +08:00
ARM: dts: sunxi: Explicitly enable pull-ups for MMC pins
In the past, all the MMC pins had allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; which was actually a no-op. We were relying on U-boot to set the bias pull up for us. These properties were removed as part of the fix up to actually support no bias on the pins. During the transition some boards experienced regular MMC time-outs during normal operation, while others completely failed to initialize the SD card. Given that MMC starts in open-drain mode and the pull-ups are required, it's best to enable it for all the pin settings. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
parent
1edcd36fcb
commit
80ee72e7e9
@ -1023,6 +1023,7 @@
|
|||||||
"PF3", "PF4", "PF5";
|
"PF3", "PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
|
mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
|
||||||
|
@ -582,6 +582,7 @@
|
|||||||
"PF4", "PF5";
|
"PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc2_pins_a: mmc2@0 {
|
mmc2_pins_a: mmc2@0 {
|
||||||
|
@ -547,6 +547,7 @@
|
|||||||
"PF3", "PF4", "PF5";
|
"PF3", "PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc1_pins_a: mmc1@0 {
|
mmc1_pins_a: mmc1@0 {
|
||||||
@ -554,6 +555,7 @@
|
|||||||
"PG4", "PG5";
|
"PG4", "PG5";
|
||||||
function = "mmc1";
|
function = "mmc1";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc2_pins_a: mmc2@0 {
|
mmc2_pins_a: mmc2@0 {
|
||||||
@ -571,6 +573,7 @@
|
|||||||
"PC24";
|
"PC24";
|
||||||
function = "mmc2";
|
function = "mmc2";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc3_8bit_emmc_pins: mmc3@1 {
|
mmc3_8bit_emmc_pins: mmc3@1 {
|
||||||
@ -580,6 +583,7 @@
|
|||||||
"PC24";
|
"PC24";
|
||||||
function = "mmc3";
|
function = "mmc3";
|
||||||
drive-strength = <40>;
|
drive-strength = <40>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart0_pins_a: uart0@0 {
|
uart0_pins_a: uart0@0 {
|
||||||
|
@ -1179,6 +1179,7 @@
|
|||||||
"PF3", "PF4", "PF5";
|
"PF3", "PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
|
mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
|
||||||
@ -1200,6 +1201,7 @@
|
|||||||
"PI7", "PI8", "PI9";
|
"PI7", "PI8", "PI9";
|
||||||
function = "mmc3";
|
function = "mmc3";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
ps20_pins_a: ps20@0 {
|
ps20_pins_a: ps20@0 {
|
||||||
|
@ -293,6 +293,7 @@
|
|||||||
"PF3", "PF4", "PF5";
|
"PF3", "PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc1_pins_a: mmc1@0 {
|
mmc1_pins_a: mmc1@0 {
|
||||||
@ -300,6 +301,7 @@
|
|||||||
"PG3", "PG4", "PG5";
|
"PG3", "PG4", "PG5";
|
||||||
function = "mmc1";
|
function = "mmc1";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc2_8bit_pins: mmc2_8bit {
|
mmc2_8bit_pins: mmc2_8bit {
|
||||||
@ -309,6 +311,7 @@
|
|||||||
"PC15", "PC16";
|
"PC15", "PC16";
|
||||||
function = "mmc2";
|
function = "mmc2";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
pwm0_pins: pwm0 {
|
pwm0_pins: pwm0 {
|
||||||
|
@ -171,6 +171,7 @@
|
|||||||
"PF3", "PF4", "PF5";
|
"PF3", "PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart0_pins_a: uart0@0 {
|
uart0_pins_a: uart0@0 {
|
||||||
|
@ -348,6 +348,7 @@
|
|||||||
"PF4", "PF5";
|
"PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc0_cd_pin: mmc0_cd_pin@0 {
|
mmc0_cd_pin: mmc0_cd_pin@0 {
|
||||||
@ -361,6 +362,7 @@
|
|||||||
"PG4", "PG5";
|
"PG4", "PG5";
|
||||||
function = "mmc1";
|
function = "mmc1";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc2_8bit_pins: mmc2_8bit {
|
mmc2_8bit_pins: mmc2_8bit {
|
||||||
@ -370,6 +372,7 @@
|
|||||||
"PC15", "PC16";
|
"PC15", "PC16";
|
||||||
function = "mmc2";
|
function = "mmc2";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
spi0_pins: spi0 {
|
spi0_pins: spi0 {
|
||||||
|
@ -696,6 +696,7 @@
|
|||||||
"PF4", "PF5";
|
"PF4", "PF5";
|
||||||
function = "mmc0";
|
function = "mmc0";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc1_pins: mmc1 {
|
mmc1_pins: mmc1 {
|
||||||
@ -703,6 +704,7 @@
|
|||||||
"PG4", "PG5";
|
"PG4", "PG5";
|
||||||
function = "mmc1";
|
function = "mmc1";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc2_8bit_pins: mmc2_8bit {
|
mmc2_8bit_pins: mmc2_8bit {
|
||||||
@ -712,6 +714,7 @@
|
|||||||
"PC16";
|
"PC16";
|
||||||
function = "mmc2";
|
function = "mmc2";
|
||||||
drive-strength = <30>;
|
drive-strength = <30>;
|
||||||
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart0_pins_a: uart0@0 {
|
uart0_pins_a: uart0@0 {
|
||||||
|
Loading…
Reference in New Issue
Block a user