Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5fc2498 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC cleanups from Olof Johansson:
 "A large cleanup branch this release, with a healthy 10k negative line
  delta.

  Most of this is removal of legacy (non-DT) support of shmobile
  platforms.  There is also removal of two non-DT platforms on OMAP, and
  the plat-samsung directory is cleaned out by moving most of the
  previously shared-location-but-not-actually-shared files from there to
  the appropriate mach directories instead.

  There are other sets of changes in here as well:

   - Rob Herring removed use of set_irq_flags under all platforms and
     moved to genirq alternatives

   - a series of timer API conversions to set-state interface

   - ep93xx, nomadik and ux500 cleanups from Linus Walleij

   - __init annotation fixes from Nicolas Pitre

   + a bunch of other changes that all add up to a nice set of cleanups"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (108 commits)
  ARM/fb: ep93xx: switch framebuffer to use modedb only
  ARM: gemini: Setup timer3 as free running timer
  ARM: gemini: Use timer1 for clockevent
  ARM: gemini: Add missing register definitions for gemini timer
  ARM: ep93xx/timer: Migrate to new 'set-state' interface
  ARM: nomadik: push accelerometer down to boards
  ARM: nomadik: move l2x0 setup to device tree
  ARM: nomadik: selectively enable UART0 on boards
  ARM: nomadik: move hog code to use DT hogs
  ARM: shmobile: Fix mismerges
  ARM: ux500: simplify secondary CPU boot
  ARM: SAMSUNG: remove keypad-core header in plat-samsung
  ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
  ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
  ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
  ARM: SAMSUNG: local backlight header in mach-s3c64xx
  ARM: SAMSUNG: local ata-core header in mach-s3c64xx
  ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
  ARM: SAMSUNG: local spi-core header in mach-s3c24xx
  ARM: SAMSUNG: local nand-core header in mach-s3c24xx
  ...
parents 00e3fcc2 97a2482d

Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ Required properties: 
- interrupts : The interrupt from the HDA controller.

- clocks : Must contain an entry for each required entry in clock-names.

  See ../clocks/clock-bindings.txt for details.

- clock-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi

- clock-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x

- resets : Must contain an entry for each entry in reset-names.

  See ../reset/reset.txt for details.

- reset-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi

- reset-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x



Example:
@@ -24,7 +24,7 @@ hda@0,70030000 { 
		 <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;

	clock-names = "hda", "hda2hdmi", "hda2codec_2x";

	resets = <&tegra_car 125>, /* hda */

		 <&tegra_car 128>; /* hda2hdmi */

		 <&tegra_car 111>, /* hda2codec_2x */

		 <&tegra_car 128>, /* hda2hdmi */

		 <&tegra_car 111>; /* hda2codec_2x */

	reset-names = "hda", "hda2hdmi", "hda2codec_2x";

};

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -1471,9 +1471,7 @@ F: arch/arm/boot/dts/emev2* 
F:	arch/arm/boot/dts/r7s*

F:	arch/arm/boot/dts/r8a*

F:	arch/arm/boot/dts/sh*

F:	arch/arm/configs/armadillo800eva_defconfig

F:	arch/arm/configs/bockw_defconfig

F:	arch/arm/configs/kzm9g_defconfig

F:	arch/arm/configs/marzen_defconfig

F:	arch/arm/configs/shmobile_defconfig

F:	arch/arm/include/debug/renesas-scif.S

arch/arm/Kconfig

+5 −6
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ config PHYS_OFFSET 
	depends on !ARM_PATCH_PHYS_VIRT

	default DRAM_BASE if !MMU

	default 0x00000000 if ARCH_EBSA110 || \

			EP93XX_SDCE3_SYNC_PHYS_OFFSET || \

			ARCH_FOOTBRIDGE || \

			ARCH_INTEGRATOR || \

			ARCH_IOP13XX || \
@@ -277,10 +276,7 @@ config PHYS_OFFSET 
	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC

	default 0x20000000 if ARCH_S5PV210

	default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET

	default 0xc0000000 if EP93XX_SDCE0_PHYS_OFFSET || ARCH_SA1100

	default 0xd0000000 if EP93XX_SDCE1_PHYS_OFFSET

	default 0xe0000000 if EP93XX_SDCE2_PHYS_OFFSET

	default 0xf0000000 if EP93XX_SDCE3_ASYNC_PHYS_OFFSET

	default 0xc0000000 if ARCH_SA1100

	help

	  Please provide the physical address corresponding to the

	  location of main memory in your system.
@@ -418,11 +414,14 @@ config ARCH_EP93XX 
	bool "EP93xx-based"

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select ARM_AMBA

	select ARM_PATCH_PHYS_VIRT

	select ARM_VIC

	select AUTO_ZRELADDR

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

	help

	  This enables support for the Cirrus EP93xx series of CPUs.

arch/arm/boot/compressed/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ else 
endif

endif



ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)

OBJS		+= head-shmobile.o

endif



#

# We now have a PIC decompressor implementation.  Decompressors running

# from RAM should not define ZTEXTADDR.  Decompressors running directly

arch/arm/boot/compressed/head-shmobile.S

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/*

 * The head-file for SH-Mobile ARM platforms

 *

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 * Simon Horman <horms@verge.net.au>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#ifdef CONFIG_ZBOOT_ROM



	.section	".start", "ax"



	/* load board-specific initialization code */

#include <mach/zboot.h>



	adr	r0, dtb_info

	ldmia	r0, {r1, r3, r4, r5, r7}



	sub	r0, r0, r1		@ calculate the delta offset

	add	r5, r5, r0		@ _edata



	ldr	lr, [r5, #0]		@ check if valid DTB is present

	cmp	lr, r3

	bne	0f



	add	r9, r7, #31		@ rounded up to a multiple

	bic	r9, r9, #31		@ ... of 32 bytes



	add	r6, r9, r5		@ copy from _edata

	add	r9, r9, r4		@ to MEMORY_START



1:	ldmdb	r6!, {r0 - r3, r10 - r12, lr}

	cmp	r6, r5

	stmdb	r9!, {r0 - r3, r10 - r12, lr}

	bhi	1b



	/* Success: Zero board ID, pointer to start of memory for atag/dtb */

	mov	r7, #0

	mov	r8, r4

	b	2f



	.align	2

dtb_info:

	.word	dtb_info

#ifndef __ARMEB__

	.word	0xedfe0dd0		@ sig is 0xd00dfeed big endian

#else

	.word	0xd00dfeed

#endif

	.word	MEMORY_START

	.word	_edata

	.word	0x4000			@ maximum DTB size

0:

	/* Failure: Zero board ID, NULL atag/dtb */

	mov 	r7, #0

	mov	r8, #0			@ pass null pointer as atag

2 :



#endif /* CONFIG_ZBOOT_ROM */