* [PATCH v8 0/6] of: add display helper
From: Steffen Trumtrar @ 2012-11-12 15:37 UTC (permalink / raw)
To: devicetree-discuss
Cc: Steffen Trumtrar, Rob Herring, linux-fbdev, dri-devel,
Laurent Pinchart, Thierry Reding, Guennady Liakhovetski,
linux-media, Tomi Valkeinen, Stephen Warren, kernel
Hi!
This is v8 of the display helper series
Changes since v7:
- move of_xxx to drivers/video
- remove non-binding documentation from display-timings.txt
- squash display_timings and videomode in one patch
- misc minor fixes
Regards,
Steffen
Steffen Trumtrar (6):
video: add display_timing and videomode
video: add of helper for videomode
fbmon: add videomode helpers
fbmon: add of_videomode helpers
drm_modes: add videomode helpers
drm_modes: add of_videomode helpers
.../devicetree/bindings/video/display-timings.txt | 107 +++++++++++
drivers/gpu/drm/drm_modes.c | 77 ++++++++
drivers/video/Kconfig | 19 ++
drivers/video/Makefile | 4 +
drivers/video/display_timing.c | 22 +++
drivers/video/fbmon.c | 77 ++++++++
drivers/video/of_display_timing.c | 186 ++++++++++++++++++++
drivers/video/of_videomode.c | 47 +++++
drivers/video/videomode.c | 45 +++++
include/drm/drmP.h | 8 +
include/linux/display_timing.h | 69 ++++++++
include/linux/fb.h | 5 +
include/linux/of_display_timings.h | 19 ++
include/linux/of_videomode.h | 15 ++
include/linux/videomode.h | 39 ++++
15 files changed, 739 insertions(+)
create mode 100644 Documentation/devicetree/bindings/video/display-timings.txt
create mode 100644 drivers/video/display_timing.c
create mode 100644 drivers/video/of_display_timing.c
create mode 100644 drivers/video/of_videomode.c
create mode 100644 drivers/video/videomode.c
create mode 100644 include/linux/display_timing.h
create mode 100644 include/linux/of_display_timings.h
create mode 100644 include/linux/of_videomode.h
create mode 100644 include/linux/videomode.h
--
1.7.10.4
^ permalink raw reply
* Re: [PATCHv6 0/2] Add support for the OLED in the CFA10036
From: Maxime Ripard @ 2012-11-12 14:14 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1351674774-2891-1-git-send-email-maxime.ripard@free-electrons.com>
Ping?
Le 31/10/2012 10:12, Maxime Ripard a écrit :
> Hi everyone,
>
> This patchset adds support for the solomon SSD1307 OLED controller present
> in the CFA-10036 board.
>
> It first adds the framebuffer driver for this controller, and then the
> needed bits to enable it in the cfa10036 dts.
>
> Considering that the driver has been around since almost three months now, and
> I have not received any comments on the framebuffer part, I'd very much like it
> to be included in 3.8 if possible.
>
> Thanks,
> Maxime
>
> Changes from v5:
> * Fixed bogus reset code
>
> Maxime Ripard (2):
> video: Add support for the Solomon SSD1307 OLED Controller
> ARM: dts: mxs: add oled support for the cfa-10036
>
> .../devicetree/bindings/video/ssd1307fb.txt | 24 ++
> arch/arm/boot/dts/imx28-cfa10036.dts | 19 +
> drivers/video/Kconfig | 13 +
> drivers/video/Makefile | 1 +
> drivers/video/ssd1307fb.c | 407 ++++++++++++++++++++
> 5 files changed, 464 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/video/ssd1307fb.txt
> create mode 100644 drivers/video/ssd1307fb.c
>
--
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-12 14:06 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAGhQ9VxgbCGzOPVtQq-LYsEPuyyGjRDfB3jHPtvbHr1xLgntXA@mail.gmail.com>
On 11:54 Sat 10 Nov , Joachim Eastwood wrote:
> Hi Jean-Christophe,
>
> On 7 November 2012 12:22, Jean-Christophe PLAGNIOL-VILLARD
> <plagnioj@jcrosoft.com> wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> > Cc: linux-ide@vger.kernel.org
> > Cc: linux-input@vger.kernel.org
> > Cc: linux-mmc@vger.kernel.org
> > Cc: linux-can@vger.kernel.org
> > Cc: netdev@vger.kernel.org
> > Cc: linux-pcmcia@lists.infradead.org
> > Cc: rtc-linux@googlegroups.com
> > Cc: spi-devel-general@lists.sourceforge.net
> > Cc: linux-serial@vger.kernel.org
> > Cc: linux-usb@vger.kernel.org
> > Cc: linux-fbdev@vger.kernel.org
> > ---
> > HI all,
> >
> > If it's ok with everyone this will go via at91
> > with the patch serie than clean up the include/mach
> >
> > For preparation to switch to arm multiarch kernel
> >
> > Best Regards,
> > J.
> > arch/arm/mach-at91/include/mach/board.h | 55 ----------------------
> > arch/avr32/mach-at32ap/include/mach/board.h | 7 ---
> > drivers/ata/pata_at91.c | 2 +-
> > drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
> > drivers/mmc/host/atmel-mci.c | 2 +-
> > drivers/net/can/at91_can.c | 3 +-
> > drivers/net/ethernet/cadence/at91_ether.c | 2 +-
> > drivers/pcmcia/at91_cf.c | 2 +-
> > drivers/rtc/rtc-at91sam9.c | 2 +-
> > drivers/spi/spi-atmel.c | 2 +-
> > drivers/tty/serial/atmel_serial.c | 2 +-
> > drivers/usb/gadget/at91_udc.c | 2 +-
> > drivers/usb/gadget/atmel_usba_udc.c | 2 +-
> > drivers/usb/host/ohci-at91.c | 2 +-
> > drivers/video/atmel_lcdfb.c | 2 +-
> > include/linux/platform_data/atmel.h | 67 +++++++++++++++++++++++++++
> > 16 files changed, 80 insertions(+), 76 deletions(-)
>
> <snip>
>
> > diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
> > index 4e980a7..35fc6edb 100644
> > --- a/drivers/net/ethernet/cadence/at91_ether.c
> > +++ b/drivers/net/ethernet/cadence/at91_ether.c
> > @@ -31,6 +31,7 @@
> > #include <linux/clk.h>
> > #include <linux/gfp.h>
> > #include <linux/phy.h>
> > +#include <linux/platform_data/atmel.h>
> >
> > #include <asm/io.h>
> > #include <asm/uaccess.h>
> > @@ -38,7 +39,6 @@
> >
> > #include <mach/at91rm9200_emac.h>
> > #include <asm/gpio.h>
> > -#include <mach/board.h>
> >
> > #include "at91_ether.h"
>
> The at91_ether driver in net-next does not need to be change since it
> all mach includes has already been removed by other patches and it
> includes linux/platform_data/macb.h directly.
>
> What tree was these patches based on?
> The at91_ether driver changes has been in linux-next for a long while now.
the conflict is minor easy to handle and the cleanup need to go first on arm soc so this is
based on rc3
Best Regards,
J.
^ permalink raw reply
* Re: [PATCH 0/5] OMAPFB: use dma_alloc instead of omap's vram
From: Tomi Valkeinen @ 2012-11-12 13:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CANOLnOO0yMabku-_3yhi=1bwohbrb=rtFDOuKf1LPCAFv_OqCQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2064 bytes --]
On 2012-11-12 15:39, Grazvydas Ignotas wrote:
> Hi,
>
> On Mon, Nov 12, 2012 at 12:25 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>> This series changes omapfb to use standard dma_alloc funcs instead of omap
>> specific vram allocator. This let's us remove the omap vram allocator, making
>> omapfb platform independent.
>>
>> However, note that using standard dma funcs causes the following downsides:
>>
>> ...
>>
>> 3) OMAPFB_GET_VRAM_INFO ioctl cannot return real values anymore. I
>> changed the ioctl to return 64M for all the values, which, I hope, the
>> applications will interpret as "there's enough vram".
>
> Do at least OMAPFB_QUERY_MEM/OMAPFB_SETUP_MEM still work?
>
>> 4) "vram" kernel parameter to define how much ram to reserve for video use no
>> longer works. The user needs to enable CMA and use "cma" parameter.
>
> That's a significant change, you should update Documentation/ .
I've added the following documentation change:
diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS
index a564cee..4484e02 100644
--- a/Documentation/arm/OMAP/DSS
+++ b/Documentation/arm/OMAP/DSS
@@ -285,7 +285,10 @@ FB0 +-- GFX ---- LCD ---- LCD
Misc notes
----------
-OMAP FB allocates the framebuffer memory using the OMAP VRAM allocator.
+OMAP FB allocates the framebuffer memory using the standard dma allocator. You
+can enable Contiguous Memory Allocator (CONFIG_CMA) to improve the dma
+allocator, and if CMA is enabled, you use "cma=" kernel parameter to increase
+the global memory area for CMA.
Using DSI DPLL to generate pixel clock it is possible produce the pixel clock
of 86.5MHz (max possible), and with that you get 1280x1024@57 output from DVI.
@@ -301,11 +304,6 @@ framebuffer parameters.
Kernel boot arguments
---------------------
-vram=<size>[,<physaddr>]
- - Amount of total VRAM to preallocate and optionally a physical start
- memory address. For example, "10M". omapfb allocates memory for
- framebuffers from VRAM.
-
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 897 bytes --]
^ permalink raw reply related
* Re: [PATCH 0/5] OMAPFB: use dma_alloc instead of omap's vram
From: Tomi Valkeinen @ 2012-11-12 13:50 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CANOLnOO0yMabku-_3yhi=1bwohbrb=rtFDOuKf1LPCAFv_OqCQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]
On 2012-11-12 15:39, Grazvydas Ignotas wrote:
> Hi,
>
> On Mon, Nov 12, 2012 at 12:25 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>> This series changes omapfb to use standard dma_alloc funcs instead of omap
>> specific vram allocator. This let's us remove the omap vram allocator, making
>> omapfb platform independent.
>>
>> However, note that using standard dma funcs causes the following downsides:
>>
>> ...
>>
>> 3) OMAPFB_GET_VRAM_INFO ioctl cannot return real values anymore. I
>> changed the ioctl to return 64M for all the values, which, I hope, the
>> applications will interpret as "there's enough vram".
>
> Do at least OMAPFB_QUERY_MEM/OMAPFB_SETUP_MEM still work?
Yes.
>> 4) "vram" kernel parameter to define how much ram to reserve for video use no
>> longer works. The user needs to enable CMA and use "cma" parameter.
>
> That's a significant change, you should update Documentation/ .
Ah right. The documentation. I never remember =).
> What about omapfb.vram, is it still there?
Yes.
> Perhaps we also need to select/depend on CMA?
dma_alloc_* funcs work fine without CMA. CMA only makes them work
better. Thus I don't think OMAPFB should depend on CMA, but perhaps CMA
should be enabled by default in omap2plus_defconfig?
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 897 bytes --]
^ permalink raw reply
* Re: [PATCH 0/5] OMAPFB: use dma_alloc instead of omap's vram
From: Grazvydas Ignotas @ 2012-11-12 13:39 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352715906-16946-1-git-send-email-tomi.valkeinen@ti.com>
Hi,
On Mon, Nov 12, 2012 at 12:25 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
> This series changes omapfb to use standard dma_alloc funcs instead of omap
> specific vram allocator. This let's us remove the omap vram allocator, making
> omapfb platform independent.
>
> However, note that using standard dma funcs causes the following downsides:
>
> ...
>
> 3) OMAPFB_GET_VRAM_INFO ioctl cannot return real values anymore. I
> changed the ioctl to return 64M for all the values, which, I hope, the
> applications will interpret as "there's enough vram".
Do at least OMAPFB_QUERY_MEM/OMAPFB_SETUP_MEM still work?
> 4) "vram" kernel parameter to define how much ram to reserve for video use no
> longer works. The user needs to enable CMA and use "cma" parameter.
That's a significant change, you should update Documentation/ .
What about omapfb.vram, is it still there?
Perhaps we also need to select/depend on CMA?
--
Gražvydas
^ permalink raw reply
* Re: [PATCH 0/2] Adding devm_ functions and DT support to MIPI driver
From: Sylwester Nawrocki @ 2012-11-12 13:08 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1352547285-12302-1-git-send-email-shaik.ameer@samsung.com>
Hi,
On 11/12/2012 01:35 PM, Tomi Valkeinen wrote:
>> Shaik Ameer Basha (2):
>> exynos-mipi-dsi: using devm_ functions for automatic cleanup
>> video: exynos-mipi-dsi: Adding DT support to exynos mipi driver
>
> MIPI is an organization. DSI is a protocol from MIPI. MIPI has many
> protocols. Thus it doesn't make sense to say "MIPI driver", "MIPI
> display", or use names like "samsung,exynos-mipi".
True.
> It's either "MIPI DSI" if you want to be exact, or just "DSI", which I
> think is clear from the context.
>
> What is "dsim"?
In the Samsung SoCs documentation MIPI DSIM stands for MIPI DSI Master
and similarly MIPI CSIS stands for MIPI CSI Slave.
--
Regards,
Sylwester
^ permalink raw reply
* Re: [PATCH 0/2] Adding devm_ functions and DT support to MIPI driver
From: Tomi Valkeinen @ 2012-11-12 12:35 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1352547285-12302-1-git-send-email-shaik.ameer@samsung.com>
Hi,
On 2012-11-10 13:34, Shaik Ameer Basha wrote:
> In this patch series,
>
> First patch adds the devm_ functions to the driver code for automatic
> code cleanup.
>
> Second patch adds the DT support for the exynos mipi-dsi driver.
> for DT support, mipi device node should supply the following
> information to the mipi-dsi driver.
> 1] dsim_config information
> 2] d-phy setting information
> 3] lcd poweron, reset information
> 4] fb_videomode information
>
> refer the documentation files for further details.
>
> Shaik Ameer Basha (2):
> exynos-mipi-dsi: using devm_ functions for automatic cleanup
> video: exynos-mipi-dsi: Adding DT support to exynos mipi driver
MIPI is an organization. DSI is a protocol from MIPI. MIPI has many
protocols. Thus it doesn't make sense to say "MIPI driver", "MIPI
display", or use names like "samsung,exynos-mipi".
It's either "MIPI DSI" if you want to be exact, or just "DSI", which I
think is clear from the context.
What is "dsim"?
Tomi
^ permalink raw reply
* Re: [PATCH 0/3] OMAPDSS: APPLY: Misc Fixes
From: Tomi Valkeinen @ 2012-11-12 12:00 UTC (permalink / raw)
To: Archit Taneja; +Cc: linux-fbdev, linux-omap
In-Reply-To: <1352279844-10494-1-git-send-email-archit@ti.com>
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
On 2012-11-07 11:17, Archit Taneja wrote:
> This series resolves a few minor issues with APPLY. Tested on a 4430sdp, checked
> switching overlays between DSI command mode and HDMI displays for any unexpected
> behavior.
>
> Reference tree:
> git://gitorious.org/~boddob/linux-omap-dss2/archit-dss2-clone.git 3.8/apply_fixes
>
> Archit Taneja (3):
> OMAPDSS: APPLY: Don't treat an overlay's channel out as shadow bits
> OMAPDSS: APPLY: Remove unnecessary variable in dss_apply_irq_handler
> OMAPDSS: APPLY: Remove unnecessary call to mg_clear_shadow_dirty
>
> drivers/video/omap2/dss/apply.c | 48 +++++++++++++++++++++------------------
> 1 file changed, 26 insertions(+), 22 deletions(-)
>
Thanks, looks ok. I'll apply to omapdss tree.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 897 bytes --]
^ permalink raw reply
* Re: [PATCH 0/3] OMAPDSS: DISPC: Writeback fixes
From: Tomi Valkeinen @ 2012-11-12 12:00 UTC (permalink / raw)
To: Archit Taneja; +Cc: linux-fbdev, linux-omap
In-Reply-To: <1352268905-31093-1-git-send-email-archit@ti.com>
[-- Attachment #1: Type: text/plain, Size: 753 bytes --]
On 2012-11-07 08:15, Archit Taneja wrote:
> Some issues were found in the DISPC driver when performing scaling with
> writeback pipeline. This series fixes those issues.
>
> Reference tree:
> git://gitorious.org/~boddob/linux-omap-dss2/archit-dss2-clone.git 3.8/writeback_fixes_dispc
>
> Archit Taneja (3):
> OMAPDSS: DISPC: Fix calc_scaling_44xx() bugs for writeback pipeline
> OMAPDSS: DISPC: Don't allow predecimation for writeback
> OMAPDSS: DISPC: Use output width and height to calculate row/pix inc
> for writeback
>
> drivers/video/omap2/dss/dispc.c | 39 +++++++++++++++++++++++++++------------
> 1 file changed, 27 insertions(+), 12 deletions(-)
>
Thanks, looks ok. I'll apply to omapdss tree.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 897 bytes --]
^ permalink raw reply
* Re: [PATCH v7 5/8] fbmon: add videomode helpers
From: Laurent Pinchart @ 2012-11-12 11:46 UTC (permalink / raw)
To: Steffen Trumtrar
Cc: Manjunathappa, Prakash, linux-fbdev@vger.kernel.org,
devicetree-discuss@lists.ozlabs.org,
dri-devel@lists.freedesktop.org, Valkeinen, Tomi,
kernel@pengutronix.de, Guennady Liakhovetski,
linux-media@vger.kernel.org
In-Reply-To: <20121109193133.GD3660@pengutronix.de>
Hi Steffen,
On Friday 09 November 2012 20:31:33 Steffen Trumtrar wrote:
> On Fri, Nov 09, 2012 at 04:54:16PM +0000, Manjunathappa, Prakash wrote:
> > On Fri, Nov 09, 2012 at 02:55:45, Steffen Trumtrar wrote:
> > > On Wed, Oct 31, 2012 at 03:30:03PM +0000, Manjunathappa, Prakash wrote:
> > > > On Wed, Oct 31, 2012 at 14:58:05, Steffen Trumtrar wrote:
> > > > > +#if IS_ENABLED(CONFIG_VIDEOMODE)
> > > > > +int videomode_to_fb_videomode(struct videomode *vm, struct
> > > > > fb_videomode *fbmode) +{
> > > > > + fbmode->xres = vm->hactive;
> > > > > + fbmode->left_margin = vm->hback_porch;
> > > > > + fbmode->right_margin = vm->hfront_porch;
> > > > > + fbmode->hsync_len = vm->hsync_len;
> > > > > +
> > > > > + fbmode->yres = vm->vactive;
> > > > > + fbmode->upper_margin = vm->vback_porch;
> > > > > + fbmode->lower_margin = vm->vfront_porch;
> > > > > + fbmode->vsync_len = vm->vsync_len;
> > > > > +
> > > > > + fbmode->pixclock = KHZ2PICOS(vm->pixelclock / 1000);
> > > > > +
> > > > > + fbmode->sync = 0;
> > > > > + fbmode->vmode = 0;
> > > > > + if (vm->hah)
> > > > > + fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
> > > > > + if (vm->vah)
> > > > > + fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
> > > > > + if (vm->interlaced)
> > > > > + fbmode->vmode |= FB_VMODE_INTERLACED;
> > > > > + if (vm->doublescan)
> > > > > + fbmode->vmode |= FB_VMODE_DOUBLE;
> > > > > +
> > > >
> > > > "pixelclk-inverted" property of the panel is not percolated
> > > > fb_videomode.
> > > > Please let me know if I am missing something.
> > >
> > > The next version is almost finished. Only thing I'm missing is this.
> > > And I actually do not know which flag would represent an inverted
> > > pixelclock in fb_videomode. Does anybody have any idea what I have to
> > > do here?> >
> > > if (vm->pixelclk_pol)
> > >
> > > fbmode->sync = ???
> > >
> > > That's as far as I have come and I don't see a flag that seems right.
> > > Is this even a valid property of fb_videomode?
> >
> > Thanks for considering it, I see IMX addresses it as proprietary FB_SYNC_
> > flag. FB_SYNC_CLK_INVERT: arch/arm/plat-mxc/include/mach/mx3fb.h
>
> No problem. So, it seems this flag has to be set in some imx-specific
> videomode_to_fb_videomode function. It is included in the
> struct videomode, so that should be no problem. But it will not be
> part of this series.
A possible solution would be to standardize the FB_SYNC_CLK_INVERT flag in
fbdev, but that's in my opinion out of scope of this patch series. iMX3
developers, feel free to send patches :-)
--
Regards,
Laurent Pinchart
^ permalink raw reply
* [patch] fbmem: return -EFAULT on copy_to_user() failure
From: Dan Carpenter @ 2012-11-12 11:08 UTC (permalink / raw)
To: Florian Tobias Schandinat; +Cc: linux-fbdev, linux-kernel, kernel-janitors
copy_to_user() returns the number of bytes remaining to be copied.
put_user() returns -EFAULT on error.
This function ORs a bunch of stuff together and returns jumbled non-zero
values on error. It should return -EFAULT.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 3ff0105..3d2a4d0 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1302,8 +1302,9 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
err |= put_user(fix->accel, &fix32->accel);
err |= copy_to_user(fix32->reserved, fix->reserved,
sizeof(fix->reserved));
-
- return err;
+ if (err)
+ return -EFAULT;
+ return 0;
}
static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,
^ permalink raw reply related
* [PATCH 5/5] OMAP: remove vram allocator
From: Tomi Valkeinen @ 2012-11-12 10:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352715906-16946-1-git-send-email-tomi.valkeinen@ti.com>
OMAP specific vram allocator is no longer in use, and we can remove all
the vram code.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
arch/arm/plat-omap/include/plat/vram.h | 43 ---
drivers/video/omap2/Kconfig | 3 -
drivers/video/omap2/Makefile | 1 -
drivers/video/omap2/dss/Kconfig | 12 -
drivers/video/omap2/vram.c | 514 --------------------------------
5 files changed, 573 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/vram.h
delete mode 100644 drivers/video/omap2/vram.c
diff --git a/arch/arm/plat-omap/include/plat/vram.h b/arch/arm/plat-omap/include/plat/vram.h
deleted file mode 100644
index 4d65b7d..0000000
--- a/arch/arm/plat-omap/include/plat/vram.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * VRAM manager for OMAP
- *
- * Copyright (C) 2009 Nokia Corporation
- * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __OMAP_VRAM_H__
-#define __OMAP_VRAM_H__
-
-#include <linux/types.h>
-
-extern int omap_vram_add_region(unsigned long paddr, size_t size);
-extern int omap_vram_free(unsigned long paddr, size_t size);
-extern int omap_vram_alloc(size_t size, unsigned long *paddr);
-extern int omap_vram_reserve(unsigned long paddr, size_t size);
-extern void omap_vram_get_info(unsigned long *vram, unsigned long *free_vram,
- unsigned long *largest_free_block);
-
-#ifdef CONFIG_OMAP2_VRAM
-extern void omap_vram_set_sdram_vram(u32 size, u32 start);
-
-extern void omap_vram_reserve_sdram_memblock(void);
-#else
-static inline void omap_vram_set_sdram_vram(u32 size, u32 start) { }
-
-static inline void omap_vram_reserve_sdram_memblock(void) { }
-#endif
-
-#endif
diff --git a/drivers/video/omap2/Kconfig b/drivers/video/omap2/Kconfig
index d877c36..346d67d 100644
--- a/drivers/video/omap2/Kconfig
+++ b/drivers/video/omap2/Kconfig
@@ -1,6 +1,3 @@
-config OMAP2_VRAM
- bool
-
config OMAP2_VRFB
bool
diff --git a/drivers/video/omap2/Makefile b/drivers/video/omap2/Makefile
index 5ddef12..5ea7cb9 100644
--- a/drivers/video/omap2/Makefile
+++ b/drivers/video/omap2/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_OMAP2_VRAM) += vram.o
obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
obj-$(CONFIG_OMAP2_DSS) += dss/
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 80f5390..058a669 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -6,18 +6,6 @@ menuconfig OMAP2_DSS
if OMAP2_DSS
-config OMAP2_VRAM_SIZE
- int "VRAM size (MB)"
- range 0 32
- default 0
- help
- The amount of SDRAM to reserve at boot time for video RAM use.
- This VRAM will be used by omapfb and other drivers that need
- large continuous RAM area for video use.
-
- You can also set this with "vram=<bytes>" kernel argument, or
- in the board file.
-
config OMAP2_DSS_DEBUG_SUPPORT
bool "Debug support"
default y
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
deleted file mode 100644
index f2b15c4..0000000
--- a/drivers/video/omap2/vram.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * VRAM manager for OMAP
- *
- * Copyright (C) 2009 Nokia Corporation
- * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/*#define DEBUG*/
-
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/seq_file.h>
-#include <linux/memblock.h>
-#include <linux/completion.h>
-#include <linux/debugfs.h>
-#include <linux/jiffies.h>
-#include <linux/module.h>
-
-#include <asm/setup.h>
-
-#include <plat/vram.h>
-
-#ifdef DEBUG
-#define DBG(format, ...) pr_debug("VRAM: " format, ## __VA_ARGS__)
-#else
-#define DBG(format, ...)
-#endif
-
-/* postponed regions are used to temporarily store region information at boot
- * time when we cannot yet allocate the region list */
-#define MAX_POSTPONED_REGIONS 10
-
-static bool vram_initialized;
-static int postponed_cnt;
-static struct {
- unsigned long paddr;
- size_t size;
-} postponed_regions[MAX_POSTPONED_REGIONS];
-
-struct vram_alloc {
- struct list_head list;
- unsigned long paddr;
- unsigned pages;
-};
-
-struct vram_region {
- struct list_head list;
- struct list_head alloc_list;
- unsigned long paddr;
- unsigned pages;
-};
-
-static DEFINE_MUTEX(region_mutex);
-static LIST_HEAD(region_list);
-
-static struct vram_region *omap_vram_create_region(unsigned long paddr,
- unsigned pages)
-{
- struct vram_region *rm;
-
- rm = kzalloc(sizeof(*rm), GFP_KERNEL);
-
- if (rm) {
- INIT_LIST_HEAD(&rm->alloc_list);
- rm->paddr = paddr;
- rm->pages = pages;
- }
-
- return rm;
-}
-
-#if 0
-static void omap_vram_free_region(struct vram_region *vr)
-{
- list_del(&vr->list);
- kfree(vr);
-}
-#endif
-
-static struct vram_alloc *omap_vram_create_allocation(struct vram_region *vr,
- unsigned long paddr, unsigned pages)
-{
- struct vram_alloc *va;
- struct vram_alloc *new;
-
- new = kzalloc(sizeof(*va), GFP_KERNEL);
-
- if (!new)
- return NULL;
-
- new->paddr = paddr;
- new->pages = pages;
-
- list_for_each_entry(va, &vr->alloc_list, list) {
- if (va->paddr > new->paddr)
- break;
- }
-
- list_add_tail(&new->list, &va->list);
-
- return new;
-}
-
-static void omap_vram_free_allocation(struct vram_alloc *va)
-{
- list_del(&va->list);
- kfree(va);
-}
-
-int omap_vram_add_region(unsigned long paddr, size_t size)
-{
- struct vram_region *rm;
- unsigned pages;
-
- if (vram_initialized) {
- DBG("adding region paddr %08lx size %d\n",
- paddr, size);
-
- size &= PAGE_MASK;
- pages = size >> PAGE_SHIFT;
-
- rm = omap_vram_create_region(paddr, pages);
- if (rm = NULL)
- return -ENOMEM;
-
- list_add(&rm->list, ®ion_list);
- } else {
- if (postponed_cnt = MAX_POSTPONED_REGIONS)
- return -ENOMEM;
-
- postponed_regions[postponed_cnt].paddr = paddr;
- postponed_regions[postponed_cnt].size = size;
-
- ++postponed_cnt;
- }
- return 0;
-}
-
-int omap_vram_free(unsigned long paddr, size_t size)
-{
- struct vram_region *rm;
- struct vram_alloc *alloc;
- unsigned start, end;
-
- DBG("free mem paddr %08lx size %d\n", paddr, size);
-
- size = PAGE_ALIGN(size);
-
- mutex_lock(®ion_mutex);
-
- list_for_each_entry(rm, ®ion_list, list) {
- list_for_each_entry(alloc, &rm->alloc_list, list) {
- start = alloc->paddr;
- end = alloc->paddr + (alloc->pages >> PAGE_SHIFT);
-
- if (start >= paddr && end < paddr + size)
- goto found;
- }
- }
-
- mutex_unlock(®ion_mutex);
- return -EINVAL;
-
-found:
- omap_vram_free_allocation(alloc);
-
- mutex_unlock(®ion_mutex);
- return 0;
-}
-EXPORT_SYMBOL(omap_vram_free);
-
-static int _omap_vram_reserve(unsigned long paddr, unsigned pages)
-{
- struct vram_region *rm;
- struct vram_alloc *alloc;
- size_t size;
-
- size = pages << PAGE_SHIFT;
-
- list_for_each_entry(rm, ®ion_list, list) {
- unsigned long start, end;
-
- DBG("checking region %lx %d\n", rm->paddr, rm->pages);
-
- start = rm->paddr;
- end = start + (rm->pages << PAGE_SHIFT) - 1;
- if (start > paddr || end < paddr + size - 1)
- continue;
-
- DBG("block ok, checking allocs\n");
-
- list_for_each_entry(alloc, &rm->alloc_list, list) {
- end = alloc->paddr - 1;
-
- if (start <= paddr && end >= paddr + size - 1)
- goto found;
-
- start = alloc->paddr + (alloc->pages << PAGE_SHIFT);
- }
-
- end = rm->paddr + (rm->pages << PAGE_SHIFT) - 1;
-
- if (!(start <= paddr && end >= paddr + size - 1))
- continue;
-found:
- DBG("found area start %lx, end %lx\n", start, end);
-
- if (omap_vram_create_allocation(rm, paddr, pages) = NULL)
- return -ENOMEM;
-
- return 0;
- }
-
- return -ENOMEM;
-}
-
-int omap_vram_reserve(unsigned long paddr, size_t size)
-{
- unsigned pages;
- int r;
-
- DBG("reserve mem paddr %08lx size %d\n", paddr, size);
-
- size = PAGE_ALIGN(size);
- pages = size >> PAGE_SHIFT;
-
- mutex_lock(®ion_mutex);
-
- r = _omap_vram_reserve(paddr, pages);
-
- mutex_unlock(®ion_mutex);
-
- return r;
-}
-EXPORT_SYMBOL(omap_vram_reserve);
-
-static int _omap_vram_alloc(unsigned pages, unsigned long *paddr)
-{
- struct vram_region *rm;
- struct vram_alloc *alloc;
-
- list_for_each_entry(rm, ®ion_list, list) {
- unsigned long start, end;
-
- DBG("checking region %lx %d\n", rm->paddr, rm->pages);
-
- start = rm->paddr;
-
- list_for_each_entry(alloc, &rm->alloc_list, list) {
- end = alloc->paddr;
-
- if (end - start >= pages << PAGE_SHIFT)
- goto found;
-
- start = alloc->paddr + (alloc->pages << PAGE_SHIFT);
- }
-
- end = rm->paddr + (rm->pages << PAGE_SHIFT);
-found:
- if (end - start < pages << PAGE_SHIFT)
- continue;
-
- DBG("found %lx, end %lx\n", start, end);
-
- alloc = omap_vram_create_allocation(rm, start, pages);
- if (alloc = NULL)
- return -ENOMEM;
-
- *paddr = start;
-
- return 0;
- }
-
- return -ENOMEM;
-}
-
-int omap_vram_alloc(size_t size, unsigned long *paddr)
-{
- unsigned pages;
- int r;
-
- BUG_ON(!size);
-
- DBG("alloc mem size %d\n", size);
-
- size = PAGE_ALIGN(size);
- pages = size >> PAGE_SHIFT;
-
- mutex_lock(®ion_mutex);
-
- r = _omap_vram_alloc(pages, paddr);
-
- mutex_unlock(®ion_mutex);
-
- return r;
-}
-EXPORT_SYMBOL(omap_vram_alloc);
-
-void omap_vram_get_info(unsigned long *vram,
- unsigned long *free_vram,
- unsigned long *largest_free_block)
-{
- struct vram_region *vr;
- struct vram_alloc *va;
-
- *vram = 0;
- *free_vram = 0;
- *largest_free_block = 0;
-
- mutex_lock(®ion_mutex);
-
- list_for_each_entry(vr, ®ion_list, list) {
- unsigned free;
- unsigned long pa;
-
- pa = vr->paddr;
- *vram += vr->pages << PAGE_SHIFT;
-
- list_for_each_entry(va, &vr->alloc_list, list) {
- free = va->paddr - pa;
- *free_vram += free;
- if (free > *largest_free_block)
- *largest_free_block = free;
- pa = va->paddr + (va->pages << PAGE_SHIFT);
- }
-
- free = vr->paddr + (vr->pages << PAGE_SHIFT) - pa;
- *free_vram += free;
- if (free > *largest_free_block)
- *largest_free_block = free;
- }
-
- mutex_unlock(®ion_mutex);
-}
-EXPORT_SYMBOL(omap_vram_get_info);
-
-#if defined(CONFIG_DEBUG_FS)
-static int vram_debug_show(struct seq_file *s, void *unused)
-{
- struct vram_region *vr;
- struct vram_alloc *va;
- unsigned size;
-
- mutex_lock(®ion_mutex);
-
- list_for_each_entry(vr, ®ion_list, list) {
- size = vr->pages << PAGE_SHIFT;
- seq_printf(s, "%08lx-%08lx (%d bytes)\n",
- vr->paddr, vr->paddr + size - 1,
- size);
-
- list_for_each_entry(va, &vr->alloc_list, list) {
- size = va->pages << PAGE_SHIFT;
- seq_printf(s, " %08lx-%08lx (%d bytes)\n",
- va->paddr, va->paddr + size - 1,
- size);
- }
- }
-
- mutex_unlock(®ion_mutex);
-
- return 0;
-}
-
-static int vram_debug_open(struct inode *inode, struct file *file)
-{
- return single_open(file, vram_debug_show, inode->i_private);
-}
-
-static const struct file_operations vram_debug_fops = {
- .open = vram_debug_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
-};
-
-static int __init omap_vram_create_debugfs(void)
-{
- struct dentry *d;
-
- d = debugfs_create_file("vram", S_IRUGO, NULL,
- NULL, &vram_debug_fops);
- if (IS_ERR(d))
- return PTR_ERR(d);
-
- return 0;
-}
-#endif
-
-static __init int omap_vram_init(void)
-{
- int i;
-
- vram_initialized = 1;
-
- for (i = 0; i < postponed_cnt; i++)
- omap_vram_add_region(postponed_regions[i].paddr,
- postponed_regions[i].size);
-
-#ifdef CONFIG_DEBUG_FS
- if (omap_vram_create_debugfs())
- pr_err("VRAM: Failed to create debugfs file\n");
-#endif
-
- return 0;
-}
-
-arch_initcall(omap_vram_init);
-
-/* boottime vram alloc stuff */
-
-/* set from board file */
-static u32 omap_vram_sdram_start __initdata;
-static u32 omap_vram_sdram_size __initdata;
-
-/* set from kernel cmdline */
-static u32 omap_vram_def_sdram_size __initdata;
-static u32 omap_vram_def_sdram_start __initdata;
-
-static int __init omap_vram_early_vram(char *p)
-{
- omap_vram_def_sdram_size = memparse(p, &p);
- if (*p = ',')
- omap_vram_def_sdram_start = simple_strtoul(p + 1, &p, 16);
- return 0;
-}
-early_param("vram", omap_vram_early_vram);
-
-/*
- * Called from map_io. We need to call to this early enough so that we
- * can reserve the fixed SDRAM regions before VM could get hold of them.
- */
-void __init omap_vram_reserve_sdram_memblock(void)
-{
- u32 paddr;
- u32 size = 0;
-
- /* cmdline arg overrides the board file definition */
- if (omap_vram_def_sdram_size) {
- size = omap_vram_def_sdram_size;
- paddr = omap_vram_def_sdram_start;
- }
-
- if (!size) {
- size = omap_vram_sdram_size;
- paddr = omap_vram_sdram_start;
- }
-
-#ifdef CONFIG_OMAP2_VRAM_SIZE
- if (!size) {
- size = CONFIG_OMAP2_VRAM_SIZE * 1024 * 1024;
- paddr = 0;
- }
-#endif
-
- if (!size)
- return;
-
- size = ALIGN(size, SZ_2M);
-
- if (paddr) {
- if (paddr & ~PAGE_MASK) {
- pr_err("VRAM start address 0x%08x not page aligned\n",
- paddr);
- return;
- }
-
- if (!memblock_is_region_memory(paddr, size)) {
- pr_err("Illegal SDRAM region 0x%08x..0x%08x for VRAM\n",
- paddr, paddr + size - 1);
- return;
- }
-
- if (memblock_is_region_reserved(paddr, size)) {
- pr_err("FB: failed to reserve VRAM - busy\n");
- return;
- }
-
- if (memblock_reserve(paddr, size) < 0) {
- pr_err("FB: failed to reserve VRAM - no memory\n");
- return;
- }
- } else {
- paddr = memblock_alloc(size, SZ_2M);
- }
-
- memblock_free(paddr, size);
- memblock_remove(paddr, size);
-
- omap_vram_add_region(paddr, size);
-
- pr_info("Reserving %u bytes SDRAM for VRAM\n", size);
-}
-
-void __init omap_vram_set_sdram_vram(u32 size, u32 start)
-{
- omap_vram_sdram_start = start;
- omap_vram_sdram_size = size;
-}
--
1.7.10.4
^ permalink raw reply related
* [PATCH 4/5] OMAP: common.c: remove init call to vram
From: Tomi Valkeinen @ 2012-11-12 10:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352715906-16946-1-git-send-email-tomi.valkeinen@ti.com>
OMAP specific vram allocator is no longer used, and we can remove init
call to the vram allocator.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
arch/arm/plat-omap/common.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 111315a..d21ed18 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -17,7 +17,6 @@
#include <linux/dma-mapping.h>
#include <plat/common.h>
-#include <plat/vram.h>
#include <linux/platform_data/dsp-omap.h>
#include <plat/dma.h>
@@ -25,7 +24,6 @@
void __init omap_reserve(void)
{
- omap_vram_reserve_sdram_memblock();
omap_dsp_reserve_sdram_memblock();
omap_secure_ram_reserve_memblock();
omap_barrier_reserve_memblock();
--
1.7.10.4
^ permalink raw reply related
* [PATCH 3/5] OMAP: RX51: remove use of vram
From: Tomi Valkeinen @ 2012-11-12 10:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352715906-16946-1-git-send-email-tomi.valkeinen@ti.com>
As omapfb no longer uses omap specific vram allocator we can remove the
vram pre-allocation from rx51 board file.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
arch/arm/mach-omap2/board-rx51-video.c | 14 --------------
arch/arm/mach-omap2/board-rx51.c | 3 ---
2 files changed, 17 deletions(-)
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index c22e111..46f4fc9 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -16,7 +16,6 @@
#include <linux/mm.h>
#include <asm/mach-types.h>
#include <video/omapdss.h>
-#include <plat/vram.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "board-rx51.h"
@@ -87,17 +86,4 @@ static int __init rx51_video_init(void)
}
subsys_initcall(rx51_video_init);
-
-void __init rx51_video_mem_init(void)
-{
- /*
- * GFX 864x480x32bpp
- * VID1/2 1280x720x32bpp double buffered
- */
- omap_vram_set_sdram_vram(PAGE_ALIGN(864 * 480 * 4) +
- 2 * PAGE_ALIGN(1280 * 720 * 4 * 2), 0);
-}
-
-#else
-void __init rx51_video_mem_init(void) { }
#endif /* defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) */
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 7bbb05d..6e0de6f 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -34,8 +34,6 @@
#define RX51_GPIO_SLEEP_IND 162
-extern void rx51_video_mem_init(void);
-
static struct gpio_led gpio_leds[] = {
{
.name = "sleep_ind",
@@ -112,7 +110,6 @@ static void __init rx51_init(void)
static void __init rx51_reserve(void)
{
- rx51_video_mem_init();
omap_reserve();
}
--
1.7.10.4
^ permalink raw reply related
* [PATCH 2/5] OMAPFB: use dma_alloc_attrs to allocate memory
From: Tomi Valkeinen @ 2012-11-12 10:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352715906-16946-1-git-send-email-tomi.valkeinen@ti.com>
Use dma_alloc_attrs to allocate memory instead of omap specific vram
allocator. After this we can remove the omap vram allocator.
There are some downsides to this change:
1) dma_alloc_attrs doesn't let us allocate at certain physical address.
However, this should not be a problem as this feature of vram allocator
is only used when reserving the framebuffer that was initialized by the
bootloader, and we don't currently support "passing" a framebuffer from
the bootloader to the kernel anyway.
2) dma_alloc_attrs, as of now, always ioremaps the allocated area, and
we don't need the ioremap when using VRFB. This patch uses
DMA_ATTR_NO_KERNEL_MAPPING for the allocation, but the flag is currently
not operational.
3) OMAPFB_GET_VRAM_INFO ioctl cannot return real values anymore. I
changed the ioctl to return 64M for all the values, which, I hope, the
applications will interpret as "there's enough vram".
4) "vram" kernel parameter to define how much ram to reserve for video
use no longer works. The user needs to enable CMA and use "cma"
parameter.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/omap2/omapfb/Kconfig | 1 -
drivers/video/omap2/omapfb/omapfb-ioctl.c | 14 +++---
drivers/video/omap2/omapfb/omapfb-main.c | 69 +++++++++++++++--------------
drivers/video/omap2/omapfb/omapfb.h | 5 +++
4 files changed, 48 insertions(+), 41 deletions(-)
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 4ea17dc..4cb12ce 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -2,7 +2,6 @@ menuconfig FB_OMAP2
tristate "OMAP2+ frame buffer support"
depends on FB && OMAP2_DSS && !DRM_OMAP
- select OMAP2_VRAM
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 606b89f..574c170 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -31,7 +31,6 @@
#include <video/omapdss.h>
#include <plat/vrfb.h>
-#include <plat/vram.h>
#include "omapfb.h"
@@ -853,14 +852,15 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
break;
case OMAPFB_GET_VRAM_INFO: {
- unsigned long vram, free, largest;
-
DBG("ioctl GET_VRAM_INFO\n");
- omap_vram_get_info(&vram, &free, &largest);
- p.vram_info.total = vram;
- p.vram_info.free = free;
- p.vram_info.largest_free_block = largest;
+ /*
+ * We don't have the ability to get this vram info anymore.
+ * Fill in something that should keep the applications working.
+ */
+ p.vram_info.total = SZ_1M * 64;
+ p.vram_info.free = SZ_1M * 64;
+ p.vram_info.largest_free_block = SZ_1M * 64;
if (copy_to_user((void __user *)arg, &p.vram_info,
sizeof(p.vram_info)))
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 16db158..84c1012 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -32,7 +32,6 @@
#include <video/omapdss.h>
#include <plat/cpu.h>
-#include <plat/vram.h>
#include <plat/vrfb.h>
#include "omapfb.h"
@@ -1336,24 +1335,25 @@ static void omapfb_free_fbmem(struct fb_info *fbi)
rg = ofbi->region;
- WARN_ON(atomic_read(&rg->map_count));
-
- if (rg->paddr)
- if (omap_vram_free(rg->paddr, rg->size))
- dev_err(fbdev->dev, "VRAM FREE failed\n");
+ if (rg->token = NULL)
+ return;
- if (rg->vaddr)
- iounmap(rg->vaddr);
+ WARN_ON(atomic_read(&rg->map_count));
if (ofbi->rotation_type = OMAP_DSS_ROT_VRFB) {
/* unmap the 0 angle rotation */
if (rg->vrfb.vaddr[0]) {
iounmap(rg->vrfb.vaddr[0]);
- omap_vrfb_release_ctx(&rg->vrfb);
rg->vrfb.vaddr[0] = NULL;
}
+
+ omap_vrfb_release_ctx(&rg->vrfb);
}
+ dma_free_attrs(fbdev->dev, rg->size, rg->token, rg->dma_handle,
+ &rg->attrs);
+
+ rg->token = NULL;
rg->vaddr = NULL;
rg->paddr = 0;
rg->alloc = 0;
@@ -1388,7 +1388,9 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
struct omapfb_info *ofbi = FB2OFB(fbi);
struct omapfb2_device *fbdev = ofbi->fbdev;
struct omapfb2_mem_region *rg;
- void __iomem *vaddr;
+ void *token;
+ DEFINE_DMA_ATTRS(attrs);
+ dma_addr_t dma_handle;
int r;
rg = ofbi->region;
@@ -1403,42 +1405,43 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
size = PAGE_ALIGN(size);
- if (!paddr) {
- DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
- r = omap_vram_alloc(size, &paddr);
- } else {
- DBG("reserving %lu bytes at %lx for fb %d\n", size, paddr,
- ofbi->id);
- r = omap_vram_reserve(paddr, size);
- }
+ WARN_ONCE(paddr,
+ "reserving memory at predefined address not supported\n");
- if (r) {
+ dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
+
+ if (ofbi->rotation_type = OMAP_DSS_ROT_VRFB)
+ dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs);
+
+ DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
+
+ token = dma_alloc_attrs(fbdev->dev, size, &dma_handle,
+ GFP_KERNEL, &attrs);
+
+ if (token = NULL) {
dev_err(fbdev->dev, "failed to allocate framebuffer\n");
return -ENOMEM;
}
- if (ofbi->rotation_type != OMAP_DSS_ROT_VRFB) {
- vaddr = ioremap_wc(paddr, size);
-
- if (!vaddr) {
- dev_err(fbdev->dev, "failed to ioremap framebuffer\n");
- omap_vram_free(paddr, size);
- return -ENOMEM;
- }
+ DBG("allocated VRAM paddr %lx, vaddr %p\n",
+ (unsigned long)dma_handle, token);
- DBG("allocated VRAM paddr %lx, vaddr %p\n", paddr, vaddr);
- } else {
+ if (ofbi->rotation_type = OMAP_DSS_ROT_VRFB) {
r = omap_vrfb_request_ctx(&rg->vrfb);
if (r) {
+ dma_free_attrs(fbdev->dev, size, token, dma_handle,
+ &attrs);
dev_err(fbdev->dev, "vrfb create ctx failed\n");
return r;
}
-
- vaddr = NULL;
}
- rg->paddr = paddr;
- rg->vaddr = vaddr;
+ rg->attrs = attrs;
+ rg->token = token;
+ rg->dma_handle = dma_handle;
+
+ rg->paddr = (unsigned long)dma_handle;
+ rg->vaddr = (void __iomem *)token;
rg->size = size;
rg->alloc = 1;
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
index 5ced9b3..5f72bf9 100644
--- a/drivers/video/omap2/omapfb/omapfb.h
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -28,6 +28,8 @@
#endif
#include <linux/rwsem.h>
+#include <linux/dma-attrs.h>
+#include <linux/dma-mapping.h>
#include <video/omapdss.h>
@@ -49,6 +51,9 @@ extern bool omapfb_debug;
struct omapfb2_mem_region {
int id;
+ struct dma_attrs attrs;
+ void *token;
+ dma_addr_t dma_handle;
u32 paddr;
void __iomem *vaddr;
struct vrfb vrfb;
--
1.7.10.4
^ permalink raw reply related
* [PATCH 1/5] OMAP: FB: use DMA_BIT_MASK() for fb's coherent_dma_mask
From: Tomi Valkeinen @ 2012-11-12 10:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352715906-16946-1-git-send-email-tomi.valkeinen@ti.com>
Use DMA_BIT_MASK() for fb's coherent_dma_mask for clarity.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
arch/arm/plat-omap/fb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index bcbb9d5..218963b 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -29,6 +29,7 @@
#include <linux/memblock.h>
#include <linux/io.h>
#include <linux/omapfb.h>
+#include <linux/dma-mapping.h>
#include <mach/hardware.h>
#include <asm/mach/map.h>
@@ -45,7 +46,7 @@ static struct platform_device omap_fb_device = {
.id = -1,
.dev = {
.dma_mask = &omap_fb_dma_mask,
- .coherent_dma_mask = ~(u32)0,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &omapfb_config,
},
.num_resources = 0,
@@ -81,7 +82,7 @@ static struct platform_device omap_fb_device = {
.id = -1,
.dev = {
.dma_mask = &omap_fb_dma_mask,
- .coherent_dma_mask = ~(u32)0,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &omapfb_config,
},
.num_resources = 0,
--
1.7.10.4
^ permalink raw reply related
* [PATCH 0/5] OMAPFB: use dma_alloc instead of omap's vram
From: Tomi Valkeinen @ 2012-11-12 10:25 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
This series changes omapfb to use standard dma_alloc funcs instead of omap
specific vram allocator. This let's us remove the omap vram allocator, making
omapfb platform independent.
However, note that using standard dma funcs causes the following downsides:
1) dma_alloc_attrs doesn't let us allocate at certain physical address.
However, this should not be a problem as this feature of vram allocator
is only used when reserving the framebuffer that was initialized by the
bootloader, and we don't currently support "passing" a framebuffer from
the bootloader to the kernel anyway.
2) dma_alloc_attrs, as of now, always ioremaps the allocated area, and
we don't need the ioremap when using VRFB. This patch uses
DMA_ATTR_NO_KERNEL_MAPPING for the allocation, but the flag is currently
not operational.
3) OMAPFB_GET_VRAM_INFO ioctl cannot return real values anymore. I
changed the ioctl to return 64M for all the values, which, I hope, the
applications will interpret as "there's enough vram".
4) "vram" kernel parameter to define how much ram to reserve for video use no
longer works. The user needs to enable CMA and use "cma" parameter.
Tomi
Tomi Valkeinen (5):
OMAP: FB: use DMA_BIT_MASK() for fb's coherent_dma_mask
OMAPFB: use dma_alloc_attrs to allocate memory
OMAP: RX51: remove use of vram
OMAP: common.c: remove init call to vram
OMAP: remove vram allocator
arch/arm/mach-omap2/board-rx51-video.c | 14 -
arch/arm/mach-omap2/board-rx51.c | 3 -
arch/arm/plat-omap/common.c | 2 -
arch/arm/plat-omap/fb.c | 5 +-
arch/arm/plat-omap/include/plat/vram.h | 43 ---
drivers/video/omap2/Kconfig | 3 -
drivers/video/omap2/Makefile | 1 -
drivers/video/omap2/dss/Kconfig | 12 -
drivers/video/omap2/omapfb/Kconfig | 1 -
drivers/video/omap2/omapfb/omapfb-ioctl.c | 14 +-
drivers/video/omap2/omapfb/omapfb-main.c | 69 ++--
drivers/video/omap2/omapfb/omapfb.h | 5 +
drivers/video/omap2/vram.c | 514 -----------------------------
13 files changed, 51 insertions(+), 635 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/vram.h
delete mode 100644 drivers/video/omap2/vram.c
--
1.7.10.4
^ permalink raw reply
* Re: [PATCH] pwm-backlight: Pinctrl-fy
From: Pantelis Antoniou @ 2012-11-12 10:21 UTC (permalink / raw)
To: Linus Walleij
Cc: Thierry Reding, Richard Purdie, Florian Tobias Schandinat,
linux-fbdev, linux-kernel, Koen Kooi, Matt Porter, Russ Dill,
linux-omap
In-Reply-To: <CACRpkdY_sXu12k455XcEBOj3_3syxromdCWObE4didKiU_F2cA@mail.gmail.com>
Hi Linus,
On Nov 11, 2012, at 7:26 PM, Linus Walleij wrote:
> On Fri, Nov 9, 2012 at 9:06 AM, Thierry Reding
> <thierry.reding@avionic-design.de> wrote:
>> On Wed, Oct 31, 2012 at 05:57:27PM +0200, Pantelis Antoniou wrote:
>
>>> + pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
>>> + if (IS_ERR(pinctrl))
>>> + dev_warn(&pdev->dev, "unable to select pin group\n");
>>> +
>>
>> I just saw this done in a similar way in some other driver and then
>> remembered your patch. When I reviewed this I wasn't sure if a warning
>> was good enough in this case. I've checked the kernel tree and it seems
>> like a majority handled this as failure instead of a warning. I took a
>> look at the pinctrl core and it seems like indeed if neither pinctrl is
>> enabled or if there isn't actually a pinmux configuration for a device,
>> then devm_pinctrl_get_select_default() will actually not return an
>> error, so in those cases where an error is returned it should actually
>> be handled as a fatal error.
>
> So it depends.
>
> One good reason to just error out and return the error code is
> if the error returned is -EPROBE_DEFER, right?
>
> Because then you're pinctrl driver is not up yet, and you
> need to bail out and be revisited later.
>
> On a related key we have this debate going on with some
> subsystem maintainers as to whether we should try do
> centralize boilerplate like this, the lates suggestion is:
> http://marc.info/?l=linux-kernel&m\x135263661110528&w=2
>
Interesting... This is certainly much nicer than peppering all the
devices with pinctrl calls.
> The fun never ends...
>
Indeed.
> Yours,
> Linus Walleij
Regards
-- Pantelis
^ permalink raw reply
* Re: [PATCH] pwm-backlight: Pinctrl-fy
From: Linus Walleij @ 2012-11-11 18:26 UTC (permalink / raw)
To: Thierry Reding
Cc: Pantelis Antoniou, Richard Purdie, Florian Tobias Schandinat,
linux-fbdev, linux-kernel, Koen Kooi, Matt Porter, Russ Dill,
linux-omap
In-Reply-To: <20121109080604.GA25611@avionic-0098.mockup.avionic-design.de>
On Fri, Nov 9, 2012 at 9:06 AM, Thierry Reding
<thierry.reding@avionic-design.de> wrote:
> On Wed, Oct 31, 2012 at 05:57:27PM +0200, Pantelis Antoniou wrote:
>> + pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
>> + if (IS_ERR(pinctrl))
>> + dev_warn(&pdev->dev, "unable to select pin group\n");
>> +
>
> I just saw this done in a similar way in some other driver and then
> remembered your patch. When I reviewed this I wasn't sure if a warning
> was good enough in this case. I've checked the kernel tree and it seems
> like a majority handled this as failure instead of a warning. I took a
> look at the pinctrl core and it seems like indeed if neither pinctrl is
> enabled or if there isn't actually a pinmux configuration for a device,
> then devm_pinctrl_get_select_default() will actually not return an
> error, so in those cases where an error is returned it should actually
> be handled as a fatal error.
So it depends.
One good reason to just error out and return the error code is
if the error returned is -EPROBE_DEFER, right?
Because then you're pinctrl driver is not up yet, and you
need to bail out and be revisited later.
On a related key we have this debate going on with some
subsystem maintainers as to whether we should try do
centralize boilerplate like this, the lates suggestion is:
http://marc.info/?l=linux-kernel&m\x135263661110528&w=2
The fun never ends...
Yours,
Linus Walleij
^ permalink raw reply
* [PATCH 2/2] video: exynos-mipi-dsi: Adding DT support to exynos mipi driver
From: Shaik Ameer Basha @ 2012-11-10 11:46 UTC (permalink / raw)
To: linux-fbdev
This patch adds the DT support for the exynos mipi-dsi driver.
for DT support mipi device node should supply the following
information to the mipi-dsi driver.
1] dsim_config information
2] d-phy setting information
3] lcd poweron, reset information
4] fb_videomode information
Change-Id: I93005636a7825b0c5ef4832dd17a2809d0aeda1d
Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com>
---
.../devicetree/bindings/video/exynos/mipi-dsi.txt | 185 +++++++
drivers/video/exynos/exynos_mipi_dsi.c | 573 +++++++++++++++++++-
include/video/exynos_mipi_dsim.h | 27 +
3 files changed, 765 insertions(+), 20 deletions(-)
create mode 100644 Documentation/devicetree/bindings/video/exynos/mipi-dsi.txt
diff --git a/Documentation/devicetree/bindings/video/exynos/mipi-dsi.txt b/Documentation/devicetree/bindings/video/exynos/mipi-dsi.txt
new file mode 100644
index 0000000..6445eac
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/exynos/mipi-dsi.txt
@@ -0,0 +1,185 @@
+* Samsung Exynos MIPI-DSI bindings
+
+Properties for MIPI-DSI node ::
+===============+- compatible: should be "samsung,exynos5-mipi"
+
+- reg: should contain mipi-dsi physical address location and length.
+
+- interrupts: should contain mipi-dsi interrupt number
+
+- enabled: Describes whether MIPI DSI got enabled in uboot
+
+- mipi-lcd: phandle to lcd specific information. It can be anything
+ specific to lcd driver.
+
+- mipi-phy: phandle to D-PHY node.
+
+- mipi-config: subnode for mipi config information
+ - auto_flush: enable or disable Auto flush of MD FIFO using VSYNC pulse
+ - eot_disable: enable or disable EoT packet in HS mode
+ - auto_vertical_cnt: specifies auto vertical count mode.
+ In Video mode, the vertical line transition uses line counter
+ configured by VSA, VBP, and Vertical resolution. If this bit is
+ set to '1', the line counter does not use VSA and VBP registers.
+ In command mode, this property is ignored.
+ - hse: set horizontal sync event mode.
+ In VSYNC pulse and Vporch area, MIPI DSI master transfers only
+ HSYNC start packet to MIPI DSI slave at MIPI DSI spec1.1r02.
+ This bit transfers HSYNC end packet in VSYNC pulse and Vporch
+ area. In command mode, this property is ignored.
+ - hfp: specifies HFP disable mode.
+ If this property is set, DSI master ignores HFP area in
+ VIDEO mode. In command mode, this property is ignored.
+ - hbp: specifies HBP disable mode.
+ If this property is set, DSI master ignores HBP area in
+ VIDEO mode. In command mode, this property is ignored.
+ - hsa: specifies HSA disable mode.
+ If this property is set, DSI master ignores HSA area in
+ VIDEO mode. In command mode, this property is ignored.
+ - cmd_allow: specifies the number of horizontal lines, where command
+ packet transmission is allowed after Stable VFP period.
+ - e_interface: specifies interface to be used.(CPU or RGB interface)
+ - e_virtual_ch: specifies virtual channel number that main or
+ sub display uses.
+ - e_pixel_format: specifies pixel stream format for main or sub display.
+ - e_burst_mode: selects Burst mode in Video mode.
+ In Non-burst mode, RGB data area is filled with RGB data
+ and NULL packets, according to input bandwidth of RGB interface.
+ In Burst mode, RGB data area is filled with RGB data only.
+ - e_no_data_lane: specifies data lane count to be used by Master.
+ - e_byte_clk: select byte clock source. (it must be DSIM_PLL_OUT_DIV8)
+ DSIM_EXT_CLK_DIV8 and DSIM_EXT_CLK_BYPASSS are not supported.
+ - pll_stable_time: specifies the PLL Timer for stability of the
+ generated clock(System clock cycle base). If the timer value
+ goes to 0x00000000, the clock stable bit of status and interrupt
+ register is set.
+ - esc_clk: specifies escape clock frequency for getting the escape clock
+ prescaler value.
+ - stop_holding_cnt: specifies the interval value between transmitting
+ read packet(or write "set_tear_on" command) and BTA request.
+ after transmitting read packet or write "set_tear_on" command,
+ BTA requests to D-PHY automatically. this counter value
+ specifies the interval between them.
+ - bta_timeout: specifies the timer for BTA.
+ this register specifies time out from BTA request to change
+ the direction with respect to Tx escape clock.
+ - rx_timeout: specifies the timer for LP Rx mode timeout.
+ this register specifies time out on how long RxValid deasserts,
+ after RxLpdt asserts with respect to Tx escape clock.
+ - RxValid specifies Rx data valid indicator.
+ - RxLpdt specifies an indicator that D-PHY is under RxLpdt mode.
+ - RxValid and RxLpdt specifies signal from D-PHY.
+
+- display-mode: timing and resolution information of the panel used. As per
+ current exynos mipi-dsi driver need, only some fields from
+ struct fb_videomode are defined in this node.
+ - xres: horizontal resolution (active frame width)
+ - yres: vertical resolution (active frame height).
+ - left_margin: Horizontal Back Porch (Number of PIXCLK pulses between
+ HSYNC signal and the first valid pixel data.
+ - right_margin: Horizontal Front Porch (Number of PIXCLK between
+ last valid pixel data in the line and the next HSYNC pulse).
+ - upper_margin: Vertical Back Porch (Number of lines (HSYNC pulses)
+ from when a VSYNC signal is asserted and the first valid line).
+ - lower_margin: Vertical Front Porch (Number of lines (HSYNC pulses)
+ between last valid line of the frame and the next VSYNC Pulse).
+ - hsync_len: Hsync pulse width (Number of PIXCLK pulses when a HSYNC
+ signal is active).
+ - vsync_len: Vsync pulse width (Number of HSYNC pulses when a VSYNC
+ signal is active).
+
+Properties for D-PHY node ::
+==============+ Instead of passing D-PHY related callbacks as part of platform data,
+we can pass the phy nodes to the mipi driver. Depending on the type of PHY
+settings, we can implement multiple PHY node types and corresponding
+enable/disable/reset callbacks in the driver itself. Currently we support
+only one type of PHY node.
+
+D-PHY node type1:
+------------------
+- compatible: "samsung,exynos-mipi-phy-type1"
+- reg_enable_dphy: should contain physical address location of
+ D-PHY enable register
+- mask_enable_dphy: should contain the mask for D-PHY enable register
+- reg_reset_dsim: should contain physical address location of
+ D-PHY DSIM reset register
+- mask_reset_dsim: should contain the mask for D-PHY DSIM reset register
+
+MIPI-LCD node ::
+========+ Apart from the following three properties, driver specific
+properties can be sent through this node. The following example sends
+some more properties for driver's use.
+
+- lcd-name: name of the device to use with this device
+- id: id of device to be registered (default -1 in case not specified)
+- bus-id: bus id for identifing connected bus and this bus id should be
+ same as id of mipi_dsim_device (default -1 incase not specified)
+
+Example:
+--------
+ mipi_lcd: mipi-lcd@toshiba {
+ lcd-name = "tc358764";
+ id = <0>;
+ enabled = <1>;
+ reset-delay = <120>;
+ power-on-delay = <25>;
+ power-off-delay = <200>;
+ gpio-poweron = <&gpx1 5 0 0 0>;
+ };
+
+ mipi_dsim_phy: mipi-phy@exynos5250 {
+ compatible = "samsung-exynos,mipi-phy-type1";
+ reg_enable_dphy = <0x10040714>;
+ mask_enable_dphy = <0x00000001>;
+ reg_reset_dsim = <0x10040714>;
+ mask_reset_dsim = <0x00000004>;
+ };
+
+ mipi {
+ compatible = "samsung,exynos-mipi";
+ reg = <0x14500000 0x10000>;
+ interrupts = <0 82 0>;
+
+ mipi-lcd = <&mipi_lcd>;
+ mipi-phy = <&mipi_dsim_phy>;
+ enabled = <0>;
+
+ mipi-config {
+ e_interface = <1>;
+ e_pixel_format = <7>;
+ auto_flush = <0>;
+ eot_disable = <0>;
+ auto_vertical_cnt = <0>;
+ hse = <0>;
+ hfp = <0>;
+ hbp = <0>;
+ hsa = <0>;
+ e_no_data_lane = <3>;
+ e_byte_clk = <0>;
+ e_burst_mode = <3>;
+ p = <3>;
+ m = <115>;
+ s = <1>;
+ pll_stable_time = <500>;
+ esc_clk = <400000>;
+ stop_holding_cnt =<0x0f>;
+ bta_timeout = <0xff>;
+ rx_timeout = <0xffff>;
+ e_virtual_ch = <0>;
+ cmd_allow = <0xf>;
+ };
+
+ panel-info {
+ left_margin = <0x4>;
+ right_margin = <0x4>;
+ upper_margin = <0x4>;
+ lower_margin = <0x4>;
+ hsync_len = <0x4>;
+ vsync_len = <0x4>;
+ xres = <1280>;
+ yres = <800>;
+ };
+ };
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index ae20bc3..667857b 100755
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -32,6 +32,7 @@
#include <linux/notifier.h>
#include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h>
+#include <linux/lcd.h>
#include <video/exynos_mipi_dsim.h>
@@ -43,6 +44,8 @@
struct mipi_dsim_ddi {
int bus_id;
struct list_head list;
+ struct device_node *ofnode_dsim_lcd_dev;
+ struct device_node *ofnode_dsim_dphy;
struct mipi_dsim_lcd_device *dsim_lcd_dev;
struct mipi_dsim_lcd_driver *dsim_lcd_drv;
};
@@ -181,6 +184,36 @@ static int exynos_mipi_dsi_blank_mode(struct mipi_dsim_device *dsim, int power)
return 0;
}
+struct mipi_dsim_ddi *exynos_mipi_dsi_find_lcd_driver(
+ struct mipi_dsim_lcd_device *lcd_dev)
+{
+ struct mipi_dsim_ddi *dsim_ddi, *next;
+ struct mipi_dsim_lcd_driver *lcd_drv;
+
+ mutex_lock(&mipi_dsim_lock);
+
+ list_for_each_entry_safe(dsim_ddi, next, &dsim_ddi_list, list) {
+ if (!dsim_ddi)
+ goto out;
+
+ lcd_drv = dsim_ddi->dsim_lcd_drv;
+ if (!lcd_drv)
+ continue;
+
+ if ((strcmp(lcd_dev->name, lcd_drv->name)) = 0) {
+ mutex_unlock(&mipi_dsim_lock);
+ return dsim_ddi;
+ }
+
+ list_del(&dsim_ddi->list);
+ kfree(dsim_ddi);
+ }
+
+out:
+ mutex_unlock(&mipi_dsim_lock);
+ return NULL;
+}
+
int exynos_mipi_dsi_register_lcd_device(struct mipi_dsim_lcd_device *lcd_dev)
{
struct mipi_dsim_ddi *dsim_ddi;
@@ -190,13 +223,17 @@ int exynos_mipi_dsi_register_lcd_device(struct mipi_dsim_lcd_device *lcd_dev)
return -EFAULT;
}
- dsim_ddi = kzalloc(sizeof(struct mipi_dsim_ddi), GFP_KERNEL);
+ dsim_ddi = exynos_mipi_dsi_find_lcd_driver(lcd_dev);
if (!dsim_ddi) {
- pr_err("failed to allocate dsim_ddi object.\n");
- return -ENOMEM;
+ dsim_ddi = kzalloc(sizeof(struct mipi_dsim_ddi), GFP_KERNEL);
+ if (!dsim_ddi) {
+ pr_err("failed to allocate dsim_ddi object.\n");
+ return -ENOMEM;
+ }
}
dsim_ddi->dsim_lcd_dev = lcd_dev;
+ dsim_ddi->bus_id = lcd_dev->bus_id;
mutex_lock(&mipi_dsim_lock);
list_add_tail(&dsim_ddi->list, &dsim_ddi_list);
@@ -253,11 +290,26 @@ int exynos_mipi_dsi_register_lcd_driver(struct mipi_dsim_lcd_driver *lcd_drv)
dsim_ddi = exynos_mipi_dsi_find_lcd_device(lcd_drv);
if (!dsim_ddi) {
- pr_err("mipi_dsim_ddi object not found.\n");
- return -EFAULT;
- }
+ /*
+ * If driver specific device is not registered then create a
+ * dsim_ddi object, fill the driver information and add to the
+ * end of the dsim_ddi_list list
+ */
+ dsim_ddi = kzalloc(sizeof(struct mipi_dsim_ddi), GFP_KERNEL);
+ if (!dsim_ddi) {
+ pr_err("failed to allocate dsim_ddi object.\n");
+ return -ENOMEM;
+ }
+
+ dsim_ddi->dsim_lcd_drv = lcd_drv;
- dsim_ddi->dsim_lcd_drv = lcd_drv;
+ mutex_lock(&mipi_dsim_lock);
+ list_add_tail(&dsim_ddi->list, &dsim_ddi_list);
+ mutex_unlock(&mipi_dsim_lock);
+
+ } else {
+ dsim_ddi->dsim_lcd_drv = lcd_drv;
+ }
pr_info("registered panel driver(%s) to mipi-dsi driver.\n",
lcd_drv->name);
@@ -329,6 +381,372 @@ static struct mipi_dsim_master_ops master_ops = {
.set_blank_mode = exynos_mipi_dsi_blank_mode,
};
+struct device_node *exynos_mipi_find_ofnode_dsim_phy(
+ struct platform_device *pdev)
+{
+ struct device_node *dn, *dn_dphy;
+ const __be32 *prop;
+
+ dn = pdev->dev.of_node;
+ prop = of_get_property(dn, "mipi-phy", NULL);
+ if (NULL = prop) {
+ dev_err(&pdev->dev, "Could not find property mipi-phy\n");
+ return NULL;
+ }
+
+ dn_dphy = of_find_node_by_phandle(be32_to_cpup(prop));
+ if (NULL = dn_dphy) {
+ dev_err(&pdev->dev, "Could not find node\n");
+ return NULL;
+ }
+
+ return dn_dphy;
+}
+
+struct device_node *exynos_mipi_find_ofnode_lcd_device(
+ struct platform_device *pdev)
+{
+ struct device_node *dn, *dn_lcd_panel;
+ const __be32 *prop;
+
+ dn = pdev->dev.of_node;
+ prop = of_get_property(dn, "mipi-lcd", NULL);
+ if (NULL = prop) {
+ dev_err(&pdev->dev, "could not find property mipi-lcd\n");
+ return NULL;
+ }
+
+ dn_lcd_panel = of_find_node_by_phandle(be32_to_cpup(prop));
+ if (NULL = dn_lcd_panel) {
+ dev_err(&pdev->dev, "could not find node\n");
+ return NULL;
+ }
+
+ return dn_lcd_panel;
+}
+
+static void exynos_mipi_dsim_enable_d_phy_type1(
+ struct platform_device *pdev,
+ bool enable)
+{
+ struct mipi_dsim_device *dsim = (struct mipi_dsim_device *)
+ platform_get_drvdata(pdev);
+ struct mipi_dsim_phy_config_type1 *dphy_cfg_type1 + &dsim->dsim_phy_config->phy_cfg_type1;
+ u32 reg_enable;
+
+ reg_enable = __raw_readl(dphy_cfg_type1->reg_enable_dphy);
+ reg_enable &= ~(dphy_cfg_type1->ctrlbit_enable_dphy);
+
+ if (enable)
+ reg_enable |= dphy_cfg_type1->ctrlbit_enable_dphy;
+
+ __raw_writel(reg_enable, dphy_cfg_type1->reg_enable_dphy);
+}
+
+static void exynos_mipi_dsim_reset_type1(
+ struct platform_device *pdev,
+ bool enable)
+{
+ struct mipi_dsim_device *dsim = (struct mipi_dsim_device *)
+ platform_get_drvdata(pdev);
+ struct mipi_dsim_phy_config_type1 *dphy_cfg_type1 + &dsim->dsim_phy_config->phy_cfg_type1;
+ u32 reg_reset;
+
+ reg_reset = __raw_readl(dphy_cfg_type1->reg_reset_dsim);
+ reg_reset &= ~(dphy_cfg_type1->ctrlbit_reset_dsim);
+
+ if (enable)
+ reg_reset |= dphy_cfg_type1->ctrlbit_reset_dsim;
+
+ __raw_writel(reg_reset, dphy_cfg_type1->reg_reset_dsim);
+}
+
+static int exynos_mipi_dsim_phy_init_type1(
+ struct platform_device *pdev,
+ bool on_off)
+{
+ exynos_mipi_dsim_enable_d_phy_type1(pdev, on_off);
+ exynos_mipi_dsim_reset_type1(pdev, on_off);
+ return 0;
+}
+
+static int parse_u32_property(struct device_node *np, char *name,
+ u32 *result)
+{
+ if (of_property_read_u32(np, name, result)) {
+ pr_err("not able to find property: %s\n", name);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int exynos_mipi_parse_ofnode_dsim_phy_type1(
+ struct platform_device *pdev,
+ struct mipi_dsim_phy_config_type1 *dphy_cfg_type1,
+ struct device_node *np)
+{
+ struct mipi_dsim_device *dsim = (struct mipi_dsim_device *)
+ platform_get_drvdata(pdev);
+ u32 paddr_phy_enable, paddr_dsim_reset;
+ int ret = 0;
+
+ ret |= parse_u32_property(np, "reg_enable_dphy", &paddr_phy_enable);
+ ret |= parse_u32_property(np, "reg_reset_dsim", &paddr_dsim_reset);
+ ret |= parse_u32_property(np, "mask_enable_dphy",
+ &dphy_cfg_type1->ctrlbit_enable_dphy);
+ ret |= parse_u32_property(np, "mask_reset_dsim",
+ &dphy_cfg_type1->ctrlbit_reset_dsim);
+
+ if (ret) {
+ pr_err("%s: error reading phy node properties\n", __func__);
+ return -EINVAL;
+ }
+
+ dphy_cfg_type1->reg_enable_dphy = ioremap(paddr_phy_enable, SZ_4);
+ if (!dphy_cfg_type1->reg_enable_dphy)
+ return -EINVAL;
+
+ dphy_cfg_type1->reg_reset_dsim = ioremap(paddr_dsim_reset, SZ_4);
+ if (!dphy_cfg_type1->reg_reset_dsim)
+ goto err_ioremap;
+
+ dsim->pd->phy_enable = exynos_mipi_dsim_phy_init_type1;
+
+ return 0;
+
+err_ioremap:
+ iounmap(dphy_cfg_type1->reg_enable_dphy);
+ return -EINVAL;
+}
+
+static struct mipi_dsim_phy_config *exynos_mipi_parse_ofnode_dsim_phy(
+ struct platform_device *pdev,
+ struct device_node *np)
+{
+ struct mipi_dsim_phy_config *mipi_dphy_config;
+ const char *compatible;
+
+ mipi_dphy_config = devm_kzalloc(&pdev->dev,
+ sizeof(struct mipi_dsim_phy_config), GFP_KERNEL);
+ if (!mipi_dphy_config) {
+ dev_err(&pdev->dev,
+ "failed to allocate mipi_dsim_phy_config object.\n");
+ return NULL;
+ }
+
+ if (of_property_read_string(np, "compatible", &compatible)) {
+ dev_err(&pdev->dev, "compatible property not found");
+ return NULL;
+ }
+
+ /* try to find the phy node type from compatible string */
+ if (!strcmp(compatible, "samsung-exynos,mipi-phy-type1"))
+ mipi_dphy_config->type = MIPI_DSIM_PHY_CONFIG_TYPE1;
+ else
+ mipi_dphy_config->type = -1;
+
+ /* parse the phy node as per its type */
+ switch (mipi_dphy_config->type) {
+ case MIPI_DSIM_PHY_CONFIG_TYPE1:
+ if (exynos_mipi_parse_ofnode_dsim_phy_type1(
+ pdev, &mipi_dphy_config->phy_cfg_type1, np))
+ return NULL;
+ break;
+ default:
+ dev_err(&pdev->dev, "mipi phy - unknown type");
+ return NULL;
+ }
+
+ return mipi_dphy_config;
+}
+
+static struct mipi_dsim_lcd_device *exynos_mipi_parse_ofnode_lcd(
+ struct platform_device *pdev, struct device_node *np)
+{
+ struct mipi_dsim_lcd_device *active_mipi_dsim_lcd_device;
+ struct lcd_platform_data *active_lcd_platform_data;
+ const char *lcd_name;
+
+ active_mipi_dsim_lcd_device = devm_kzalloc(&pdev->dev,
+ sizeof(struct mipi_dsim_lcd_device), GFP_KERNEL);
+ if (!active_mipi_dsim_lcd_device) {
+ dev_err(&pdev->dev,
+ "failed to allocate active_mipi_dsim_lcd_device object.\n");
+ return NULL;
+ }
+
+ if (of_property_read_string(np, "lcd-name", &lcd_name)) {
+ dev_err(&pdev->dev, "lcd name property not found");
+ return NULL;
+ }
+
+ active_mipi_dsim_lcd_device->name = (char *)lcd_name;
+
+ if (of_property_read_u32(np, "id", &active_mipi_dsim_lcd_device->id))
+ active_mipi_dsim_lcd_device->id = -1;
+
+ if (of_property_read_u32(np, "bus-id",
+ &active_mipi_dsim_lcd_device->bus_id))
+ active_mipi_dsim_lcd_device->bus_id = -1;
+
+ active_lcd_platform_data = devm_kzalloc(&pdev->dev,
+ sizeof(struct lcd_platform_data), GFP_KERNEL);
+ if (!active_lcd_platform_data) {
+ dev_err(&pdev->dev,
+ "failed to allocate active_lcd_platform_data object.\n");
+ return NULL;
+ }
+
+ /* store the lcd node pointer for futher use in lcd driver */
+ active_lcd_platform_data->pdata = (void *) np;
+ active_mipi_dsim_lcd_device->platform_data + (void *)active_lcd_platform_data;
+
+ return active_mipi_dsim_lcd_device;
+}
+
+static int exynos_mipi_parse_ofnode_config(struct platform_device *pdev,
+ struct device_node *np, struct mipi_dsim_config *dsim_config)
+{
+ unsigned int u32Val;
+
+ if (parse_u32_property(np, "e_interface", &u32Val))
+ return -EINVAL;
+ dsim_config->e_interface = (enum mipi_dsim_interface_type)u32Val;
+
+ if (parse_u32_property(np, "e_pixel_format", &u32Val))
+ return -EINVAL;
+ dsim_config->e_pixel_format = (enum mipi_dsim_pixel_format)u32Val;
+
+ if (parse_u32_property(np, "auto_flush", &u32Val))
+ return -EINVAL;
+ dsim_config->auto_flush = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "eot_disable", &u32Val))
+ return -EINVAL;
+ dsim_config->eot_disable = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "auto_vertical_cnt", &u32Val))
+ return -EINVAL;
+ dsim_config->auto_vertical_cnt = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "hse", &u32Val))
+ return -EINVAL;
+ dsim_config->hse = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "hfp", &u32Val))
+ return -EINVAL;
+ dsim_config->hfp = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "hbp", &u32Val))
+ return -EINVAL;
+ dsim_config->hbp = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "hsa", &u32Val))
+ return -EINVAL;
+ dsim_config->hsa = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "e_no_data_lane", &u32Val))
+ return -EINVAL;
+ dsim_config->e_no_data_lane = (enum mipi_dsim_no_of_data_lane)u32Val;
+
+ if (parse_u32_property(np, "e_byte_clk", &u32Val))
+ return -EINVAL;
+ dsim_config->e_byte_clk = (enum mipi_dsim_byte_clk_src)u32Val;
+
+ if (parse_u32_property(np, "e_burst_mode", &u32Val))
+ return -EINVAL;
+ dsim_config->e_burst_mode = (enum mipi_dsim_burst_mode_type)u32Val;
+
+ if (parse_u32_property(np, "p", &u32Val))
+ return -EINVAL;
+ dsim_config->p = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "m", &u32Val))
+ return -EINVAL;
+ dsim_config->m = (unsigned short)u32Val;
+
+ if (parse_u32_property(np, "s", &u32Val))
+ return -EINVAL;
+ dsim_config->s = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "pll_stable_time", &u32Val))
+ return -EINVAL;
+ dsim_config->pll_stable_time = (unsigned int)u32Val;
+
+ if (parse_u32_property(np, "esc_clk", &u32Val))
+ return -EINVAL;
+ dsim_config->esc_clk = (unsigned long)u32Val;
+
+ if (parse_u32_property(np, "stop_holding_cnt", &u32Val))
+ return -EINVAL;
+ dsim_config->stop_holding_cnt = (unsigned short)u32Val;
+
+ if (parse_u32_property(np, "bta_timeout", &u32Val))
+ return -EINVAL;
+ dsim_config->bta_timeout = (unsigned char)u32Val;
+
+ if (parse_u32_property(np, "rx_timeout", &u32Val))
+ return -EINVAL;
+ dsim_config->rx_timeout = (unsigned short)u32Val;
+
+ if (parse_u32_property(np, "e_virtual_ch", &u32Val))
+ return -EINVAL;
+ dsim_config->e_virtual_ch = (enum mipi_dsim_virtual_ch_no)u32Val;
+
+ if (parse_u32_property(np, "cmd_allow", &u32Val))
+ return -EINVAL;
+ dsim_config->cmd_allow = (unsigned char)u32Val;
+
+ return 0;
+}
+
+static int exynos_mipi_parse_ofnode_panel_info(struct platform_device *pdev,
+ struct device_node *np, struct fb_videomode *vm)
+{
+ int ret = 0;
+
+ ret |= parse_u32_property(np, "left_margin", &vm->left_margin);
+ ret |= parse_u32_property(np, "right_margin", &vm->right_margin);
+ ret |= parse_u32_property(np, "upper_margin", &vm->upper_margin);
+ ret |= parse_u32_property(np, "lower_margin", &vm->lower_margin);
+ ret |= parse_u32_property(np, "hsync_len", &vm->hsync_len);
+ ret |= parse_u32_property(np, "vsync_len", &vm->vsync_len);
+ ret |= parse_u32_property(np, "xres", &vm->xres);
+ ret |= parse_u32_property(np, "yres", &vm->yres);
+ if (ret)
+ pr_err("%s: error reading fb_videomodeproperties\n", __func__);
+
+ return ret;
+}
+
+static int exynos_mipi_parse_ofnode(struct platform_device *pdev,
+ struct mipi_dsim_config *dsim_config, struct fb_videomode *panel_info)
+{
+ struct device_node *np_dsim_config, *np_panel_info;
+ struct device_node *np = pdev->dev.of_node;
+
+ np_dsim_config = of_find_node_by_name(np, "mipi-config");
+ if (!np_dsim_config)
+ return -EINVAL;
+
+ if (exynos_mipi_parse_ofnode_config(pdev, np_dsim_config, dsim_config))
+ return -EINVAL;
+
+ np_panel_info = of_find_node_by_name(np, "display-mode");
+ if (!np_panel_info)
+ return -EINVAL;
+
+ if (exynos_mipi_parse_ofnode_panel_info(pdev,
+ np_panel_info, panel_info))
+ return -EINVAL;
+
+ return 0;
+}
+
static int exynos_mipi_dsi_probe(struct platform_device *pdev)
{
struct resource *res;
@@ -336,6 +754,12 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
struct mipi_dsim_config *dsim_config;
struct mipi_dsim_platform_data *dsim_pd;
struct mipi_dsim_ddi *dsim_ddi;
+ struct device_node *ofnode_lcd = NULL;
+ struct device_node *ofnode_dphy = NULL;
+ struct mipi_dsim_lcd_device *active_mipi_dsim_lcd_device = NULL;
+ struct mipi_dsim_phy_config *mipi_dphy_config;
+ struct fb_videomode *panel_info;
+ unsigned int u32Val;
int ret = -EINVAL;
dsim = devm_kzalloc(&pdev->dev,
@@ -345,23 +769,87 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ if (pdev->dev.of_node) {
+ ofnode_lcd = exynos_mipi_find_ofnode_lcd_device(pdev);
+ if (!ofnode_lcd)
+ return -EINVAL;
+
+ active_mipi_dsim_lcd_device + exynos_mipi_parse_ofnode_lcd(pdev, ofnode_lcd);
+
+ if (NULL = active_mipi_dsim_lcd_device)
+ return -EINVAL;
+
+ if (NULL = exynos_mipi_dsi_find_lcd_driver
+ (active_mipi_dsim_lcd_device))
+ return -ENXIO;
+
+ exynos_mipi_dsi_register_lcd_device(
+ active_mipi_dsim_lcd_device);
+ }
+
dsim->pd = to_dsim_plat(pdev);
dsim->dev = &pdev->dev;
dsim->id = pdev->id;
- /* get mipi_dsim_platform_data. */
- dsim_pd = (struct mipi_dsim_platform_data *)dsim->pd;
- if (dsim_pd = NULL) {
- dev_err(&pdev->dev, "failed to get platform data for dsim.\n");
- return -EFAULT;
- }
- /* get mipi_dsim_config. */
- dsim_config = dsim_pd->dsim_config;
- if (dsim_config = NULL) {
- dev_err(&pdev->dev, "failed to get dsim config data.\n");
- return -EFAULT;
- }
+ if (pdev->dev.of_node) {
+ dsim_config = devm_kzalloc(&pdev->dev,
+ sizeof(struct mipi_dsim_config), GFP_KERNEL);
+ if (!dsim_config) {
+ dev_err(&pdev->dev,
+ "failed to allocate dsim_config object.\n");
+ return -ENOMEM;
+ }
+ panel_info = devm_kzalloc(&pdev->dev,
+ sizeof(struct fb_videomode), GFP_KERNEL);
+ if (!panel_info) {
+ dev_err(&pdev->dev,
+ "failed to allocate fb_videomode object.\n");
+ return -ENOMEM;
+ }
+
+ /* parse the mipi of_node for dism_config and panel info. */
+ if (exynos_mipi_parse_ofnode(pdev, dsim_config, panel_info)) {
+ dev_err(&pdev->dev,
+ "failed to read mipi-config, display-mode\n");
+ return -EINVAL;
+ }
+
+ dsim_pd = devm_kzalloc(&pdev->dev,
+ sizeof(struct mipi_dsim_platform_data), GFP_KERNEL);
+ if (!dsim_pd) {
+ dev_err(&pdev->dev,
+ "failed to allocate mipi_dsim_platform_data\n");
+ return -ENOMEM;
+ }
+
+ if (of_property_read_u32(pdev->dev.of_node, "enabled", &u32Val))
+ dev_err(&pdev->dev, "enabled property not found\n");
+ else
+ dsim_pd->enabled = !(!u32Val);
+
+ dsim_pd->lcd_panel_info = (void *)panel_info;
+ dsim_pd->dsim_config = dsim_config;
+ dsim->pd = dsim_pd;
+
+ } else {
+ /* get mipi_dsim_platform_data. */
+ dsim_pd = (struct mipi_dsim_platform_data *)dsim->pd;
+ if (dsim_pd = NULL) {
+ dev_err(&pdev->dev,
+ "failed to get platform data for dsim.\n");
+ return -EFAULT;
+ }
+
+ /* get mipi_dsim_config. */
+ dsim_config = dsim_pd->dsim_config;
+ if (dsim_config = NULL) {
+ dev_err(&pdev->dev,
+ "failed to get dsim config data.\n");
+ return -EFAULT;
+ }
+ }
dsim->dsim_config = dsim_config;
dsim->master_ops = &master_ops;
@@ -394,11 +882,21 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
mutex_init(&dsim->lock);
/* bind lcd ddi matched with panel name. */
- dsim_ddi = exynos_mipi_dsi_bind_lcd_ddi(dsim, dsim_pd->lcd_panel_name);
+ if (pdev->dev.of_node) {
+ dsim_ddi = exynos_mipi_dsi_bind_lcd_ddi(dsim,
+ active_mipi_dsim_lcd_device->name);
+ } else {
+ dsim_ddi = exynos_mipi_dsi_bind_lcd_ddi(dsim,
+ dsim_pd->lcd_panel_name);
+ }
+
if (!dsim_ddi) {
dev_err(&pdev->dev, "mipi_dsim_ddi object not found.\n");
ret = -ENXIO;
goto cleanup_clk;
+ } else if (pdev->dev.of_node) {
+ dsim_ddi->ofnode_dsim_lcd_dev = ofnode_lcd;
+ dsim_ddi->ofnode_dsim_dphy = ofnode_dphy;
}
dsim->irq = platform_get_irq(pdev, 0);
@@ -412,6 +910,21 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
init_completion(&dsim_rd_comp);
platform_set_drvdata(pdev, dsim);
+ /* update dsim phy config node */
+ if (pdev->dev.of_node) {
+ ofnode_dphy = exynos_mipi_find_ofnode_dsim_phy(pdev);
+ if (!ofnode_dphy)
+ return -EINVAL;
+
+ mipi_dphy_config = exynos_mipi_parse_ofnode_dsim_phy(pdev,
+ ofnode_dphy);
+
+ if (NULL = mipi_dphy_config)
+ return -EINVAL;
+
+ dsim->dsim_phy_config = mipi_dphy_config;
+ }
+
ret = devm_request_irq(&pdev->dev, dsim->irq,
exynos_mipi_dsi_interrupt_handler,
IRQF_SHARED, dev_name(&pdev->dev), dsim);
@@ -557,13 +1070,33 @@ static const struct dev_pm_ops exynos_mipi_dsi_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(exynos_mipi_dsi_suspend, exynos_mipi_dsi_resume)
};
+static struct platform_device_id exynos_mipi_driver_ids[] = {
+ {
+ .name = "exynos-mipi",
+ .driver_data = NULL,
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(platform, exynos_mipi_driver_ids);
+
+static const struct of_device_id exynos_mipi_match[] = {
+ {
+ .compatible = "samsung,exynos5-mipi",
+ .data = NULL,
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(of, exynos_mipi_match);
+
static struct platform_driver exynos_mipi_dsi_driver = {
.probe = exynos_mipi_dsi_probe,
.remove = __devexit_p(exynos_mipi_dsi_remove),
+ .id_table = exynos_mipi_driver_ids,
.driver = {
.name = "exynos-mipi-dsim",
.owner = THIS_MODULE,
.pm = &exynos_mipi_dsi_pm_ops,
+ .of_match_table = exynos_mipi_match,
},
};
diff --git a/include/video/exynos_mipi_dsim.h b/include/video/exynos_mipi_dsim.h
index 772c770..6d9b01d 100644
--- a/include/video/exynos_mipi_dsim.h
+++ b/include/video/exynos_mipi_dsim.h
@@ -230,6 +230,7 @@ struct mipi_dsim_device {
struct mipi_dsim_master_ops *master_ops;
struct mipi_dsim_lcd_device *dsim_lcd_dev;
struct mipi_dsim_lcd_driver *dsim_lcd_drv;
+ struct mipi_dsim_phy_config *dsim_phy_config;
unsigned int state;
unsigned int data_lane;
@@ -295,6 +296,32 @@ struct mipi_dsim_master_ops {
};
/*
+ * phy node structure for mipi-dsim.
+ *
+ * @reg_enable_dphy : base address to memory mapped D-PHY enable register
+ * @ctrlbit_enable_dphy : control bit for enabling D-PHY
+ * @reg_reset_dsim : base address to memory mapped DSIM reset register
+ * @ctrlbit_reset_dsim : control bit for resetting DSIM
+ */
+struct mipi_dsim_phy_config_type1 {
+ void __iomem *reg_enable_dphy;
+ int ctrlbit_enable_dphy;
+ void __iomem *reg_reset_dsim;
+ int ctrlbit_reset_dsim;
+};
+
+enum mipi_dsim_phy_config_type {
+ MIPI_DSIM_PHY_CONFIG_TYPE1,
+};
+
+struct mipi_dsim_phy_config {
+ enum mipi_dsim_phy_config_type type;
+ union {
+ struct mipi_dsim_phy_config_type1 phy_cfg_type1;
+ };
+};
+
+/*
* device structure for mipi-dsi based lcd panel.
*
* @name: name of the device to use with this device, or an
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/2] exynos-mipi-dsi: using devm_ functions for automatic cleanup
From: Shaik Ameer Basha @ 2012-11-10 11:46 UTC (permalink / raw)
To: linux-fbdev
Using devm_ functions will take care of cleaning the allocated
resources when the device is removed.
Change-Id: Ia904a65ebdfe15a69c7c16501b3d94dd41f69bf4
Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com>
---
drivers/video/exynos/exynos_mipi_dsi.c | 76 ++++++++-----------------------
1 files changed, 20 insertions(+), 56 deletions(-)
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 1f5de89..ae20bc3 100755
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -338,7 +338,8 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
struct mipi_dsim_ddi *dsim_ddi;
int ret = -EINVAL;
- dsim = kzalloc(sizeof(struct mipi_dsim_device), GFP_KERNEL);
+ dsim = devm_kzalloc(&pdev->dev,
+ sizeof(struct mipi_dsim_device), GFP_KERNEL);
if (!dsim) {
dev_err(&pdev->dev, "failed to allocate dsim object.\n");
return -ENOMEM;
@@ -352,13 +353,13 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
dsim_pd = (struct mipi_dsim_platform_data *)dsim->pd;
if (dsim_pd = NULL) {
dev_err(&pdev->dev, "failed to get platform data for dsim.\n");
- goto err_clock_get;
+ return -EFAULT;
}
/* get mipi_dsim_config. */
dsim_config = dsim_pd->dsim_config;
if (dsim_config = NULL) {
dev_err(&pdev->dev, "failed to get dsim config data.\n");
- goto err_clock_get;
+ return -EFAULT;
}
dsim->dsim_config = dsim_config;
@@ -366,41 +367,28 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
mutex_init(&dsim->lock);
- ret = regulator_bulk_get(&pdev->dev, ARRAY_SIZE(supplies), supplies);
+ ret = devm_regulator_bulk_get(&pdev->dev,
+ ARRAY_SIZE(supplies), supplies);
if (ret) {
dev_err(&pdev->dev, "Failed to get regulators: %d\n", ret);
- goto err_clock_get;
+ return ret;
}
- dsim->clock = clk_get(&pdev->dev, "dsim0");
+ dsim->clock = devm_clk_get(&pdev->dev, "dsim0");
if (IS_ERR(dsim->clock)) {
dev_err(&pdev->dev, "failed to get dsim clock source\n");
- ret = -ENODEV;
- goto err_clock_get;
+ return PTR_ERR(dsim->clock);
}
clk_enable(dsim->clock);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
- dev_err(&pdev->dev, "failed to get io memory region\n");
- ret = -ENODEV;
- goto err_platform_get;
- }
-
- dsim->res = request_mem_region(res->start, resource_size(res),
- dev_name(&pdev->dev));
- if (!dsim->res) {
- dev_err(&pdev->dev, "failed to request io memory region\n");
- ret = -ENOMEM;
- goto err_mem_region;
- }
- dsim->reg_base = ioremap(res->start, resource_size(res));
+ dsim->reg_base = devm_request_and_ioremap(&pdev->dev, res);
if (!dsim->reg_base) {
- dev_err(&pdev->dev, "failed to remap io region\n");
- ret = -ENOMEM;
- goto err_ioremap;
+ dev_err(&pdev->dev, "failed to map registers\n");
+ ret = -ENXIO;
+ goto cleanup_clk;
}
mutex_init(&dsim->lock);
@@ -409,27 +397,28 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
dsim_ddi = exynos_mipi_dsi_bind_lcd_ddi(dsim, dsim_pd->lcd_panel_name);
if (!dsim_ddi) {
dev_err(&pdev->dev, "mipi_dsim_ddi object not found.\n");
- ret = -EINVAL;
- goto err_bind;
+ ret = -ENXIO;
+ goto cleanup_clk;
}
dsim->irq = platform_get_irq(pdev, 0);
if (dsim->irq < 0) {
dev_err(&pdev->dev, "failed to request dsim irq resource\n");
ret = -EINVAL;
- goto err_platform_get_irq;
+ goto cleanup_clk;
}
init_completion(&dsim_wr_comp);
init_completion(&dsim_rd_comp);
platform_set_drvdata(pdev, dsim);
- ret = request_irq(dsim->irq, exynos_mipi_dsi_interrupt_handler,
+ ret = devm_request_irq(&pdev->dev, dsim->irq,
+ exynos_mipi_dsi_interrupt_handler,
IRQF_SHARED, dev_name(&pdev->dev), dsim);
if (ret != 0) {
dev_err(&pdev->dev, "failed to request dsim irq\n");
ret = -EINVAL;
- goto err_bind;
+ goto cleanup_clk;
}
/* enable interrupts */
@@ -464,29 +453,13 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
dsim->suspended = false;
done:
- platform_set_drvdata(pdev, dsim);
-
dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__,
dsim_config->e_interface = DSIM_COMMAND ? "CPU" : "RGB");
return 0;
-err_bind:
- iounmap(dsim->reg_base);
-
-err_ioremap:
- release_mem_region(dsim->res->start, resource_size(dsim->res));
-
-err_mem_region:
- release_resource(dsim->res);
-
-err_platform_get:
+cleanup_clk:
clk_disable(dsim->clock);
- clk_put(dsim->clock);
-err_clock_get:
- kfree(dsim);
-
-err_platform_get_irq:
return ret;
}
@@ -496,13 +469,7 @@ static int __devexit exynos_mipi_dsi_remove(struct platform_device *pdev)
struct mipi_dsim_ddi *dsim_ddi, *next;
struct mipi_dsim_lcd_driver *dsim_lcd_drv;
- iounmap(dsim->reg_base);
-
clk_disable(dsim->clock);
- clk_put(dsim->clock);
-
- release_resource(dsim->res);
- release_mem_region(dsim->res->start, resource_size(dsim->res));
list_for_each_entry_safe(dsim_ddi, next, &dsim_ddi_list, list) {
if (dsim_ddi) {
@@ -518,9 +485,6 @@ static int __devexit exynos_mipi_dsi_remove(struct platform_device *pdev)
}
}
- regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
- kfree(dsim);
-
return 0;
}
--
1.7.0.4
^ permalink raw reply related
* [PATCH 0/2] Adding devm_ functions and DT support to MIPI driver
From: Shaik Ameer Basha @ 2012-11-10 11:46 UTC (permalink / raw)
To: linux-fbdev
In this patch series,
First patch adds the devm_ functions to the driver code for automatic
code cleanup.
Second patch adds the DT support for the exynos mipi-dsi driver.
for DT support, mipi device node should supply the following
information to the mipi-dsi driver.
1] dsim_config information
2] d-phy setting information
3] lcd poweron, reset information
4] fb_videomode information
refer the documentation files for further details.
Shaik Ameer Basha (2):
exynos-mipi-dsi: using devm_ functions for automatic cleanup
video: exynos-mipi-dsi: Adding DT support to exynos mipi driver
.../devicetree/bindings/video/exynos/mipi-dsi.txt | 185 ++++++
drivers/video/exynos/exynos_mipi_dsi.c | 645 +++++++++++++++++---
include/video/exynos_mipi_dsim.h | 27 +
3 files changed, 783 insertions(+), 74 deletions(-)
create mode 100644 Documentation/devicetree/bindings/video/exynos/mipi-dsi.txt
^ permalink raw reply
* Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
From: Joachim Eastwood @ 2012-11-10 10:54 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352287374-25176-2-git-send-email-plagnioj@jcrosoft.com>
Hi Jean-Christophe,
On 7 November 2012 12:22, Jean-Christophe PLAGNIOL-VILLARD
<plagnioj@jcrosoft.com> wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: linux-ide@vger.kernel.org
> Cc: linux-input@vger.kernel.org
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-can@vger.kernel.org
> Cc: netdev@vger.kernel.org
> Cc: linux-pcmcia@lists.infradead.org
> Cc: rtc-linux@googlegroups.com
> Cc: spi-devel-general@lists.sourceforge.net
> Cc: linux-serial@vger.kernel.org
> Cc: linux-usb@vger.kernel.org
> Cc: linux-fbdev@vger.kernel.org
> ---
> HI all,
>
> If it's ok with everyone this will go via at91
> with the patch serie than clean up the include/mach
>
> For preparation to switch to arm multiarch kernel
>
> Best Regards,
> J.
> arch/arm/mach-at91/include/mach/board.h | 55 ----------------------
> arch/avr32/mach-at32ap/include/mach/board.h | 7 ---
> drivers/ata/pata_at91.c | 2 +-
> drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
> drivers/mmc/host/atmel-mci.c | 2 +-
> drivers/net/can/at91_can.c | 3 +-
> drivers/net/ethernet/cadence/at91_ether.c | 2 +-
> drivers/pcmcia/at91_cf.c | 2 +-
> drivers/rtc/rtc-at91sam9.c | 2 +-
> drivers/spi/spi-atmel.c | 2 +-
> drivers/tty/serial/atmel_serial.c | 2 +-
> drivers/usb/gadget/at91_udc.c | 2 +-
> drivers/usb/gadget/atmel_usba_udc.c | 2 +-
> drivers/usb/host/ohci-at91.c | 2 +-
> drivers/video/atmel_lcdfb.c | 2 +-
> include/linux/platform_data/atmel.h | 67 +++++++++++++++++++++++++++
> 16 files changed, 80 insertions(+), 76 deletions(-)
<snip>
> diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
> index 4e980a7..35fc6edb 100644
> --- a/drivers/net/ethernet/cadence/at91_ether.c
> +++ b/drivers/net/ethernet/cadence/at91_ether.c
> @@ -31,6 +31,7 @@
> #include <linux/clk.h>
> #include <linux/gfp.h>
> #include <linux/phy.h>
> +#include <linux/platform_data/atmel.h>
>
> #include <asm/io.h>
> #include <asm/uaccess.h>
> @@ -38,7 +39,6 @@
>
> #include <mach/at91rm9200_emac.h>
> #include <asm/gpio.h>
> -#include <mach/board.h>
>
> #include "at91_ether.h"
The at91_ether driver in net-next does not need to be change since it
all mach includes has already been removed by other patches and it
includes linux/platform_data/macb.h directly.
What tree was these patches based on?
The at91_ether driver changes has been in linux-next for a long while now.
regards
Joachim Eastwood
^ permalink raw reply
* Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
From: Dmitry Torokhov @ 2012-11-10 8:42 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <509A5219.2080408@pengutronix.de>
On Wed, Nov 07, 2012 at 01:20:41PM +0100, Marc Kleine-Budde wrote:
> On 11/07/2012 12:22 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> > Cc: linux-ide@vger.kernel.org
> > Cc: linux-input@vger.kernel.org
> > Cc: linux-mmc@vger.kernel.org
> > Cc: linux-can@vger.kernel.org
> > Cc: netdev@vger.kernel.org
> > Cc: linux-pcmcia@lists.infradead.org
> > Cc: rtc-linux@googlegroups.com
> > Cc: spi-devel-general@lists.sourceforge.net
> > Cc: linux-serial@vger.kernel.org
> > Cc: linux-usb@vger.kernel.org
> > Cc: linux-fbdev@vger.kernel.org
> > ---
> > HI all,
> >
> > If it's ok with everyone this will go via at91
> > with the patch serie than clean up the include/mach
>
> Fine with me.
>
> > For preparation to switch to arm multiarch kernel
>
> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> (for the CAN related changes)
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
for input piece.
--
Dmitry
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox