Commit e4c0da21 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 Olof Johansson:
 "Here's a set of patches for (hopefully) -rc1.  Some of them are fixes,
  but a good number of them also do things such as enable new drivers in
  the defconfigs for platforms that have such devices, increases
  coverage of the multiplatform defconfig and some DTS changes that
  plumbs up some of the devices that now have bindings and driver
  support.

  The commit dates are recent; we've mostly collected these fixes in the
  last few days but I also had to rebuild the branch yesterday to sort
  out some internal conflicts which reset the timestamps.  The changes
  should have been tested by each platform maintainer already (and few
  of them have cross-platform impact) so I'm personally not too
  concerned by it at this time"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
  ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA
  ARM: multi_v7_defconfig: add mvebu drivers
  clocksource: kona: Add basic use of external clock
  drivers: bus: fix CCI driver kcalloc call parameters swap
  ARM: dts: bcm28155-ap: Fix Card Detection GPIO
  ARM: multi_v7_defconfig: Select CONFIG_AT803X_PHY
  ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
  MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
  ARM: dts: zynq: Add SDHCI nodes
  ARM: hisi: don't select SMP
  ARM: tegra: rebuild tegra_defconfig to add DEBUG_FS
  ARM: multi_v7: copy most options from tegra_defconfig
  ARM: iop32x: fix power off handling for the EM7210 board
  ARM: integrator: restore static map on the CP
  ARM: msm_defconfig: Enable MSM clock drivers
  ARM: dts: msm: Add clock controller nodes and hook into uart
  ARM: OMAP4+: move errata initialization to omap4_pm_init_early
  ARM: OMAP4460: cpuidle: Extend PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD on cpuidle
  ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
  ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
  ...
parents 5cb480f6 f39aa275

MAINTAINERS

+1 −8
Original line number Diff line number Diff line
@@ -868,14 +868,7 @@ F: arch/arm/mach-prima2/ 
F:	drivers/clk/clk-prima2.c

F:	drivers/clocksource/timer-prima2.c

F:	drivers/clocksource/timer-marco.c

F:	drivers/dma/sirf-dma.c

F:	drivers/i2c/busses/i2c-sirf.c

F:	drivers/input/misc/sirfsoc-onkey.c

F:	drivers/irqchip/irq-sirfsoc.c

F:	drivers/mmc/host/sdhci-sirf.c

F:	drivers/pinctrl/sirf/

F:	drivers/rtc/rtc-sirfsoc.c

F:	drivers/spi/spi-sirf.c

N:	[^a-z]sirf



ARM/EBSA110 MACHINE SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

arch/arm/boot/dts/bcm28155-ap.dts

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 


/dts-v1/;



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



#include "bcm11351.dtsi"



/ {
@@ -60,7 +62,7 @@ 


	sdio4: sdio@3f1b0000 {

		max-frequency = <48000000>;

		cd-gpios = <&gpio 14 0>;

		cd-gpios = <&gpio 14 GPIO_ACTIVE_LOW>;

		status = "okay";

	};

arch/arm/boot/dts/qcom-msm8660-surf.dts

+11 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


/include/ "skeleton.dtsi"



#include <dt-bindings/clock/qcom,gcc-msm8660.h>



/ {

	model = "Qualcomm MSM8660 SURF";

	compatible = "qcom,msm8660-surf", "qcom,msm8660";
@@ -37,11 +39,20 @@ 
		#interrupt-cells = <2>;

	};



	gcc: clock-controller@900000 {

		compatible = "qcom,gcc-msm8660";

		#clock-cells = <1>;

		#reset-cells = <1>;

		reg = <0x900000 0x4000>;

	};



	serial@19c40000 {

		compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";

		reg = <0x19c40000 0x1000>,

		      <0x19c00000 0x1000>;

		interrupts = <0 195 0x0>;

		clocks = <&gcc GSBI12_UART_CLK>, <&gcc GSBI12_H_CLK>;

		clock-names = "core", "iface";

	};



	qcom,ssbi@500000 {

arch/arm/boot/dts/qcom-msm8960-cdp.dts

+18 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


/include/ "skeleton.dtsi"



#include <dt-bindings/clock/qcom,gcc-msm8960.h>



/ {

	model = "Qualcomm MSM8960 CDP";

	compatible = "qcom,msm8960-cdp", "qcom,msm8960";
@@ -37,11 +39,27 @@ 
		reg = <0x800000 0x4000>;

	};



	gcc: clock-controller@900000 {

		compatible = "qcom,gcc-msm8960";

		#clock-cells = <1>;

		#reset-cells = <1>;

		reg = <0x900000 0x4000>;

	};



	clock-controller@4000000 {

		compatible = "qcom,mmcc-msm8960";

		reg = <0x4000000 0x1000>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	serial@16440000 {

		compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";

		reg = <0x16440000 0x1000>,

		      <0x16400000 0x1000>;

		interrupts = <0 154 0x0>;

		clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;

		clock-names = "core", "iface";

	};



	qcom,ssbi@500000 {

arch/arm/boot/dts/qcom-msm8974.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


#include "skeleton.dtsi"



#include <dt-bindings/clock/qcom,gcc-msm8974.h>



/ {

	model = "Qualcomm MSM8974";

	compatible = "qcom,msm8974";
@@ -93,5 +95,27 @@ 
			compatible = "qcom,pshold";

			reg = <0xfc4ab000 0x4>;

		};



		gcc: clock-controller@fc400000 {

			compatible = "qcom,gcc-msm8974";

			#clock-cells = <1>;

			#reset-cells = <1>;

			reg = <0xfc400000 0x4000>;

		};



		mmcc: clock-controller@fd8c0000 {

			compatible = "qcom,mmcc-msm8974";

			#clock-cells = <1>;

			#reset-cells = <1>;

			reg = <0xfd8c0000 0x6000>;

		};



		serial@f991e000 {

			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";

			reg = <0xf991e000 0x1000>;

			interrupts = <0 108 0x0>;

			clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;

			clock-names = "core", "iface";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE