diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-04-19 05:28:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:28:30 -0700 |
| commit | b68d58a816971dd9dad3aea2832b6f8b151a7796 (patch) | |
| tree | f5dc4a74046fee3860c366d70ecc76e205c24a4e | |
| parent | Merge tag 'stm32-dt-for-v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt (diff) | |
| parent | ARM: dts: da850: move spi0_cs3_pin pinconf node (diff) | |
| download | wireguard-linux-b68d58a816971dd9dad3aea2832b6f8b151a7796.tar.xz wireguard-linux-b68d58a816971dd9dad3aea2832b6f8b151a7796.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/boot/dts/da850-lego-ev3.dts | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/da850.dtsi | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts index c20580a7356e..512604ad8b71 100644 --- a/arch/arm/boot/dts/da850-lego-ev3.dts +++ b/arch/arm/boot/dts/da850-lego-ev3.dts @@ -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] */ diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index c708155767f3..941d455000a7 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -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 */ |