mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
Merge remote-tracking branch 'agust/next' into next
Fixes for build issues when LPB FIFO driver is configured as a module, removal of #ifdefs in mpc512x DIU platform code and a revert of recent changes to mpc52xx PIC driver. Wolfram provided a better fix for PIC driver build issue popping up when older gcc-4.3.5 is used.
This commit is contained in:
commit
5c509a2bb4
4 changed files with 10 additions and 18 deletions
|
@ -60,8 +60,6 @@ void mpc512x_restart(char *cmd)
|
|||
;
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_FB_FSL_DIU)
|
||||
|
||||
struct fsl_diu_shared_fb {
|
||||
u8 gamma[0x300]; /* 32-bit aligned! */
|
||||
struct diu_ad ad0; /* 32-bit aligned! */
|
||||
|
@ -71,7 +69,7 @@ struct fsl_diu_shared_fb {
|
|||
};
|
||||
|
||||
#define DIU_DIV_MASK 0x000000ff
|
||||
void mpc512x_set_pixel_clock(unsigned int pixclock)
|
||||
static void mpc512x_set_pixel_clock(unsigned int pixclock)
|
||||
{
|
||||
unsigned long bestval, bestfreq, speed, busfreq;
|
||||
unsigned long minpixclock, maxpixclock, pixval;
|
||||
|
@ -164,7 +162,7 @@ void mpc512x_set_pixel_clock(unsigned int pixclock)
|
|||
iounmap(ccm);
|
||||
}
|
||||
|
||||
enum fsl_diu_monitor_port
|
||||
static enum fsl_diu_monitor_port
|
||||
mpc512x_valid_monitor_port(enum fsl_diu_monitor_port port)
|
||||
{
|
||||
return FSL_DIU_PORT_DVI;
|
||||
|
@ -179,7 +177,7 @@ static inline void mpc512x_free_bootmem(struct page *page)
|
|||
free_reserved_page(page);
|
||||
}
|
||||
|
||||
void mpc512x_release_bootmem(void)
|
||||
static void mpc512x_release_bootmem(void)
|
||||
{
|
||||
unsigned long addr = diu_shared_fb.fb_phys & PAGE_MASK;
|
||||
unsigned long size = diu_shared_fb.fb_len;
|
||||
|
@ -205,7 +203,7 @@ void mpc512x_release_bootmem(void)
|
|||
* address range will be reserved in setup_arch() after bootmem
|
||||
* allocator is up.
|
||||
*/
|
||||
void __init mpc512x_init_diu(void)
|
||||
static void __init mpc512x_init_diu(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
struct diu __iomem *diu_reg;
|
||||
|
@ -274,7 +272,7 @@ void __init mpc512x_init_diu(void)
|
|||
iounmap(diu_reg);
|
||||
}
|
||||
|
||||
void __init mpc512x_setup_diu(void)
|
||||
static void __init mpc512x_setup_diu(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -303,8 +301,6 @@ void __init mpc512x_setup_diu(void)
|
|||
diu_ops.release_bootmem = mpc512x_release_bootmem;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void __init mpc512x_init_IRQ(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
|
@ -337,7 +333,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
|
|||
{},
|
||||
};
|
||||
|
||||
void __init mpc512x_declare_of_platform_devices(void)
|
||||
static void __init mpc512x_declare_of_platform_devices(void)
|
||||
{
|
||||
if (of_platform_bus_probe(NULL, of_bus_ids, NULL))
|
||||
printk(KERN_ERR __FILE__ ": "
|
||||
|
@ -387,7 +383,7 @@ static unsigned int __init get_fifo_size(struct device_node *np,
|
|||
((u32)(_base) + sizeof(struct mpc52xx_psc)))
|
||||
|
||||
/* Init PSC FIFO space for TX and RX slices */
|
||||
void __init mpc512x_psc_fifo_init(void)
|
||||
static void __init mpc512x_psc_fifo_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
void __iomem *psc;
|
||||
|
|
|
@ -57,5 +57,5 @@ config PPC_MPC5200_BUGFIX
|
|||
|
||||
config PPC_MPC5200_LPBFIFO
|
||||
tristate "MPC5200 LocalPlus bus FIFO driver"
|
||||
depends on PPC_MPC52xx
|
||||
depends on PPC_MPC52xx && PPC_BESTCOMM
|
||||
select PPC_BESTCOMM_GEN_BD
|
||||
|
|
|
@ -340,7 +340,7 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
|
|||
{
|
||||
int l1irq;
|
||||
int l2irq;
|
||||
struct irq_chip *irqchip;
|
||||
struct irq_chip *uninitialized_var(irqchip);
|
||||
void *hndlr;
|
||||
int type;
|
||||
u32 reg;
|
||||
|
@ -373,9 +373,8 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
|
|||
case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
|
||||
case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
|
||||
case MPC52xx_IRQ_L1_CRIT:
|
||||
default:
|
||||
pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
|
||||
__func__, l1irq);
|
||||
__func__, l2irq);
|
||||
irq_set_chip(virq, &no_irq_chip);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -21,8 +21,6 @@ struct device_node;
|
|||
|
||||
extern void fsl_rstcr_restart(char *cmd);
|
||||
|
||||
#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
|
||||
|
||||
/* The different ports that the DIU can be connected to */
|
||||
enum fsl_diu_monitor_port {
|
||||
FSL_DIU_PORT_DVI, /* DVI */
|
||||
|
@ -43,7 +41,6 @@ struct platform_diu_data_ops {
|
|||
};
|
||||
|
||||
extern struct platform_diu_data_ops diu_ops;
|
||||
#endif
|
||||
|
||||
void fsl_hv_restart(char *cmd);
|
||||
void fsl_hv_halt(void);
|
||||
|
|
Loading…
Reference in a new issue