From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Jose Cazarin <joseespiriki@gmail.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peter Rosin <peda@axentia.se>
Subject: Re: linux-next: manual merge of the iio tree with the char-misc.current tree
Date: Fri, 29 Apr 2022 14:47:21 +1000 [thread overview]
Message-ID: <20220429144721.63ae260f@canb.auug.org.au> (raw)
In-Reply-To: <20220429143517.75be9c04@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1525 bytes --]
Hi all,
On Fri, 29 Apr 2022 14:35:17 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> diff --cc drivers/iio/dac/ti-dac5571.c
> index 0b775f943db3,96b86e2dcc6b..000000000000
> --- a/drivers/iio/dac/ti-dac5571.c
> +++ b/drivers/iio/dac/ti-dac5571.c
> @@@ -393,15 -386,16 +394,16 @@@ static int dac5571_remove(struct i2c_cl
> }
>
> static const struct of_device_id dac5571_of_id[] = {
> - {.compatible = "ti,dac5571"},
> - {.compatible = "ti,dac6571"},
> - {.compatible = "ti,dac7571"},
> - {.compatible = "ti,dac5574"},
> - {.compatible = "ti,dac6574"},
> - {.compatible = "ti,dac7574"},
> - {.compatible = "ti,dac5573"},
> - {.compatible = "ti,dac6573"},
> - {.compatible = "ti,dac7573"},
> - {.compatible = "ti,dac121c081"},
> + {.compatible = "ti,dac5571", .data = (void *)single_8bit},
> + {.compatible = "ti,dac6571", .data = (void *)single_10bit},
> + {.compatible = "ti,dac7571", .data = (void *)single_12bit},
> + {.compatible = "ti,dac5574", .data = (void *)quad_8bit},
> + {.compatible = "ti,dac6574", .data = (void *)quad_10bit},
> + {.compatible = "ti,dac7574", .data = (void *)quad_12bit},
> + {.compatible = "ti,dac5573", .data = (void *)quad_8bit},
> + {.compatible = "ti,dac6573", .data = (void *)quad_10bit},
> + {.compatible = "ti,dac7573", .data = (void *)quad_12bit},
> ++ {.compatible = "ti,dac121c081", data = (void *)single_12bit},
^
I fixed up the missing '.'
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-04-29 4:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 4:35 linux-next: manual merge of the iio tree with the char-misc.current tree Stephen Rothwell
2022-04-29 4:47 ` Stephen Rothwell [this message]
2022-05-01 18:09 ` Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 4:21 Stephen Rothwell
2025-01-13 3:23 ` Stephen Rothwell
2025-01-13 5:19 ` Greg KH
2022-02-22 20:40 broonie
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=20220429144721.63ae260f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jonathan.Cameron@Huawei.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=joseespiriki@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peda@axentia.se \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox