Patchwork powerpc: add Ethernet UPSMR definitions to QE library

login
register
mail settings
Submitter Timur Tabi
Date Jan. 6, 2009, 11:12 p.m.
Message ID <1231283543-26752-1-git-send-email-timur@freescale.com>
Download mbox | patch
Permalink /patch/16968/
State Accepted, archived
Commit fdd4e8152f5f0d6d500b35515265e425acdfd203
Delegated to: Kumar Gala
Headers show

Comments

Timur Tabi - Jan. 6, 2009, 11:12 p.m.
Add the UCC_GETH_UPSMR_xxx definitions to qe.h.  The ucc_geth driver will
eventually use these instead of the UPSMR_ macros it currently defines.

Signed-off-by: Timur Tabi <timur@freescale.com>
---
 arch/powerpc/include/asm/qe.h |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
Kumar Gala - Jan. 7, 2009, 3:21 a.m.
On Jan 6, 2009, at 5:12 PM, Timur Tabi wrote:

> Add the UCC_GETH_UPSMR_xxx definitions to qe.h.  The ucc_geth driver  
> will
> eventually use these instead of the UPSMR_ macros it currently  
> defines.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> arch/powerpc/include/asm/qe.h |   19 ++++++++++++++++++-
> 1 files changed, 18 insertions(+), 1 deletions(-)

is there some reason to move the defines into this file?

- k
Timur Tabi - Jan. 7, 2009, 3:33 a.m.
On Tue, Jan 6, 2009 at 9:21 PM, Kumar Gala <galak@kernel.crashing.org> wrote:
>
> is there some reason to move the defines into this file?

For consistency.  Similar definitions for UART are already in this file.
Kumar Gala - Jan. 7, 2009, 4:25 a.m.
On Jan 6, 2009, at 5:12 PM, Timur Tabi wrote:

> Add the UCC_GETH_UPSMR_xxx definitions to qe.h.  The ucc_geth driver  
> will
> eventually use these instead of the UPSMR_ macros it currently  
> defines.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> arch/powerpc/include/asm/qe.h |   19 ++++++++++++++++++-
> 1 files changed, 18 insertions(+), 1 deletions(-)

applied

- k

Patch

diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h
index edee15d..a355e72 100644
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
@@ -591,7 +591,7 @@  struct ucc_slow_pram {
 #define UCC_GETH_UCCE_RXF1      0x00000002
 #define UCC_GETH_UCCE_RXF0      0x00000001
 
-/* UPSMR, when used as a UART */
+/* UCC Protocol Specific Mode Register (UPSMR), when used for UART */
 #define UCC_UART_UPSMR_FLC		0x8000
 #define UCC_UART_UPSMR_SL		0x4000
 #define UCC_UART_UPSMR_CL_MASK		0x3000
@@ -619,6 +619,23 @@  struct ucc_slow_pram {
 #define UCC_UART_UPSMR_TPM_EVEN		0x0002
 #define UCC_UART_UPSMR_TPM_HIGH		0x0003
 
+/* UCC Protocol Specific Mode Register (UPSMR), when used for Ethernet */
+#define UCC_GETH_UPSMR_FTFE     0x80000000
+#define UCC_GETH_UPSMR_PTPE     0x40000000
+#define UCC_GETH_UPSMR_ECM      0x04000000
+#define UCC_GETH_UPSMR_HSE      0x02000000
+#define UCC_GETH_UPSMR_PRO      0x00400000
+#define UCC_GETH_UPSMR_CAP      0x00200000
+#define UCC_GETH_UPSMR_RSH      0x00100000
+#define UCC_GETH_UPSMR_RPM      0x00080000
+#define UCC_GETH_UPSMR_R10M     0x00040000
+#define UCC_GETH_UPSMR_RLPB     0x00020000
+#define UCC_GETH_UPSMR_TBIM     0x00010000
+#define UCC_GETH_UPSMR_RES1     0x00002000
+#define UCC_GETH_UPSMR_RMM      0x00001000
+#define UCC_GETH_UPSMR_CAM      0x00000400
+#define UCC_GETH_UPSMR_BRO      0x00000200
+
 /* UCC Transmit On Demand Register (UTODR) */
 #define UCC_SLOW_TOD	0x8000
 #define UCC_FAST_TOD	0x8000