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

Commit a5e1d715 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:
 "Again we have a sizable (but not huge) cleanup branch with a net delta
  of about -3k lines.

  Main contents here is:

   - A bunch of development/cleanup of a few PXA boards
   - Removal of bockw platforms on shmobile, since the platform has now
     gone completely multiplatform.  Whee!
   - move of the 32kHz timer on OMAP to a proper timesource
   - Misc cleanup of older OMAP material (incl removal of one board
     file)
   - Switch over to new common PWM lookup support for several platforms

  There's also a handful of other cleanups across the tree, but the
  above are the major pieces"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (103 commits)
  ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs
  ARM: DRA7: hwmod data: Remove spinlock hwmod addrs
  ARM: OMAP4: hwmod data: Remove spinlock hwmod addrs
  ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data
  ARM: Remove __ref on hotplug cpu die path
  ARM: Remove open-coded version of IRQCHIP_DECLARE
  arm: omap2: board-generic: use omap4_local_timer_init for AM437x
  ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data
  ARM: OMAP: Remove duplicated operand in OR operation
  clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE
  ARM: pxa: remove incorrect __init annotation on pxa27x_set_pwrmode
  ARM: pxa: raumfeld: make some variables static
  ARM: OMAP: Change all cpu_is_* occurences to soc_is_* for id.c
  ARM: OMAP2+: Rename cpu_is macros to soc_is
  arm: omap2: timer: limit hwmod usage to non-DT boots
  arm: omap2+: select 32k clocksource driver
  clocksource: add TI 32.768 Hz counter driver
  arm: omap2: timer: rename omap_sync32k_timer_init()
  arm: omap2: timer: always call clocksource_of_init() when DT
  arm: omap2: timer: move realtime_counter_init() around
  ...
parents 64fd8c8a d3dc3df6

Documentation/devicetree/bindings/arm/shmobile.txt

+0 −6
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ Boards: 
    compatible = "renesas,armadillo800eva"

  - BOCK-W

    compatible = "renesas,bockw", "renesas,r8a7778"

  - BOCK-W - Reference Device Tree Implementation

    compatible = "renesas,bockw-reference", "renesas,r8a7778"

  - Genmai (RTK772100BC00000BR)

    compatible = "renesas,genmai", "renesas,r7s72100"

  - Gose
@@ -57,7 +55,3 @@ Boards: 
    compatible = "renesas,lager", "renesas,r8a7790"

  - Marzen

    compatible = "renesas,marzen", "renesas,r8a7779"
 


Note: Reference Device Tree Implementations are temporary implementations

      to ease the migration from platform devices to Device Tree, and are

      intended to be removed in the future.

Documentation/devicetree/bindings/memory-controllers/renesas-memory-controllers.txt

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Required properties: 
Optional properties:

  - interrupts: Must contain a list of interrupt specifiers for memory

		controller interrupts, if available.

  - interrupts-names: Must contain a list of interrupt names corresponding to

  - interrupt-names: Must contain a list of interrupt names corresponding to

		     the interrupts in the interrupts property, if available.

		     Valid interrupt names are:

			- "sec" (secure interrupt)

Documentation/spi/pxa2xx

+0 −6
Original line number Diff line number Diff line
@@ -22,15 +22,10 @@ Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a 
found in include/linux/spi/pxa2xx_spi.h:



struct pxa2xx_spi_master {

	u32 clock_enable;

	u16 num_chipselect;

	u8 enable_dma;

};



The "pxa2xx_spi_master.clock_enable" field is used to enable/disable the

corresponding SSP peripheral block in the "Clock Enable Register (CKEN"). See

the "PXA2xx Developer Manual" section "Clocks and Power Management".



The "pxa2xx_spi_master.num_chipselect" field is used to determine the number of

slave device (chips) attached to this SPI master.
@@ -57,7 +52,6 @@ static struct resource pxa_spi_nssp_resources[] = { 
};



static struct pxa2xx_spi_master pxa_nssp_master_info = {

	.clock_enable = CKEN_NSSP, /* NSSP Peripheral clock */

	.num_chipselect = 1, /* Matches the number of chips attached to NSSP */

	.enable_dma = 1, /* Enables NSSP DMA */

};

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -1516,8 +1516,6 @@ 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/bockw_defconfig

F:	arch/arm/configs/marzen_defconfig

F:	arch/arm/configs/shmobile_defconfig

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

F:	arch/arm/mach-shmobile/

arch/arm/Kconfig

+1 −25
Original line number Diff line number Diff line
@@ -621,28 +621,6 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_SHMOBILE_LEGACY

	bool "Renesas ARM SoCs (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT if MMU

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select MULTI_IRQ_HANDLER

	select NO_IOPORT_MAP

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

	select SH_CLK_CPG

	select SPARSE_IRQ

	help

	  Support for Renesas ARM SoC platforms using a non-multiplatform

	  kernel. This includes the SH-Mobile, R-Mobile, EMMA-Mobile, R-Car

	  and RZ families.



config ARCH_RPC

	bool "RiscPC"

	depends on MMU
@@ -1537,7 +1515,6 @@ config HZ_FIXED 
	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default 128 if SOC_AT91RM9200

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0



choice
@@ -1756,8 +1733,7 @@ config ARM_MODULE_PLTS 
source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE_LEGACY

	int "Maximum zone order"

	default "12" if SOC_AM33XX

	default "9" if SA1111 || ARCH_EFM32

	default "11"