| Message ID | 1372081326-6917-3-git-send-email-peter.ujfalusi@ti.com |
|---|---|
| State | Accepted |
| Commit | fa223ec37c9f6710022381a25c352955675817f9 |
| Headers | show |
Hi Peter, On Mon, Jun 24, 2013 at 03:42:04PM +0200, Peter Ujfalusi wrote: > Add define for: HSDRV, HFDAC, HFPGA and HFDRV enable bits > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > CC: Samuel Ortiz <sameo@linux.intel.com> > --- > include/linux/mfd/twl6040.h | 7 +++++++ > 1 file changed, 7 insertions(+) I don't see the rest of the patchset, so I can't tell if there's a build time dependeny between this one and the other patches. I applied it for now, please let me know if you'd like the whole patchset to go through another tree at once. Cheers, Samuel.
On Thu, Jun 27, 2013 at 10:05:47AM +0200, Samuel Ortiz wrote: > I don't see the rest of the patchset, so I can't tell if there's a build > time dependeny between this one and the other patches. > I applied it for now, please let me know if you'd like the whole > patchset to go through another tree at once. There's build dependencies - the new register bits are used by the following patches. I'd already applied this to ASoC and sent it upstream unfortunately so I can't rebase it out or pull in your commit instead sadly.
On Thu, Jun 27, 2013 at 09:20:03AM +0100, Mark Brown wrote: > On Thu, Jun 27, 2013 at 10:05:47AM +0200, Samuel Ortiz wrote: > > > I don't see the rest of the patchset, so I can't tell if there's a build > > time dependeny between this one and the other patches. > > I applied it for now, please let me know if you'd like the whole > > patchset to go through another tree at once. > > There's build dependencies - the new register bits are used by the > following patches. I'd already applied this to ASoC and sent it > upstream unfortunately so I can't rebase it out or pull in your commit > instead sadly. No worries, that shouldn't cause any merge issues. I dropped it from mfd-next. Cheers, Samuel.
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 94ac944..7e7fbce 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -125,8 +125,15 @@ #define TWL6040_HSDACENA (1 << 0) #define TWL6040_HSDACMODE (1 << 1) +#define TWL6040_HSDRVENA (1 << 2) #define TWL6040_HSDRVMODE (1 << 3) +/* HFLCTL/R (0x14/0x16) fields */ + +#define TWL6040_HFDACENA (1 << 0) +#define TWL6040_HFPGAENA (1 << 1) +#define TWL6040_HFDRVENA (1 << 4) + /* VIBCTLL/R (0x18/0x1A) fields */ #define TWL6040_VIBENA (1 << 0)
Add define for: HSDRV, HFDAC, HFPGA and HFDRV enable bits Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> CC: Samuel Ortiz <sameo@linux.intel.com> --- include/linux/mfd/twl6040.h | 7 +++++++ 1 file changed, 7 insertions(+)