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

Commit 0a166559 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: Enable Z8851 for APQ8017"

parents e1969edb 815b0200

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

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

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-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
@@ -244,3 +244,35 @@ 
		status = "okay";

	};

};



/* SX1508q i/o expander */

&i2c_4 {

	status = "ok";

	ioexp_gpios: sx150x@20 {

		status = "ok";

		compatible = "sx1508q";

		#gpio-cells = <2>;

		gpio-controller;

		reg = <0x20>; /* I2C Client Addr */

		sx150x,pullup_ena = <0x0>;

		sx150x,pulldn_ena = <0x0>;

		sx150x,float_ena = <0x00>;

		sx150x,polarity = <0x0>;

		sx150x,gpio_base = <200>;

	};

};



/* KS8851 eth over spi */

&spi_6 {

	status = "ok";

	ethernet@0 {

		status = "ok";

		compatible = "micrel,ks8851";

		reg = <1>;  /* CS-1 */

		interrupt-parent = <&tlmm>;

		interrupts = <97 0>;

		reset-gpios = <&ioexp_gpios 2 0>;

		spi-max-frequency = <40000000>;

	};

};

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

+31 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,37 @@ 
			};

		};



		/* IO Expander SX150xq */

		i2c_4 {

			i2c_4_active: i2c_4_active {

				/* active state */

				mux {

					pins = "gpio14", "gpio15";

					function = "blsp_i2c4";

				};



				config {

					pins = "gpio14", "gpio15";

					drive-strength = <2>;

					bias-disable;

				};

			};



			i2c_4_sleep: i2c_4_sleep {

				/* suspended state */

				mux {

					pins = "gpio14", "gpio15";

					function = "gpio";

				};



				config {

					pins = "gpio14", "gpio15";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		i2c_5 {

			i2c_5_active: i2c_5_active {

				/* active state */

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

+28 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
		i2c2 = &i2c_2;

		i2c5 = &i2c_5;

		i2c3 = &i2c_3;

		i2c4 = &i2c_4;

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc2 = &sdhc_2; /* SDC2 for SD card */

	};
@@ -570,6 +571,33 @@ 
		status = "disabled";

	};



	/*IO Expander SX150xq*/

	/* BLSP1 QUP4 */

	i2c_4: i2c@78b8000 {

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr";

		reg = <0x78b8000 0x600>;

		interrupt-names = "qup_irq";

		interrupts = <0 98 0>;

		qcom,clk-freq-out = <400000>;

		qcom,clk-freq-in  = <19200000>;

		clock-names = "iface_clk", "core_clk";

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			<&clock_gcc clk_gcc_blsp1_qup4_i2c_apps_clk>;

		pinctrl-names = "i2c_active", "i2c_sleep";

		pinctrl-0 = <&i2c_4_active>;

		pinctrl-1 = <&i2c_4_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,master-id = <86>;

		dmas = <&dma_blsp1 10 64 0x20000020 0x20>,

		<&dma_blsp1 11 32 0x20000020 0x20>;

		dma-names = "tx", "rx";

		status = "disabled";

	};



	i2c_5: i2c@7af5000 { /* BLSP2 QUP1 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;