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

Commit d12556ea authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt-v4.11' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 89f6ce1b 74b51465

arch/arm/boot/dts/uniphier-pinctrl.dtsi

+17 −1
Original line number Diff line number Diff line 
/*

 * 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 @@ 
		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";