Skip to content

clk/bcm2835: Don't allow "osc" as a parent for "dpi" #7259

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

Draft
6by9 wants to merge 1 commit into
base: rpi-6.12.y
Choose a base branch
from
+17 −1
Draft

clk/bcm2835: Don't allow "osc" as a parent for "dpi" #7259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion drivers/clk/bcm/clk-bcm2835.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,6 +1637,22 @@ static const char *const bcm2835_clock_per_parents[] = {
.parents = bcm2835_clock_per_parents, \
__VA_ARGS__)

static const char *const bcm2835_clock_per_no_osc_parents[] = {
"gnd",
"testdebug0",
"testdebug1",
"plla_per",
"pllc_per",
"plld_per",
"pllh_aux",
};

#define REGISTER_PER_NO_OSC_CLK(s, ...) REGISTER_CLK( \
s, \
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_per_no_osc_parents), \
.parents = bcm2835_clock_per_no_osc_parents, \
__VA_ARGS__)

/*
* Restrict clock sources for the PCM peripheral to the oscillator and
* PLLD_PER because other source may have varying rates or be switched
Expand Down Expand Up @@ -2126,7 +2142,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
.div_reg = CM_DFTDIV,
.int_bits = 5,
.frac_bits = 0),
[BCM2835_CLOCK_DPI] = REGISTER_PER_CLK(
[BCM2835_CLOCK_DPI] = REGISTER_PER_NO_OSC_CLK(
SOC_ALL,
.name = "dpi",
.ctl_reg = CM_DPICTL,
Expand Down