Commit e88fa1b8 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 Arnd Bergmann:
 "A few simple cleanups across multiple platforms, not much standing
  out:

   - lpc32xx removes its private implementation of the clk API, after
     generic code was merged in 4.5
   - all unused Makefile.boot files get removed
   - a number of simplifications for shmobile
   - asm/clkdev.h gets replaced with the asm-generic version after all
     mach/clkdev.h implementations are gone"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: shmobile: Kconfig: Get rid of old comment
  ARM: shmobile: Consolidate SCU mapping code
  arm: lpc32xx: remove direct control of GPIOs from shared mach file
  arm: lpc32xx: remove selected HAVE_IDE
  arm: lpc32xx: switch to common clock framework
  ARM: Use generic clkdev.h header
  ARM: plat-versatile: Remove unused clock.c file
  ARM: netx: remove redundant "depends on ARCH_NETX"
  ARM: integrator: remove redundant select in Kconfig
  ARM: drop unused Makefile.boot of Multiplatform SoCs
  ARM: mvebu: add missing of_node_put()
  ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code
  ARM: shmobile: Typo s/MIPDR/MPIDR/
  ARM: shmobile: Add includes providing forward declarations
  ARM: shmobile: rcar-gen2: Make rcar_gen2_dma_contiguous static
  ARM: mv78xx0: use "depends on" instead of "if" after prompt
parents dae0b74e 809683ee

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -527,10 +527,10 @@ config ARCH_LPC32XX 
	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_LPC32XX

	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_IDE

	select USE_OF

	help

	  Support for the NXP LPC32XX family of processors

arch/arm/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 




generic-y += bitsperlong.h

generic-y += clkdev.h

generic-y += cputime.h

generic-y += current.h

generic-y += early_ioremap.h

arch/arm/include/asm/clkdev.h

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

 *  arch/arm/include/asm/clkdev.h

 *

 *  Copyright (C) 2008 Russell King.

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * Helper for the clk API to assist looking up a struct clk.

 */

#ifndef __ASM_CLKDEV_H

#define __ASM_CLKDEV_H



#include <linux/slab.h>



#ifndef CONFIG_COMMON_CLK

#ifdef CONFIG_HAVE_MACH_CLKDEV

#include <mach/clkdev.h>

#else

#define __clk_get(clk)	({ 1; })

#define __clk_put(clk)	do { } while (0)

#endif

#endif



static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)

{

	return kzalloc(size, GFP_KERNEL);

}



#endif

arch/arm/mach-cns3xxx/Makefile.boot

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
   zreladdr-y	+= 0x00008000

params_phys-y	:= 0x00000100

initrd_phys-y	:= 0x00C00000

arch/arm/mach-exynos/Makefile.boot

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
   zreladdr-y	+= 0x40008000

params_phys-y	:= 0x40000100

CRA Git | Maintained and supported by SUSTech CRA and CCSE