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

Commit c56569b3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'qcom/dt' into next/dt 



* qcom/dt:
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: msm: trout: fix uninit var warning

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents aa1ed457 47c5a5d6

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

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "skeleton.dtsi"



/ {

	model = "Qualcomm MSM8974";

	compatible = "qcom,msm8974";

	interrupt-parent = <&intc>;



	soc: soc {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		compatible = "simple-bus";



		intc: interrupt-controller@f9000000 {

			compatible = "qcom,msm-qgic2";

			interrupt-controller;

			#interrupt-cells = <3>;

			reg = <0xf9000000 0x1000>,

			      <0xf9002000 0x1000>;

		};



		timer {

			compatible = "arm,armv7-timer";

			interrupts = <1 2 0xf08>,

				     <1 3 0xf08>,

				     <1 4 0xf08>,

				     <1 1 0xf08>;

			clock-frequency = <19200000>;

		};



		timer@f9020000 {

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

			compatible = "arm,armv7-timer-mem";

			reg = <0xf9020000 0x1000>;

			clock-frequency = <19200000>;



			frame@f9021000 {

				frame-number = <0>;

				interrupts = <0 8 0x4>,

					     <0 7 0x4>;

				reg = <0xf9021000 0x1000>,

				      <0xf9022000 0x1000>;

			};



			frame@f9023000 {

				frame-number = <1>;

				interrupts = <0 9 0x4>;

				reg = <0xf9023000 0x1000>;

				status = "disabled";

			};



			frame@f9024000 {

				frame-number = <2>;

				interrupts = <0 10 0x4>;

				reg = <0xf9024000 0x1000>;

				status = "disabled";

			};



			frame@f9025000 {

				frame-number = <3>;

				interrupts = <0 11 0x4>;

				reg = <0xf9025000 0x1000>;

				status = "disabled";

			};



			frame@f9026000 {

				frame-number = <4>;

				interrupts = <0 12 0x4>;

				reg = <0xf9026000 0x1000>;

				status = "disabled";

			};



			frame@f9027000 {

				frame-number = <5>;

				interrupts = <0 13 0x4>;

				reg = <0xf9027000 0x1000>;

				status = "disabled";

			};



			frame@f9028000 {

				frame-number = <6>;

				interrupts = <0 14 0x4>;

				reg = <0xf9028000 0x1000>;

				status = "disabled";

			};

		};



		restart@fc4ab000 {

			compatible = "qcom,pshold";

			reg = <0xfc4ab000 0x4>;

		};

	};

};

arch/arm/mach-msm/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ endchoice 


config ARCH_MSM8X60

	bool "MSM8X60"

	select ARCH_MSM_DT

	select ARM_GIC

	select CPU_V7

	select GPIO_MSM_V2
@@ -52,15 +53,25 @@ config ARCH_MSM8X60 


config ARCH_MSM8960

	bool "MSM8960"

	select ARCH_MSM_DT

	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select GPIO_MSM_V2

	select MSM_SCM if SMP



config ARCH_MSM8974

	bool "MSM8974"

	select ARCH_MSM_DT

	select ARM_GIC

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select HAVE_SMP

	select MSM_SCM if SMP

	select USE_OF



config ARCH_MSM_DT

	def_bool y

	depends on (ARCH_MSM8X60 || ARCH_MSM8960)

	bool

	select SPARSE_IRQ

	select USE_OF

arch/arm/mach-msm/board-trout.c

+6 −6
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * GNU General Public License for more details.

 *

 */

#define pr_fmt(fmt) "%s: " fmt, __func__



#include <linux/kernel.h>

#include <linux/init.h>
@@ -68,12 +69,11 @@ static void __init trout_init(void) 


	platform_add_devices(devices, ARRAY_SIZE(devices));



#ifdef CONFIG_MMC

	if (IS_ENABLED(CONFIG_MMC)) {

		rc = trout_init_mmc(system_rev);

		if (rc)

                printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc);

#endif



			pr_crit("MMC init failure (%d)\n", rc);

	}

}



static struct map_desc trout_io_desc[] __initdata = {