diff options
| author | Olof Johansson <olof@lixom.net> | 2016-03-12 17:26:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-03-12 17:26:37 -0800 |
| commit | 301c6e0b16ef1c45d3a269f6d854d88ca97a950c (patch) | |
| tree | 3205e28fb4da835e3f2cea93bc472a3bb85e2b37 /arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | |
| parent | b2af8e58a0c194eee1be5912566b68f076672cc1 (diff) | |
| parent | 6d6acd140ab3d46348ec3a9dbfd386d9ca42b825 (diff) | |
| download | lwn-301c6e0b16ef1c45d3a269f6d854d88ca97a950c.tar.gz lwn-301c6e0b16ef1c45d3a269f6d854d88ca97a950c.zip | |
Merge tag 'vexpress-for-v4.6/dt-updates-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt
Additional updates for ARM VExpress/Juno platforms
1. Add support for SBSA Generic Watchdog on foundation models
2. Fix node name unit-address presence/absence mismatch warnings in
all the device trees
* tag 'vexpress-for-v4.6/dt-updates-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
arm64: dts: juno/vexpress: fix node name unit-address presence warnings
arm64: dts: foundation-v8: add SBSA Generic Watchdog device node
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts')
| -rw-r--r-- | arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts index bb3c26d1154d..e3a171162bb4 100644 --- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts +++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts @@ -93,7 +93,7 @@ compatible = "arm,vexpress,config-bus"; arm,vexpress,config-bridge = <&v2m_sysreg>; - smbclk: osc@4 { + smbclk: smclk { /* SMC clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 4>; @@ -102,7 +102,7 @@ clock-output-names = "smclk"; }; - volt@0 { + volt-vio { /* VIO to expansion board above */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 0>; @@ -112,7 +112,7 @@ regulator-always-on; }; - volt@1 { + volt-12v { /* 12V from power connector J6 */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 1>; @@ -120,7 +120,7 @@ regulator-always-on; }; - temp@0 { + temp-fpga { /* FPGA temperature */ compatible = "arm,vexpress-temp"; arm,vexpress-sysreg,func = <4 0>; @@ -128,7 +128,7 @@ }; }; - smb { + smb@08000000 { compatible = "simple-bus"; #address-cells = <2>; |