From d722bc94615d582d2cdb0e9b6f1a56a2628d0c77 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Wed, 8 Feb 2017 18:43:23 -0500 Subject: [PATCH 1/9] MAINTAINERS: Add Jon Mason to BCM5301X maintainers Adding myself as a maintainer for Broadcom Northstar SoCs. Also, adding a regex entry to discover the SVK DTs already present. Signed-off-by: Jon Mason Acked-by: Hauke Mehrtens Signed-off-by: Florian Fainelli --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index c265a5fe4848..e402c4a5bbb3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2671,12 +2671,14 @@ F: arch/mips/include/asm/mach-bcm47xx/* BROADCOM BCM5301X ARM ARCHITECTURE M: Hauke Mehrtens M: Rafał Miłecki +M: Jon Mason M: bcm-kernel-feedback-list@broadcom.com L: linux-arm-kernel@lists.infradead.org S: Maintained F: arch/arm/mach-bcm/bcm_5301x.c F: arch/arm/boot/dts/bcm5301x*.dtsi F: arch/arm/boot/dts/bcm470* +F: arch/arm/boot/dts/bcm953012* BROADCOM BCM53573 ARM ARCHITECTURE M: Rafał Miłecki From d944a0f260d5c12258e227472e0f911a26aa764d Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Tue, 21 Feb 2017 19:43:21 -0700 Subject: [PATCH 2/9] MAINTAINERS: remove swarren from bcm2835 I haven't been active in BCM2835 maintenance for quite a while; Eric's been doing a great job. As such, remove myself from MAINTAINERS for that. Signed-off-by: Stephen Warren Signed-off-by: Eric Anholt --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c265a5fe4848..0adfc2301772 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2649,7 +2649,6 @@ N: kona F: arch/arm/mach-bcm/ BROADCOM BCM2835 ARM ARCHITECTURE -M: Stephen Warren M: Lee Jones M: Eric Anholt L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) From 346ab44e65ac0e9aa1cd70b910fe06f8feb151c4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 23 Feb 2017 10:15:27 -0800 Subject: [PATCH 3/9] MAINTAINERS: Add Stefan Wahren to bcm2835. Stefan has been active on the platform since 2015, helping to polish drivers for upstreaming and providing review feedback to other contributors, along with doing new development. Signed-off-by: Eric Anholt Acked-by: Stefan Wahren --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0adfc2301772..ec4e500d6aa6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2651,6 +2651,7 @@ F: arch/arm/mach-bcm/ BROADCOM BCM2835 ARM ARCHITECTURE M: Lee Jones M: Eric Anholt +M: Stefan Wahren L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/anholt/linux From a06eb006237017a35141fa75c779d62cc0fd1931 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Thu, 23 Feb 2017 18:16:18 +0100 Subject: [PATCH 4/9] MAINTAINERS: tegra: Replace Stephen with Jon For a while now, Stephen's been focussing on other areas of the open source community and within NVIDIA. Jon Hunter's been doing a great job keeping things working. Replace Stephen's entry with Jon's. Acked-by: Stephen Warren Signed-off-by: Thierry Reding --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c265a5fe4848..5f9864c396cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12302,9 +12302,9 @@ S: Maintained F: drivers/media/rc/ttusbir.c TEGRA ARCHITECTURE SUPPORT -M: Stephen Warren M: Thierry Reding M: Alexandre Courbot +M: Jonathan Hunter L: linux-tegra@vger.kernel.org Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git From 89d39a63b2c25c8da1a038fdb208bfed041c889c Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Mon, 6 Mar 2017 15:11:34 +0900 Subject: [PATCH 5/9] MAINTAINERS: tegra: Remove self as maintainer I have not been doing any Tegra maintainance work for a while, and this is unlikely to change in the foreseeable future. Better reflect the actual state of things by removing myself from the list. Signed-off-by: Alexandre Courbot Signed-off-by: Thierry Reding --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 5f9864c396cc..b69388f478b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12303,7 +12303,6 @@ F: drivers/media/rc/ttusbir.c TEGRA ARCHITECTURE SUPPORT M: Thierry Reding -M: Alexandre Courbot M: Jonathan Hunter L: linux-tegra@vger.kernel.org Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ From b44327d198b4f1bbebaf83f714cde450471de644 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sun, 26 Feb 2017 12:07:01 +0900 Subject: [PATCH 6/9] ARM: oxnas: remove redundant select CPU_V6K MACH_OX820 depends on ARCH_MULTI_V6, which already selects CPU_V6K. Signed-off-by: Masahiro Yamada Acked-by: Neil Armstrong --- arch/arm/mach-oxnas/Kconfig | 1 - 1 file changed, 1 deletion(-) 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 depends on ARCH_MULTI_V6 select ARM_GIC select DMA_CACHE_RWFO if SMP - select CPU_V6K select HAVE_SMP select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP From ab7090ffb24191d3704fcbf357329567b7016f8e Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 12 Mar 2017 14:16:49 +0100 Subject: [PATCH 7/9] MAINTAINERS: Add file patterns for dove device tree bindings Submitters of device tree binding documentation may forget to CC the subsystem maintainer if this is missing. Signed-off-by: Geert Uytterhoeven Cc: Jason Cooper Cc: Andrew Lunn Cc: Sebastian Hesselbarth Cc: Gregory Clement Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Gregory CLEMENT --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index c265a5fe4848..b51166e5e794 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1486,6 +1486,7 @@ M: Sebastian Hesselbarth M: Gregory Clement L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/soc/dove/ F: arch/arm/mach-dove/ F: arch/arm/mach-mv78xx0/ F: arch/arm/mach-orion5x/ From e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 28 Mar 2017 18:17:03 +0900 Subject: [PATCH 8/9] ARM: w90x900: let clk_disable() return immediately if clk is NULL In many of clk_disable() implementations, it is a no-op for a NULL pointer input, but this is one of the exceptions. Making it treewide consistent will allow clock consumers to call clk_disable() without NULL pointer check. Signed-off-by: Masahiro Yamada Acked-by: Wan Zongshun Signed-off-by: Arnd Bergmann --- arch/arm/mach-w90x900/clock.c | 3 +++ 1 file changed, 3 insertions(+) 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) { unsigned long flags; + if (!clk) + return; + WARN_ON(clk->enabled == 0); spin_lock_irqsave(&clocks_lock, flags); From aa9daa310dee3f86fa3a693fecd996a28d993cc6 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 28 Mar 2017 18:17:02 +0900 Subject: [PATCH 9/9] ARM: mmp: let clk_disable() return immediately if clk is NULL In many of clk_disable() implementations, it is a no-op for a NULL pointer input, but this is one of the exceptions. Making it treewide consistent will allow clock consumers to call clk_disable() without NULL pointer check. Signed-off-by: Masahiro Yamada Signed-off-by: Arnd Bergmann --- arch/arm/mach-mmp/clock.c | 3 +++ 1 file changed, 3 insertions(+) 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) { unsigned long flags; + if (!clk) + return; + WARN_ON(clk->enabled == 0); spin_lock_irqsave(&clocks_lock, flags);