[PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[Jassi Brar]

Define more bit definitions in the order of mainline support for the
SoC.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
---
 sound/soc/s3c24xx/regs-i2s-v2.h |   41 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/sound/soc/s3c24xx/regs-i2s-v2.h b/sound/soc/s3c24xx/regs-i2s-v2.h
index 8e1a585..dea199e 100644
--- a/sound/soc/s3c24xx/regs-i2s-v2.h
+++ b/sound/soc/s3c24xx/regs-i2s-v2.h
@@ -20,6 +20,24 @@
 #define S3C2412_IISTXD			(0x10)
 #define S3C2412_IISRXD			(0x14)
 
+#define S5PC1XX_IISFICS		0x18
+#define S5PC1XX_IISTXDS		0x1C
+
+#define S5PC1XX_IISCON_SW_RST		(1 << 31)
+#define S5PC1XX_IISCON_FRXOFSTATUS	(1 << 26)
+#define S5PC1XX_IISCON_FRXORINTEN	(1 << 25)
+#define S5PC1XX_IISCON_FTXSURSTAT	(1 << 24)
+#define S5PC1XX_IISCON_FTXSURINTEN	(1 << 23)
+#define S5PC1XX_IISCON_TXSDMAPAUSE	(1 << 20)
+#define S5PC1XX_IISCON_TXSDMACTIVE	(1 << 18)
+
+#define S3C64XX_IISCON_FTXURSTATUS	(1 << 17)
+#define S3C64XX_IISCON_FTXURINTEN	(1 << 16)
+#define S3C64XX_IISCON_TXFIFO2_EMPTY	(1 << 15)
+#define S3C64XX_IISCON_TXFIFO1_EMPTY	(1 << 14)
+#define S3C64XX_IISCON_TXFIFO2_FULL	(1 << 13)
+#define S3C64XX_IISCON_TXFIFO1_FULL	(1 << 12)
+
 #define S3C2412_IISCON_LRINDEX		(1 << 11)
 #define S3C2412_IISCON_TXFIFO_EMPTY	(1 << 10)
 #define S3C2412_IISCON_RXFIFO_EMPTY	(1 << 9)
@@ -33,6 +51,23 @@
 #define S3C2412_IISCON_RXDMA_ACTIVE	(1 << 1)
 #define S3C2412_IISCON_IIS_ACTIVE	(1 << 0)
 
+#define S5PC1XX_IISMOD_OPCLK_CDCLK_OUT	(0 << 30)
+#define S5PC1XX_IISMOD_OPCLK_CDCLK_IN	(1 << 30)
+#define S5PC1XX_IISMOD_OPCLK_BCLK_OUT	(2 << 30)
+#define S5PC1XX_IISMOD_OPCLK_PCLK	(3 << 30)
+#define S5PC1XX_IISMOD_OPCLK_MASK	(3 << 30)
+#define S5PC1XX_IISMOD_TXS_IDMA		(1 << 28) /* Sec_TXFIFO use I-DMA */
+#define S5PC1XX_IISMOD_BLCS_MASK	0x3
+#define S5PC1XX_IISMOD_BLCS_SHIFT	26
+#define S5PC1XX_IISMOD_BLCP_MASK	0x3
+#define S5PC1XX_IISMOD_BLCP_SHIFT	24
+
+#define S3C64XX_IISMOD_C2DD_HHALF	(1 << 21) /* Discard Higher-half */
+#define S3C64XX_IISMOD_C2DD_LHALF	(1 << 20) /* Discard Lower-half */
+#define S3C64XX_IISMOD_C1DD_HHALF	(1 << 19)
+#define S3C64XX_IISMOD_C1DD_LHALF	(1 << 18)
+#define S3C64XX_IISMOD_DC2_EN		(1 << 17)
+#define S3C64XX_IISMOD_DC1_EN		(1 << 16)
 #define S3C64XX_IISMOD_BLC_16BIT	(0 << 13)
 #define S3C64XX_IISMOD_BLC_8BIT		(1 << 13)
 #define S3C64XX_IISMOD_BLC_24BIT	(2 << 13)
@@ -71,9 +106,15 @@
 
 #define S3C2412_IISPSR_PSREN		(1 << 15)
 
+#define S3C64XX_IISFIC_TX2COUNT(x)	(((x) >>  24) & 0xf)
+#define S3C64XX_IISFIC_TX1COUNT(x)	(((x) >>  16) & 0xf)
+
 #define S3C2412_IISFIC_TXFLUSH		(1 << 15)
 #define S3C2412_IISFIC_RXFLUSH		(1 << 7)
 #define S3C2412_IISFIC_TXCOUNT(x)	(((x) >>  8) & 0xf)
 #define S3C2412_IISFIC_RXCOUNT(x)	(((x) >>  0) & 0xf)
 
+#define S5PC1XX_IISFICS_TXFLUSH		(1 << 15)
+#define S5PC1XX_IISFICS_TXCOUNT(x)	(((x) >>  8) & 0x7f)
+
 #endif /* __REGS_IISV2_H */
-- 
1.6.2.5

[PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[Jassi Brar]

Define more bit definitions in the order of mainline support for the
SoC.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
---
 sound/soc/s3c24xx/regs-i2s-v2.h |   41 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/sound/soc/s3c24xx/regs-i2s-v2.h b/sound/soc/s3c24xx/regs-i2s-v2.h
index 8e1a585..dea199e 100644
--- a/sound/soc/s3c24xx/regs-i2s-v2.h
+++ b/sound/soc/s3c24xx/regs-i2s-v2.h
@@ -20,6 +20,24 @@
 #define S3C2412_IISTXD			(0x10)
 #define S3C2412_IISRXD			(0x14)
 
+#define S5PC1XX_IISFICS		0x18
+#define S5PC1XX_IISTXDS		0x1C
+
+#define S5PC1XX_IISCON_SW_RST		(1 << 31)
+#define S5PC1XX_IISCON_FRXOFSTATUS	(1 << 26)
+#define S5PC1XX_IISCON_FRXORINTEN	(1 << 25)
+#define S5PC1XX_IISCON_FTXSURSTAT	(1 << 24)
+#define S5PC1XX_IISCON_FTXSURINTEN	(1 << 23)
+#define S5PC1XX_IISCON_TXSDMAPAUSE	(1 << 20)
+#define S5PC1XX_IISCON_TXSDMACTIVE	(1 << 18)
+
+#define S3C64XX_IISCON_FTXURSTATUS	(1 << 17)
+#define S3C64XX_IISCON_FTXURINTEN	(1 << 16)
+#define S3C64XX_IISCON_TXFIFO2_EMPTY	(1 << 15)
+#define S3C64XX_IISCON_TXFIFO1_EMPTY	(1 << 14)
+#define S3C64XX_IISCON_TXFIFO2_FULL	(1 << 13)
+#define S3C64XX_IISCON_TXFIFO1_FULL	(1 << 12)
+
 #define S3C2412_IISCON_LRINDEX		(1 << 11)
 #define S3C2412_IISCON_TXFIFO_EMPTY	(1 << 10)
 #define S3C2412_IISCON_RXFIFO_EMPTY	(1 << 9)
@@ -33,6 +51,23 @@
 #define S3C2412_IISCON_RXDMA_ACTIVE	(1 << 1)
 #define S3C2412_IISCON_IIS_ACTIVE	(1 << 0)
 
+#define S5PC1XX_IISMOD_OPCLK_CDCLK_OUT	(0 << 30)
+#define S5PC1XX_IISMOD_OPCLK_CDCLK_IN	(1 << 30)
+#define S5PC1XX_IISMOD_OPCLK_BCLK_OUT	(2 << 30)
+#define S5PC1XX_IISMOD_OPCLK_PCLK	(3 << 30)
+#define S5PC1XX_IISMOD_OPCLK_MASK	(3 << 30)
+#define S5PC1XX_IISMOD_TXS_IDMA		(1 << 28) /* Sec_TXFIFO use I-DMA */
+#define S5PC1XX_IISMOD_BLCS_MASK	0x3
+#define S5PC1XX_IISMOD_BLCS_SHIFT	26
+#define S5PC1XX_IISMOD_BLCP_MASK	0x3
+#define S5PC1XX_IISMOD_BLCP_SHIFT	24
+
+#define S3C64XX_IISMOD_C2DD_HHALF	(1 << 21) /* Discard Higher-half */
+#define S3C64XX_IISMOD_C2DD_LHALF	(1 << 20) /* Discard Lower-half */
+#define S3C64XX_IISMOD_C1DD_HHALF	(1 << 19)
+#define S3C64XX_IISMOD_C1DD_LHALF	(1 << 18)
+#define S3C64XX_IISMOD_DC2_EN		(1 << 17)
+#define S3C64XX_IISMOD_DC1_EN		(1 << 16)
 #define S3C64XX_IISMOD_BLC_16BIT	(0 << 13)
 #define S3C64XX_IISMOD_BLC_8BIT		(1 << 13)
 #define S3C64XX_IISMOD_BLC_24BIT	(2 << 13)
@@ -71,9 +106,15 @@
 
 #define S3C2412_IISPSR_PSREN		(1 << 15)
 
+#define S3C64XX_IISFIC_TX2COUNT(x)	(((x) >>  24) & 0xf)
+#define S3C64XX_IISFIC_TX1COUNT(x)	(((x) >>  16) & 0xf)
+
 #define S3C2412_IISFIC_TXFLUSH		(1 << 15)
 #define S3C2412_IISFIC_RXFLUSH		(1 << 7)
 #define S3C2412_IISFIC_TXCOUNT(x)	(((x) >>  8) & 0xf)
 #define S3C2412_IISFIC_RXCOUNT(x)	(((x) >>  0) & 0xf)
 
+#define S5PC1XX_IISFICS_TXFLUSH		(1 << 15)
+#define S5PC1XX_IISFICS_TXCOUNT(x)	(((x) >>  8) & 0x7f)
+
 #endif /* __REGS_IISV2_H */
-- 
1.6.2.5

Re: [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[Mark Brown]

On Wed, Mar 10, 2010 at 04:49:00PM +0900, Jassi Brar wrote:
> Define more bit definitions in the order of mainline support for the
> SoC.

For changes like this it'd be better if the changelog said something
like "Add register bit definitions for S5PC1xx" - this is all mainline
code so it's much clearer to say that this is adding support for a new
SoC.

One other thing I'd suggest is that when constructing a patch series
it'd be better to put the more invasive or controversial changes (like
moving the headers) last.  This makes it easer to apply bits of the
series if there is any controversy.

Re: [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[jassi brar]

On Wed, Mar 10, 2010 at 8:00 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Wed, Mar 10, 2010 at 04:49:00PM +0900, Jassi Brar wrote:
>> Define more bit definitions in the order of mainline support for the
>> SoC.
> For changes like this it'd be better if the changelog said something
> like "Add register bit definitions for S5PC1xx" - this is all mainline
> code so it's much clearer to say that this is adding support for a new
> SoC.
I thought of adding definitions in 'chronological order of support' in kernel
rather than SoC wise.
Ok, will divide in two patches.

> One other thing I'd suggest is that when constructing a patch series
> it'd be better to put the more invasive or controversial changes (like
> moving the headers) last.  This makes it easer to apply bits of the
> series if there is any controversy.
I thought I already made that sure.
In my opinion, the only controversial patch was 'header-copying' and I couldn't
move that any further down the series or other changes without that.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[Mark Brown]

On Wed, Mar 10, 2010 at 09:24:45PM +0900, jassi brar wrote:
> On Wed, Mar 10, 2010 at 8:00 PM, Mark Brown

> > One other thing I'd suggest is that when constructing a patch series
> > it'd be better to put the more invasive or controversial changes (like
> > moving the headers) last.  This makes it easer to apply bits of the
> > series if there is any controversy.

> I thought I already made that sure.
> In my opinion, the only controversial patch was 'header-copying' and I couldn't
> move that any further down the series or other changes without that.

I agree that this is the only really controversial change, but it seemed
like pretty much all the changes that added stuff to the headers or used
them could've been done pre-move so that they didn't depend on it.

Re: [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[jassi brar]

On Wed, Mar 10, 2010 at 9:38 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Wed, Mar 10, 2010 at 09:24:45PM +0900, jassi brar wrote:
>> On Wed, Mar 10, 2010 at 8:00 PM, Mark Brown
>
>> > One other thing I'd suggest is that when constructing a patch series
>> > it'd be better to put the more invasive or controversial changes (like
>> > moving the headers) last.  This makes it easer to apply bits of the
>> > series if there is any controversy.
>
>> I thought I already made that sure.
>> In my opinion, the only controversial patch was 'header-copying' and I couldn't
>> move that any further down the series or other changes without that.
>
> I agree that this is the only really controversial change, but it seemed
> like pretty much all the changes that added stuff to the headers or used
> them could've been done pre-move so that they didn't depend on it.
Not sure which patch you point, but it was decision of logical
build-up and successful
compilation after each patch that made the patch series as it is now.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[Mark Brown]

On Wed, Mar 10, 2010 at 09:49:03PM +0900, jassi brar wrote:
> On Wed, Mar 10, 2010 at 9:38 PM, Mark Brown

> > I agree that this is the only really controversial change, but it seemed
> > like pretty much all the changes that added stuff to the headers or used
> > them could've been done pre-move so that they didn't depend on it.

> Not sure which patch you point, but it was decision of logical
> build-up and successful
> compilation after each patch that made the patch series as it is now.

Pretty much all of them - for example, patch 11 adds a bunch of new
bitfield definitions to the header.  This change didn't really need the
header to have been moved before it was made, it could have been done
pre-move.  Keeping things building is important and some of the changes
that affected both S3C24xx and S3C64xx might've needed the move for that
but not all of them.

Re: [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[jassi brar]

On Wed, Mar 10, 2010 at 9:56 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Wed, Mar 10, 2010 at 09:49:03PM +0900, jassi brar wrote:
>> On Wed, Mar 10, 2010 at 9:38 PM, Mark Brown
>
>> > I agree that this is the only really controversial change, but it seemed
>> > like pretty much all the changes that added stuff to the headers or used
>> > them could've been done pre-move so that they didn't depend on it.
>
>> Not sure which patch you point, but it was decision of logical
>> build-up and successful
>> compilation after each patch that made the patch series as it is now.
>
> Pretty much all of them - for example, patch 11 adds a bunch of new
> bitfield definitions to the header.  This change didn't really need the
> header to have been moved before it was made, it could have been done
> pre-move.
Dear that wud have defeated the very purpose of header moving -- don't wanna
depend on changes surfacing via ARCH tree after too long.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 11/20] ASoC: SAMSUNG: I2S: Add bit definitions

[Mark Brown]

On Wed, Mar 10, 2010 at 10:03:28PM +0900, jassi brar wrote:
> On Wed, Mar 10, 2010 at 9:56 PM, Mark Brown

> > Pretty much all of them - for example, patch 11 adds a bunch of new
> > bitfield definitions to the header.  This change didn't really need the
> > header to have been moved before it was made, it could have been done
> > pre-move.

> Dear that wud have defeated the very purpose of header moving -- don't wanna
> depend on changes surfacing via ARCH tree after too long.

Right, but the header move is itself an arch change so you're blocked on
one anyway until it goes in :/