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

Commit 05c3ae7a authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-clk-fixes-for-5.0' of... 

Merge tag 'sunxi-clk-fixes-for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes

Pull Allwinner clock fixes from Maxime Ripard:

Two fixes for clock indices, one for the A31 and one for the V3s.

* tag 'sunxi-clk-fixes-for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  clk: sunxi: A31: Fix wrong AHB gate number
  clk: sunxi-ng: v3s: Fix TCON reset de-assert bit
parents 9ff1a3b4 ee0b27a3

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) },