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

Commit e82d0a98 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: Move flash nodes to device specific dts files"

parents a6098125 b49ba018

arch/arm/boot/dts/qcom/msm8936-mtp-smb1360.dts

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

/* Copyright (c) 2014-2015, 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
@@ -60,6 +60,32 @@ 
};



&cci {

	led_flash0: qcom,led-flash@66 {

		cell-index = <0>;

		reg = <0x66>;

		qcom,slave-id = <0x66 0x00 0x0011>;

		compatible = "qcom,led-flash1";

		label = "bd7710";

		qcom,flash-type = <1>;

		qcom,gpio-no-mux = <0>;

		qcom,enable_pinctrl;

		pinctrl-names = "cam_flash_default", "cam_flash_suspend";

		pinctrl-0 = <&cam_sensor_flash_default>;

		pinctrl-1 = <&cam_sensor_flash_sleep>;

		gpios = <&msm_gpio 36 0>,

			<&msm_gpio 32 0>,

			<&msm_gpio 31 0>;

		qcom,gpio-flash-reset = <0>;

		qcom,gpio-flash-en = <1>;

		qcom,gpio-flash-now = <2>;

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

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

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

			"FLASH_EN",

			"FLASH_NOW";

		qcom,cci-master = <0>;

	};



	qcom,camera@0 {

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

	};

arch/arm/boot/dts/qcom/msm8936-mtp-wcd9306.dts

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

/* Copyright (c) 2014-2015, 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
@@ -59,6 +59,32 @@ 
};



&cci {

	led_flash1: qcom,led-flash@60 {

		cell-index = <1>;

		reg = <0x60>;

		qcom,slave-id = <0x60 0x00 0x0011>;

		compatible = "qcom,led-flash";

		label = "adp1660";

		qcom,flash-type = <1>;

		qcom,gpio-no-mux = <0>;

		qcom,enable_pinctrl;

		pinctrl-names = "cam_flash_default", "cam_flash_suspend";

		pinctrl-0 = <&cam_sensor_flash_default>;

		pinctrl-1 = <&cam_sensor_flash_sleep>;

		gpios = <&msm_gpio 36 0>,

				<&msm_gpio 32 0>,

				<&msm_gpio 31 0>;

		qcom,gpio-flash-reset = <0>;

		qcom,gpio-flash-en = <1>;

		qcom,gpio-flash-now = <2>;

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

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

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

				"FLASH_EN",

				"FLASH_NOW";

		qcom,cci-master = <0>;

	};



	qcom,camera@0 {

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

	};

arch/arm/boot/dts/qcom/msm8936-mtp.dts

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

/* Copyright (c) 2014-2015, 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
@@ -23,6 +23,32 @@ 
};



&cci {

	led_flash0: qcom,led-flash@66 {

		cell-index = <0>;

		reg = <0x66>;

		qcom,slave-id = <0x66 0x00 0x0011>;

		compatible = "qcom,led-flash1";

		label = "bd7710";

		qcom,flash-type = <1>;

		qcom,gpio-no-mux = <0>;

		qcom,enable_pinctrl;

		pinctrl-names = "cam_flash_default", "cam_flash_suspend";

		pinctrl-0 = <&cam_sensor_flash_default>;

		pinctrl-1 = <&cam_sensor_flash_sleep>;

		gpios = <&msm_gpio 36 0>,

			<&msm_gpio 32 0>,

			<&msm_gpio 31 0>;

		qcom,gpio-flash-reset = <0>;

		qcom,gpio-flash-en = <1>;

		qcom,gpio-flash-now = <2>;

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

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

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

			"FLASH_EN",

			"FLASH_NOW";

		qcom,cci-master = <0>;

	};



	qcom,camera@0 {

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

	};

arch/arm/boot/dts/qcom/msm8939-camera-sensor-mtp.dtsi

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

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, 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
@@ -28,58 +28,6 @@ 
		qcom,cam-vreg-op-mode = <80000>;

	};



	led_flash0: qcom,led-flash@66 {

		cell-index = <0>;

		reg = <0x66>;

		qcom,slave-id = <0x66 0x00 0x0011>;

		compatible = "qcom,led-flash1";

		label = "bd7710";

		qcom,flash-type = <1>;

		qcom,gpio-no-mux = <0>;

		qcom,enable_pinctrl;

		pinctrl-names = "cam_flash_default", "cam_flash_suspend";

		pinctrl-0 = <&cam_sensor_flash_default>;

		pinctrl-1 = <&cam_sensor_flash_sleep>;

		gpios = <&msm_gpio 36 0>,

			<&msm_gpio 32 0>,

			<&msm_gpio 31 0>;

		qcom,gpio-flash-reset = <0>;

		qcom,gpio-flash-en = <1>;

		qcom,gpio-flash-now = <2>;

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

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

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

			"FLASH_EN",

			"FLASH_NOW";

		qcom,cci-master = <0>;

	};



	led_flash1: qcom,led-flash@60 {

		cell-index = <1>;

		reg = <0x60>;

		qcom,slave-id = <0x60 0x00 0x0011>;

		compatible = "qcom,led-flash";

		label = "adp1660";

		qcom,flash-type = <1>;

		qcom,gpio-no-mux = <0>;

		qcom,enable_pinctrl;

		pinctrl-names = "cam_flash_default", "cam_flash_suspend";

		pinctrl-0 = <&cam_sensor_flash_default>;

		pinctrl-1 = <&cam_sensor_flash_sleep>;

		gpios = <&msm_gpio 36 0>,

				<&msm_gpio 32 0>,

				<&msm_gpio 31 0>;

		qcom,gpio-flash-reset = <0>;

		qcom,gpio-flash-en = <1>;

		qcom,gpio-flash-now = <2>;

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

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

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

				"FLASH_EN",

				"FLASH_NOW";

		qcom,cci-master = <0>;

	};



	qcom,camera@78 {

		compatible = "ovti,ov5645";

		reg = <0x78 0x0>;

arch/arm/boot/dts/qcom/msm8939-mtp-jdi.dts

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

/* Copyright (c) 2014-2015, 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
@@ -126,6 +126,32 @@ 
};



&cci {

	led_flash0: qcom,led-flash@66 {

		cell-index = <0>;

		reg = <0x66>;

		qcom,slave-id = <0x66 0x00 0x0011>;

		compatible = "qcom,led-flash1";

		label = "bd7710";

		qcom,flash-type = <1>;

		qcom,gpio-no-mux = <0>;

		qcom,enable_pinctrl;

		pinctrl-names = "cam_flash_default", "cam_flash_suspend";

		pinctrl-0 = <&cam_sensor_flash_default>;

		pinctrl-1 = <&cam_sensor_flash_sleep>;

		gpios = <&msm_gpio 36 0>,

			<&msm_gpio 32 0>,

			<&msm_gpio 31 0>;

		qcom,gpio-flash-reset = <0>;

		qcom,gpio-flash-en = <1>;

		qcom,gpio-flash-now = <2>;

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

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

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

			"FLASH_EN",

			"FLASH_NOW";

		qcom,cci-master = <0>;

	};



	qcom,camera@78 {

		qcom,cam-vreg-min-voltage = <2100000 0 3000000>;

		qcom,cam-vreg-max-voltage = <2100000 0 3000000>;