Message ID | 1453045749-22642-1-git-send-email-sre@kernel.org (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Hi, On Sun, Jan 17, 2016 at 04:49:04PM +0100, Sebastian Reichel wrote: > This patchset adds support for the N950 modem. > > [...] All of the patches are more or less mergable independent of each other, so I suggest the following merging scheme: > Sebastian Reichel (5): > ARM: OMAP2+: hwmod data: Add SSI data for omap36xx This one should go in via Paul Walmsley. > HSI: nokia-modem: add n950 and n9 support > HSI: ssi-protocol: Use handshake logic from n950 I already took those via the HSI tree. > ARM: dts: OMAP3-N950-N9: Enable SSI module > ARM: dts: OMAP3-N950-N9: Enable modem The DTS changes can go in via Tony's tree. -- Sebastian
diff --git a/plugins/n900.c b/plugins/n900.c index 44e2e75df3d9..1454d010cb2c 100644 --- a/plugins/n900.c +++ b/plugins/n900.c @@ -507,7 +507,7 @@ static void n900_post_online(struct ofono_modem *modem) ofono_netreg_create(modem, 0, "isimodem", isi->modem); ofono_sms_create(modem, 0, "isimodem", isi->modem); - ofono_cbs_create(modem, 0, "isimodem", isi->modem); + //ofono_cbs_create(modem, 0, "isimodem", isi->modem); ofono_ussd_create(modem, 0, "isimodem", isi->modem); ofono_call_settings_create(modem, 0, "isimodem", isi->modem); ofono_call_barring_create(modem, 0, "isimodem", isi->modem);