Skip to content

mmc: Relax the 50MHz overclock check #7135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 12, 2025
+3 −3
Merged

mmc: Relax the 50MHz overclock check #7135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec5b3cb
mmc: bcm2835-mmc: Relax the 50MHz overclock check
pelwell Nov 12, 2025
37c5eec
mmc: bcm2835-sdhost: Relax 50MHz overclock check
pelwell Nov 12, 2025
be24062
mmc: bcm2835: Relax the 50MHz overclock check
pelwell Nov 12, 2025
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
2 changes: 1 addition & 1 deletion drivers/mmc/host/bcm2835-mmc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ static void bcm2835_mmc_set_clock(struct bcm2835_host *host, unsigned int clock)
unsigned long timeout;
unsigned int input_clock = clock;

if (host->overclock_50 && (clock == 50000000))
if (host->overclock_50 && (clock >= 50000000))
clock = host->overclock_50 * 1000000 + 999999;

host->mmc->actual_clock = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/bcm2835-sdhost.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ static void bcm2835_sdhost_set_clock(struct bcm2835_host *host, unsigned int clo
if (host->debug)
pr_info("%s: set_clock(%d)\n", mmc_hostname(host->mmc), clock);

if (host->overclock_50 && (clock == 50*MHZ))
if (host->overclock_50 && (clock >= 50*MHZ))
clock = host->overclock_50 * MHZ + (MHZ - 1);

/* The SDCDIV register has 11 bits, and holds (div - 2).
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/bcm2835.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ static void bcm2835_set_clock(struct bcm2835_host *host, unsigned int clock)
const unsigned int MHZ = 1000000;
int div;

if (host->overclock_50 && (clock == 50*MHZ))
if (host->overclock_50 && (clock >= 50*MHZ))
clock = host->overclock_50 * MHZ + (MHZ - 1);

/* The SDCDIV register has 11 bits, and holds (div - 2). But
Expand Down