Merge "ARM: dts: msm: Add i2c_6 LED node only on apq8017" (baa4f735) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/apq8017-pmi8950-cdp-wcd-rome.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include "msm8917-pmi8950-cdp.dtsi"
		#include "apq8017-rome.dtsi"
		#include "apq8017-audio.dtsi"
		#include "apq8017-pmi8950-cdp-wcd-rome.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ8017-PMI8950 CDP \

arch/arm/boot/dts/qcom/apq8017-pmi8950-cdp-wcd-rome.dtsi

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* 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 "msm8917.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ8017-PMI8950 CDP \
		with WCD codec/Rome card";
		compatible = "qcom,apq8017-cdp", "qcom,apq8017", "qcom,cdp";
		qcom,board-id= <1 2>;
		qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

		aliases {
		i2c6 = &i2c_6;
		};
		};

		&soc {
		i2c_6: i2c@7af6000 { /* BLSP2 QUP2 */
		compatible = "qcom,i2c-msm-v2";
		#address-cells = <1>;
		#size-cells = <0>;
		reg-names = "qup_phys_addr";
		reg = <0x7af6000 0x600>;
		interrupt-names = "qup_irq";
		interrupts = <0 300 0>;
		qcom,clk-freq-out = <400000>;
		qcom,clk-freq-in = <19200000>;
		clock-names = "iface_clk", "core_clk";
		clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,
		<&clock_gcc clk_gcc_blsp2_qup2_i2c_apps_clk>;

		pinctrl-names = "i2c_active", "i2c_sleep";
		pinctrl-0 = <&i2c_6_active>;
		pinctrl-1 = <&i2c_6_sleep>;
		qcom,noise-rjct-scl = <0>;
		qcom,noise-rjct-sda = <0>;
		qcom,master-id = <84>;
		dmas = <&dma_blsp2 6 64 0x20000020 0x20>,
		<&dma_blsp2 7 32 0x20000020 0x20>;
		dma-names = "tx", "rx";
		status = "disabled";
		};
		};

arch/arm/boot/dts/qcom/apq8017-pmi8950-mtp.dts

+0 −146

Original line number	Diff line number	Diff line
		@@ -62,149 +62,3 @@
		&dsi_adv7533_1080p {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		};

		/* Warning, SPI6 & I2C6 cannot be enabled at the same time due to pin usage. */
		&spi_6 {
		status = "disabled";
		};

		&i2c_6 {
		status = "ok";
		qcom,clk-freq-out = <100000>;

		/* TI591XX LED Drivers */
		tlc59116@60 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "ti,tlc59116";
		reg = <0x60>;
		out0@0 {
		label = "ledsec1_g";
		reg = <0x0>;
		};
		out1@1 {
		label = "ledsec1_r";
		reg = <0x1>;
		};
		out2@2 {
		label = "ledsec1_b";
		reg = <0x2>;
		};
		out3@3 {
		label = "ledsec2_g";
		reg = <0x3>;
		};
		out4@4 {
		label = "ledsec2_r";
		reg = <0x4>;
		};
		out5@5 {
		label = "ledsec2_b";
		reg = <0x5>;
		};
		out6@6 {
		label = "ledsec3_g";
		reg = <0x6>;
		};
		out7@7 {
		label = "ledsec3_r";
		reg = <0x7>;
		};
		out8@8 {
		label = "ledsec3_b";
		reg = <0x8>;
		};
		out9@9 {
		label = "ledsec4_g";
		reg = <0x9>;
		};
		out10@10 {
		label = "ledsec4_r";
		reg = <0xa>;
		};
		out11@11 {
		label = "ledsec4_b";
		reg = <0xb>;
		};
		out12@12 {
		label = "ledsec5_g";
		reg = <0xc>;
		};
		out13@13 {
		label = "ledsec5_r";
		reg = <0xd>;
		};
		out14@14 {
		label = "ledsec5_b";
		reg = <0xe>;
		};
		};
		tlc59116@61 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "ti,tlc59116";
		reg = <0x61>;
		out0@0 {
		label = "ledsec6_g";
		reg = <0x0>;
		};
		out1@1 {
		label = "ledsec6_r";
		reg = <0x1>;
		};
		out2@2 {
		label = "ledsec6_b";
		reg = <0x2>;
		};
		out3@3 {
		label = "ledsec7_g";
		reg = <0x3>;
		};
		out4@4 {
		label = "ledsec7_r";
		reg = <0x4>;
		};
		out5@5 {
		label = "ledsec7_b";
		reg = <0x5>;
		};
		out6@6 {
		label = "ledsec8_g";
		reg = <0x6>;
		};
		out7@7 {
		label = "ledsec8_r";
		reg = <0x7>;
		};
		out8@8 {
		label = "ledsec8_b";
		reg = <0x8>;
		};
		out9@9 {
		label = "ledsec9_g";
		reg = <0x9>;
		};
		out10@10 {
		label = "ledsec9_r";
		reg = <0xa>;
		};
		out11@11 {
		label = "ledsec9_b";
		reg = <0xb>;
		};
		};
		};

		&soc {
		pinctrl@1000000 {
		i2c6{
		tlc59116_reset: tlc59116_reset {
		config {
		pins = "gpio20";
		drive-strength = <16>;
		bias-pull-up;
		};
		};
		};
		};
		};

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

+0 −27

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@
		i2c5 = &i2c_5;
		i2c3 = &i2c_3;
		i2c4 = &i2c_4;
		i2c6 = &i2c_6;
		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
		sdhc2 = &sdhc_2; /* SDC2 for SD card */
		};
		@@ -650,32 +649,6 @@
		dma-names = "tx", "rx";
		};

		i2c_6: i2c@7af6000 { /* BLSP2 QUP2 */
		compatible = "qcom,i2c-msm-v2";
		#address-cells = <1>;
		#size-cells = <0>;
		reg-names = "qup_phys_addr";
		reg = <0x7af6000 0x600>;
		interrupt-names = "qup_irq";
		interrupts = <0 300 0>;
		qcom,clk-freq-out = <400000>;
		qcom,clk-freq-in = <19200000>;
		clock-names = "iface_clk", "core_clk";
		clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,
		<&clock_gcc clk_gcc_blsp2_qup2_i2c_apps_clk>;

		pinctrl-names = "i2c_active", "i2c_sleep";
		pinctrl-0 = <&i2c_6_active>;
		pinctrl-1 = <&i2c_6_sleep>;
		qcom,noise-rjct-scl = <0>;
		qcom,noise-rjct-sda = <0>;
		qcom,master-id = <84>;
		dmas = <&dma_blsp2 6 64 0x20000020 0x20>,
		<&dma_blsp2 7 32 0x20000020 0x20>;
		dma-names = "tx", "rx";
		status = "disabled";
		};

		rpm_bus: qcom,rpm-smd {
		compatible = "qcom,rpm-smd";
		rpm-channel-name = "rpm_requests";