Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

HSI: nokia-modem: add n950 and n9 support

The Nokia N950 and Nokia N9 also have a SSI connected
modem, which use the same protocols as the Nokia N900,
but with increased link speed (96000 kbps instead of
55000 kbps) and with less GPIOs.

Since it's unclear, if the N950 and the N9 use exactly
the same modem, each of them gets their own compatible
string.

Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

+9 -5
+7 -5
Documentation/devicetree/bindings/hsi/nokia-modem.txt
··· 7 7 Required properties: 8 8 - compatible: Should be one of 9 9 "nokia,n900-modem" 10 + "nokia,n950-modem" 11 + "nokia,n9-modem" 10 12 - hsi-channel-names: Should contain the following strings 11 13 "mcsaab-control" 12 14 "speech-control" ··· 17 15 - gpios: Should provide a GPIO handler for each GPIO listed in 18 16 gpio-names 19 17 - gpio-names: Should contain the following strings 20 - "cmt_apeslpx" 21 - "cmt_rst_rq" 22 - "cmt_en" 23 - "cmt_rst" 24 - "cmt_bsi" 18 + "cmt_apeslpx" (for n900, n950, n9) 19 + "cmt_rst_rq" (for n900, n950, n9) 20 + "cmt_en" (for n900, n950, n9) 21 + "cmt_rst" (for n900) 22 + "cmt_bsi" (for n900) 25 23 - interrupts: Should be IRQ handle for modem's reset indication 26 24 27 25 Example:
+2
drivers/hsi/clients/nokia-modem.c
··· 281 281 #ifdef CONFIG_OF 282 282 static const struct of_device_id nokia_modem_of_match[] = { 283 283 { .compatible = "nokia,n900-modem", }, 284 + { .compatible = "nokia,n950-modem", }, 285 + { .compatible = "nokia,n9-modem", }, 284 286 {}, 285 287 }; 286 288 MODULE_DEVICE_TABLE(of, nokia_modem_of_match);