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

Commit c446407c authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

ARM: msm: Add DT support for 8960 



Add basic support to boot 8960 with device tree. For now just
support a basic machine with a uart device.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
[davidb@codeaurora.org: Remove leading zeros]
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 85a9f0f5

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

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



/include/ "skeleton.dtsi"



/ {

	model = "Qualcomm MSM8960 CDP";

	compatible = "qcom,msm8960-cdp", "qcom,msm8960";

	interrupt-parent = <&intc>;



	intc: interrupt-controller@2000000 {

		compatible = "qcom,msm-qgic2";

		interrupt-controller;

		#interrupt-cells = <3>;

		reg = < 0x02000000 0x1000 >,

		      < 0x02002000 0x1000 >;

	};



	timer@200a004 {

		compatible = "qcom,msm-gpt", "qcom,msm-timer";

		interrupts = <1 2 0x301>;

		reg = <0x0200a004 0x10>;

		clock-frequency = <32768>;

		cpu-offset = <0x80000>;

	};



	timer@200a024 {

		compatible = "qcom,msm-dgt", "qcom,msm-timer";

		interrupts = <1 1 0x301>;

		reg = <0x0200a024 0x10>,

		      <0x0200a034 0x4>;

		clock-frequency = <6750000>;

		cpu-offset = <0x80000>;

	};



	serial@19c400000 {

		compatible = "qcom,msm-hsuart", "qcom,msm-uart";

		reg = <0x16440000 0x1000>,

		      <0x16400000 0x1000>;

		interrupts = <0 154 0x0>;

	};

};

arch/arm/mach-msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ config ARCH_MSM8960 
	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select USE_OF



endchoice

arch/arm/mach-msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o 
obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o

obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o

obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o

obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o



obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o

arch/arm/mach-msm/Makefile.boot

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ params_phys-y := 0x10000100 
initrd_phys-y		:= 0x10800000



dtb-$(CONFIG_ARCH_MSM8X60) += msm8660-surf.dtb

dtb-$(CONFIG_ARCH_MSM8960) += msm8960-cdp.dtb

arch/arm/mach-msm/board-dt-8960.c

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2012, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/init.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>



#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>



#include "common.h"



static const struct of_device_id msm_dt_gic_match[] __initconst = {

	{ .compatible = "qcom,msm-qgic2", .data = gic_of_init },

	{ }

};



static void __init msm_dt_init_irq(void)

{

	of_irq_init(msm_dt_gic_match);

}



static void __init msm_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char * const msm8960_dt_match[] __initconst = {

	"qcom,msm8960-cdp",

	NULL

};



DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")

	.map_io = msm_map_msm8960_io,

	.init_irq = msm_dt_init_irq,

	.timer = &msm_dt_timer,

	.init_machine = msm_dt_init,

	.dt_compat = msm8960_dt_match,

	.handle_irq = gic_handle_irq,

MACHINE_END