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

Commit 8edabdf5 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 support for IPC platform msm8953"

parents 0763bf28 e9c5d874

Documentation/devicetree/bindings/arm/msm/msm.txt

+5 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ Generic board variants: 
- RUMI device:

  compatible = "qcom,rumi"



- IPC device:

  compatible = "qcom,ipc"







Boards (SoC type + board variant):
@@ -189,6 +192,7 @@ compatible = "qcom,apq8017-cdp" 
compatible = "qcom,apq8017-mtp"

compatible = "qcom,apq8053-cdp"

compatible = "qcom,apq8053-mtp"

compatible = "qcom,apq8053-ipc"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"
@@ -292,6 +296,7 @@ compatible = "qcom,msm8953-rumi" 
compatible = "qcom,msm8953-sim"

compatible = "qcom,msm8953-cdp"

compatible = "qcom,msm8953-mtp"

compatible = "qcom,msm8953-ipc"

compatible = "qcom,msm8953-qrd"

compatible = "qcom,msm8953-qrd-sku3"

compatible = "qcom,mdm9640-cdp"

arch/arm/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \ 
	apq8053-rcm.dtb \

	msm8953-ext-codec-rcm.dtb \

	apq8053-cdp.dtb \

	apq8053-ipc.dtb \

	msm8953-ipc.dtb \

	apq8053-mtp.dtb \

	apq8053-ext-audio-mtp.dtb \

	apq8053-ext-codec-rcm.dtb \

arch/arm/boot/dts/qcom/apq8053-ipc.dts

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 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 "apq8053.dtsi"

#include "msm8953-ipc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 IPC";

	compatible = "qcom,apq8053-ipc", "qcom,apq8053", "qcom,ipc";

	qcom,board-id= <12 0>;

};

arch/arm/boot/dts/qcom/msm8953-camera-sensor-ipc.dtsi

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 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.

 */



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8950_flash0 &pmi8950_flash1>;

		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,switch-source = <&pmi8950_switch>;

	};

};



&cci {

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_v_custom1-supply = <&pm8953_l2>;

		cam_vana-supply = <&pm8953_l22>;

		qcom,cam-vreg-name = "cam_vio", "cam_v_custom1", "cam_vana";

		qcom,cam-vreg-min-voltage = <0 1100000 2800000>;

		qcom,cam-vreg-max-voltage = <0 1100000 2800000>;

		qcom,cam-vreg-op-mode = <0 105000 80000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default

				&cam_sensor_rear_vana>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep

				&cam_sensor_rear_vana_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 40 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-req-tbl-num = <0 1>;

		qcom,gpio-req-tbl-flags = <1 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

			"CAM_RESET0";

			/*"CAM_VANA";*/

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

};

arch/arm/boot/dts/qcom/msm8953-ipc.dts

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 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 "msm8953.dtsi"

#include "msm8953-ipc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8953 IPC";

	compatible = "qcom,msm8953-ipc", "qcom,msm8953", "qcom,ipc";

	qcom,board-id= <12 0>;

};