Commit ee4383e0 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v3.13/board-removal-signed-take2' of... 

Merge tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:
Changes needed to drop legacy booting support for some
omap3 boards.

Note that that these are based on a merge of the
following for the dependencies:

- v3.12-rc5 for fixes to pinctrl mask
- omap-for-v3.13/dt-signed to avoid pointless merge conflicts
- omap-for-v3.13/quirk-signed for legacy pdata handling

* tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (125 commits)
  ARM: OMAP2+: remove legacy support for IGEP boards
  ARM: OMAP2+: Remove legacy support for zoom platforms
  ARM: OMAP2+: Remove legacy booting support for omap3 EVM
  ARM: OMAP2: delete board-rm680
  ARM: dts: add minimal DT support for Nokia N950 & N9 phones
  ARM: dts: Add basic support for zoom3
  ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
  ARM: dts: Add common support for omap3-evm
  ARM: dts: Shared file for omap GPMC connected smsc911x
  +Linux 3.12-rc5

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents af43ef67 06ff74fd

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ ALC269/270/275/276/28x/29x 
  alc269-dmic		Enable ALC269(VA) digital mic workaround

  alc271-dmic		Enable ALC271X digital mic workaround

  inv-dmic		Inverted internal mic workaround

  headset-mic		Indicates a combined headset (headphone+mic) jack

  lenovo-dock   	Enables docking station I/O for some Lenovos

  dell-headset-multi	Headset jack, which can also be used as mic-in

  dell-headset-dock	Headset jack (without mic-in), and also dock I/O

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ M: Javier Martinez Canillas <javier@dowhile0.org> 
L:	linux-omap@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-omap2/board-igep0020.c

F:	arch/arm/boot/dts/omap3-igep*



ARM/INCOME PXA270 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*

arch/arc/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int genregs_set(struct task_struct *target, 
	REG_IGNORE_ONE(pad2);

	REG_IN_CHUNK(callee, efa, cregs);	/* callee_regs[r25..r13] */

	REG_IGNORE_ONE(efa);			/* efa update invalid */

	REG_IN_ONE(stop_pc, &ptregs->ret);	/* stop_pc: PC update */

	REG_IGNORE_ONE(stop_pc);			/* PC updated via @ret */



	return ret;

}

arch/arm/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -296,10 +296,15 @@ archprepare: 
# Convert bzImage to zImage

bzImage: zImage



zImage Image xipImage bootpImage uImage: vmlinux

BOOT_TARGETS	= zImage Image xipImage bootpImage uImage

INSTALL_TARGETS	= zinstall uinstall install



PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)



$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



zinstall uinstall install: vmlinux

$(INSTALL_TARGETS):

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.dtb: | scripts

CRA Git | Maintained and supported by SUSTech CRA and CCSE