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

Merge "ARM: dts: msm: move bluetooth node under /vendor on msm8998"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-11 02:34:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4387138a3a
13 changed files with 265 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,6 +102,22 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb \
apq8096-v3-pmi8996-dragonboard.dtb
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_ARCH_MSM8998) += \
msm8998-cdp-overlay.dtbo \
msm8998-mtp-overlay.dtbo \
msm8998-v2-cdp-overlay.dtbo \
msm8998-v2-mtp-overlay.dtbo \
msm8998-v2.1-cdp-overlay.dtbo \
msm8998-v2.1-mtp-overlay.dtbo
msm8998-cdp-overlay.dtbo-base := msm8998.dtb
msm8998-mtp-overlay.dtbo-base := msm8998.dtb
msm8998-v2-cdp-overlay.dtbo-base := msm8998-v2.dtb
msm8998-v2-mtp-overlay.dtbo-base := msm8998-v2.dtb
msm8998-v2.1-cdp-overlay.dtbo-base := msm8998-v2.1.dtb
msm8998-v2.1-mtp-overlay.dtbo-base := msm8998-v2.1.dtb
else
dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \
msm8998-rumi.dtb \
msm8998-cdp.dtb \
@ -134,6 +150,7 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \
msm8998-v2.1-interposer-sdm660-cdp.dtb \
msm8998-v2.1-interposer-sdm660-mtp.dtb \
msm8998-v2.1-interposer-sdm660-qrd.dtb
endif
dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb
@ -218,6 +235,7 @@ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
ifeq ($(CONFIG_ARM64),y)
always := $(dtb-y)
always += $(dtbo-y)
subdir-y := $(dts-dirs)
else
targets += dtbs
@ -228,4 +246,4 @@ $(obj)/../%.dtb: $(src)/%.dts FORCE
dtbs: $(addprefix $(obj)/../,$(dtb-y))
endif
clean-files := *.dtb
clean-files := *.dtbo *.dtb

28
arch/arm/boot/dts/qcom/msm8998-cdp-overlay.dts Normal file
View file

@ -0,0 +1,28 @@
/* 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/;
/plugin/;
#include <dt-bindings/clock/msm-clocks-8998.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "msm8998-cdp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v1 CDP";
compatible = "qcom,msm8998-cdp", "qcom,msm8998", "qcom,cdp";
qcom,msm-id = <292 0x0>;
qcom,board-id = <1 0>;
};

3
arch/arm/boot/dts/qcom/msm8998-cdp.dtsi
View file

@ -10,9 +10,8 @@
* GNU General Public License for more details.
*/
#include "msm8998-pinctrl.dtsi"
#include "msm8998-camera-sensor-cdp.dtsi"
/ {
&vendor {
bluetooth: bt_wcn3990 {
compatible = "qca,wcn3990";
qca,bt-vdd-io-supply = <&pm8998_s3>;

28
arch/arm/boot/dts/qcom/msm8998-mtp-overlay.dts Normal file
View file

@ -0,0 +1,28 @@
/* 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/;
/plugin/;
#include <dt-bindings/clock/msm-clocks-8998.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "msm8998-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v1 MTP";
compatible = "qcom,msm8998-mtp", "qcom,msm8998", "qcom,mtp";
qcom,msm-id = <292 0x0>;
qcom,board-id = <8 0>;
};

3
arch/arm/boot/dts/qcom/msm8998-mtp.dtsi
View file

@ -11,9 +11,8 @@
*/
#include <dt-bindings/interrupt-controller/irq.h>
#include "msm8998-pinctrl.dtsi"
#include "msm8998-camera-sensor-mtp.dtsi"
/ {
&vendor {
bluetooth: bt_wcn3990 {
compatible = "qca,wcn3990";
qca,bt-vdd-io-supply = <&pm8998_s3>;

28
arch/arm/boot/dts/qcom/msm8998-v2-cdp-overlay.dts Normal file
View file

@ -0,0 +1,28 @@
/* 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/;
/plugin/;
#include <dt-bindings/clock/msm-clocks-8998.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "msm8998-cdp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v2 CDP";
compatible = "qcom,msm8998-cdp", "qcom,msm8998", "qcom,cdp";
qcom,msm-id = <292 0x20000>;
qcom,board-id = <1 0>;
};

28
arch/arm/boot/dts/qcom/msm8998-v2-mtp-overlay.dts Normal file
View file

@ -0,0 +1,28 @@
/* 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/;
/plugin/;
#include <dt-bindings/clock/msm-clocks-8998.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "msm8998-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v2 MTP";
compatible = "qcom,msm8998-mtp", "qcom,msm8998", "qcom,mtp";
qcom,msm-id = <292 0x20000>;
qcom,board-id = <8 0>;
};

28
arch/arm/boot/dts/qcom/msm8998-v2.1-cdp-overlay.dts Normal file
View file

@ -0,0 +1,28 @@
/* 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/;
/plugin/;
#include <dt-bindings/clock/msm-clocks-8998.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "msm8998-cdp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 CDP";
compatible = "qcom,msm8998-cdp", "qcom,msm8998", "qcom,cdp";
qcom,msm-id = <292 0x20001>;
qcom,board-id = <1 0>;
};

28
arch/arm/boot/dts/qcom/msm8998-v2.1-mtp-overlay.dts Normal file
View file

@ -0,0 +1,28 @@
/* 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/;
/plugin/;
#include <dt-bindings/clock/msm-clocks-8998.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "msm8998-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MTP";
compatible = "qcom,msm8998-mtp", "qcom,msm8998", "qcom,mtp";
qcom,msm-id = <292 0x20001>;
qcom,board-id = <8 0>;
};

23
arch/arm/boot/dts/qcom/msm8998-v2.1.dts Normal file
View file

@ -0,0 +1,23 @@
/* 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 <dt-bindings/clock/msm-clocks-8998.h>
#include "msm8998-v2.1.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 SoC";
compatible = "qcom,msm8998";
qcom,board-id = <0 0>;
};

23
arch/arm/boot/dts/qcom/msm8998-v2.dts Normal file
View file

@ -0,0 +1,23 @@
/* 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 <dt-bindings/clock/msm-clocks-8998.h>
#include "msm8998-v2.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v2 SoC";
compatible = "qcom,msm8998";
qcom,board-id = <0 0>;
};

23
arch/arm/boot/dts/qcom/msm8998.dts Normal file
View file

@ -0,0 +1,23 @@
/* 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 <dt-bindings/clock/msm-clocks-8998.h>
#include "msm8998.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8998 v1 SoC";
compatible = "qcom,msm8998";
qcom,board-id = <0 0>;
};

7
arch/arm/boot/dts/qcom/msm8998.dtsi
View file

@ -275,6 +275,13 @@
soc: soc { };
vendor: vendor {
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0 0 0xffffffff>;
compatible = "simple-bus";
};
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;