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

Commit 7082c6e5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "socinfo: Add MSM8996AU automotive support"

parents ba336f60 377e2603

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	msm8996-v2-fluid.dtb \

	msm8996-v2-liquid.dtb \

	msm8996-v2-dtp.dtb \

	msm8996-v3-auto-cdp.dtb \

	msm8996-v3-pmi8994-cdp.dtb \

	msm8996-v3-pmi8994-mtp.dtb \

	msm8996-v3-pmi8994-pmk8001-cdp.dtb \

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

0 → 100644
+860 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, 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.

 */



/dts-v1/;



#include "msm8996-v3.dtsi"

#include "msm8996-pm8994.dtsi"

#include "msm8996-auto-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3 AUTO CDP";

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

	qcom,msm-id = <310 0x30001>;

	qcom,board-id = <0x03010001 0>;

};



&spi_9 {

	status = "ok";

	can-controller@0 {

		compatible = "renesas,rh850";

		reg = <0>;

		interrupt-parent = <&tlmm>;

		interrupts = <127 0>;

		spi-max-frequency = <5000000>;

	};

};

drivers/soc/qcom/socinfo.c

+6 −0
Original line number Diff line number Diff line
@@ -504,6 +504,8 @@ static struct msm_soc_info cpu_of_id[] = { 


	/* 8996 IDs */

	[246] = {MSM_CPU_8996, "MSM8996"},

	[310] = {MSM_CPU_8996, "MSM8996"},

	[311] = {MSM_CPU_8996, "APQ8096"},

	[291] = {MSM_CPU_8996, "APQ8096"},

	[305] = {MSM_CPU_8996, "MSM8996pro"},

	[312] = {MSM_CPU_8996, "APQ8096pro"},
@@ -1137,6 +1139,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 246;

		strlcpy(dummy_socinfo.build_id, "msm8996 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8996_auto()) {

		dummy_socinfo.id = 310;

		strlcpy(dummy_socinfo.build_id, "msm8996-auto - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8929()) {

		dummy_socinfo.id = 268;

		strlcpy(dummy_socinfo.build_id, "msm8929 - ",

include/soc/qcom/socinfo.h

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2009-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2009-2016, 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
@@ -92,6 +92,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8937")

#define early_machine_is_msm8996()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996")

#define early_machine_is_msm8996_auto()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp")

#define early_machine_is_msm8929()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")

#define early_machine_is_mdm9607()	\