| Message ID | 1302100144-17176-1-git-send-email-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, Apr 06, 2011 at 04:29:04PM +0200, Uwe Kleine-K??nig wrote: > All machines having a imx-fb device now select IMX_HAVE_PLATFORM_IMX_FB, > so HAVE_FB_IMX can go away and there is no need anymore to explicitly > depend on ARCH_MX1 or ARCH_MX2. > > Signed-off-by: Uwe Kleine-K??nig <u.kleine-koenig@pengutronix.de> > --- > Hello, > > should this go via Sascha's or Paul's tree? > There shouldn't be anything it conflicts with in my tree, so it can go via either. Most of the imx changes have bypassed the fbdev tree, so I'm unaware if there are outstanding patches in Sascha's tree at the moment or not. I can of course take it though. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Uwe, On Wed, Apr 06, 2011 at 04:29:04PM +0200, Uwe Kleine-König wrote: > All machines having a imx-fb device now select IMX_HAVE_PLATFORM_IMX_FB, > so HAVE_FB_IMX can go away and there is no need anymore to explicitly > depend on ARCH_MX1 or ARCH_MX2. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- Sascha has already sent a patch for this. See http://article.gmane.org/gmane.linux.ports.arm.kernel/109067. baruch > Hello, > > should this go via Sascha's or Paul's tree? > > Best regards > Uwe > > arch/arm/plat-mxc/devices/Kconfig | 1 - > drivers/video/Kconfig | 5 +---- > 2 files changed, 1 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig > index b9ab1d5..e4dcf49 100644 > --- a/arch/arm/plat-mxc/devices/Kconfig > +++ b/arch/arm/plat-mxc/devices/Kconfig > @@ -24,7 +24,6 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC > > config IMX_HAVE_PLATFORM_IMX_FB > bool > - select HAVE_FB_IMX > > config IMX_HAVE_PLATFORM_IMX_I2C > bool > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index e6a8d8c..62f337a 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -8,9 +8,6 @@ menu "Graphics support" > config HAVE_FB_ATMEL > bool > > -config HAVE_FB_IMX > - bool > - > config SH_MIPI_DSI > tristate > depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK > @@ -359,7 +356,7 @@ config FB_SA1100 > > config FB_IMX > tristate "Freescale i.MX LCD support" > - depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2) > + depends on FB && IMX_HAVE_PLATFORM_IMX_FB > select FB_CFB_FILLRECT > select FB_CFB_COPYAREA > select FB_CFB_IMAGEBLIT > --
On Wed, Apr 06, 2011 at 08:31:51PM +0300, Baruch Siach wrote: > Hi Uwe, > > On Wed, Apr 06, 2011 at 04:29:04PM +0200, Uwe Kleine-König wrote: > > All machines having a imx-fb device now select IMX_HAVE_PLATFORM_IMX_FB, > > so HAVE_FB_IMX can go away and there is no need anymore to explicitly > > depend on ARCH_MX1 or ARCH_MX2. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > --- > > Sascha has already sent a patch for this. See > http://article.gmane.org/gmane.linux.ports.arm.kernel/109067. yeah, this looks more complete. Thanks for pointing that out. Best regards Uwe
On Thu, Apr 07, 2011 at 01:38:13AM +0900, Paul Mundt wrote: > On Wed, Apr 06, 2011 at 04:29:04PM +0200, Uwe Kleine-K??nig wrote: > > All machines having a imx-fb device now select IMX_HAVE_PLATFORM_IMX_FB, > > so HAVE_FB_IMX can go away and there is no need anymore to explicitly > > depend on ARCH_MX1 or ARCH_MX2. > > > > Signed-off-by: Uwe Kleine-K??nig <u.kleine-koenig@pengutronix.de> > > --- > > Hello, > > > > should this go via Sascha's or Paul's tree? > > > There shouldn't be anything it conflicts with in my tree, so it can go > via either. Most of the imx changes have bypassed the fbdev tree, so I'm > unaware if there are outstanding patches in Sascha's tree at the moment > or not. I can of course take it though. I currently collect imx patches for Sascha because he is busy doing other stuff. Can I have your ack for the patch that Baruch pointed out? Then I'd take it for the imx tree. Best regards Uwe
On Wed, Apr 06, 2011 at 08:40:22PM +0200, Uwe Kleine-K?nig wrote: > On Thu, Apr 07, 2011 at 01:38:13AM +0900, Paul Mundt wrote: > > On Wed, Apr 06, 2011 at 04:29:04PM +0200, Uwe Kleine-K??nig wrote: > > > All machines having a imx-fb device now select IMX_HAVE_PLATFORM_IMX_FB, > > > so HAVE_FB_IMX can go away and there is no need anymore to explicitly > > > depend on ARCH_MX1 or ARCH_MX2. > > > > > > Signed-off-by: Uwe Kleine-K??nig <u.kleine-koenig@pengutronix.de> > > > --- > > > Hello, > > > > > > should this go via Sascha's or Paul's tree? > > > > > There shouldn't be anything it conflicts with in my tree, so it can go > > via either. Most of the imx changes have bypassed the fbdev tree, so I'm > > unaware if there are outstanding patches in Sascha's tree at the moment > > or not. I can of course take it though. > I currently collect imx patches for Sascha because he is busy doing > other stuff. Can I have your ack for the patch that Baruch pointed out? > Then I'd take it for the imx tree. > That's fine for this, but in the future it would be nice to have changes that impact the fb driver go through the fb tree. In cases like this where you have clear interdependencies in Kconfig language it obviously doesn't make much sense to split things up, but it's something to keep in mind for the things that can be. Acked-by: Paul Mundt <lethal@linux-sh.org> -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Uwe, On Wed, Apr 06, 2011 at 08:40:22PM +0200, Uwe Kleine-König wrote: > I currently collect imx patches for Sascha because he is busy doing > other stuff. Can you take the following one then? I need this to enable multiple NAND chips on i.MX25. http://article.gmane.org/gmane.linux.ports.arm.kernel/110313 baruch
diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig index b9ab1d5..e4dcf49 100644 --- a/arch/arm/plat-mxc/devices/Kconfig +++ b/arch/arm/plat-mxc/devices/Kconfig @@ -24,7 +24,6 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC config IMX_HAVE_PLATFORM_IMX_FB bool - select HAVE_FB_IMX config IMX_HAVE_PLATFORM_IMX_I2C bool diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e6a8d8c..62f337a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -8,9 +8,6 @@ menu "Graphics support" config HAVE_FB_ATMEL bool -config HAVE_FB_IMX - bool - config SH_MIPI_DSI tristate depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK @@ -359,7 +356,7 @@ config FB_SA1100 config FB_IMX tristate "Freescale i.MX LCD support" - depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2) + depends on FB && IMX_HAVE_PLATFORM_IMX_FB select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
All machines having a imx-fb device now select IMX_HAVE_PLATFORM_IMX_FB, so HAVE_FB_IMX can go away and there is no need anymore to explicitly depend on ARCH_MX1 or ARCH_MX2. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Hello, should this go via Sascha's or Paul's tree? Best regards Uwe arch/arm/plat-mxc/devices/Kconfig | 1 - drivers/video/Kconfig | 5 +---- 2 files changed, 1 insertions(+), 5 deletions(-)