diff options
author | Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> | 2018-04-26 13:22:32 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-05-15 18:02:23 -0400 |
commit | e76e56823a318ca580be4cfc5a6a9269bc70abea (patch) | |
tree | ba82caea099972bae97ddcd24867f14a76cfc933 | |
parent | dcb899c47da9ff32e5156ddb9b2867f63ff7c4d0 (diff) |
clk:aspeed: Fix reset bits for PCI/VGA and PECI
This commit fixes incorrect setting of reset bits for PCI/VGA and
PECI modules.
1. Reset bit for PCI/VGA is 8.
2. PECI reset bit is missing so added bit 10 as its reset bit.
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Fixes: 15ed8ce5f84e ("clk: aspeed: Register gated clocks")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r-- | drivers/clk/clk-aspeed.c | 4 | ||||
-rw-r--r-- | include/dt-bindings/clock/aspeed-clock.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index dd17a818dff8..eb5fb7f88ccd 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c | |||
@@ -91,7 +91,7 @@ static const struct aspeed_gate_data aspeed_gates[] = { | |||
91 | [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, 0 }, /* 2D engine */ | 91 | [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, 0 }, /* 2D engine */ |
92 | [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", CLK_IS_CRITICAL }, /* SDRAM */ | 92 | [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", CLK_IS_CRITICAL }, /* SDRAM */ |
93 | [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */ | 93 | [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */ |
94 | [ASPEED_CLK_GATE_BCLK] = { 4, 10, "bclk-gate", "bclk", 0 }, /* PCIe/PCI */ | 94 | [ASPEED_CLK_GATE_BCLK] = { 4, 8, "bclk-gate", "bclk", 0 }, /* PCIe/PCI */ |
95 | [ASPEED_CLK_GATE_DCLK] = { 5, -1, "dclk-gate", NULL, 0 }, /* DAC */ | 95 | [ASPEED_CLK_GATE_DCLK] = { 5, -1, "dclk-gate", NULL, 0 }, /* DAC */ |
96 | [ASPEED_CLK_GATE_REFCLK] = { 6, -1, "refclk-gate", "clkin", CLK_IS_CRITICAL }, | 96 | [ASPEED_CLK_GATE_REFCLK] = { 6, -1, "refclk-gate", "clkin", CLK_IS_CRITICAL }, |
97 | [ASPEED_CLK_GATE_USBPORT2CLK] = { 7, 3, "usb-port2-gate", NULL, 0 }, /* USB2.0 Host port 2 */ | 97 | [ASPEED_CLK_GATE_USBPORT2CLK] = { 7, 3, "usb-port2-gate", NULL, 0 }, /* USB2.0 Host port 2 */ |
@@ -301,7 +301,7 @@ static const u8 aspeed_resets[] = { | |||
301 | [ASPEED_RESET_JTAG_MASTER] = 22, | 301 | [ASPEED_RESET_JTAG_MASTER] = 22, |
302 | [ASPEED_RESET_MIC] = 18, | 302 | [ASPEED_RESET_MIC] = 18, |
303 | [ASPEED_RESET_PWM] = 9, | 303 | [ASPEED_RESET_PWM] = 9, |
304 | [ASPEED_RESET_PCIVGA] = 8, | 304 | [ASPEED_RESET_PECI] = 10, |
305 | [ASPEED_RESET_I2C] = 2, | 305 | [ASPEED_RESET_I2C] = 2, |
306 | [ASPEED_RESET_AHB] = 1, | 306 | [ASPEED_RESET_AHB] = 1, |
307 | 307 | ||
diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h index 513c1b4af7a8..4d01804e7c43 100644 --- a/include/dt-bindings/clock/aspeed-clock.h +++ b/include/dt-bindings/clock/aspeed-clock.h | |||
@@ -45,7 +45,7 @@ | |||
45 | #define ASPEED_RESET_JTAG_MASTER 3 | 45 | #define ASPEED_RESET_JTAG_MASTER 3 |
46 | #define ASPEED_RESET_MIC 4 | 46 | #define ASPEED_RESET_MIC 4 |
47 | #define ASPEED_RESET_PWM 5 | 47 | #define ASPEED_RESET_PWM 5 |
48 | #define ASPEED_RESET_PCIVGA 6 | 48 | #define ASPEED_RESET_PECI 6 |
49 | #define ASPEED_RESET_I2C 7 | 49 | #define ASPEED_RESET_I2C 7 |
50 | #define ASPEED_RESET_AHB 8 | 50 | #define ASPEED_RESET_AHB 8 |
51 | #define ASPEED_RESET_CRT1 9 | 51 | #define ASPEED_RESET_CRT1 9 |