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

Commit 1e4ee879 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'lpc32xx/soc' of https://github.com/vzapolskiy/linux into next/cleanup 

From Vladimir Zapolskiy:

"The main change is a switchover to a common clock framework driver for
LPC32xx, this also allows to reuse a shared LPC32xx clockevent driver, and
hence remove legacy clock and timer drivers from arch/arm/mach-lpc32xx.

I'm adding an official LPC32xx maintainer Roland to Cc, however he seems
to be unresponsive for a quite long time (since 2014)."

* 'lpc32xx/soc' of https://github.com/vzapolskiy/linux

:
  arm: lpc32xx: remove direct control of GPIOs from shared mach file
  arm: lpc32xx: remove selected HAVE_IDE
  arm: lpc32xx: switch to common clock framework

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 915c7ce8 0ac1a101

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/mach-lpc32xx/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Makefile for the linux kernel.

#



obj-y	:= timer.o irq.o common.o serial.o clock.o

obj-y	:= irq.o common.o serial.o

obj-y	+= pm.o suspend.o

obj-y	+= phy3250.o