Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a91e2e authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Stephen Boyd
Browse files

clk: at91: fix masterck name 



The master clock is actually named masterck earlier in the driver. Having
"mck" in the parent list means that it can never be selected.

Fixes: 1eabdc2f ("clk: at91: add at91sam9x5 PMCs driver")
Fixes: a2038077 ("clk: at91: add sama5d2 PMC driver")
Fixes: 084b696b ("clk: at91: add sama5d4 pmc driver")
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Cc: <stable@vger.kernel.org> # v4.20+
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 1b328a2e

drivers/clk/at91/at91sam9x5.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, 
	parent_names[1] = "mainck";

	parent_names[2] = "plladivck";

	parent_names[3] = "utmick";

	parent_names[4] = "mck";

	parent_names[4] = "masterck";

	for (i = 0; i < 2; i++) {

		char name[6];

drivers/clk/at91/sama5d2.c

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) 
	parent_names[1] = "mainck";

	parent_names[2] = "plladivck";

	parent_names[3] = "utmick";

	parent_names[4] = "mck";

	parent_names[4] = "masterck";

	for (i = 0; i < 3; i++) {

		char name[6];
@@ -291,7 +291,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) 
	parent_names[1] = "mainck";

	parent_names[2] = "plladivck";

	parent_names[3] = "utmick";

	parent_names[4] = "mck";

	parent_names[4] = "masterck";

	parent_names[5] = "audiopll_pmcck";

	for (i = 0; i < ARRAY_SIZE(sama5d2_gck); i++) {

		hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,

drivers/clk/at91/sama5d4.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np) 
	parent_names[1] = "mainck";

	parent_names[2] = "plladivck";

	parent_names[3] = "utmick";

	parent_names[4] = "mck";

	parent_names[4] = "masterck";

	for (i = 0; i < 3; i++) {

		char name[6];