"Grosen, Mark" <[email protected]> writes: > Thanks much! > > What's the plan for Primus DA830/OMAPL137? Are you ready to take Mark Greer's > patches?
Next steps: - update/merge DaVinci git master with upstream base. Since there were lots of little changes/cleanups this merge will be a bit tedious. - work through backlog of mailing list patches (including da830 series) - sync with Mark Greer on final da830 patches > We are ready to start submitting Freon OMAPL138/DA850 patches, which will > need to depend on Greer's. OK. Kevin > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of > Kevin Hilman > Sent: Friday, May 29, 2009 7:32 AM > To: [email protected] > Subject: Re: Pull request: davinci updates for next merge window > > Update for DaVinci folks: > > Today, Russell pulled this whole series into his 'devel' branch which means > it will be merged for 2.6.31. > > Thanks > > Kevin Hilman <[email protected]> writes: > >> Russell, >> >> The series '[PATCH 00/16] davinci: generalize common SoC infrastructure' >> got a couple more updates after your latest comments. >> >> It has been updated and (re)pushed to for-next. Updated pull request >> below. >> >> Updates include: >> >> - PATCH 09/16: more mach/gpio.h --> linux/gpio.h conversions >> - PATCH 13/16: ETH_ALEN updates >> >> Boot tested on dm6446, dm355 and dm6467 EVMs. >> >> Here's an updated pull request. >> >> >> The following changes since commit 59a3759d0fe8d969888c741bb33f4946e4d3750d: >> Linus Torvalds (1): >> Linux 2.6.30-rc7 >> >> are available in the git repository at: >> >> >> ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci >> .git for-next >> >> Chaithrika U S (1): >> davinci: use 32-bit accesses for low-level debug macros >> >> David Brownell (4): >> davinci: gpio irq enable tweaks >> davinci: remove remnants of IRAM allocator >> davinci: soc-specific SRAM setup >> davinci: add SRAM allocator >> >> Hugo Villeneuve (1): >> davinci: DM644x: add support for SFFSDR board >> >> Kevin Hilman (9): >> davinci: fixups for banked GPIO interrupt handling >> davinci: add platform support for watchdog timer >> davinci: DM355: add base SoC and board support >> davinci: DM646x: add base SoC and board support >> davinci: update davinci_all_defconfig for dm355, dm6467 >> davinci: MMC platform support >> davinci: EMAC platform support >> davinci: cleanup: move dm355 UART2 define to dm355.c >> davinci: defconfig update: add EMAC >> >> Mark A. Greer (17): >> davinci: support different UART bases for zImage uncompress >> davinci: Encapsulate SoC-specific data in a structure >> davinci: Support JTAG ID register at any address >> davinci: Add clock init call to common init routine >> davinci: Add support for multiple PSCs >> davinci: Move pinmux setup info to SoC infrastructure >> davinci: Move interrupt ctlr info to SoC infrastructure >> davinci: Add base address and timer flexibility >> davinci: Add watchdog base address flexibility >> davinci: Make GPIO code more generic >> davinci: Move serial platform_device into SoC-specific files >> davinci: Move emac platform_data to SoC-specific files >> davinci: Remove unused i2c eeprom_read/write routines >> davinci: Factor out emac mac address handling >> davinci: Integrate cp_intc support into low-level irq code >> davinci: Add compare register support to timer code >> davinci: Move PINMUX defines to SoC files >> >> Sergei Shtylyov (1): >> davinci: INTC: add support for TI cp_intc >> >> Troy Kisky (1): >> davinci: interrupts: get_irqnr_and_base: save an instruction >> >> arch/arm/Kconfig | 1 + >> arch/arm/configs/davinci_all_defconfig | 21 +- >> arch/arm/mach-davinci/Kconfig | 47 ++ >> arch/arm/mach-davinci/Makefile | 13 +- >> arch/arm/mach-davinci/board-dm355-evm.c | 298 ++++++++ >> arch/arm/mach-davinci/board-dm355-leopard.c | 296 ++++++++ >> arch/arm/mach-davinci/board-dm644x-evm.c | 68 +- >> arch/arm/mach-davinci/board-dm646x-evm.c | 262 +++++++ >> arch/arm/mach-davinci/board-sffsdr.c | 189 +++++ >> arch/arm/mach-davinci/clock.c | 10 +- >> arch/arm/mach-davinci/clock.h | 4 + >> arch/arm/mach-davinci/common.c | 108 +++ >> arch/arm/mach-davinci/cp_intc.c | 161 +++++ >> arch/arm/mach-davinci/devices.c | 211 ++++++ >> arch/arm/mach-davinci/dm355.c | 730 >> ++++++++++++++++++++ >> arch/arm/mach-davinci/dm644x.c | 204 ++++++- >> arch/arm/mach-davinci/dm646x.c | 636 +++++++++++++++++ >> arch/arm/mach-davinci/gpio.c | 63 +- >> arch/arm/mach-davinci/id.c | 116 --- >> .../mach-davinci/include/mach/board-dm6446evm.h | 20 - >> arch/arm/mach-davinci/include/mach/common.h | 55 ++- >> arch/arm/mach-davinci/include/mach/cp_intc.h | 57 ++ >> arch/arm/mach-davinci/include/mach/cputype.h | 29 +- >> arch/arm/mach-davinci/include/mach/debug-macro.S | 31 +- >> arch/arm/mach-davinci/include/mach/dm355.h | 22 + >> arch/arm/mach-davinci/include/mach/dm644x.h | 1 + >> arch/arm/mach-davinci/include/mach/dm646x.h | 26 + >> arch/arm/mach-davinci/include/mach/edma.h | 4 - >> arch/arm/mach-davinci/include/mach/emac.h | 36 + >> arch/arm/mach-davinci/include/mach/entry-macro.S | 25 +- >> arch/arm/mach-davinci/include/mach/gpio.h | 14 +- >> arch/arm/mach-davinci/include/mach/irqs.h | 3 + >> arch/arm/mach-davinci/include/mach/memory.h | 1 - >> arch/arm/mach-davinci/include/mach/mmc.h | 33 + >> arch/arm/mach-davinci/include/mach/mux.h | 16 - >> arch/arm/mach-davinci/include/mach/psc.h | 8 +- >> arch/arm/mach-davinci/include/mach/serial.h | 4 +- >> arch/arm/mach-davinci/include/mach/sram.h | 27 + >> arch/arm/mach-davinci/include/mach/time.h | 35 + >> arch/arm/mach-davinci/include/mach/uncompress.h | 19 +- >> arch/arm/mach-davinci/io.c | 38 - >> arch/arm/mach-davinci/irq.c | 217 +------ >> arch/arm/mach-davinci/mux.c | 24 +- >> arch/arm/mach-davinci/psc.c | 32 +- >> arch/arm/mach-davinci/serial.c | 74 +-- >> arch/arm/mach-davinci/sram.c | 74 ++ >> arch/arm/mach-davinci/time.c | 247 ++++--- >> 47 files changed, 3908 insertions(+), 702 deletions(-) create mode >> 100644 arch/arm/mach-davinci/board-dm355-evm.c >> create mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c >> create mode 100644 arch/arm/mach-davinci/board-dm646x-evm.c >> create mode 100644 arch/arm/mach-davinci/board-sffsdr.c >> create mode 100644 arch/arm/mach-davinci/common.c create mode 100644 >> arch/arm/mach-davinci/cp_intc.c create mode 100644 >> arch/arm/mach-davinci/dm355.c create mode 100644 >> arch/arm/mach-davinci/dm646x.c delete mode 100644 >> arch/arm/mach-davinci/id.c delete mode 100644 >> arch/arm/mach-davinci/include/mach/board-dm6446evm.h >> create mode 100644 arch/arm/mach-davinci/include/mach/cp_intc.h >> create mode 100644 arch/arm/mach-davinci/include/mach/dm355.h >> create mode 100644 arch/arm/mach-davinci/include/mach/dm646x.h >> create mode 100644 arch/arm/mach-davinci/include/mach/emac.h >> create mode 100644 arch/arm/mach-davinci/include/mach/mmc.h >> create mode 100644 arch/arm/mach-davinci/include/mach/sram.h >> create mode 100644 arch/arm/mach-davinci/include/mach/time.h >> create mode 100644 arch/arm/mach-davinci/sram.c > > _______________________________________________ > Davinci-linux-open-source mailing list > [email protected] > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
