Skip to contentSkip to conversation

omap fixes for v3.10 merge window part2

GIT PULL Tony Lindgren 2 participants 4 messages May 9, 2013

lore
Share & tools
lore
#0 lore raw

The following changes since commit 956e46efb2478ebff7a871138458fa8124fd18dd:

mm/slab: Fix crash during slab init (2013-05-08 15:02:33 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/fixes-for-merge-window-part2

for you to fetch changes up to b1dd11d60e5357c13d3f3decfb69bd07dde159bd:

ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c (2013-05-09 09:06:27 -0700)

----------------------------------------------------------------
Omap fixes for things that were discovered during the merge window:

- Few GPMC fixes and binding doc updates noted after sending pull requests for the GPMC branch.

- Board fixes for beagle usb host and rx51 spi probe order

- SoC fixes dt earlyprintk, omap1 dma and omap2+ id.c error handling fixes

Then few minor things that are not strictly fixes but are good to get out of the way:

- Add missing legacy mux registers for am/dm73x gpio

- Add detection for am33xx pg2.1 silicon

- Enable twl4030 audio modules in defconfig

----------------------------------------------------------------
Aaro Koskinen (1):
ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices

Christoph Fritz (1):
omap: mux: add AM/DM37x gpios

Javier Martinez Canillas (3):
Documentation: dt: update TI GPMC ethernet binding properties
ARM: OMAP2+: only search for GPMC DT child nodes on probe
ARM: OMAP2+: only WARN if a GPMC child probe function fail

Jon Hunter (1):
Documentation: dt: update properties in TI GPMC NAND example

Kevin Hilman (1):
ARM: OMAP2+: omap_device: use late_initcall_sync

Peter Ujfalusi (1):
ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module

Roger Quadros (1):
ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx

Tony Lindgren (2):
Merge branch 'omap-gpmc-fixes-for-v3.10' of git://github.com/jonhunter/linux into fixes
ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c

Vaibhav Hiremath (1):
ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si

Wei Yongjun (1):
ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()

 .../devicetree/bindings/mtd/gpmc-nand.txt          | 28 +++++------
 Documentation/devicetree/bindings/net/gpmc-eth.txt | 56 +++++++++++-----------
 arch/arm/configs/omap2plus_defconfig               |  2 +
 arch/arm/mach-omap1/dma.c                          |  8 ++--
 arch/arm/mach-omap2/board-omap3beagle.c            |  6 +--
 arch/arm/mach-omap2/board-rx51-peripherals.c       |  4 +-
 arch/arm/mach-omap2/gpmc.c                         | 38 +++++----------
 arch/arm/mach-omap2/id.c                           | 13 +++--
 arch/arm/mach-omap2/mux34xx.h                      |  6 ++-
 arch/arm/mach-omap2/omap_device.c                  |  2 +-
 arch/arm/mach-omap2/soc.h                          |  2 +
 11 files changed, 81 insertions(+), 84 deletions(-)
#1 lore raw

[GIT PULL 2/2] omap device tree fixes for v3.10 merge window

The following changes since commit bb9055b2744ada735a2fe555c4196ad39a83ef2a:

Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2013-05-07 11:28:42 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-fixes-for-merge-window

for you to fetch changes up to 914dc329ee11d6b1ecbebef802962dc06e78b942:

ARM: dts: don't assume boards are using twl4030 for omap3 (2013-05-09 09:06:57 -0700)

----------------------------------------------------------------
Omap device tree fixes for issue discovered during the merge window:

- Fix triggering for GPIO interrupts that's needed for 4430sdp Ethernet. Otherwise booting with nfsroot won't work.

- Fix CPU operating point values

- Fix wrong assumption that twl PMIC is always connected to omap3

- Add gpmc for am33xx so beaglebone users can use the bus

- Cosmetic fix for mcspi pin muxing to avoid confusion

----------------------------------------------------------------
Jason Cooper (1):
ARM: dts: don't assume boards are using twl4030 for omap3

Jon Hunter (1):
ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards

Nishanth Menon (2):
ARM: dts: OMAP36xx: Fix CPU OPP voltages
ARM: dts: OMAP4460: Fix CPU OPP voltages

Philip Avinash (1):
ARM: dts: AM33XX: Add GPMC node

Tony Lindgren (1):
ARM: dts: Configure and fix the McSPI pins for 4430sdp

 arch/arm/boot/dts/am33xx.dtsi         | 12 ++++++++++++
 arch/arm/boot/dts/omap3-beagle-xm.dts |  1 +
 arch/arm/boot/dts/omap3-evm.dts       |  1 +
 arch/arm/boot/dts/omap3-overo.dtsi    |  1 +
 arch/arm/boot/dts/omap3.dtsi          |  1 -
 arch/arm/boot/dts/omap36xx.dtsi       |  6 +++---
 arch/arm/boot/dts/omap4-sdp.dts       | 14 +++++++++++++-
 arch/arm/boot/dts/omap4-var-som.dts   |  2 +-
 arch/arm/boot/dts/omap4460.dtsi       |  6 +++---
 9 files changed, 35 insertions(+), 9 deletions(-)
#2 lore raw

[GIT PULL 2/2] omap device tree fixes for v3.10 merge window

Quoted 4 lines · Tony Lindgren

The following changes since commit bb9055b2744ada735a2fe555c4196ad39a83ef2a:

Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2013-05-07 11:28:42 -0700)

