aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2017-05-09 11:20:16 -0500
committerLinus Torvalds2017-05-09 11:20:16 -0500
commite07e368b27c3470765b70f71279d18992c7d9e03 (patch)
treed22aa4523475ae1dfb2a01470a53bcf4cabcfc9b
parent11fbf53d66ec302fe50b06bd7cb4863dbb98775a (diff)
parentc58ab5376a0f46fd3356786f4b146894df40f22b (diff)
downloadkernel-e07e368b27c3470765b70f71279d18992c7d9e03.tar.gz
kernel-e07e368b27c3470765b70f71279d18992c7d9e03.tar.xz
kernel-e07e368b27c3470765b70f71279d18992c7d9e03.zip
Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull misc ARM SoC fixes from Olof Johansson: "ARM SoC non-urgent fixes for merge window Smaller patches that didn't seem to find a home in other branches, and low-priority fixes from late in the merge window. A number of these are MAINTAINER updates, it seems. Highlights: * Maintainers: - Remove Alexandre Courbot and Stephen Warren from Tegra maintainership, add Jon Hunter - Remove Stephen Warren and add Stefan Wahren to bcm2835 - Tweaks for file flagging for Marvell Dove * Fixes: - For two non-common-clk platform, handle clk_disable with NULL arg - Remove redundant Kconfig select for Oxnas" * tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: mmp: let clk_disable() return immediately if clk is NULL ARM: w90x900: let clk_disable() return immediately if clk is NULL MAINTAINERS: Add file patterns for dove device tree bindings ARM: oxnas: remove redundant select CPU_V6K MAINTAINERS: tegra: Remove self as maintainer MAINTAINERS: tegra: Replace Stephen with Jon MAINTAINERS: Add Stefan Wahren to bcm2835. MAINTAINERS: remove swarren from bcm2835 MAINTAINERS: Add Jon Mason to BCM5301X maintainers
-rw-r--r--MAINTAINERS8
-rw-r--r--arch/arm/mach-mmp/clock.c3
-rw-r--r--arch/arm/mach-oxnas/Kconfig1
-rw-r--r--arch/arm/mach-w90x900/clock.c3
4 files changed, 11 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a4a9e31fed72..0244bbc76e7f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1497,6 +1497,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1497M: Gregory Clement <gregory.clement@free-electrons.com> 1497M: Gregory Clement <gregory.clement@free-electrons.com>
1498L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1498L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1499S: Maintained 1499S: Maintained
1500F: Documentation/devicetree/bindings/soc/dove/
1500F: arch/arm/mach-dove/ 1501F: arch/arm/mach-dove/
1501F: arch/arm/mach-mv78xx0/ 1502F: arch/arm/mach-mv78xx0/
1502F: arch/arm/mach-orion5x/ 1503F: arch/arm/mach-orion5x/
@@ -2667,9 +2668,9 @@ N: kona
2667F: arch/arm/mach-bcm/ 2668F: arch/arm/mach-bcm/
2668 2669
2669BROADCOM BCM2835 ARM ARCHITECTURE 2670BROADCOM BCM2835 ARM ARCHITECTURE
2670M: Stephen Warren <swarren@wwwdotorg.org>
2671M: Lee Jones <lee@kernel.org> 2671M: Lee Jones <lee@kernel.org>
2672M: Eric Anholt <eric@anholt.net> 2672M: Eric Anholt <eric@anholt.net>
2673M: Stefan Wahren <stefan.wahren@i2se.com>
2673L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) 2674L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
2674L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2675L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2675T: git git://github.com/anholt/linux 2676T: git git://github.com/anholt/linux
@@ -2689,12 +2690,14 @@ F: arch/mips/include/asm/mach-bcm47xx/*
2689BROADCOM BCM5301X ARM ARCHITECTURE 2690BROADCOM BCM5301X ARM ARCHITECTURE
2690M: Hauke Mehrtens <hauke@hauke-m.de> 2691M: Hauke Mehrtens <hauke@hauke-m.de>
2691M: Rafał Miłecki <zajec5@gmail.com> 2692M: Rafał Miłecki <zajec5@gmail.com>
2693M: Jon Mason <jonmason@broadcom.com>
2692M: bcm-kernel-feedback-list@broadcom.com 2694M: bcm-kernel-feedback-list@broadcom.com
2693L: linux-arm-kernel@lists.infradead.org 2695L: linux-arm-kernel@lists.infradead.org
2694S: Maintained 2696S: Maintained
2695F: arch/arm/mach-bcm/bcm_5301x.c 2697F: arch/arm/mach-bcm/bcm_5301x.c
2696F: arch/arm/boot/dts/bcm5301x*.dtsi 2698F: arch/arm/boot/dts/bcm5301x*.dtsi
2697F: arch/arm/boot/dts/bcm470* 2699F: arch/arm/boot/dts/bcm470*
2700F: arch/arm/boot/dts/bcm953012*
2698 2701
2699BROADCOM BCM53573 ARM ARCHITECTURE 2702BROADCOM BCM53573 ARM ARCHITECTURE
2700M: Rafał Miłecki <rafal@milecki.pl> 2703M: Rafał Miłecki <rafal@milecki.pl>
@@ -12516,9 +12519,8 @@ S: Maintained
12516F: drivers/media/rc/ttusbir.c 12519F: drivers/media/rc/ttusbir.c
12517 12520
12518TEGRA ARCHITECTURE SUPPORT 12521TEGRA ARCHITECTURE SUPPORT
12519M: Stephen Warren <swarren@wwwdotorg.org>
12520M: Thierry Reding <thierry.reding@gmail.com> 12522M: Thierry Reding <thierry.reding@gmail.com>
12521M: Alexandre Courbot <gnurou@gmail.com> 12523M: Jonathan Hunter <jonathanh@nvidia.com>
12522L: linux-tegra@vger.kernel.org 12524L: linux-tegra@vger.kernel.org
12523Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ 12525Q: http://patchwork.ozlabs.org/project/linux-tegra/list/
12524T: git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git 12526T: git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
diff --git a/arch/arm/mach-mmp/clock.c b/arch/arm/mach-mmp/clock.c
index ac6633d0b69b..28fe64c6e2f5 100644
--- a/arch/arm/mach-mmp/clock.c
+++ b/arch/arm/mach-mmp/clock.c
@@ -67,6 +67,9 @@ void clk_disable(struct clk *clk)
67{ 67{
68 unsigned long flags; 68 unsigned long flags;
69 69
70 if (!clk)
71 return;
72
70 WARN_ON(clk->enabled == 0); 73 WARN_ON(clk->enabled == 0);
71 74
72 spin_lock_irqsave(&clocks_lock, flags); 75 spin_lock_irqsave(&clocks_lock, flags);
diff --git a/arch/arm/mach-oxnas/Kconfig b/arch/arm/mach-oxnas/Kconfig
index 8fa4557e27a9..e3610c5b309b 100644
--- a/arch/arm/mach-oxnas/Kconfig
+++ b/arch/arm/mach-oxnas/Kconfig
@@ -28,7 +28,6 @@ config MACH_OX820
28 depends on ARCH_MULTI_V6 28 depends on ARCH_MULTI_V6
29 select ARM_GIC 29 select ARM_GIC
30 select DMA_CACHE_RWFO if SMP 30 select DMA_CACHE_RWFO if SMP
31 select CPU_V6K
32 select HAVE_SMP 31 select HAVE_SMP
33 select HAVE_ARM_SCU if SMP 32 select HAVE_ARM_SCU if SMP
34 select HAVE_ARM_TWD if SMP 33 select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-w90x900/clock.c b/arch/arm/mach-w90x900/clock.c
index 2c371ff22e51..ac6fd1a2cb59 100644
--- a/arch/arm/mach-w90x900/clock.c
+++ b/arch/arm/mach-w90x900/clock.c
@@ -46,6 +46,9 @@ void clk_disable(struct clk *clk)
46{ 46{
47 unsigned long flags; 47 unsigned long flags;
48 48
49 if (!clk)
50 return;
51
49 WARN_ON(clk->enabled == 0); 52 WARN_ON(clk->enabled == 0);
50 53
51 spin_lock_irqsave(&clocks_lock, flags); 54 spin_lock_irqsave(&clocks_lock, flags);