Changes to existing drivers:

- Repair platform device collision; da9052, wm8994-core
   - Regmap configuration amendments; tps65218
   - Fix runtime PM deadlock; rtsx_usb
   - Remove unused/superfluous code; db8500-prcmu, omap-usb-host
   - Enable watchdog timer; lpc_sch
   - Add start/stop RX URBs helpers; dln2
   - Remove platform device (DT only); max77686, max77802
   - Support suspend and resume; dln2
   - Add Device Tree support; da9063
   - Supply extra error checking; intel_soc_pmic
   - Constify all the things; 88pm860x, hi6421-pmic, intel_soc_pmic,
                              max77686, lm3533, retu, pcf50633,
                              davinci_voicecodec, smsc-ece1099,
                              tps65218, mc13xxx, tps65217, twl-core,
                              twl6040
 New drivers/supported devices:
   - Supply new driver for Richtek RT5033
   - Supply new driver for DA9150 Charger and FuelGauge
   - Supply new driver for Qualcomm Resource Power Manager (RPM)
   - Add support for the ir-clk into sun6i-prcm
   - Add support for FuelGauge into axp20x
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJU4yfwAAoJEFGvii+H/HdhhLQP/iWReuVzIp6bs7MIOWYAI5XZ
 hYGWD4rj/3jR9uAMOPj/h7ZmiMt7pYR2jzzOLIM9lyaAUJ1KkIHhBvimthu0NiMa
 5zE/m8V86FUkuZpBQgXMFYxU69q6Q4Smd9aM6nx3tJpcv7VV2ROotUU+h0Zc+hfa
 2SJhnCLL9joewv6kflELJT7X/WnOnHXwBdo/co79QlQ/Zw4Ry29TTFTWDCKPtY21
 XFmArDNm2OCDu0wffR/rI23DJRqWh3/TSVruFk6AsspdPthjOwxbu7n1od0izkn2
 Ulwte4daLJXsGzlHMVT52xTKiPU+KL5RhlzZSC2BEMhzbQLZQF51zrlWAHIXFRyU
 C6FhIug2CHb/Gv1fBdbxWR9FM2csRTsYam5xBRoy/OnmvdjysAa/KryFg5JwCoAz
 Y8SXT6CZbZwkFVMY+X+jMBcEHRBqo9Wd8S9dPTCfVnYamg27SGMikmZ+4tWMhLFF
 r28itoWMVHVByO9LzJxJVxL3qjHDxqxwZH6l4zO5DFxOJMG9tuY79IbXorUO/maL
 ld6NamfCon8f0m/UlnmImwE1VyIjFJMHHVqJyrSnML4nKFYHrbtxZS0KMtKV6OJg
 zmB/7EmPeltNLrB+OY7lVOyZVod6IM4+mOF/WjIlo7VvC9MAv5kZyjShiZ29JOvD
 wvmnB1bwe98vTjeHKDl7
 =9a/l
 -----END PGP SIGNATURE-----

Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "Changes to existing drivers:
   - fixr platform device collision; da9052, wm8994-core
   - regmap configuration amendments; tps65218
   - fix runtime PM deadlock; rtsx_usb
   - remove unused/superfluous code; db8500-prcmu, omap-usb-host
   - enable watchdog timer; lpc_sch
   - add start/stop RX URBs helpers; dln2
   - remove platform device (DT only); max77686, max77802
   - support suspend and resume; dln2
   - add Device Tree support; da9063
   - extra error checking; intel_soc_pmic
   - const'ify all the things; 88pm860x, hi6421-pmic, intel_soc_pmic,
                               max77686, lm3533, retu, pcf50633,
                               davinci_voicecodec, smsc-ece1099,
                               tps65218, mc13xxx, tps65217, twl-core,
                               twl6040

  New drivers/supported devices:
   - new driver for Richtek RT5033
   - new driver for DA9150 Charger and FuelGauge
   - new driver for Qualcomm Resource Power Manager (RPM)
   - add support for the ir-clk into sun6i-prcm
   - add support for FuelGauge into axp20x"

* tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (32 commits)
  mfd: intel_soc_pmic: Add missing error check for devm_kzalloc
  mfd: rtsx_usb: Defer autosuspend while card exists
  mfd: devicetree: Add bindings for DA9063
  mfd: da9063: Add device tree support
  regulator: qcom-rpm: Add missing state flag in call to RPM
  mfd: qcom-rpm: Driver for the Qualcomm RPM
  mfd: devicetree: bindings: Add Qualcomm RPM DT binding
  mfd: max77686/802: Remove support for board files
  mfd: omap-usb-host: Remove some unused functions
  mfd: twl6040: Constify struct regmap_config and reg_default array
  mfd: twl-core: Constify struct regmap_config and reg_default array
  mfd: tps65217: Constify struct regmap_config
  mfd: mc13xxx: i2c/spi: Constify struct regmap_config
  mfd: tps65218: Constify struct regmap_config
  mfd: smsc-ece1099: Constify struct regmap_config
  mfd: davinci_voicecodec: Constify struct regmap_config
  mfd: pcf50633: Constify struct regmap_config
  mfd: retu: Constify struct regmap_config
  mfd: lm3533: Constify struct regmap_config
  mfd: max77686: Constify struct regmap_config
  ...
