tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- only include FEC platform entries when hardware supports it
- fix typo in ifdef config name
* tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: coldfire/device.c: only build FEC when HW macros are defined
m68k: mcfgpio: Fix incorrect register offset for CONFIG_M5441x
+5
-5
+4
-4
arch/m68k/coldfire/device.c
+4
-4
arch/m68k/coldfire/device.c
···
93
93
.dev.platform_data = mcf_uart_platform_data,
94
94
};
95
95
96
-
#if IS_ENABLED(CONFIG_FEC)
96
+
#ifdef MCFFEC_BASE0
97
97
98
98
#ifdef CONFIG_M5441x
99
99
#define FEC_NAME "enet-fec"
···
145
145
.platform_data = FEC_PDATA,
146
146
}
147
147
};
148
+
#endif /* MCFFEC_BASE0 */
148
149
149
150
#ifdef MCFFEC_BASE1
150
151
static struct resource mcf_fec1_resources[] = {
···
183
182
}
184
183
};
185
184
#endif /* MCFFEC_BASE1 */
186
-
#endif /* CONFIG_FEC */
187
185
188
186
#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
189
187
/*
···
624
624
625
625
static struct platform_device *mcf_devices[] __initdata = {
626
626
&mcf_uart,
627
-
#if IS_ENABLED(CONFIG_FEC)
627
+
#ifdef MCFFEC_BASE0
628
628
&mcf_fec0,
629
+
#endif
629
630
#ifdef MCFFEC_BASE1
630
631
&mcf_fec1,
631
-
#endif
632
632
#endif
633
633
#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
634
634
&mcf_qspi,
+1
-1
arch/m68k/include/asm/mcfgpio.h
+1
-1
arch/m68k/include/asm/mcfgpio.h
···
136
136
* read-modify-write as well as those controlled by the EPORT and GPIO modules.
137
137
*/
138
138
#define MCFGPIO_SCR_START 40
139
-
#elif defined(CONFIGM5441x)
139
+
#elif defined(CONFIG_M5441x)
140
140
/* The m5441x EPORT doesn't have its own GPIO port, uses PORT C */
141
141
#define MCFGPIO_SCR_START 0
142
142
#else