Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-congo.dts
Original file line number Diff line number Diff line change
Expand Up @@ -1097,3 +1097,16 @@ spd_ ## bus ## _ ## index: spd@addr,4cc5118 ## index ## 000 { \
status = "okay";
memory-region = <&bmc_dev0_memory>;
};

&emmc_controller {
status = "okay";
mmc-hs200-1_8v;
};

&emmc {
status = "okay";
bus-width = <8>;
pinctrl-0 = <&pinctrl_emmc_default &pinctrl_emmcg8_default>;
non-removable;
max-frequency = <200000000>;
};
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-ghana.dts
Original file line number Diff line number Diff line change
Expand Up @@ -774,3 +774,16 @@ spd_ ## bus ## _ ## index: spd@addr,4cc5118 ## index ## 000 { \
status = "okay";
memory-region = <&bmc_dev0_memory>;
};

&emmc_controller {
status = "okay";
mmc-hs200-1_8v;
};

&emmc {
status = "okay";
bus-width = <8>;
pinctrl-0 = <&pinctrl_emmc_default &pinctrl_emmcg8_default>;
non-removable;
max-frequency = <200000000>;
};
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-kenya.dts
Original file line number Diff line number Diff line change
Expand Up @@ -773,3 +773,16 @@ spd_ ## bus ## _ ## index: spd@addr,4cc5118 ## index ## 000 { \
status = "okay";
memory-region = <&bmc_dev0_memory>;
};

&emmc_controller {
status = "okay";
mmc-hs200-1_8v;
};

&emmc {
status = "okay";
bus-width = <8>;
pinctrl-0 = <&pinctrl_emmc_default &pinctrl_emmcg8_default>;
non-removable;
max-frequency = <200000000>;
};
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-morocco.dts
Original file line number Diff line number Diff line change
Expand Up @@ -1308,3 +1308,16 @@ spd_ ## bus ## _ ## index: spd@addr,4cc5118 ## index ## 000 { \
status = "okay";
memory-region = <&bmc_dev0_memory>;
};

&emmc_controller {
status = "okay";
mmc-hs200-1_8v;
};

&emmc {
status = "okay";
bus-width = <8>;
pinctrl-0 = <&pinctrl_emmc_default &pinctrl_emmcg8_default>;
non-removable;
max-frequency = <200000000>;
};
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-nigeria.dts
Original file line number Diff line number Diff line change
Expand Up @@ -1057,3 +1057,16 @@ spd_ ## bus ## _ ## index: spd@addr,4cc5118 ## index ## 000 { \
status = "okay";
memory-region = <&bmc_dev0_memory>;
};

&emmc_controller {
status = "okay";
mmc-hs200-1_8v;
};

&emmc {
status = "okay";
bus-width = <8>;
pinctrl-0 = <&pinctrl_emmc_default &pinctrl_emmcg8_default>;
non-removable;
max-frequency = <200000000>;
};
2 changes: 2 additions & 0 deletions drivers/mmc/core/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,8 @@ static unsigned mmc_sdio_get_max_clock(struct mmc_card *card)
if (mmc_card_sd_combo(card))
max_dtr = min(max_dtr, mmc_sd_get_max_clock(card));

max_dtr = min_not_zero(max_dtr, card->quirk_max_rate);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a comment. If this is a patch from upstream, can we do cherry pick it? It might have more context around this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, this is sync from two sources. Linux upstream 6.6.52 + Aspeed SDK 9.7, whatever changes were independant, i cherrypicked them. Some changes are part of overall merge which spans other driver changes so couldn't cherry pick mmc alone out of them. example: AspeedTech-BMC@85cb395


return max_dtr;
}

Expand Down
Loading