[GIT PULL v2] Blackfin changes for 3.6-rc1

[GIT PULL v2] Blackfin changes for 3.6-rc1

[Bob Liu]

Hi linus,

This is the new pull request about blackfin changes for 3.6-rc1.
I've rebased my tree to 3.5.

The big changes are adding PM and HDMI support for bf60x, other patches are various
bug fix and code cleanup.

Thanks,
-Bob

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git for-linus

for you to fetch changes up to 719154c6d1c1a3a404f4ff570c4b36bb2ef868ca:

  bf60x: fix build warning (2012-07-24 13:39:53 +0800)

----------------------------------------------------------------
Bob Liu (7):
      bfin: reorg clock init steps for bf609
      blackfin: Kconfig: fix ROM range for bf60x
      blackfin: mach-common: ints-priority add irq_set_wake
      blackfin: bf609-ezkit: add probe_type for norflash
      blackfin: fix musb macro name
      blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit
      bf60x: fix build warning

Scott Jiang (10):
      bf609: change ad7877 cs and irq pin
      bfin: add 32M, 16M and 8M uncached DMA region options
      v4l2: add adv7842 video decoder driver
      bf609: add ssm2602 support on bf609 platform
      bf609: add CVBS and S-Video support for adv7842
      bf609: add HDMI support for adv7842
      bf609: convert vs6624 blank_clocks to black_pixels
      bf561: add capabilities in adv7183_inputs
      bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver
      bf609: add adv7511 display support

Sonic Zhang (16):
      blackfin: Call sg_for_each to pass through the whole sg list.
      bf609: crypto: Add blackfin crypto crc driver platform data.
      bf60x: Enable Blackfin CRC crypto driver by default.
      bf60x: bfin_crc: move structure bfin_crc out of head file.
      bf609: bfin_crc: Remove unused CRC TX DMA platform resources.
      bfin: pm: add deepsleep for bf60x
      bf60x: Add wake up latency bench for deep sleep mode.
      i2c: i2c-bfin-twi: Always access 16 bit MMR by bfin 16 bit access Macro.
      bf60x: sec: Clean up interrupt initialization code for SEC.
      bf60x: sec: Enable sec interrupt source priority configuration.
      bf60x: update bf60x anomaly list.
      bf60x: add default anomaly setting.
      bf60x: update anomaly id in serial and twi driver headers.
      bf60x: Add double fault, hardware error and NMI SEC handler
      bf60x: cpufreq: fix anomaly 05000273
      blackfin: twi: read twi mmr via bfin_read macro

Steven Miao (14):
      pm: dpmc macro typo fix
      bfin-dma: only use MDMA3 on bf609
      irq: set cgu event handle to fasteoi handle
      cpufreq: change debug message level to show clock change error
      cache: enable L2 sram icache in menuconfig
      bfin: simple_timer: add READ_COUNTER ioctl and add NOIRQ timer mode
      bf60x: pm: add smc nor flash syscore ops
      bf60x: pm: pass wakeup param
      gpiokeys: add gpio keyboard platform device
      bf60x: pm: add pint suspend and resume support
      bfin: pint: add pint suspend and resume
      cleanup: sec and linkport only built on bf60x
      dpm: deepsleep: reserve stack
      PM: add BF60x flash suspend and resume support

Vivi Li (1):
      bf60x: vs6624 pin update

 arch/blackfin/Kconfig                              |   16 +-
 arch/blackfin/configs/BF609-EZKIT_defconfig        |    2 +
 arch/blackfin/include/asm/bfin-global.h            |    8 +-
 arch/blackfin/include/asm/bfin_crc.h               |   14 -
 arch/blackfin/include/asm/bfin_serial.h            |    2 +-
 arch/blackfin/include/asm/bfin_simple_timer.h      |    6 +
 arch/blackfin/include/asm/bfin_twi.h               |   10 +-
 arch/blackfin/include/asm/context.S                |    9 +
 arch/blackfin/include/asm/dpmc.h                   |    2 +-
 arch/blackfin/include/asm/gpio.h                   |    2 +
 arch/blackfin/include/asm/irq.h                    |   10 +
 arch/blackfin/include/asm/mem_init.h               |  212 +++++++++++++
 arch/blackfin/include/asm/traps.h                  |    2 +
 arch/blackfin/kernel/bfin_dma.c                    |    4 +-
 arch/blackfin/kernel/cplb-nompu/cplbinit.c         |    8 +
 arch/blackfin/kernel/dma-mapping.c                 |   10 +-
 arch/blackfin/mach-bf527/boards/ezkit.c            |    4 +-
 arch/blackfin/mach-bf548/boards/ezkit.c            |    4 +-
 arch/blackfin/mach-bf548/include/mach/gpio.h       |    2 +
 arch/blackfin/mach-bf561/boards/ezkit.c            |    3 +
 arch/blackfin/mach-bf609/Kconfig                   |    8 +
 arch/blackfin/mach-bf609/Makefile                  |    4 +-
 arch/blackfin/mach-bf609/boards/ezkit.c            |  304 +++++++++++++++++-
 arch/blackfin/mach-bf609/clock.c                   |    3 +-
 arch/blackfin/mach-bf609/dpm.S                     |  157 ++++++++++
 arch/blackfin/mach-bf609/hibernate.S               |   65 ----
 arch/blackfin/mach-bf609/include/mach/anomaly.h    |  141 ++++-----
 .../mach-bf609/include/mach/defBF60x_base.h        |    1 -
 arch/blackfin/mach-bf609/include/mach/gpio.h       |    2 +
 arch/blackfin/mach-bf609/include/mach/irq.h        |    4 +
 arch/blackfin/mach-bf609/include/mach/pm.h         |    9 +-
 arch/blackfin/mach-bf609/ints-priority.c           |  156 +++++++++
 arch/blackfin/mach-bf609/pm.c                      |  130 ++++----
 arch/blackfin/mach-common/clocks-init.c            |  139 +-------
 arch/blackfin/mach-common/cpufreq.c                |    5 +-
 arch/blackfin/mach-common/entry.S                  |    7 -
 arch/blackfin/mach-common/ints-priority.c          |  331 ++++++++++++++------
 arch/blackfin/mach-common/pm.c                     |    8 +
 38 files changed, 1298 insertions(+), 506 deletions(-)
 create mode 100644 arch/blackfin/mach-bf609/dpm.S
 delete mode 100644 arch/blackfin/mach-bf609/hibernate.S
 create mode 100644 arch/blackfin/mach-bf609/ints-priority.c

