ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node (d90bf60c) · Commits · e / devices / android_kernel_teracube_emerald

Due to an error when resolving conflicts df40f256b18300e1 ("ARM: shmobile: lager: add i2c1, i2c2 pins") added the i2c[12]_pins nodes to the wrong node. This patch moves them to their correct location in the pfc node. Cc: Ben Dooks <ben.dooks@codethink.co.uk> Reported-by:

Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by:

Simon Horman <horms+renesas@verge.net.au>

arch/arm/boot/dts/r8a7790-lager.dts

+10 −10

Original line number	Diff line number	Diff line
		@@ -144,16 +144,6 @@
		states = <3300000 1
		1800000 0>;
		};

		i2c1_pins: i2c1 {
		renesas,groups = "i2c1";
		renesas,function = "i2c1";
		};

		i2c2_pins: i2c2 {
		renesas,groups = "i2c2";
		renesas,function = "i2c2";
		};
		};

		&extal_clk {
		@@ -215,6 +205,16 @@
		renesas,function = "msiof1";
		};

		i2c1_pins: i2c1 {
		renesas,groups = "i2c1";
		renesas,function = "i2c1";
		};

		i2c2_pins: i2c2 {
		renesas,groups = "i2c2";
		renesas,function = "i2c2";
		};

		i2c3_pins: i2c3 {
		renesas,groups = "i2c3";
		renesas,function = "i2c3";