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

Commit 9e05f9f3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sirf-soc-for-3.16' of... 

Merge tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/cleanup

Merge "ARM: sirf: machine update for 3.16" from Barry Song:

Most of them fix some minor checkpatch issues according to key customers'
requirement. And this patchset also cleanups the clk of clocksource: move
to get clk by dts properity.

* tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux

:
  clocksource:sirf: remove the hardcode for the clk of timers
  irqchip: sirf: fix one minor checkpatch issue
  clocksource: prima2: fix some minor checkpatch issues
  ARM: prima2: rstc: fix some minor checkpatch issues
  + Linux 3.15-rc3

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a501fd37 c7cff54d

Makefile

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

PATCHLEVEL = 15

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*

arch/arm/Kconfig

+9 −8
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ config ARM 
	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_TRACEHOOK

	select HAVE_BPF_JIT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CONTEXT_TRACKING

	select HAVE_C_RECORDMCOUNT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS
@@ -311,6 +311,7 @@ config ARCH_MULTIPLATFORM 
	select ARM_HAS_SG_CHAIN

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER
@@ -422,8 +423,8 @@ config ARCH_EFM32 
	bool "Energy Micro efm32"

	depends on !MMU

	select ARCH_REQUIRE_GPIOLIB

	select AUTO_ZRELADDR

	select ARM_NVIC

	select AUTO_ZRELADDR

	select CLKSRC_OF

	select COMMON_CLK

	select CPU_V7M
@@ -511,8 +512,8 @@ config ARCH_IXP4XX 
	bool "IXP4xx-based"

	depends on MMU

	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_SUPPORTS_BIG_ENDIAN

	select CLKSRC_MMIO

	select CPU_XSCALE

	select DMABOUNCE if PCI
@@ -1110,9 +1111,9 @@ config ARM_NR_BANKS 
	default 8



config IWMMXT

	bool "Enable iWMMXt support" if !CPU_PJ4

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4

	default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4

	bool "Enable iWMMXt support"

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 || CPU_PJ4B

	default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4 || CPU_PJ4B

	help

	  Enable support for iWMMXt context switching at run time if

	  running on a CPU that supports it.
@@ -1575,8 +1576,8 @@ config BIG_LITTLE 
config BL_SWITCHER

	bool "big.LITTLE switcher support"

	depends on BIG_LITTLE && MCPM && HOTPLUG_CPU

	select CPU_PM

	select ARM_CPU_SUSPEND

	select CPU_PM

	help

	  The big.LITTLE "switcher" provides the core functionality to

	  transparently handle transition between a cluster of A15's
@@ -1920,9 +1921,9 @@ config XEN 
	depends on CPU_V7 && !CPU_V6

	depends on !GENERIC_ATOMIC64

	depends on MMU

	select ARCH_DMA_ADDR_T_64BIT

	select ARM_PSCI

	select SWIOTLB_XEN

	select ARCH_DMA_ADDR_T_64BIT

	help

	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.

arch/arm/Kconfig.debug

+6 −6
Original line number Diff line number Diff line
@@ -1030,9 +1030,9 @@ config DEBUG_UART_PHYS 
	default 0x40100000 if DEBUG_PXA_UART1

	default 0x42000000 if ARCH_GEMINI

	default 0x7c0003f8 if FOOTBRIDGE

	default 0x80230000 if DEBUG_PICOXCELL_UART

	default 0x80070000 if DEBUG_IMX23_UART

	default 0x80074000 if DEBUG_IMX28_UART

	default 0x80230000 if DEBUG_PICOXCELL_UART

	default 0x808c0000 if ARCH_EP93XX

	default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART

	default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
@@ -1096,22 +1096,22 @@ config DEBUG_UART_VIRT 
	default 0xfeb26000 if DEBUG_RK3X_UART1

	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0

	default 0xfeb31000 if DEBUG_KEYSTONE_UART1

	default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE

	default 0xfed60000 if DEBUG_RK29_UART0

	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2

	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

	default 0xfec02000 if DEBUG_SOCFPGA_UART

	default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE

	default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0

	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1

	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2

	default 0xfed12000 if ARCH_KIRKWOOD

	default 0xfed60000 if DEBUG_RK29_UART0

	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2

	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

	default 0xfedc0000 if ARCH_EP93XX

	default 0xfee003f8 if FOOTBRIDGE

	default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART

	default 0xfef36000 if DEBUG_HIGHBANK_UART

	default 0xfee82340 if ARCH_IOP13XX

	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN

	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN

	default 0xfef36000 if DEBUG_HIGHBANK_UART

	default 0xfefff700 if ARCH_IOP33X

	default 0xff003000 if DEBUG_U300_UART

	default DEBUG_UART_PHYS if !MMU

arch/arm/boot/dts/Makefile

+10 −10
Original line number Diff line number Diff line
@@ -51,10 +51,9 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.dtb 


dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb

dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb

dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \

	bcm21664-garnet.dtb

dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb

dtb-$(CONFIG_ARCH_BERLIN) += \

	berlin2-sony-nsz-gs7.dtb	\

	berlin2cd-google-chromecast.dtb
@@ -246,6 +245,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-sbc-t3730.dtb \

	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-beagle-xm-ab.dtb \

	omap3-evm.dtb \

	omap3-evm-37xx.dtb \

	omap3-ldp.dtb \
@@ -294,13 +294,6 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb 
dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb \

	qcom-apq8074-dragonboard.dtb

dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \

	ste-hrefprev60-stuib.dtb \

	ste-hrefprev60-tvk.dtb \

	ste-hrefv60plus-stuib.dtb \

	ste-hrefv60plus-tvk.dtb \

	ste-ccu8540.dtb \

	ste-ccu9540.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \

	s3c6410-smdk6410.dtb
@@ -369,9 +362,16 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ 
	tegra30-cardhu-a04.dtb \

	tegra114-dalmore.dtb \

	tegra124-venice2.dtb

dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb

dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \

	ste-hrefprev60-stuib.dtb \

	ste-hrefprev60-tvk.dtb \

	ste-hrefv60plus-stuib.dtb \

	ste-hrefv60plus-tvk.dtb \

	ste-ccu8540.dtb \

	ste-ccu9540.dtb

dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \

	versatile-pb.dtb

dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb

dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \

	vexpress-v2p-ca9.dtb \

	vexpress-v2p-ca15-tc1.dtb \

arch/arm/boot/dts/am335x-bone-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
&usb {

	status = "okay";



	control@44e10000 {

	control@44e10620 {

		status = "okay";

	};
@@ -204,7 +204,7 @@ 
		dr_mode = "host";

	};



	dma-controller@07402000  {

	dma-controller@47402000  {

		status = "okay";

	};

};