diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-06-25 03:17:28 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-06-25 03:17:28 +0200 |
| commit | b2f874d27b62816fd170a554e4fe1d15e541fa1d (patch) | |
| tree | 482e523f9774437f076b7147c21bbb2182e93ed0 /drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | |
| parent | Linux 5.2-rc1 (diff) | |
| parent | dt-bindings: clk: Convert Allwinner CCU to a schema (diff) | |
| download | linux-b2f874d27b62816fd170a554e4fe1d15e541fa1d.tar.xz linux-b2f874d27b62816fd170a554e4fe1d15e541fa1d.zip | |
Merge tag 'sunxi-clk-for-5.3-201906210814' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull Allwinner clk driver updates from Maxime Ripard:
- A few patches to fix two minor bugs
- Introduce a schema for our device tree bindings
* tag 'sunxi-clk-for-5.3-201906210814' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
dt-bindings: clk: Convert Allwinner CCU to a schema
clk: sunxi-ng: sun50i-h6-r: Fix incorrect W1 clock gate register
clk-sunxi: fix a missing-check bug in sunxi_divs_clk_setup()
Diffstat (limited to 'drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c')
| -rw-r--r-- | drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c index 27554eaf6929..8d05d4f1f8a1 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c +++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c @@ -104,7 +104,7 @@ static SUNXI_CCU_GATE(r_apb2_i2c_clk, "r-apb2-i2c", "r-apb2", static SUNXI_CCU_GATE(r_apb1_ir_clk, "r-apb1-ir", "r-apb1", 0x1cc, BIT(0), 0); static SUNXI_CCU_GATE(r_apb1_w1_clk, "r-apb1-w1", "r-apb1", - 0x1cc, BIT(0), 0); + 0x1ec, BIT(0), 0); /* Information of IR(RX) mod clock is gathered from BSP source code */ static const char * const r_mod0_default_parents[] = { "osc32k", "osc24M" }; |