evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Add initial device tree for SDA630"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-04 03:25:36 -08:00 • committed by Gerrit - the friendly Code Review server
commit 246e930ecb
11 changed files with 191 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/devicetree/bindings/arm/msm/msm.txt
View file

@ -104,6 +104,9 @@ SoCs:
- SDM630
compatible = "qcom,sdm630"
- SDA630
compatible = "qcom,sda630"
- MSM8952
compatible = "qcom,msm8952"
@ -284,6 +287,8 @@ compatible = "qcom,sda660-cdp"
compatible = "qcom,sdm630-rumi"
compatible = "qcom,sdm630-mtp"
compatible = "qcom,sdm630-cdp"
compatible = "qcom,sda630-mtp"
compatible = "qcom,sda630-cdp"
compatible = "qcom,msm8952-rumi"
compatible = "qcom,msm8952-sim"
compatible = "qcom,msm8952-qrd"

8
arch/arm/boot/dts/qcom/Makefile
View file

@ -194,7 +194,13 @@ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
sdm630-pm660a-rcm.dtb \
sdm630-internal-codec-pm660a-cdp.dtb \
sdm630-internal-codec-pm660a-mtp.dtb \
sdm630-internal-codec-pm660a-rcm.dtb
sdm630-internal-codec-pm660a-rcm.dtb \
sda630-mtp.dtb \
sda630-cdp.dtb \
sda630-rcm.dtb \
sda630-pm660a-mtp.dtb \
sda630-pm660a-cdp.dtb \
sda630-pm660a-rcm.dtb
ifeq ($(CONFIG_ARM64),y)
always := $(dtb-y)

25
arch/arm/boot/dts/qcom/sda630-cdp.dts Normal file
View file

@ -0,0 +1,25 @@
/* Copyright (c) 2017, 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 "sda630.dtsi"
#include "sdm630-cdp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L CDP";
compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
qcom,board-id = <1 0>;
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};

25
arch/arm/boot/dts/qcom/sda630-mtp.dts Normal file
View file

@ -0,0 +1,25 @@
/* Copyright (c) 2017, 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 "sda630.dtsi"
#include "sdm630-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L MTP";
compatible = "qcom,sda630-mtp", "qcom,sda630", "qcom,mtp";
qcom,board-id = <8 0>;
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};

25
arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts Normal file
View file

@ -0,0 +1,25 @@
/* Copyright (c) 2017, 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 "sda630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A CDP";
compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
qcom,board-id = <1 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};

25
arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts Normal file
View file

@ -0,0 +1,25 @@
/* Copyright (c) 2017, 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 "sda630.dtsi"
#include "sdm630-mtp.dtsi"
#include "msm-pm660a.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A MTP";
compatible = "qcom,sda630-mtp", "qcom,sda630", "qcom,mtp";
qcom,board-id = <8 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};

25
arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts Normal file
View file

@ -0,0 +1,25 @@
/* Copyright (c) 2017, 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 "sda630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A RCM";
compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
qcom,board-id = <21 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};

25
arch/arm/boot/dts/qcom/sda630-rcm.dts Normal file
View file

@ -0,0 +1,25 @@
/* Copyright (c) 2017, 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 "sda630.dtsi"
#include "sdm630-cdp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L RCM";
compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
qcom,board-id = <21 0>;
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};

19
arch/arm/boot/dts/qcom/sda630.dtsi Normal file
View file

@ -0,0 +1,19 @@
/* Copyright (c) 2017, 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 "sdm630.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630";
compatible = "qcom,sda630";
qcom,msm-id = <327 0x0>;
};

7
drivers/soc/qcom/socinfo.c
View file

@ -1,5 +1,5 @@
/*
* 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
* it under the terms of the GNU General Public License version 2 and
@ -543,6 +543,7 @@ static struct msm_soc_info cpu_of_id[] = {
/* 630 ID */
[318] = {MSM_CPU_630, "SDM630"},
[327] = {MSM_CPU_630, "SDA630"},
/* Uninitialized IDs are not known to run Linux.
MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
@ -1230,6 +1231,10 @@ static void * __init setup_dummy_socinfo(void)
dummy_socinfo.id = 318;
strlcpy(dummy_socinfo.build_id, "sdm630 - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_sda630()) {
dummy_socinfo.id = 327;
strlcpy(dummy_socinfo.build_id, "sda630 - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_apq8998()) {
dummy_socinfo.id = 319;
strlcpy(dummy_socinfo.build_id, "apq8998 - ",

5
include/soc/qcom/socinfo.h
View file

@ -1,5 +1,5 @@
/*
* 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
* it under the terms of the GNU General Public License version 2 and
@ -104,6 +104,8 @@
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda658")
#define early_machine_is_sdm630() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm630")
#define early_machine_is_sda630() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda630")
#else
#define of_board_is_sim() 0
#define of_board_is_rumi() 0
@ -145,6 +147,7 @@
#define early_machine_is_sdm658() 0
#define early_machine_is_sda658() 0
#define early_machine_is_sdm630() 0
#define early_machine_is_sda630() 0
#endif
#define PLATFORM_SUBTYPE_MDM 1