Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt-archive
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Branche: master
Branches Tags
openwrt-archive
/
target
/
linux
/
mediatek
/
patches-4.4
/
0036-soc-mediatek-PMIC-wrap-SPI_WRITE-needs-a-different-b.patch

0036-soc-mediatek-PMIC-wrap-SPI_WRITE-needs-a-different-b.patch 2.3 KB
Lien permanent Historique Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 
  1. From 511e697282c6425950b95373ac8dc59a42fd2485 Mon Sep 17 00:00:00 2001
    2. 

  2. From: John Crispin <blogic@openwrt.org>
    3. 

  3. Date: Wed, 20 Jan 2016 10:21:42 +0100
    4. 

  4. Subject: [PATCH 036/102] soc: mediatek: PMIC wrap: SPI_WRITE needs a
    5. 

  5.  different bitmask for MT2701/7623
    6. 

  6. 

  7. Different SoCs will use different bitmask for the SPI_WRITE command. This
    8. 

  8. patch defines the bitmask in the pmic_wrapper_type struct. This allows us
    9. 

  9. to support new SoCs with a different bitmask to the one currently used.
    10. 

  10. 

  11. Signed-off-by: John Crispin <blogic@openwrt.org>
    12. 

  12. ---
    13. 

  13.  drivers/soc/mediatek/mtk-pmic-wrap.c |   11 +++++++----
    14. 

  14.  1 file changed, 7 insertions(+), 4 deletions(-)
    15. 

  15. 

  16. --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
    17. 

  17. +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
    18. 

  18. @@ -372,6 +372,7 @@ struct pmic_wrapper_type {
    19. 

  19.  	enum pwrap_type type;
    20. 

  20.  	u32 arb_en_all;
    21. 

  21.  	u32 int_en_all;
    22. 

  22. +	u32 spi_w;
    23. 

  23.  	int (*init_reg_clock)(struct pmic_wrapper *wrp);
    24. 

  24.  	int (*init_soc_specific)(struct pmic_wrapper *wrp);
    25. 

  25.  };
    26. 

  26. @@ -511,15 +512,15 @@ static int pwrap_reset_spislave(struct p
    27. 

  27.  	pwrap_writel(wrp, 1, PWRAP_MAN_EN);
    28. 

  28.  	pwrap_writel(wrp, 0, PWRAP_DIO_EN);
    29. 

  29.  
    30. 

  30. -	pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_CSL,
    31. 

  31. +	pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_CSL,
    32. 

  32.  			PWRAP_MAN_CMD);
    33. 

  33. -	pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_OUTS,
    34. 

  34. +	pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_OUTS,
    35. 

  35.  			PWRAP_MAN_CMD);
    36. 

  36. -	pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_CSH,
    37. 

  37. +	pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_CSH,
    38. 

  38.  			PWRAP_MAN_CMD);
    39. 

  39.  
    40. 

  40.  	for (i = 0; i < 4; i++)
    41. 

  41. -		pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_OUTS,
    42. 

  42. +		pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_OUTS,
    43. 

  43.  				PWRAP_MAN_CMD);
    44. 

  44.  
    45. 

  45.  	ret = pwrap_wait_for_state(wrp, pwrap_is_sync_idle);
    46. 

  46. @@ -827,6 +828,7 @@ static struct pmic_wrapper_type pwrap_mt
    47. 

  47.  	.type = PWRAP_MT8135,
    48. 

  48.  	.arb_en_all = 0x1ff,
    49. 

  49.  	.int_en_all = ~(BIT(31) | BIT(1)),
    50. 

  50. +	.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
    51. 

  51.  	.init_reg_clock = pwrap_mt8135_init_reg_clock,
    52. 

  52.  	.init_soc_specific = pwrap_mt8135_init_soc_specific,
    53. 

  53.  };
    54. 

  54. @@ -836,6 +838,7 @@ static struct pmic_wrapper_type pwrap_mt
    55. 

  55.  	.type = PWRAP_MT8173,
    56. 

  56.  	.arb_en_all = 0x3f,
    57. 

  57.  	.int_en_all = ~(BIT(31) | BIT(1)),
    58. 

  58. +	.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
    59. 

  59.  	.init_reg_clock = pwrap_mt8173_init_reg_clock,
    60. 

  60.  	.init_soc_specific = pwrap_mt8173_init_soc_specific,
    61. 

  61.  };
    62.