summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/rk3188.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-20 09:02:16 +0400
committerOlof Johansson <olof@lixom.net>2014-05-20 09:02:16 +0400
commit80c2e8876c24cb9429a50962becb2408c8d89708 (patch)
tree4ca8d2816f0df758a40d5287a8debe76df8a6507 /arch/arm/boot/dts/rk3188.dtsi
parent61e810d36416effcfe25bbbba4f126c4b8462f3c (diff)
parent56f2b894dcf455ffd31bd2e8e96a074249aeb4ba (diff)
downloadlinux-80c2e8876c24cb9429a50962becb2408c8d89708.tar.xz
Merge tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "ARM: rockchip: devicetree changes for v3.16" from Heiko Stübner: Addition of missing board compatible names and their vendor-prefixes as well as the dts portions of the pinctrl rework. * tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: convert pinctrl nodes to new bindings ARM: dts: rockchip: add root compatible properties of: add mundoreader and radxa vendor prefixes Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/rk3188.dtsi')
-rw-r--r--arch/arm/boot/dts/rk3188.dtsi9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index ed9a70af3e3f..a494fb0cff64 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -75,17 +75,16 @@
pinctrl@20008000 {
compatible = "rockchip,rk3188-pinctrl";
- reg = <0x20008000 0xa0>,
- <0x20008164 0x1a0>;
- reg-names = "base", "pull";
+ rockchip,grf = <&grf>;
+ rockchip,pmu = <&pmu>;
+
#address-cells = <1>;
#size-cells = <1>;
ranges;
gpio0: gpio0@0x2000a000 {
compatible = "rockchip,rk3188-gpio-bank0";
- reg = <0x2000a000 0x100>,
- <0x20004064 0x8>;
+ reg = <0x2000a000 0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk_gates8 9>;