From 382f7afd9e60a9be2b4aced1e23bbbaf6ab1ea97 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Tue, 22 Dec 2020 16:15:35 +0900 Subject: [PATCH] arm64: dts: amlogic: odroid: Update gpiomem node as khadas's style For multi-instance of gpiomem, khadas gpiomem uses seperated gpiomem nodes with its own dev node name. Because gpiomem driver is applied as khadas' style, so update from odroid dt files. Change-Id: I98b802d30045b2936ab98d6e23b81e6aff8068d6 Fixes: commit c167bac048f5 ("char: aml-gpiomem: Update to Khadas' multi-instance version") Signed-off-by: Seung-Woo Kim --- arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts | 11 +++++++++-- arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index f72147d755d8..b7fcced4a370 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -31,8 +31,15 @@ gpiomem { compatible = "amlogic, gpiomem"; - reg = <0x0 0xff634000 0x0 0x1000>, /* GPIO banks */ - <0x0 0xff800000 0x0 0x1000>; /* GPIO_AO bank */ + reg = <0x0 0xff634000 0x0 0x1000>; /* GPIO banks */ + dev_name = "gpiomem"; + status = "okay"; + }; + + gpiomem_ao { + compatible = "amlogic, gpiomem"; + reg = <0x0 0xff800000 0x0 0x1000>; /* GPIO_AO bank */ + dev_name = "gpiomem-ao"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi index 5ebc87532437..4564b01a2318 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi @@ -21,6 +21,7 @@ gpiomem { compatible = "amlogic, gpiomem"; reg = <0x0 0xff634000 0x0 0x1000>; + dev_name = "gpiomem"; status = "okay"; }; -- 2.34.1