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

Commit 0fbf6104 authored Sep 18, 2015 by Srinivas Kandagatla Committed by Andy Gross Oct 13, 2015

ARM: dts: apq8064: remove redundant i2c pinctrl properties



This patch removes i2c pinctrl properties from board which which are now
mentioned in the SOC specific file. This will avoid redundant properties
across multiple board fiiles.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>

parent 9afbb3ba

arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -13,15 +13,6 @@
	};		};

	soc {		soc {
	pinctrl@800000 {
	i2c1_pins: i2c1 {
	mux {
	pins = "gpio20", "gpio21";
	function = "gsbi1";
	};
	};
	};

	rpm@108000 {		rpm@108000 {
	regulators {		regulators {
	vin_lvs1_3_6-supply = <&pm8921_s4>;		vin_lvs1_3_6-supply = <&pm8921_s4>;
	@@ -96,8 +87,6 @@
	i2c@12460000 {		i2c@12460000 {
	status = "okay";		status = "okay";
	clock-frequency = <200000>;		clock-frequency = <200000>;
	pinctrl-0 = <&i2c1_pins>;
	pinctrl-names = "default";

	eeprom: eeprom@50 {		eeprom: eeprom@50 {
	compatible = "24c02";		compatible = "24c02";

arch/arm/boot/dts/qcom-apq8064-ifc6410.dts

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -119,8 +119,6 @@
	qcom,mode = <GSBI_PROT_I2C>;		qcom,mode = <GSBI_PROT_I2C>;
	i2c3: i2c@16280000 {		i2c3: i2c@16280000 {
	status = "okay";		status = "okay";
	pinctrl-0 = <&i2c3_pins>;
	pinctrl-names = "default";
	};		};
	};		};

	@@ -131,8 +129,6 @@
	i2c@12460000 {		i2c@12460000 {
	status = "okay";		status = "okay";
	clock-frequency = <200000>;		clock-frequency = <200000>;
	pinctrl-0 = <&i2c1_pins>;
	pinctrl-names = "default";

	eeprom: eeprom@52 {		eeprom: eeprom@52 {
	compatible = "atmel,24c128";		compatible = "atmel,24c128";
	@@ -148,7 +144,6 @@

	serial@16540000 {		serial@16540000 {
	status = "ok";		status = "ok";

	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&uart_pins>;		pinctrl-0 = <&uart_pins>;
	};		};

arch/arm/boot/dts/qcom-apq8064.dtsi

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -213,6 +213,8 @@

	i2c1: i2c@12460000 {		i2c1: i2c@12460000 {
	compatible = "qcom,i2c-qup-v1.1.1";		compatible = "qcom,i2c-qup-v1.1.1";
			pinctrl-0 = <&i2c1_pins>;
			pinctrl-names = "default";
	reg = <0x12460000 0x1000>;		reg = <0x12460000 0x1000>;
	interrupts = <0 194 IRQ_TYPE_NONE>;		interrupts = <0 194 IRQ_TYPE_NONE>;
	clocks = <&gcc GSBI1_QUP_CLK>, <&gcc GSBI1_H_CLK>;		clocks = <&gcc GSBI1_QUP_CLK>, <&gcc GSBI1_H_CLK>;
	@@ -258,6 +260,8 @@
	ranges;		ranges;
	i2c3: i2c@16280000 {		i2c3: i2c@16280000 {
	compatible = "qcom,i2c-qup-v1.1.1";		compatible = "qcom,i2c-qup-v1.1.1";
			pinctrl-0 = <&i2c3_pins>;
			pinctrl-names = "default";
	reg = <0x16280000 0x1000>;		reg = <0x16280000 0x1000>;
	interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;		interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
	clocks = <&gcc GSBI3_QUP_CLK>,		clocks = <&gcc GSBI3_QUP_CLK>,