diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-29 16:28:52 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-29 16:28:52 -0700 |
| commit | 8f697e574012cc73b6b0dcbf30d88a3a0f43b78f (patch) | |
| tree | a6b16bcf33ad08e03837b61eed2fffb31118f1f3 /drivers/clk/shmobile/clk-emev2.c | |
| parent | Input: walkera0701 - use parallel port device model (diff) | |
| parent | Linux 4.3-rc3 (diff) | |
| download | linux-dev-8f697e574012cc73b6b0dcbf30d88a3a0f43b78f.tar.xz linux-dev-8f697e574012cc73b6b0dcbf30d88a3a0f43b78f.zip | |
Merge tag 'v4.3-rc3' into next
Merge with Linux 4.3-rc3 to bring in MFD DA9062 changes to merge DA9062
OnKey driver.
Diffstat (limited to 'drivers/clk/shmobile/clk-emev2.c')
| -rw-r--r-- | drivers/clk/shmobile/clk-emev2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/clk/shmobile/clk-emev2.c b/drivers/clk/shmobile/clk-emev2.c index 5b60beb7d0eb..a91825471c79 100644 --- a/drivers/clk/shmobile/clk-emev2.c +++ b/drivers/clk/shmobile/clk-emev2.c @@ -28,6 +28,8 @@ #define USIBU1_RSTCTRL 0x0ac #define USIBU2_RSTCTRL 0x0b0 #define USIBU3_RSTCTRL 0x0b4 +#define IIC0_RSTCTRL 0x0dc +#define IIC1_RSTCTRL 0x0e0 #define STI_RSTCTRL 0x124 #define STI_CLKSEL 0x688 @@ -66,6 +68,10 @@ static void __init emev2_smu_init(void) emev2_smu_write(2, USIBU1_RSTCTRL); emev2_smu_write(2, USIBU2_RSTCTRL); emev2_smu_write(2, USIBU3_RSTCTRL); + + /* deassert reset for IIC0->IIC1 */ + emev2_smu_write(1, IIC0_RSTCTRL); + emev2_smu_write(1, IIC1_RSTCTRL); } static void __init emev2_smu_clkdiv_init(struct device_node *np) |