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

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

Merge "ARM: dts: msm: Add new platform id for sdxhedgehog"

parents aa342049 ea8dc5e9

arch/arm/boot/dts/qcom/sdxhedgehog.dtsi

+2 −2
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -13,7 +13,7 @@ 
/ {

/ {

	model = "Qualcomm Technologies, Inc. SDX HEDGEHOG";

	model = "Qualcomm Technologies, Inc. SDX HEDGEHOG";

	compatible = "qcom,sdxhedgehog";

	compatible = "qcom,sdxhedgehog";

	qcom,msm-id = <314 0x0>;

	qcom,msm-id = <314 0x0>, <333 0x0>;





	timer {

	timer {

		compatible = "arm,armv7-timer";

		compatible = "arm,armv7-timer";

drivers/soc/qcom/socinfo.c

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

/*

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

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -572,6 +572,7 @@ static struct msm_soc_info cpu_of_id[] = { 




	/* Hedgehog IDs */

	/* Hedgehog IDs */

	[314] = {SDX_CPU_HEDGEHOG, "SDXHEDGEHOG"},

	[314] = {SDX_CPU_HEDGEHOG, "SDXHEDGEHOG"},

	[333] = {SDX_CPU_HEDGEHOG, "SDXHEDGEHOG"},





	/*MSM8937 ID  */

	/*MSM8937 ID  */

	[294] = {MSM_CPU_8937, "MSM8937"},

	[294] = {MSM_CPU_8937, "MSM8937"},