OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- pmic wrapper: fix clock handling 

- pmic wrapper: fix state machine
 - pmic wrapper: fix compile dependency
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVZdd3AAoJELQ5Ylss8dNDNcsQAKlMLoDcMdUM0mL2s5CZNkFz
 Y93MQ5gZw8uPReRX0ANhrQLeNy9Fh66F6Q5T+kPR8WEuov0hSDbU8EQY269aBGcZ
 Vgqomoj2TmklP9IFlQZCzA6M4XW+2RqSrrCGrkrghLR2cTdRFCg7Ygj7riavxTfk
 qT6Acd7bxTG+JrBpdbEr345PQs6JCoBdOqA5kPH2OBveN0zXeh7wa66RuFK4v7uS
 IadrrgPeHxjjcDcb5th7Cq1v8NoYVwZIK6Z2pMpYUZcZ4O0kYUNhyFeQI5y/0hre
 7OGP4+XCVtVxfoOZDKC/d10CZDICtjK1t9yamvWGbx0Kyp+VF92ERWw1cm2WzM0u
 Bcr5gIMx4xarnSTlvx3d+76kT3kV0XZIE/GNL3UmOFxMSCRD7+Mz0BMDjC13J1gh
 840jjz3s6r2UTsytvhnXa6MkkWUMqMr2TpA5x9/t/d/kDTS7wgNyyFqlXyYgmgAr
 YBAt5xsFUKjjX6026KuiJqDXQAZfUOotI+5Fj7DrZkxcyzt7T1NLc4dKujl9ckc1
 QvgZ+yiTEO0qNt7eiG3uiAEvt2s5y41SbuN74OonffIB9zAWRa385JQDBVkrjga7
 jORw90fkvilX2aICaKX/R0Rf0LLXGDyXqa7Tc/YBeXoEPLAUjuszMQsyLKshrFYY
 /uR9kzE2efKafU/422Gb
 =pyc3
 -----END PGP SIGNATURE-----

Merge tag 'v4.1-next-soc' of https://github.com/mbgg/linux-mediatek into fixes

These are bug fixes for mediatek, fixing code that was recently introduced.

- pmic wrapper: fix clock handling
- pmic wrapper: fix state machine
- pmic wrapper: fix compile dependency

* tag 'v4.1-next-soc' of https://github.com/mbgg/linux-mediatek:
  soc: mediatek: Add compile dependency to pmic-wrapper
  soc: mediatek: PMIC wrap: Fix register state machine handling
  soc: mediatek: PMIC wrap: Fix clock rate handling
This commit is contained in:
Arnd Bergmann 2015-06-01 17:02:19 +02:00
parent c65b99f046 2a910d139e
commit e9d57102ba
2 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/soc/mediatek/Kconfig
View File

@ -4,6 +4,7 @@
config MTK_PMIC_WRAP
tristate "MediaTek PMIC Wrapper Support"
depends on ARCH_MEDIATEK
depends on RESET_CONTROLLER
select REGMAP
help
Say yes here to add support for MediaTek PMIC Wrapper found

54
drivers/soc/mediatek/mtk-pmic-wrap.c
View File

@ -443,11 +443,6 @@ static int pwrap_wait_for_state(struct pmic_wrapper *wrp,
static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
{
int ret;
u32 val;
val = pwrap_readl(wrp, PWRAP_WACS2_RDATA);
if (PWRAP_GET_WACS_FSM(val) == PWRAP_WACS_FSM_WFVLDCLR)
pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
if (ret)
@ -462,11 +457,6 @@ static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
{
int ret;
u32 val;
val = pwrap_readl(wrp, PWRAP_WACS2_RDATA);
if (PWRAP_GET_WACS_FSM(val) == PWRAP_WACS_FSM_WFVLDCLR)
pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
if (ret)
@ -480,6 +470,8 @@ static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
*rdata = PWRAP_GET_WACS_RDATA(pwrap_readl(wrp, PWRAP_WACS2_RDATA));
pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
return 0;
}
@ -563,45 +555,17 @@ static int pwrap_init_sidly(struct pmic_wrapper *wrp)
static int pwrap_init_reg_clock(struct pmic_wrapper *wrp)
{
unsigned long rate_spi;
int ck_mhz;
rate_spi = clk_get_rate(wrp->clk_spi);
if (rate_spi > 26000000)
ck_mhz = 26;
else if (rate_spi > 18000000)
ck_mhz = 18;
else
ck_mhz = 0;
switch (ck_mhz) {
case 18:
if (pwrap_is_mt8135(wrp))
pwrap_writel(wrp, 0xc, PWRAP_CSHEXT);
pwrap_writel(wrp, 0x4, PWRAP_CSHEXT_WRITE);
pwrap_writel(wrp, 0xc, PWRAP_CSHEXT_READ);
pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_START);
pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_END);
break;
case 26:
if (pwrap_is_mt8135(wrp))
pwrap_writel(wrp, 0x4, PWRAP_CSHEXT);
if (pwrap_is_mt8135(wrp)) {
pwrap_writel(wrp, 0x4, PWRAP_CSHEXT);
pwrap_writel(wrp, 0x0, PWRAP_CSHEXT_WRITE);
pwrap_writel(wrp, 0x4, PWRAP_CSHEXT_READ);
pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_START);
pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_END);
break;
case 0:
if (pwrap_is_mt8135(wrp))
pwrap_writel(wrp, 0xf, PWRAP_CSHEXT);
pwrap_writel(wrp, 0xf, PWRAP_CSHEXT_WRITE);
pwrap_writel(wrp, 0xf, PWRAP_CSHEXT_READ);
pwrap_writel(wrp, 0xf, PWRAP_CSLEXT_START);
pwrap_writel(wrp, 0xf, PWRAP_CSLEXT_END);
break;
default:
return -EINVAL;
} else {
pwrap_writel(wrp, 0x0, PWRAP_CSHEXT_WRITE);
pwrap_writel(wrp, 0x4, PWRAP_CSHEXT_READ);
pwrap_writel(wrp, 0x2, PWRAP_CSLEXT_START);
pwrap_writel(wrp, 0x2, PWRAP_CSLEXT_END);
}
return 0;