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

Commit a3504f7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:
 "A few more fixes for clk drivers causing regressions this release.

  Two Allwinner index fixes for A31 and V3 and two Microchip AT91 fixes
  for an incorrect clk parent linkage and a miscalculated number of
  clks"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: at91: fix masterck name
  clk: at91: fix at91sam9x5 peripheral clock number
  clk: sunxi: A31: Fix wrong AHB gate number
  clk: sunxi-ng: v3s: Fix TCON reset de-assert bit
parents 8a61716f 65a91e2e

drivers/clk/at91/at91sam9x5.c

+2 −3
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, 
		return;



	at91sam9x5_pmc = pmc_data_allocate(PMC_MAIN + 1,

					   nck(at91sam9x5_systemck),

					   nck(at91sam9x35_periphck), 0);

					   nck(at91sam9x5_systemck), 31, 0);

	if (!at91sam9x5_pmc)

		return;
@@ -210,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];

drivers/clk/sunxi-ng/ccu-sun6i-a31.c

+2 −2
Original line number Diff line number Diff line
@@ -264,9 +264,9 @@ static SUNXI_CCU_GATE(ahb1_mmc1_clk, "ahb1-mmc1", "ahb1", 
static SUNXI_CCU_GATE(ahb1_mmc2_clk,	"ahb1-mmc2",	"ahb1",

		      0x060, BIT(10), 0);

static SUNXI_CCU_GATE(ahb1_mmc3_clk,	"ahb1-mmc3",	"ahb1",

		      0x060, BIT(12), 0);

		      0x060, BIT(11), 0);

static SUNXI_CCU_GATE(ahb1_nand1_clk,	"ahb1-nand1",	"ahb1",

		      0x060, BIT(13), 0);

		      0x060, BIT(12), 0);

static SUNXI_CCU_GATE(ahb1_nand0_clk,	"ahb1-nand0",	"ahb1",

		      0x060, BIT(13), 0);

static SUNXI_CCU_GATE(ahb1_sdram_clk,	"ahb1-sdram",	"ahb1",

drivers/clk/sunxi-ng/ccu-sun8i-v3s.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static struct ccu_reset_map sun8i_v3s_ccu_resets[] = { 
	[RST_BUS_OHCI0]		=  { 0x2c0, BIT(29) },



	[RST_BUS_VE]		=  { 0x2c4, BIT(0) },

	[RST_BUS_TCON0]		=  { 0x2c4, BIT(3) },

	[RST_BUS_TCON0]		=  { 0x2c4, BIT(4) },

	[RST_BUS_CSI]		=  { 0x2c4, BIT(8) },

	[RST_BUS_DE]		=  { 0x2c4, BIT(12) },

	[RST_BUS_DBG]		=  { 0x2c4, BIT(31) },