diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
| commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c (patch) | |
| tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 /Documentation/devicetree/bindings/sound/sgtl5000.txt | |
| parent | f1992dde7fef6713a469a5a142b86812b8a47f9e (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7
Conflicts):
drivers/base/regmap/regmap.c (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
Diffstat (limited to 'Documentation/devicetree/bindings/sound/sgtl5000.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/sgtl5000.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt index 2c3cd413f04..9cc44449508 100644 --- a/Documentation/devicetree/bindings/sound/sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - compatible : "fsl,sgtl5000". | 4 | - compatible : "fsl,sgtl5000". |
| 5 | 5 | ||
| 6 | - reg : the I2C address of the device | ||
| 7 | |||
| 6 | Example: | 8 | Example: |
| 7 | 9 | ||
| 8 | codec: sgtl5000@0a { | 10 | codec: sgtl5000@0a { |