summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2018-05-09 19:46:01 +0300
committerSudeep Holla <sudeep.holla@arm.com>2018-05-11 16:12:20 +0300
commit83be0e605e2cb1cc680b18ea426ea21beba720be (patch)
treec3144daae687065f660eccec5f08bd16232d6cc5 /arch/arm/boot/dts
parentbd7aff03406dbce495634e8b5d27e9b63f951720 (diff)
downloadlinux-83be0e605e2cb1cc680b18ea426ea21beba720be.tar.xz
ARM: dts: vexpress: use standard gpio bindings for sys_{led,mci,flash}
Commit 2cff6dba57b7 ("ARM: dts: vexpress: fix node name unit-address presence warnings") removed the unit address as there was no associated reg property in these sysreg nodes. Also the latest DTC throws warnings for character '_' in the node names. Warning (node_name_chars_strict): /sysreg@10000/sys_led: Character '_' not recommended in node name Warning (node_name_chars_strict): /sysreg@10000/sys_mci: Character '_' not recommended in node name Warning (node_name_chars_strict): /sysreg@10000/sys_flash: Character '_' not recommended in node name The correct way to fix this as well as the original unit-address presence warnings is to use the standard gpio controller binding and specify the reg properties as per the hardware as it was before. However note that Vexpress sysreg MFD driver will still continue to use the hardcoded values for compatibility reasons. Acked-by: Liviu Dudau <liviu.dudau@arm.com> Suggested-by: Rob Herring <robh@kernel.org> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/vexpress-v2m-rs1.dtsi12
-rw-r--r--arch/arm/boot/dts/vexpress-v2m.dtsi12
2 files changed, 18 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index 7b8ff5b3b912..4488c8fe213a 100644
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -76,21 +76,27 @@
v2m_sysreg: sysreg@10000 {
compatible = "arm,vexpress-sysreg";
reg = <0x010000 0x1000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0x10000 0x1000>;
- v2m_led_gpios: sys_led {
+ v2m_led_gpios: gpio@8 {
compatible = "arm,vexpress-sysreg,sys_led";
+ reg = <0x008 4>;
gpio-controller;
#gpio-cells = <2>;
};
- v2m_mmc_gpios: sys_mci {
+ v2m_mmc_gpios: gpio@48 {
compatible = "arm,vexpress-sysreg,sys_mci";
+ reg = <0x048 4>;
gpio-controller;
#gpio-cells = <2>;
};
- v2m_flash_gpios: sys_flash {
+ v2m_flash_gpios: gpio@4c {
compatible = "arm,vexpress-sysreg,sys_flash";
+ reg = <0x04c 4>;
gpio-controller;
#gpio-cells = <2>;
};
diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi
index 9cd5e146abd5..4db42f6326a3 100644
--- a/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -76,21 +76,27 @@
v2m_sysreg: sysreg@0 {
compatible = "arm,vexpress-sysreg";
reg = <0x00000 0x1000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0 0x1000>;
- v2m_led_gpios: sys_led {
+ v2m_led_gpios: gpio@8 {
compatible = "arm,vexpress-sysreg,sys_led";
+ reg = <0x008 4>;
gpio-controller;
#gpio-cells = <2>;
};
- v2m_mmc_gpios: sys_mci {
+ v2m_mmc_gpios: gpio@48 {
compatible = "arm,vexpress-sysreg,sys_mci";
+ reg = <0x048 4>;
gpio-controller;
#gpio-cells = <2>;
};
- v2m_flash_gpios: sys_flash {
+ v2m_flash_gpios: gpio@4c {
compatible = "arm,vexpress-sysreg,sys_flash";
+ reg = <0x04c 4>;
gpio-controller;
#gpio-cells = <2>;
};