From: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> To: linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>, Dan DeVoto <dand1972-/E1597aS9LQAvxtiuMwx3w@public.gmane.org>, Mark Elliott <txlitebeer-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> Subject: [RFC] sound: ppc: keywest: check if DEQ was already instantiated Date: Sat, 23 May 2015 18:15:11 +0200 [thread overview] Message-ID: <1432397711-3186-1-git-send-email-wsa@the-dreams.de> (raw) Due to changes in i2c-powermac, for some Macs the DEQ is instantiated now in i2c-powermac while some need the instantiation here in the keywest sound driver. The proper fix is to convert this driver to AOA. Until then support both ways of instantiation. Before this patch, some Macs lost sound because the sound driver failed when instantiating the DEQ for the second time. Signed-off-by: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> --- Dan, Mark: I hope I found a generic but not too intrusive solution to the doubled instantiation problem. Can you please test this patch on top of this one "sound: ppc: keywest: drop using attach adapter" from last time? Check if you have sound and send the dmesg output, please. I hope it compiles even, couldn't test that this time. sound/ppc/keywest.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index d7627bae08362e..6120a067494a44 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -31,10 +31,15 @@ */ static struct pmac_keywest *keywest_ctx; +static bool keywest_probed; static int keywest_probe(struct i2c_client *client, const struct i2c_device_id *id) { + keywest_probed = true; + /* If instantiated via i2c-powermac, we still need to set the client */ + if (!keywest_ctx->client) + keywest_ctx->client = client; i2c_set_clientdata(client, keywest_ctx); return 0; } @@ -92,7 +97,8 @@ static int keywest_remove(struct i2c_client *client) static const struct i2c_device_id keywest_i2c_id[] = { - { "keywest", 0 }, + { "MAC,tas3004", 0 }, /* instantiated by i2c-powermac */ + { "keywest", 0 }, /* instantiated by us if needed */ { } }; @@ -149,8 +155,13 @@ int snd_pmac_keywest_init(struct pmac_keywest *i2c) return err; } + /* There was already a device from i2c-powermac. Great, let's return */ + if (keywest_probed) + return 0; + /* We assume Macs have consecutive I2C bus numbers starting at 0 */ while (adap) { + /* Scan for devices to be bound to */ err = keywest_attach_adapter(adap); if (!err) return 0; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Wolfram Sang <wsa@the-dreams.de> To: linuxppc-dev@lists.ozlabs.org Cc: linux-i2c@vger.kernel.org, alsa-devel@alsa-project.org, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Dan DeVoto <dand1972@yahoo.com>, Mark Elliott <txlitebeer@gmail.com>, Wolfram Sang <wsa@the-dreams.de> Subject: [RFC] sound: ppc: keywest: check if DEQ was already instantiated Date: Sat, 23 May 2015 18:15:11 +0200 [thread overview] Message-ID: <1432397711-3186-1-git-send-email-wsa@the-dreams.de> (raw) Due to changes in i2c-powermac, for some Macs the DEQ is instantiated now in i2c-powermac while some need the instantiation here in the keywest sound driver. The proper fix is to convert this driver to AOA. Until then support both ways of instantiation. Before this patch, some Macs lost sound because the sound driver failed when instantiating the DEQ for the second time. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> --- Dan, Mark: I hope I found a generic but not too intrusive solution to the doubled instantiation problem. Can you please test this patch on top of this one "sound: ppc: keywest: drop using attach adapter" from last time? Check if you have sound and send the dmesg output, please. I hope it compiles even, couldn't test that this time. sound/ppc/keywest.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index d7627bae08362e..6120a067494a44 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -31,10 +31,15 @@ */ static struct pmac_keywest *keywest_ctx; +static bool keywest_probed; static int keywest_probe(struct i2c_client *client, const struct i2c_device_id *id) { + keywest_probed = true; + /* If instantiated via i2c-powermac, we still need to set the client */ + if (!keywest_ctx->client) + keywest_ctx->client = client; i2c_set_clientdata(client, keywest_ctx); return 0; } @@ -92,7 +97,8 @@ static int keywest_remove(struct i2c_client *client) static const struct i2c_device_id keywest_i2c_id[] = { - { "keywest", 0 }, + { "MAC,tas3004", 0 }, /* instantiated by i2c-powermac */ + { "keywest", 0 }, /* instantiated by us if needed */ { } }; @@ -149,8 +155,13 @@ int snd_pmac_keywest_init(struct pmac_keywest *i2c) return err; } + /* There was already a device from i2c-powermac. Great, let's return */ + if (keywest_probed) + return 0; + /* We assume Macs have consecutive I2C bus numbers starting at 0 */ while (adap) { + /* Scan for devices to be bound to */ err = keywest_attach_adapter(adap); if (!err) return 0; -- 2.1.4
next reply other threads:[~2015-05-23 16:15 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-23 16:15 Wolfram Sang [this message] 2015-05-23 16:15 ` [RFC] sound: ppc: keywest: check if DEQ was already instantiated Wolfram Sang 2015-05-26 9:19 ` Dan DeVoto 2015-05-26 9:19 ` Dan DeVoto [not found] ` <1432631974.85649.YahooMailBasic-+kJcCv7Q1G9al3a5i+KC+JEhsgyP+Z75VpNB7YpNyf8@public.gmane.org> 2015-05-28 7:33 ` [alsa-devel] " Takashi Iwai 2015-05-28 7:33 ` Takashi Iwai [not found] ` <s5htwuxb1h4.wl-tiwai-l3A5Bk7waGM@public.gmane.org> 2015-05-29 10:50 ` Wolfram Sang 2015-05-29 10:50 ` Wolfram Sang 2015-05-29 10:57 ` Takashi Iwai 2015-05-29 10:57 ` Takashi Iwai [not found] ` <s5hsiaf6489.wl-tiwai-l3A5Bk7waGM@public.gmane.org> 2015-05-29 11:06 ` Wolfram Sang 2015-05-29 11:06 ` Wolfram Sang 2015-05-29 11:44 ` Takashi Iwai 2015-05-29 11:44 ` Takashi Iwai [not found] ` <s5hoal3621l.wl-tiwai-l3A5Bk7waGM@public.gmane.org> 2015-05-31 23:30 ` Wolfram Sang 2015-05-31 23:30 ` Wolfram Sang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1432397711-3186-1-git-send-email-wsa@the-dreams.de \ --to=wsa-z923lk4zbo2bacvfa/9k2g@public.gmane.org \ --cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \ --cc=benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org \ --cc=dand1972-/E1597aS9LQAvxtiuMwx3w@public.gmane.org \ --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=txlitebeer-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.