linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Florian Tobias Schandinat' <FlorianSchandinat@gmx.de>
Cc: 'Leela Krishna Amudala' <l.krishna@samsung.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org,
	dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org,
	'Kukjin Kim' <kgene.kim@samsung.com>
Subject: RE: [PATCH V2 0/5] arm: samsung: Move FIMD headers to include/video/
Date: Thu, 23 Aug 2012 09:55:37 +0000	[thread overview]
Message-ID: <1d5a01cd8115$7251eb40$56f5c1c0$%kim@samsung.com> (raw)
In-Reply-To: <5018FDF6.4020205@gmx.de>

Florian Tobias Schandinat wrote:
> 
> On 08/01/2012 02:28 AM, Kukjin Kim wrote:
> > Leela Krishna Amudala wrote:
> >>
> >> This patchset moves the contents of regs-fb-v4.h and regs-fb.h from
> arch
> >> side
> >> to include/video/samsung_fimd.h
> >>
> >> This patchset is created and rebased against master branch of torvalds
> >> tree.
> >> Tested on smdk5250 board, build tested for other boards.
> >>
> > (Cc'ed Florian Tobias Schandinat)
> >
> > Yeah, since it's merge window, this series could be created against on
> > mainline. And IMO, would be helpful to us if this series could be sent
> to
> > upstream via samsung tree after reviewing, because this touches too many
> > files in samsung tree and just adds include/video/samsung_fimd.h. But
> I'm
> > not sure the added inclusion will be used in other file of
drivers/video.
> If
> > so, I can provide some topic branch can be merged into Florian's tree.
> > Florian, how about?
> 
> Using a topic branch to merge it in both trees sounds like a good plan
> to me.
> 
Florian,

Please pull following topic branch we talked. I already merged it into my
-next.

git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
v3.7-for-florian

Note, I applied Leela's V4 patches not this V2 series.

If any problems, please kindly let me know.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:

  Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
v3.7-for-florian

Leela Krishna Amudala (2):
      include/video: move fimd register headers from platform to
include/video
      include/video: Add register offsets for FIMD version 8

 arch/arm/mach-exynos/mach-nuri.c                   |    2 +-
 arch/arm/mach-exynos/mach-origen.c                 |    2 +-
 arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
 arch/arm/mach-exynos/mach-smdkv310.c               |    2 +-
 arch/arm/mach-exynos/mach-universal_c210.c         |    2 +-
 arch/arm/mach-exynos/setup-fimd0.c                 |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |    2 +-
 arch/arm/mach-s5pc100/mach-smdkc100.c              |    2 +-
 arch/arm/mach-s5pv210/mach-aquila.c                |    2 +-
 arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-smdkv210.c              |    2 +-
 arch/arm/plat-samsung/include/plat/regs-fb-v4.h    |  159
--------------------
 drivers/gpu/drm/exynos/exynos_drm_fimd.c           |    2 +-
 drivers/video/s3c-fb.c                             |    2 +-
 .../plat/regs-fb.h => include/video/samsung_fimd.h |  152
+++++++++++++++++--
 26 files changed, 165 insertions(+), 194 deletions(-)
 delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
 rename arch/arm/plat-samsung/include/plat/regs-fb.h =>
include/video/samsung_fimd.h (73%)


  parent reply	other threads:[~2012-08-23  9:55 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-31 12:35 [PATCH V2 0/5] arm: samsung: Move FIMD headers to include/video/ Leela Krishna Amudala
2012-07-31 12:35 ` [PATCH V2 1/5] include/video: Add samsung FIMD register header Leela Krishna Amudala
2012-08-01  2:10   ` Kukjin Kim
2012-07-31 12:35 ` [PATCH V2 2/5] include/video: Add Exynos5 specific FIMD register offsets Leela Krishna Amudala
2012-07-31 12:51   ` Sergei Shtylyov
2012-07-31 13:03     ` Sylwester Nawrocki
2012-08-01  1:49   ` Jingoo Han
2012-08-01  2:14   ` Kukjin Kim
2012-07-31 12:35 ` [PATCH V2 3/5] arm: samsung: Include the modified FIMD header file Leela Krishna Amudala
2012-08-01  1:42   ` Jingoo Han
2012-08-01  2:19   ` Kukjin Kim
2012-07-31 12:35 ` [PATCH V2 4/5] driver: " Leela Krishna Amudala
2012-08-01  1:36   ` Jingoo Han
2012-08-01  2:20   ` Kukjin Kim
2012-07-31 12:35 ` [PATCH V2 5/5] arm: samsung: delete frame buffer header files from platform Leela Krishna Amudala
2012-08-01  2:04   ` Kukjin Kim
2012-08-01  3:32     ` Leela Krishna Amudala
2012-08-01  9:39       ` Kukjin Kim
2012-08-01 10:00         ` Sylwester Nawrocki
2012-08-01 10:09           ` Kukjin Kim
2012-08-01  2:28 ` [PATCH V2 0/5] arm: samsung: Move FIMD headers to include/video/ Kukjin Kim
2012-08-01  9:59   ` Florian Tobias Schandinat
2012-08-01 10:03     ` Kukjin Kim
2012-08-23  9:55     ` Kukjin Kim [this message]
2012-09-23 19:26       ` Florian Tobias Schandinat

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='1d5a01cd8115$7251eb40$56f5c1c0$%kim@samsung.com' \
    --to=kgene.kim@samsung.com \
    --cc=FlorianSchandinat@gmx.de \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=l.krishna@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).