Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6baf1190 authored by Timur Tabi's avatar Timur Tabi Committed by Anatolij Gustschin
Browse files

powerpc/512x: don't compile any platform DIU code if the DIU is not enabled 



If the DIU framebuffer driver is not enabled, then there's no point in
compiling any platform DIU code, because it will never be used.  Most of
the platform code was protected in the appropriate #ifdef, but not all.
This caused a break in some randconfig builds.

This is only a problem on the 512x platforms.  The P1022DS and MPC8610HPCD
platforms are already correct.

This patch reverts commit 12e36309 ("powerpc:
Option FB_FSL_DIU is not really optional for mpc512x") and restores the
ability to configure DIU support.

Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
parent 6c27b203

arch/powerpc/platforms/512x/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config PPC_MPC512x 
	bool "512x-based boards"

	depends on 6xx

	select FSL_SOC

	select FB_FSL_DIU

	select IPIC

	select PPC_CLOCK

	select PPC_PCI_CHOICE

arch/powerpc/platforms/512x/mpc5121_ads.c

+3 −0
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ static void __init mpc5121_ads_setup_arch(void) 
	for_each_compatible_node(np, "pci", "fsl,mpc5121-pci")

		mpc83xx_add_bridge(np);

#endif



#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)

	mpc512x_setup_diu();

#endif

}



static void __init mpc5121_ads_init_IRQ(void)

arch/powerpc/platforms/512x/mpc512x.h

+9 −2
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ extern void __init mpc512x_init(void); 
extern int __init mpc5121_clk_init(void);

void __init mpc512x_declare_of_platform_devices(void);

extern void mpc512x_restart(char *cmd);

extern void mpc512x_init_diu(void);

extern void mpc512x_setup_diu(void);



#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)

void mpc512x_init_diu(void);

void mpc512x_setup_diu(void);

#else

#define mpc512x_init_diu NULL

#define mpc512x_setup_diu NULL

#endif



#endif				/* __MPC512X_H__ */

arch/powerpc/platforms/512x/mpc512x_shared.c

+4 −21
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ void mpc512x_restart(char *cmd) 
		;

}



#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)



struct fsl_diu_shared_fb {

	u8		gamma[0x300];	/* 32-bit aligned! */

	struct diu_ad	ad0;		/* 32-bit aligned! */
@@ -66,25 +68,6 @@ struct fsl_diu_shared_fb { 
	bool		in_use;

};



u32 mpc512x_get_pixel_format(enum fsl_diu_monitor_port port,

			     unsigned int bits_per_pixel)

{

	switch (bits_per_pixel) {

	case 32:

		return 0x88883316;

	case 24:

		return 0x88082219;

	case 16:

		return 0x65053118;

	}

	return 0x00000400;

}



void mpc512x_set_gamma_table(enum fsl_diu_monitor_port port,

			     char *gamma_table_base)

{

}



void mpc512x_set_monitor_port(enum fsl_diu_monitor_port port)

{

}
@@ -320,14 +303,14 @@ void __init mpc512x_setup_diu(void) 
		}

	}



	diu_ops.get_pixel_format	= mpc512x_get_pixel_format;

	diu_ops.set_gamma_table		= mpc512x_set_gamma_table;

	diu_ops.set_monitor_port	= mpc512x_set_monitor_port;

	diu_ops.set_pixel_clock		= mpc512x_set_pixel_clock;

	diu_ops.valid_monitor_port	= mpc512x_valid_monitor_port;

	diu_ops.release_bootmem		= mpc512x_release_bootmem;

}



#endif



void __init mpc512x_init_IRQ(void)

{

	struct device_node *np;