This commit is contained in:
Linus Torvalds 2015-02-18 09:05:48 -08:00
commit 5c2770079f
44 changed files with 3229 additions and 109 deletions

View file

@ -0,0 +1,154 @@
/*
* This header provides constants for the Qualcomm RPM bindings.
*/
#ifndef _DT_BINDINGS_MFD_QCOM_RPM_H
#define _DT_BINDINGS_MFD_QCOM_RPM_H
/*
* Constants use to identify individual resources in the RPM.
*/
#define QCOM_RPM_APPS_FABRIC_ARB 1
#define QCOM_RPM_APPS_FABRIC_CLK 2
#define QCOM_RPM_APPS_FABRIC_HALT 3
#define QCOM_RPM_APPS_FABRIC_IOCTL 4
#define QCOM_RPM_APPS_FABRIC_MODE 5
#define QCOM_RPM_APPS_L2_CACHE_CTL 6
#define QCOM_RPM_CFPB_CLK 7
#define QCOM_RPM_CXO_BUFFERS 8
#define QCOM_RPM_CXO_CLK 9
#define QCOM_RPM_DAYTONA_FABRIC_CLK 10
#define QCOM_RPM_DDR_DMM 11
#define QCOM_RPM_EBI1_CLK 12
#define QCOM_RPM_HDMI_SWITCH 13
#define QCOM_RPM_MMFPB_CLK 14
#define QCOM_RPM_MM_FABRIC_ARB 15
#define QCOM_RPM_MM_FABRIC_CLK 16
#define QCOM_RPM_MM_FABRIC_HALT 17
#define QCOM_RPM_MM_FABRIC_IOCTL 18
#define QCOM_RPM_MM_FABRIC_MODE 19
#define QCOM_RPM_PLL_4 20
#define QCOM_RPM_PM8058_LDO0 21
#define QCOM_RPM_PM8058_LDO1 22
#define QCOM_RPM_PM8058_LDO2 23
#define QCOM_RPM_PM8058_LDO3 24
#define QCOM_RPM_PM8058_LDO4 25
#define QCOM_RPM_PM8058_LDO5 26
#define QCOM_RPM_PM8058_LDO6 27
#define QCOM_RPM_PM8058_LDO7 28
#define QCOM_RPM_PM8058_LDO8 29
#define QCOM_RPM_PM8058_LDO9 30
#define QCOM_RPM_PM8058_LDO10 31
#define QCOM_RPM_PM8058_LDO11 32
#define QCOM_RPM_PM8058_LDO12 33
#define QCOM_RPM_PM8058_LDO13 34
#define QCOM_RPM_PM8058_LDO14 35
#define QCOM_RPM_PM8058_LDO15 36
#define QCOM_RPM_PM8058_LDO16 37
#define QCOM_RPM_PM8058_LDO17 38
#define QCOM_RPM_PM8058_LDO18 39
#define QCOM_RPM_PM8058_LDO19 40
#define QCOM_RPM_PM8058_LDO20 41
#define QCOM_RPM_PM8058_LDO21 42
#define QCOM_RPM_PM8058_LDO22 43
#define QCOM_RPM_PM8058_LDO23 44
#define QCOM_RPM_PM8058_LDO24 45
#define QCOM_RPM_PM8058_LDO25 46
#define QCOM_RPM_PM8058_LVS0 47
#define QCOM_RPM_PM8058_LVS1 48
#define QCOM_RPM_PM8058_NCP 49
#define QCOM_RPM_PM8058_SMPS0 50
#define QCOM_RPM_PM8058_SMPS1 51
#define QCOM_RPM_PM8058_SMPS2 52
#define QCOM_RPM_PM8058_SMPS3 53
#define QCOM_RPM_PM8058_SMPS4 54
#define QCOM_RPM_PM8821_LDO1 55
#define QCOM_RPM_PM8821_SMPS1 56
#define QCOM_RPM_PM8821_SMPS2 57
#define QCOM_RPM_PM8901_LDO0 58
#define QCOM_RPM_PM8901_LDO1 59
#define QCOM_RPM_PM8901_LDO2 60
#define QCOM_RPM_PM8901_LDO3 61
#define QCOM_RPM_PM8901_LDO4 62
#define QCOM_RPM_PM8901_LDO5 63
#define QCOM_RPM_PM8901_LDO6 64
#define QCOM_RPM_PM8901_LVS0 65
#define QCOM_RPM_PM8901_LVS1 66
#define QCOM_RPM_PM8901_LVS2 67
#define QCOM_RPM_PM8901_LVS3 68
#define QCOM_RPM_PM8901_MVS 69
#define QCOM_RPM_PM8901_SMPS0 70
#define QCOM_RPM_PM8901_SMPS1 71
#define QCOM_RPM_PM8901_SMPS2 72
#define QCOM_RPM_PM8901_SMPS3 73
#define QCOM_RPM_PM8901_SMPS4 74
#define QCOM_RPM_PM8921_CLK1 75
#define QCOM_RPM_PM8921_CLK2 76
#define QCOM_RPM_PM8921_LDO1 77
#define QCOM_RPM_PM8921_LDO2 78
#define QCOM_RPM_PM8921_LDO3 79
#define QCOM_RPM_PM8921_LDO4 80
#define QCOM_RPM_PM8921_LDO5 81
#define QCOM_RPM_PM8921_LDO6 82
#define QCOM_RPM_PM8921_LDO7 83
#define QCOM_RPM_PM8921_LDO8 84
#define QCOM_RPM_PM8921_LDO9 85
#define QCOM_RPM_PM8921_LDO10 86
#define QCOM_RPM_PM8921_LDO11 87
#define QCOM_RPM_PM8921_LDO12 88
#define QCOM_RPM_PM8921_LDO13 89
#define QCOM_RPM_PM8921_LDO14 90
#define QCOM_RPM_PM8921_LDO15 91
#define QCOM_RPM_PM8921_LDO16 92
#define QCOM_RPM_PM8921_LDO17 93
#define QCOM_RPM_PM8921_LDO18 94
#define QCOM_RPM_PM8921_LDO19 95
#define QCOM_RPM_PM8921_LDO20 96
#define QCOM_RPM_PM8921_LDO21 97
#define QCOM_RPM_PM8921_LDO22 98
#define QCOM_RPM_PM8921_LDO23 99
#define QCOM_RPM_PM8921_LDO24 100
#define QCOM_RPM_PM8921_LDO25 101
#define QCOM_RPM_PM8921_LDO26 102
#define QCOM_RPM_PM8921_LDO27 103
#define QCOM_RPM_PM8921_LDO28 104
#define QCOM_RPM_PM8921_LDO29 105
#define QCOM_RPM_PM8921_LVS1 106
#define QCOM_RPM_PM8921_LVS2 107
#define QCOM_RPM_PM8921_LVS3 108
#define QCOM_RPM_PM8921_LVS4 109
#define QCOM_RPM_PM8921_LVS5 110
#define QCOM_RPM_PM8921_LVS6 111
#define QCOM_RPM_PM8921_LVS7 112
#define QCOM_RPM_PM8921_MVS 113
#define QCOM_RPM_PM8921_NCP 114
#define QCOM_RPM_PM8921_SMPS1 115
#define QCOM_RPM_PM8921_SMPS2 116
#define QCOM_RPM_PM8921_SMPS3 117
#define QCOM_RPM_PM8921_SMPS4 118
#define QCOM_RPM_PM8921_SMPS5 119
#define QCOM_RPM_PM8921_SMPS6 120
#define QCOM_RPM_PM8921_SMPS7 121
#define QCOM_RPM_PM8921_SMPS8 122
#define QCOM_RPM_PXO_CLK 123
#define QCOM_RPM_QDSS_CLK 124
#define QCOM_RPM_SFPB_CLK 125
#define QCOM_RPM_SMI_CLK 126
#define QCOM_RPM_SYS_FABRIC_ARB 127
#define QCOM_RPM_SYS_FABRIC_CLK 128
#define QCOM_RPM_SYS_FABRIC_HALT 129
#define QCOM_RPM_SYS_FABRIC_IOCTL 130
#define QCOM_RPM_SYS_FABRIC_MODE 131
#define QCOM_RPM_USB_OTG_SWITCH 132
#define QCOM_RPM_VDDMIN_GPIO 133
/*
* Constants used to select force mode for regulators.
*/
#define QCOM_RPM_FORCE_MODE_NONE 0
#define QCOM_RPM_FORCE_MODE_LPM 1
#define QCOM_RPM_FORCE_MODE_HPM 2
#define QCOM_RPM_FORCE_MODE_AUTO 3
#define QCOM_RPM_FORCE_MODE_BYPASS 4
#endif