mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-28 06:38:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'uniphier-dt-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Browse Source 
UniPhier ARM SoC DT updates for v4.11

- Add eMMC, SD pin-mux nodes

* tag 'uniphier-dt-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add SD pin-mux node
  ARM: dts: uniphier: add eMMC pin-mux node

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2017-01-29 14:47:53 -08:00
parent 89f6ce1be2 74b51465c0
commit d12556ea05
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/boot/dts/uniphier-pinctrl.dtsi
View File

@@ -1,7 +1,8 @@
/*
* Device Tree Source for UniPhier SoCs default pinctrl settings
*
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2015-2017 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
@@ -43,6 +44,11 @@
*/
&pinctrl {
pinctrl_emmc: emmc_grp {
groups = "emmc";
function = "emmc";
};
pinctrl_i2c0: i2c0_grp {
groups = "i2c0";
function = "i2c0";
@@ -78,6 +84,16 @@ pinctrl_nand2cs: nand2cs_grp {
function = "nand";
};
pinctrl_sd: sd_grp {
groups = "sd";
function = "sd";
};
pinctrl_sd1: sd1_grp {
groups = "sd1";
function = "sd1";
};
pinctrl_system_bus: system_bus_grp {
groups = "system_bus", "system_bus_cs1";
function = "system_bus";