diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 13:24:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 13:24:18 -0400 |
| commit | e5744abb2fa3629aa5a94e21ca1eae32ff2fe00b (patch) | |
| tree | ef90c96390256b073f5255d224aecb2fc1f6ee84 /include/linux/mfd | |
| parent | c29aa153ef0469cddf0146d41ce6494bd76be78b (diff) | |
| parent | 2d28ca731b9bb6262f7711241628c7844b0cf7dc (diff) | |
Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"Changes to existing drivers:
- Use of managed resources - omap, twl4030, ti_am335x_tscadc
- Advanced error handling - omap
- Rework clk management - omap
- Device Tree (re-)work - tc3589x, pm8921, da9055, sec
- IRC management overhaul and !BROKEN - pm8921
- Convert to regmap - ssbi, pm8921
- Use simple power-management ops - ucb1x00
- Include file clean-up - adp5520, cs5535, janz, lpc_ich,
- lpc_sch, max14577, mcp-sa11x0, pcf50633-adc, rc5t583,
rdc321x-southbridge, retu, smsc-ece1099, ti-ssp, ti_am335x_tscadc,
tps65912, vexpress-config, wm8350, ywm8350
- Various bug fixes across the subsystem
- NULL/invalid pointer dereference prevention
- Resource leak mitigation,
- Variable used initialised
- Staticise various containers
- Enforce return value checks
New drivers/supported devices:
- Add support for s2mps14 and s2mpa01 to sec
- Add support for da9063 (v5) to da9063
- Add support for atom-c2000 to gpio-ich
- Add support for come-{mbt10,cbt6,chl6} to kempld
- Add support for da9053 to da9052
- Add support for itco-wdt (v3) and baytrail to lpc_ich
- Add new drivers for tps65218, rtsx_usb, bcm590xx
(Re-)moved drivers:
- twl4030 ==> drivers/iio
- ti-ssp ==> /dev/null"
* tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (103 commits)
mfd: wm5110: Correct default for HEADPHONE_DETECT_1
mfd: arizona: Correct small errors in the DT binding documentation
mfd: arizona: Mark DSP clocking register as volatile
mfd: devicetree: bindings: Add pm8xxx RTC description
mfd: kempld-core: Fix potential hang-up during boot
mfd: sec-core: Fix uninitialized 'regmap_rtc' on S2MPA01
mfd: tps65910: Fix regmap_irq_chip_data leak on mfd_add_devices fail
mfd: tps65910: Fix possible invalid pointer dereference on regmap_add_irq_chip fail
mfd: sec-core: Fix I2C dummy device resource leak on probe failure
mfd: sec-core: Add of_compatible strings for clock MFD cells
mfd: Remove obsolete ti-ssp driver
Documentation: mfd: s2mps11: Describe S5M8767 and S2MPS14 clocks
mfd: bcm590xx: Fix type argument for module device table
mfd: lpc_ich: Add support for Intel Bay Trail SoC
mfd: lpc_ich: Add support for NM10 GPIO
mfd: lpc_ich: Change Avoton to iTCO v3
watchdog: iTCO_wdt: Add support for v3 silicon
mfd: lpc_ich: Add support for iTCO v3
mfd: lpc_ich: Remove lpc_ich_cfg struct use
mfd: lpc_ich: Only configure watchdog or GPIO when present
...
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/arizona/registers.h | 84 | ||||
| -rw-r--r-- | include/linux/mfd/bcm590xx.h | 31 | ||||
| -rw-r--r-- | include/linux/mfd/da9052/da9052.h | 1 | ||||
| -rw-r--r-- | include/linux/mfd/da9063/core.h | 6 | ||||
| -rw-r--r-- | include/linux/mfd/da9063/registers.h | 120 | ||||
| -rw-r--r-- | include/linux/mfd/lpc_ich.h | 25 | ||||
| -rw-r--r-- | include/linux/mfd/max14577-private.h | 8 | ||||
| -rw-r--r-- | include/linux/mfd/max14577.h | 5 | ||||
| -rw-r--r-- | include/linux/mfd/pm8xxx/irq.h | 59 | ||||
| -rw-r--r-- | include/linux/mfd/pm8xxx/pm8921.h | 30 | ||||
| -rw-r--r-- | include/linux/mfd/rtsx_usb.h | 628 | ||||
| -rw-r--r-- | include/linux/mfd/tps65218.h | 284 |
12 files changed, 1109 insertions, 172 deletions
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h index 3ddaa634b19d..7b35c21170d5 100644 --- a/include/linux/mfd/arizona/registers.h +++ b/include/linux/mfd/arizona/registers.h | |||
| @@ -1034,6 +1034,27 @@ | |||
| 1034 | #define ARIZONA_DSP1_STATUS_1 0x1104 | 1034 | #define ARIZONA_DSP1_STATUS_1 0x1104 |
| 1035 | #define ARIZONA_DSP1_STATUS_2 0x1105 | 1035 | #define ARIZONA_DSP1_STATUS_2 0x1105 |
| 1036 | #define ARIZONA_DSP1_STATUS_3 0x1106 | 1036 | #define ARIZONA_DSP1_STATUS_3 0x1106 |
| 1037 | #define ARIZONA_DSP1_STATUS_4 0x1107 | ||
| 1038 | #define ARIZONA_DSP1_WDMA_BUFFER_1 0x1110 | ||
| 1039 | #define ARIZONA_DSP1_WDMA_BUFFER_2 0x1111 | ||
| 1040 | #define ARIZONA_DSP1_WDMA_BUFFER_3 0x1112 | ||
| 1041 | #define ARIZONA_DSP1_WDMA_BUFFER_4 0x1113 | ||
| 1042 | #define ARIZONA_DSP1_WDMA_BUFFER_5 0x1114 | ||
| 1043 | #define ARIZONA_DSP1_WDMA_BUFFER_6 0x1115 | ||
| 1044 | #define ARIZONA_DSP1_WDMA_BUFFER_7 0x1116 | ||
| 1045 | #define ARIZONA_DSP1_WDMA_BUFFER_8 0x1117 | ||
| 1046 | #define ARIZONA_DSP1_RDMA_BUFFER_1 0x1120 | ||
| 1047 | #define ARIZONA_DSP1_RDMA_BUFFER_2 0x1121 | ||
| 1048 | #define ARIZONA_DSP1_RDMA_BUFFER_3 0x1122 | ||
| 1049 | #define ARIZONA_DSP1_RDMA_BUFFER_4 0x1123 | ||
| 1050 | #define ARIZONA_DSP1_RDMA_BUFFER_5 0x1124 | ||
| 1051 | #define ARIZONA_DSP1_RDMA_BUFFER_6 0x1125 | ||
| 1052 | #define ARIZONA_DSP1_WDMA_CONFIG_1 0x1130 | ||
| 1053 | #define ARIZONA_DSP1_WDMA_CONFIG_2 0x1131 | ||
| 1054 | #define ARIZONA_DSP1_WDMA_OFFSET_1 0x1132 | ||
| 1055 | #define ARIZONA_DSP1_RDMA_CONFIG_1 0x1134 | ||
| 1056 | #define ARIZONA_DSP1_RDMA_OFFSET_1 0x1135 | ||
| 1057 | #define ARIZONA_DSP1_EXTERNAL_START_SELECT_1 0x1138 | ||
| 1037 | #define ARIZONA_DSP1_SCRATCH_0 0x1140 | 1058 | #define ARIZONA_DSP1_SCRATCH_0 0x1140 |
| 1038 | #define ARIZONA_DSP1_SCRATCH_1 0x1141 | 1059 | #define ARIZONA_DSP1_SCRATCH_1 0x1141 |
| 1039 | #define ARIZONA_DSP1_SCRATCH_2 0x1142 | 1060 | #define ARIZONA_DSP1_SCRATCH_2 0x1142 |
| @@ -1043,6 +1064,27 @@ | |||
| 1043 | #define ARIZONA_DSP2_STATUS_1 0x1204 | 1064 | #define ARIZONA_DSP2_STATUS_1 0x1204 |
| 1044 | #define ARIZONA_DSP2_STATUS_2 0x1205 | 1065 | #define ARIZONA_DSP2_STATUS_2 0x1205 |
| 1045 | #define ARIZONA_DSP2_STATUS_3 0x1206 | 1066 | #define ARIZONA_DSP2_STATUS_3 0x1206 |
| 1067 | #define ARIZONA_DSP2_STATUS_4 0x1207 | ||
| 1068 | #define ARIZONA_DSP2_WDMA_BUFFER_1 0x1210 | ||
| 1069 | #define ARIZONA_DSP2_WDMA_BUFFER_2 0x1211 | ||
| 1070 | #define ARIZONA_DSP2_WDMA_BUFFER_3 0x1212 | ||
| 1071 | #define ARIZONA_DSP2_WDMA_BUFFER_4 0x1213 | ||
| 1072 | #define ARIZONA_DSP2_WDMA_BUFFER_5 0x1214 | ||
| 1073 | #define ARIZONA_DSP2_WDMA_BUFFER_6 0x1215 | ||
| 1074 | #define ARIZONA_DSP2_WDMA_BUFFER_7 0x1216 | ||
| 1075 | #define ARIZONA_DSP2_WDMA_BUFFER_8 0x1217 | ||
| 1076 | #define ARIZONA_DSP2_RDMA_BUFFER_1 0x1220 | ||
| 1077 | #define ARIZONA_DSP2_RDMA_BUFFER_2 0x1221 | ||
| 1078 | #define ARIZONA_DSP2_RDMA_BUFFER_3 0x1222 | ||
| 1079 | #define ARIZONA_DSP2_RDMA_BUFFER_4 0x1223 | ||
| 1080 | #define ARIZONA_DSP2_RDMA_BUFFER_5 0x1224 | ||
| 1081 | #define ARIZONA_DSP2_RDMA_BUFFER_6 0x1225 | ||
| 1082 | #define ARIZONA_DSP2_WDMA_CONFIG_1 0x1230 | ||
| 1083 | #define ARIZONA_DSP2_WDMA_CONFIG_2 0x1231 | ||
| 1084 | #define ARIZONA_DSP2_WDMA_OFFSET_1 0x1232 | ||
| 1085 | #define ARIZONA_DSP2_RDMA_CONFIG_1 0x1234 | ||
| 1086 | #define ARIZONA_DSP2_RDMA_OFFSET_1 0x1235 | ||
| 1087 | #define ARIZONA_DSP2_EXTERNAL_START_SELECT_1 0x1238 | ||
| 1046 | #define ARIZONA_DSP2_SCRATCH_0 0x1240 | 1088 | #define ARIZONA_DSP2_SCRATCH_0 0x1240 |
| 1047 | #define ARIZONA_DSP2_SCRATCH_1 0x1241 | 1089 | #define ARIZONA_DSP2_SCRATCH_1 0x1241 |
| 1048 | #define ARIZONA_DSP2_SCRATCH_2 0x1242 | 1090 | #define ARIZONA_DSP2_SCRATCH_2 0x1242 |
| @@ -1052,6 +1094,27 @@ | |||
| 1052 | #define ARIZONA_DSP3_STATUS_1 0x1304 | 1094 | #define ARIZONA_DSP3_STATUS_1 0x1304 |
| 1053 | #define ARIZONA_DSP3_STATUS_2 0x1305 | 1095 | #define ARIZONA_DSP3_STATUS_2 0x1305 |
| 1054 | #define ARIZONA_DSP3_STATUS_3 0x1306 | 1096 | #define ARIZONA_DSP3_STATUS_3 0x1306 |
| 1097 | #define ARIZONA_DSP3_STATUS_4 0x1307 | ||
| 1098 | #define ARIZONA_DSP3_WDMA_BUFFER_1 0x1310 | ||
| 1099 | #define ARIZONA_DSP3_WDMA_BUFFER_2 0x1311 | ||
| 1100 | #define ARIZONA_DSP3_WDMA_BUFFER_3 0x1312 | ||
| 1101 | #define ARIZONA_DSP3_WDMA_BUFFER_4 0x1313 | ||
| 1102 | #define ARIZONA_DSP3_WDMA_BUFFER_5 0x1314 | ||
| 1103 | #define ARIZONA_DSP3_WDMA_BUFFER_6 0x1315 | ||
| 1104 | #define ARIZONA_DSP3_WDMA_BUFFER_7 0x1316 | ||
| 1105 | #define ARIZONA_DSP3_WDMA_BUFFER_8 0x1317 | ||
| 1106 | #define ARIZONA_DSP3_RDMA_BUFFER_1 0x1320 | ||
| 1107 | #define ARIZONA_DSP3_RDMA_BUFFER_2 0x1321 | ||
| 1108 | #define ARIZONA_DSP3_RDMA_BUFFER_3 0x1322 | ||
| 1109 | #define ARIZONA_DSP3_RDMA_BUFFER_4 0x1323 | ||
| 1110 | #define ARIZONA_DSP3_RDMA_BUFFER_5 0x1324 | ||
| 1111 | #define ARIZONA_DSP3_RDMA_BUFFER_6 0x1325 | ||
| 1112 | #define ARIZONA_DSP3_WDMA_CONFIG_1 0x1330 | ||
| 1113 | #define ARIZONA_DSP3_WDMA_CONFIG_2 0x1331 | ||
| 1114 | #define ARIZONA_DSP3_WDMA_OFFSET_1 0x1332 | ||
| 1115 | #define ARIZONA_DSP3_RDMA_CONFIG_1 0x1334 | ||
| 1116 | #define ARIZONA_DSP3_RDMA_OFFSET_1 0x1335 | ||
| 1117 | #define ARIZONA_DSP3_EXTERNAL_START_SELECT_1 0x1338 | ||
| 1055 | #define ARIZONA_DSP3_SCRATCH_0 0x1340 | 1118 | #define ARIZONA_DSP3_SCRATCH_0 0x1340 |
| 1056 | #define ARIZONA_DSP3_SCRATCH_1 0x1341 | 1119 | #define ARIZONA_DSP3_SCRATCH_1 0x1341 |
| 1057 | #define ARIZONA_DSP3_SCRATCH_2 0x1342 | 1120 | #define ARIZONA_DSP3_SCRATCH_2 0x1342 |
| @@ -1061,6 +1124,27 @@ | |||
| 1061 | #define ARIZONA_DSP4_STATUS_1 0x1404 | 1124 | #define ARIZONA_DSP4_STATUS_1 0x1404 |
| 1062 | #define ARIZONA_DSP4_STATUS_2 0x1405 | 1125 | #define ARIZONA_DSP4_STATUS_2 0x1405 |
| 1063 | #define ARIZONA_DSP4_STATUS_3 0x1406 | 1126 | #define ARIZONA_DSP4_STATUS_3 0x1406 |
| 1127 | #define ARIZONA_DSP4_STATUS_4 0x1407 | ||
| 1128 | #define ARIZONA_DSP4_WDMA_BUFFER_1 0x1410 | ||
| 1129 | #define ARIZONA_DSP4_WDMA_BUFFER_2 0x1411 | ||
| 1130 | #define ARIZONA_DSP4_WDMA_BUFFER_3 0x1412 | ||
| 1131 | #define ARIZONA_DSP4_WDMA_BUFFER_4 0x1413 | ||
| 1132 | #define ARIZONA_DSP4_WDMA_BUFFER_5 0x1414 | ||
| 1133 | #define ARIZONA_DSP4_WDMA_BUFFER_6 0x1415 | ||
| 1134 | #define ARIZONA_DSP4_WDMA_BUFFER_7 0x1416 | ||
| 1135 | #define ARIZONA_DSP4_WDMA_BUFFER_8 0x1417 | ||
| 1136 | #define ARIZONA_DSP4_RDMA_BUFFER_1 0x1420 | ||
| 1137 | #define ARIZONA_DSP4_RDMA_BUFFER_2 0x1421 | ||
| 1138 | #define ARIZONA_DSP4_RDMA_BUFFER_3 0x1422 | ||
| 1139 | #define ARIZONA_DSP4_RDMA_BUFFER_4 0x1423 | ||
| 1140 | #define ARIZONA_DSP4_RDMA_BUFFER_5 0x1424 | ||
| 1141 | #define ARIZONA_DSP4_RDMA_BUFFER_6 0x1425 | ||
| 1142 | #define ARIZONA_DSP4_WDMA_CONFIG_1 0x1430 | ||
| 1143 | #define ARIZONA_DSP4_WDMA_CONFIG_2 0x1431 | ||
| 1144 | #define ARIZONA_DSP4_WDMA_OFFSET_1 0x1432 | ||
| 1145 | #define ARIZONA_DSP4_RDMA_CONFIG_1 0x1434 | ||
| 1146 | #define ARIZONA_DSP4_RDMA_OFFSET_1 0x1435 | ||
| 1147 | #define ARIZONA_DSP4_EXTERNAL_START_SELECT_1 0x1438 | ||
| 1064 | #define ARIZONA_DSP4_SCRATCH_0 0x1440 | 1148 | #define ARIZONA_DSP4_SCRATCH_0 0x1440 |
| 1065 | #define ARIZONA_DSP4_SCRATCH_1 0x1441 | 1149 | #define ARIZONA_DSP4_SCRATCH_1 0x1441 |
| 1066 | #define ARIZONA_DSP4_SCRATCH_2 0x1442 | 1150 | #define ARIZONA_DSP4_SCRATCH_2 0x1442 |
diff --git a/include/linux/mfd/bcm590xx.h b/include/linux/mfd/bcm590xx.h new file mode 100644 index 000000000000..434df2d4e587 --- /dev/null +++ b/include/linux/mfd/bcm590xx.h | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | /* | ||
| 2 | * Broadcom BCM590xx PMU | ||
| 3 | * | ||
| 4 | * Copyright 2014 Linaro Limited | ||
| 5 | * Author: Matt Porter <mporter@linaro.org> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify it | ||
| 8 | * under the terms of the GNU General Public License as published by the | ||
| 9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 10 | * option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #ifndef __LINUX_MFD_BCM590XX_H | ||
| 15 | #define __LINUX_MFD_BCM590XX_H | ||
| 16 | |||
| 17 | #include <linux/device.h> | ||
| 18 | #include <linux/i2c.h> | ||
| 19 | #include <linux/regmap.h> | ||
| 20 | |||
| 21 | /* max register address */ | ||
| 22 | #define BCM590XX_MAX_REGISTER 0xe7 | ||
| 23 | |||
| 24 | struct bcm590xx { | ||
| 25 | struct device *dev; | ||
| 26 | struct i2c_client *i2c_client; | ||
| 27 | struct regmap *regmap; | ||
| 28 | unsigned int id; | ||
| 29 | }; | ||
| 30 | |||
| 31 | #endif /* __LINUX_MFD_BCM590XX_H */ | ||
diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h index 21e21b81cc75..bba65f51a0b5 100644 --- a/include/linux/mfd/da9052/da9052.h +++ b/include/linux/mfd/da9052/da9052.h | |||
| @@ -83,6 +83,7 @@ enum da9052_chip_id { | |||
| 83 | DA9053_AA, | 83 | DA9053_AA, |
| 84 | DA9053_BA, | 84 | DA9053_BA, |
| 85 | DA9053_BB, | 85 | DA9053_BB, |
