Commit 64576e43 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'qcom/drivers' into next/drivers 



* qcom/drivers:
  tty: serial: Limit msm_serial_hs driver to platforms that use it
  mmc: msm_sdcc: Limit driver to platforms that use it
  usb: phy: msm: Move mach dependent code to platform data

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3d7e0207 c0f8a487

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ 
	kirkwood-ts219-6282.dtb

dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb

dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb

	qcom-msm8960-cdp.dtb \

	qcom-apq8074-dragonboard.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \

arch/arm/boot/dts/qcom-apq8074-dragonboard.dts

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#include "qcom-msm8974.dtsi"



/ {

	model = "Qualcomm APQ8074 Dragonboard";

	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";

};

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/configs/msm_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8X60=y

CONFIG_ARCH_MSM8960=y

CONFIG_ARCH_MSM8974=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y
@@ -88,6 +89,8 @@ CONFIG_SSBI=y 
CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_MSM=y

CONFIG_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_MEDIA_SUPPORT=y

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE