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

Commit 008f08d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "Here are a couple of bugfixes for v4.8-rc.

  Most of them have actually been around for a while this time but for
  some reason didn't get applied early on.  The shmobile regulator fix
  is the only one that isn't completely obvious.

  Device tree changes:
   - archtimer interrupts must be level triggered (multiple platforms)
   - fix for USB and MMC clocks on STiH410
   - fix split DT repository in case of raspberry-pi 3
   - a new use of skeleton.dtsi on arm64 has crept in after that was
     removed.

  defconfig updates:
   - xilinx vdma has a new Kconfig symbol name
   - keystone requires CONFIG_NOP_USB_XCEIV since v4.8-rc1

  Code fixes:
   - fix regulator quirk on shmobile
   - suspend-to-ram regression on EXYNOS

  Maintainer updates:
   - Javier Martinez Canillas is now a reviewer for Samsung EXYNOS"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: keystone: defconfig: Fix USB configuration
  arm64: dts: Fix broken architected timer interrupt trigger
  ARM: multi_v7_defconfig: update XILINX_VDMA
  ARM64: dts: bcm: Use a symlink to R-Pi dtsi files from arch=arm
  ARM: dts: Remove use of skeleton.dtsi from bcm283x.dtsi
  ARM: dts: STiH407-family: Provide interconnect clock for consumption in ST SDHCI
  ARM: dts: STiH410: Handle interconnect clock required by EHCI/OHCI (USB)
  ARM: shmobile: fix regulator quirk for Gen2
  ARM: EXYNOS: Clear OF_POPULATED flag from PMU node in IRQ init callback
  MAINTAINERS: Add myself as reviewer for Samsung Exynos support
parents cac4662a 64086491

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1625,6 +1625,7 @@ N: rockchip 
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <krzk@kernel.org>

R:	Javier Martinez Canillas <javier@osg.samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

arch/arm/boot/dts/bcm2835-rpi.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


/ {

	memory {

		device_type = "memory";

		reg = <0 0x10000000>;

	};

arch/arm/boot/dts/bcm283x.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <dt-bindings/clock/bcm2835.h>

#include <dt-bindings/clock/bcm2835-aux.h>

#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/* This include file covers the common peripherals and configuration between

 * bcm2835 and bcm2836 implementations, leaving the CPU configuration to
@@ -13,6 +12,8 @@ 
	compatible = "brcm,bcm2835";

	model = "BCM2835";

	interrupt-parent = <&intc>;

	#address-cells = <1>;

	#size-cells = <1>;



	chosen {

		bootargs = "earlyprintk console=ttyAMA0";

arch/arm/boot/dts/stih407-family.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -550,8 +550,9 @@ 
			interrupt-names = "mmcirq";

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_mmc0>;

			clock-names = "mmc";

			clocks = <&clk_s_c0_flexgen CLK_MMC_0>;

			clock-names = "mmc", "icn";

			clocks = <&clk_s_c0_flexgen CLK_MMC_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;

			bus-width = <8>;

			non-removable;

		};
@@ -565,8 +566,9 @@ 
			interrupt-names = "mmcirq";

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_sd1>;

			clock-names = "mmc";

			clocks = <&clk_s_c0_flexgen CLK_MMC_1>;

			clock-names = "mmc", "icn";

			clocks = <&clk_s_c0_flexgen CLK_MMC_1>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;

			resets = <&softreset STIH407_MMC1_SOFTRESET>;

			bus-width = <4>;

		};

arch/arm/boot/dts/stih410.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 
			compatible = "st,st-ohci-300x";

			reg = <0x9a03c00 0x100>;

			interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT0_SOFTRESET>;

			reset-names = "power", "softreset";
@@ -57,7 +58,8 @@ 
			interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT0_SOFTRESET>;

			reset-names = "power", "softreset";
@@ -71,7 +73,8 @@ 
			compatible = "st,st-ohci-300x";

			reg = <0x9a83c00 0x100>;

			interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT1_SOFTRESET>;

			reset-names = "power", "softreset";
@@ -87,7 +90,8 @@ 
			interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb1>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT1_SOFTRESET>;

			reset-names = "power", "softreset";