diff options
| author | Linus Torvalds | 2016-03-17 12:58:11 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-03-17 12:58:11 -0700 |
| commit | 3c0b8d1c5f334d1fd0c7eafc18bfb4ab0087b165 (patch) | |
| tree | c3eef3a06a812d42f83c4fdb6ee0757b1f510c3a /Documentation | |
| parent | 9cc984e4bc089cd21b715b92ffe2d2bda0bb1d1a (diff) | |
| parent | 87d99063be016ceee90723a13365a40b21eec0d9 (diff) | |
Merge tag 'hsi-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
"nokia-modem: add N950 and N9 support"
* tag 'hsi-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: ssi-protocol: Use handshake logic from n950
HSI: nokia-modem: add n950 and n9 support
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/hsi/nokia-modem.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/hsi/nokia-modem.txt b/Documentation/devicetree/bindings/hsi/nokia-modem.txt index 8a979780452b..53de1d9d0b95 100644 --- a/Documentation/devicetree/bindings/hsi/nokia-modem.txt +++ b/Documentation/devicetree/bindings/hsi/nokia-modem.txt @@ -7,6 +7,8 @@ properties are needed by the Nokia modem HSI client: Required properties: - compatible: Should be one of "nokia,n900-modem" + "nokia,n950-modem" + "nokia,n9-modem" - hsi-channel-names: Should contain the following strings "mcsaab-control" "speech-control" @@ -15,11 +17,11 @@ Required properties: - gpios: Should provide a GPIO handler for each GPIO listed in gpio-names - gpio-names: Should contain the following strings - "cmt_apeslpx" - "cmt_rst_rq" - "cmt_en" - "cmt_rst" - "cmt_bsi" + "cmt_apeslpx" (for n900, n950, n9) + "cmt_rst_rq" (for n900, n950, n9) + "cmt_en" (for n900, n950, n9) + "cmt_rst" (for n900) + "cmt_bsi" (for n900) - interrupts: Should be IRQ handle for modem's reset indication Example: |