aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/da850.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-11-18 09:54:54 -0800
committerOlof Johansson <olof@lixom.net>2016-11-18 09:54:54 -0800
commitf05646c94b64adcc2ce3892b91ab7421ef1c690f (patch)
tree449ca86405fa5c845b4a2dbb5709e655b5dda6fb /arch/arm/boot/dts/da850.dtsi
parentMerge tag 'at91-ab-4.10-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt (diff)
parentARM: dts: Add #pinctrl-cells for pinctrl-single instances (diff)
downloadlinux-dev-f05646c94b64adcc2ce3892b91ab7421ef1c690f.tar.xz
linux-dev-f05646c94b64adcc2ce3892b91ab7421ef1c690f.zip
Merge tag 'omap-for-v4.10/pinctrl-cells-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Add #pinctrl-cells for pinctrl-single using dts files. This allows us to use generic parser later on. Note that the driver supports handling the legacy binding also with no #pinctrl-cells so these changes can be queued separately from the driver changes. * tag 'omap-for-v4.10/pinctrl-cells-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Add #pinctrl-cells for pinctrl-single instances Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/da850.dtsi')
-rw-r--r--arch/arm/boot/dts/da850.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 2534aab851e1..1bb1f6d7c99a 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -36,6 +36,7 @@
reg = <0x14120 0x50>;
#address-cells = <1>;
#size-cells = <0>;
+ #pinctrl-cells = <2>;
pinctrl-single,bit-per-mux;
pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0xf>;