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

Commit b68d58a8 authored Apr 19, 2017 by Olof Johansson

Merge tag 'davinci-for-v4.12/dt-2' of...

Merge tag 'davinci-for-v4.12/dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

A clean-up device-tree patch to ensure pinmux entry reuse.

* tag 'davinci-for-v4.12/dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: dts: da850: move spi0_cs3_pin pinconf node

Signed-off-by: Olof Johansson <olof@lixom.net>

parents ed50c485 96f24474

arch/arm/boot/dts/da850-lego-ev3.dts

+0 −7

Original line number	Diff line number	Diff line
		@@ -177,13 +177,6 @@
		&pmx_core {
		status = "okay";

		spi0_cs3_pin: pinmux_spi0_cs3_pin {
		pinctrl-single,bits = <
		/* CS3 */
		0xc 0x01000000 0x0f000000
		>;
		};

		mmc0_cd_pin: pinmux_mmc0_cd {
		pinctrl-single,bits = <
		/* GP5[14] */

arch/arm/boot/dts/da850.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,12 @@
		0x10 0x00000010 0x000000f0
		>;
		};
		spi0_cs3_pin: pinmux_spi0_cs3_pin {
		pinctrl-single,bits = <
		/* CS3 */
		0xc 0x01000000 0x0f000000
		>;
		};
		spi1_pins: pinmux_spi1_pins {
		pinctrl-single,bits = <
		/* SIMO, SOMI, CLK */