Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 504695479ecce2a89955b52c332b0eeec75be8e8

Authored by Greg Ungerer
1 parent 4f8f9fb8cb
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

m68knommu: make 532x FEC platform addressing consistent 

If we make all FEC (ethernet) addressing consistent across all ColdFire
family members then we will be able to remove the duplicated plaform data
and use a single setup for all.

So modify the ColdFire 532x FEC addressing so that:

. FECs are numbered from 0 up
. base addresses are absolute (not relative to MBAR peripheral register)
. use a common name for IRQs used

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

Showing 2 changed files with 21 additions and 8 deletions Side-by-side Diff

arch/m68k/include/asm/m532xsim.h
Diff comments   View file @ 5046954
... ... @@ -24,11 +24,18 @@
24 24 #define MCFINT_UART1 27 /* Interrupt number for UART1 */
25 25 #define MCFINT_UART2 28 /* Interrupt number for UART2 */
26 26 #define MCFINT_QSPI 31 /* Interrupt number for QSPI */
  27 +#define MCFINT_FECRX0 36 /* Interrupt number for FEC */
  28 +#define MCFINT_FECTX0 40 /* Interrupt number for FEC */
  29 +#define MCFINT_FECENTC0 42 /* Interrupt number for FEC */
27 30  
28 31 #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0)
29 32 #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1)
30 33 #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2)
31 34  
  35 +#define MCF_IRQ_FECRX0 (MCFINT_VECBASE + MCFINT_FECRX0)
  36 +#define MCF_IRQ_FECTX0 (MCFINT_VECBASE + MCFINT_FECTX0)
  37 +#define MCF_IRQ_FECENTC0 (MCFINT_VECBASE + MCFINT_FECENTC0)
  38 +
32 39 #define MCF_WTM_WCR MCF_REG16(0xFC098000)
33 40  
34 41 /*
... ... @@ -89,6 +96,12 @@
89 96 #define MCFUART_BASE0 0xFC060000 /* Base address of UART1 */
90 97 #define MCFUART_BASE1 0xFC064000 /* Base address of UART2 */
91 98 #define MCFUART_BASE2 0xFC068000 /* Base address of UART3 */
  99 +
  100 +/*
  101 + * FEC module.
  102 + */
  103 +#define MCFFEC_BASE0 0xFC030000 /* Base address of FEC0 */
  104 +#define MCFFEC_SIZE0 0x800 /* Size of FEC0 region */
92 105  
93 106 /*
94 107 * Timer module.
arch/m68k/platform/532x/config.c
Diff comments   View file @ 5046954
... ... @@ -35,23 +35,23 @@
35 35  
36 36 static struct resource m532x_fec_resources[] = {
37 37 {
38   - .start = 0xfc030000,
39   - .end = 0xfc0307ff,
  38 + .start = MCFFEC_BASE0,
  39 + .end = MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,
40 40 .flags = IORESOURCE_MEM,
41 41 },
42 42 {
43   - .start = 64 + 36,
44   - .end = 64 + 36,
  43 + .start = MCF_IRQ_FECRX0,
  44 + .end = MCF_IRQ_FECRX0,
45 45 .flags = IORESOURCE_IRQ,
46 46 },
47 47 {
48   - .start = 64 + 40,
49   - .end = 64 + 40,
  48 + .start = MCF_IRQ_FECTX0,
  49 + .end = MCF_IRQ_FECTX0,
50 50 .flags = IORESOURCE_IRQ,
51 51 },
52 52 {
53   - .start = 64 + 42,
54   - .end = 64 + 42,
  53 + .start = MCF_IRQ_FECENTC0,
  54 + .end = MCF_IRQ_FECENTC0,
55 55 .flags = IORESOURCE_IRQ,
56 56 },
57 57 };