Quoted 8 lines

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-fixes-for-merge-window

for you to fetch changes up to 914dc329ee11d6b1ecbebef802962dc06e78b942:

ARM: dts: don't assume boards are using twl4030 for omap3 (2013-05-09 09:06:57 -0700)

Pulled, thanks.

-Olof

#3 lore raw

[GIT PULL 2/2] omap device tree fixes for v3.10 merge window

In reply to Tony Lindgren

The following changes since commit bb9055b2744ada735a2fe555c4196ad39a83ef2a:

Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2013-05-07 11:28:42 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-fixes-for-merge-window

for you to fetch changes up to 914dc329ee11d6b1ecbebef802962dc06e78b942:

ARM: dts: don't assume boards are using twl4030 for omap3 (2013-05-09 09:06:57 -0700)

----------------------------------------------------------------
Omap device tree fixes for issue discovered during the merge window:

- Fix triggering for GPIO interrupts that's needed for 4430sdp Ethernet. Otherwise booting with nfsroot won't work.

- Fix CPU operating point values

- Fix wrong assumption that twl PMIC is always connected to omap3

- Add gpmc for am33xx so beaglebone users can use the bus

- Cosmetic fix for mcspi pin muxing to avoid confusion

----------------------------------------------------------------
Jason Cooper (1):
ARM: dts: don't assume boards are using twl4030 for omap3

Jon Hunter (1):
ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards

Nishanth Menon (2):
ARM: dts: OMAP36xx: Fix CPU OPP voltages
ARM: dts: OMAP4460: Fix CPU OPP voltages

Philip Avinash (1):
ARM: dts: AM33XX: Add GPMC node

Tony Lindgren (1):
ARM: dts: Configure and fix the McSPI pins for 4430sdp

 arch/arm/boot/dts/am33xx.dtsi         | 12 ++++++++++++
 arch/arm/boot/dts/omap3-beagle-xm.dts |  1 +
 arch/arm/boot/dts/omap3-evm.dts       |  1 +
 arch/arm/boot/dts/omap3-overo.dtsi    |  1 +
 arch/arm/boot/dts/omap3.dtsi          |  1 -
 arch/arm/boot/dts/omap36xx.dtsi       |  6 +++---
 arch/arm/boot/dts/omap4-sdp.dts       | 14 +++++++++++++-
 arch/arm/boot/dts/omap4-var-som.dts   |  2 +-
 arch/arm/boot/dts/omap4460.dtsi       |  6 +++---
 9 files changed, 35 insertions(+), 9 deletions(-)