Commit b68d58a8 authored by Olof Johansson's avatar 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: default avatarOlof Johansson <olof@lixom.net>
parents ed50c485 96f24474
...@@ -177,13 +177,6 @@ amp: regulator3 { ...@@ -177,13 +177,6 @@ amp: regulator3 {
&pmx_core { &pmx_core {
status = "okay"; status = "okay";
spi0_cs3_pin: pinmux_spi0_cs3_pin {
pinctrl-single,bits = <
/* CS3 */
0xc 0x01000000 0x0f000000
>;
};
mmc0_cd_pin: pinmux_mmc0_cd { mmc0_cd_pin: pinmux_mmc0_cd {
pinctrl-single,bits = < pinctrl-single,bits = <
/* GP5[14] */ /* GP5[14] */
......
...@@ -153,6 +153,12 @@ spi0_cs0_pin: pinmux_spi0_cs0 { ...@@ -153,6 +153,12 @@ spi0_cs0_pin: pinmux_spi0_cs0 {
0x10 0x00000010 0x000000f0 0x10 0x00000010 0x000000f0
>; >;
}; };
spi0_cs3_pin: pinmux_spi0_cs3_pin {
pinctrl-single,bits = <
/* CS3 */
0xc 0x01000000 0x0f000000
>;
};
spi1_pins: pinmux_spi1_pins { spi1_pins: pinmux_spi1_pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* SIMO, SOMI, CLK */ /* SIMO, SOMI, CLK */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment