git/linux-net
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/ synced 2026-04-24 19:25:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
  ...
This commit is contained in:
Linus Torvalds
2014-04-07 10:24:18 -07:00
parent c29aa153ef 2d28ca731b
commit e5744abb2f
92 changed files with 3960 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
include/linux/mfd/arizona/registers.h
View File

@@ -1034,6 +1034,27 @@
#define ARIZONA_DSP1_STATUS_1 0x1104
#define ARIZONA_DSP1_STATUS_2 0x1105
#define ARIZONA_DSP1_STATUS_3 0x1106
#define ARIZONA_DSP1_STATUS_4 0x1107
#define ARIZONA_DSP1_WDMA_BUFFER_1 0x1110
#define ARIZONA_DSP1_WDMA_BUFFER_2 0x1111
#define ARIZONA_DSP1_WDMA_BUFFER_3 0x1112
#define ARIZONA_DSP1_WDMA_BUFFER_4 0x1113
#define ARIZONA_DSP1_WDMA_BUFFER_5 0x1114
#define ARIZONA_DSP1_WDMA_BUFFER_6 0x1115
#define ARIZONA_DSP1_WDMA_BUFFER_7 0x1116
#define ARIZONA_DSP1_WDMA_BUFFER_8 0x1117
#define ARIZONA_DSP1_RDMA_BUFFER_1 0x1120
#define ARIZONA_DSP1_RDMA_BUFFER_2 0x1121
#define ARIZONA_DSP1_RDMA_BUFFER_3 0x1122
#define ARIZONA_DSP1_RDMA_BUFFER_4 0x1123
#define ARIZONA_DSP1_RDMA_BUFFER_5 0x1124
#define ARIZONA_DSP1_RDMA_BUFFER_6 0x1125
#define ARIZONA_DSP1_WDMA_CONFIG_1 0x1130
#define ARIZONA_DSP1_WDMA_CONFIG_2 0x1131
#define ARIZONA_DSP1_WDMA_OFFSET_1 0x1132
#define ARIZONA_DSP1_RDMA_CONFIG_1 0x1134
#define ARIZONA_DSP1_RDMA_OFFSET_1 0x1135
#define ARIZONA_DSP1_EXTERNAL_START_SELECT_1 0x1138
#define ARIZONA_DSP1_SCRATCH_0 0x1140
#define ARIZONA_DSP1_SCRATCH_1 0x1141
#define ARIZONA_DSP1_SCRATCH_2 0x1142
@@ -1043,6 +1064,27 @@
#define ARIZONA_DSP2_STATUS_1 0x1204
#define ARIZONA_DSP2_STATUS_2 0x1205
#define ARIZONA_DSP2_STATUS_3 0x1206
#define ARIZONA_DSP2_STATUS_4 0x1207
#define ARIZONA_DSP2_WDMA_BUFFER_1 0x1210
#define ARIZONA_DSP2_WDMA_BUFFER_2 0x1211
#define ARIZONA_DSP2_WDMA_BUFFER_3 0x1212
#define ARIZONA_DSP2_WDMA_BUFFER_4 0x1213
#define ARIZONA_DSP2_WDMA_BUFFER_5 0x1214
#define ARIZONA_DSP2_WDMA_BUFFER_6 0x1215
#define ARIZONA_DSP2_WDMA_BUFFER_7 0x1216
#define ARIZONA_DSP2_WDMA_BUFFER_8 0x1217
#define ARIZONA_DSP2_RDMA_BUFFER_1 0x1220
#define ARIZONA_DSP2_RDMA_BUFFER_2 0x1221
#define ARIZONA_DSP2_RDMA_BUFFER_3 0x1222
#define ARIZONA_DSP2_RDMA_BUFFER_4 0x1223
#define ARIZONA_DSP2_RDMA_BUFFER_5 0x1224
#define ARIZONA_DSP2_RDMA_BUFFER_6 0x1225
#define ARIZONA_DSP2_WDMA_CONFIG_1 0x1230
#define ARIZONA_DSP2_WDMA_CONFIG_2 0x1231
#define ARIZONA_DSP2_WDMA_OFFSET_1 0x1232
#define ARIZONA_DSP2_RDMA_CONFIG_1 0x1234
#define ARIZONA_DSP2_RDMA_OFFSET_1 0x1235
#define ARIZONA_DSP2_EXTERNAL_START_SELECT_1 0x1238
#define ARIZONA_DSP2_SCRATCH_0 0x1240
#define ARIZONA_DSP2_SCRATCH_1 0x1241
#define ARIZONA_DSP2_SCRATCH_2 0x1242
@@ -1052,6 +1094,27 @@
#define ARIZONA_DSP3_STATUS_1 0x1304
#define ARIZONA_DSP3_STATUS_2 0x1305
#define ARIZONA_DSP3_STATUS_3 0x1306
#define ARIZONA_DSP3_STATUS_4 0x1307
#define ARIZONA_DSP3_WDMA_BUFFER_1 0x1310
#define ARIZONA_DSP3_WDMA_BUFFER_2 0x1311
#define ARIZONA_DSP3_WDMA_BUFFER_3 0x1312
#define ARIZONA_DSP3_WDMA_BUFFER_4 0x1313
#define ARIZONA_DSP3_WDMA_BUFFER_5 0x1314
#define ARIZONA_DSP3_WDMA_BUFFER_6 0x1315
#define ARIZONA_DSP3_WDMA_BUFFER_7 0x1316
#define ARIZONA_DSP3_WDMA_BUFFER_8 0x1317
#define ARIZONA_DSP3_RDMA_BUFFER_1 0x1320
#define ARIZONA_DSP3_RDMA_BUFFER_2 0x1321
#define ARIZONA_DSP3_RDMA_BUFFER_3 0x1322
#define ARIZONA_DSP3_RDMA_BUFFER_4 0x1323
#define ARIZONA_DSP3_RDMA_BUFFER_5 0x1324
#define ARIZONA_DSP3_RDMA_BUFFER_6 0x1325
#define ARIZONA_DSP3_WDMA_CONFIG_1 0x1330
#define ARIZONA_DSP3_WDMA_CONFIG_2 0x1331
#define ARIZONA_DSP3_WDMA_OFFSET_1 0x1332
#define ARIZONA_DSP3_RDMA_CONFIG_1 0x1334
#define ARIZONA_DSP3_RDMA_OFFSET_1 0x1335
#define ARIZONA_DSP3_EXTERNAL_START_SELECT_1 0x1338
#define ARIZONA_DSP3_SCRATCH_0 0x1340
#define ARIZONA_DSP3_SCRATCH_1 0x1341
#define ARIZONA_DSP3_SCRATCH_2 0x1342
@@ -1061,6 +1124,27 @@
#define ARIZONA_DSP4_STATUS_1 0x1404
#define ARIZONA_DSP4_STATUS_2 0x1405
#define ARIZONA_DSP4_STATUS_3 0x1406
#define ARIZONA_DSP4_STATUS_4 0x1407
#define ARIZONA_DSP4_WDMA_BUFFER_1 0x1410
#define ARIZONA_DSP4_WDMA_BUFFER_2 0x1411
#define ARIZONA_DSP4_WDMA_BUFFER_3 0x1412
#define ARIZONA_DSP4_WDMA_BUFFER_4 0x1413
#define ARIZONA_DSP4_WDMA_BUFFER_5 0x1414
#define ARIZONA_DSP4_WDMA_BUFFER_6 0x1415
#define ARIZONA_DSP4_WDMA_BUFFER_7 0x1416
#define ARIZONA_DSP4_WDMA_BUFFER_8 0x1417
#define ARIZONA_DSP4_RDMA_BUFFER_1 0x1420
#define ARIZONA_DSP4_RDMA_BUFFER_2 0x1421
#define ARIZONA_DSP4_RDMA_BUFFER_3 0x1422
#define ARIZONA_DSP4_RDMA_BUFFER_4 0x1423
#define ARIZONA_DSP4_RDMA_BUFFER_5 0x1424
#define ARIZONA_DSP4_RDMA_BUFFER_6 0x1425
#define ARIZONA_DSP4_WDMA_CONFIG_1 0x1430
#define ARIZONA_DSP4_WDMA_CONFIG_2 0x1431
#define ARIZONA_DSP4_WDMA_OFFSET_1 0x1432
#define ARIZONA_DSP4_RDMA_CONFIG_1 0x1434
#define ARIZONA_DSP4_RDMA_OFFSET_1 0x1435
#define ARIZONA_DSP4_EXTERNAL_START_SELECT_1 0x1438
#define ARIZONA_DSP4_SCRATCH_0 0x1440
#define ARIZONA_DSP4_SCRATCH_1 0x1441
#define ARIZONA_DSP4_SCRATCH_2 0x1442