Re: [GIT PULL v2] Blackfin changes for 3.6-rc1

[Linus Torvalds]

On Mon, Jul 23, 2012 at 10:54 PM, Bob Liu <lliubbo@gmail.com> wrote:
>
> This is the new pull request about blackfin changes for 3.6-rc1.
> I've rebased my tree to 3.5.

So I pulled it, but next time I'd really like to not see so much
recent rebasing.

So preferably it would be something that has been stable for at least
a week, and tested in next. If you really need to use some kind of
rebasing model, try to calm it down *before* the merge window starts,
so that you can have a tested tree ready without rebasing it in the
last few days.

The release schedule is generally predictable enough that you can (for
example) decide to pick a fairly stable -rc version (say -rc5 or -rc6,
by which time the kernel should be pretty reliable), and use that as
your base point, and keep it in -next *without* rebasing at all (just
possibly add new patches at the end).

Generally, the less you rebase, the better. Yes, sometimes it's worth
it as a way to clean up the history especially if you need some
changes that come from elsewhere, or if you want to fix a bug in a
commit that you haven't asked me to pull yet. But if you can get to a
workflow with minimal rebasing, it really helps people who want to
work with you, so that they can rely on your tree not changing from
under them.

Now, I assume that blackfin just doesn't have enough developers or big
changes for this to be a big deal, but it's a good habit to aim for
regardless.

                   Linus

Re: [GIT PULL v2] Blackfin changes for 3.6-rc1

[Theodore Ts'o]

On Tue, Jul 24, 2012 at 01:54:40PM +0800, Bob Liu wrote:
> 
> This is the new pull request about blackfin changes for 3.6-rc1.
> I've rebased my tree to 3.5.

To save Linus having to send you a chastising e-mail (and because I'll
probably be more gentle about it than he would be :-), in general it's
good not to rebase your the tree before submitting to Linus.  If you
tested with your set of commits pon top of 3.5-rc3, then submit those
patches that way.  Rebasing at least partially invalidates your
testing, and causes other problems if someone else has based their
tree off of yours.

If the goal is to avoid merge conflicts, it's better to just resolve
the conflict, and push the proposed merge resolution, and send Linus
both the commit pre-merge, and post-merge, and let him decide if wants
to use your merge resolution, or to fix things up in a slightly
different way.

Regards,

						- Ted

Re: [GIT PULL v2] Blackfin changes for 3.6-rc1

[Bob Liu]

On Wed, Jul 25, 2012 at 3:21 AM, Theodore Ts'o <tytso@mit.edu> wrote:
> On Tue, Jul 24, 2012 at 01:54:40PM +0800, Bob Liu wrote:
>>
>> This is the new pull request about blackfin changes for 3.6-rc1.
>> I've rebased my tree to 3.5.
>
> To save Linus having to send you a chastising e-mail (and because I'll
> probably be more gentle about it than he would be :-), in general it's
> good not to rebase your the tree before submitting to Linus.  If you
> tested with your set of commits pon top of 3.5-rc3, then submit those
> patches that way.  Rebasing at least partially invalidates your
> testing, and causes other problems if someone else has based their
> tree off of yours.
>
> If the goal is to avoid merge conflicts, it's better to just resolve
> the conflict, and push the proposed merge resolution, and send Linus
> both the commit pre-merge, and post-merge, and let him decide if wants
> to use your merge resolution, or to fix things up in a slightly
> different way.
>

Got it, thanks a lot for your kindly explanation.

-- 
Regards,
--Bob