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/juno-base.dtsi | |
parent | b2af8e58a0c194eee1be5912566b68f076672cc1 (diff) | |
parent | 6d6acd140ab3d46348ec3a9dbfd386d9ca42b825 (diff) |
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/juno-base.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 4b6172b0f2cb..68ccc39a7a66 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -105,13 +105,13 @@ clocks { compatible = "arm,scpi-clocks"; - scpi_dvfs: scpi_clocks@0 { + scpi_dvfs: scpi-dvfs { compatible = "arm,scpi-dvfs-clocks"; #clock-cells = <1>; clock-indices = <0>, <1>, <2>; clock-output-names = "atlclk", "aplclk","gpuclk"; }; - scpi_clk: scpi_clocks@3 { + scpi_clk: scpi-clk { compatible = "arm,scpi-variable-clocks"; #clock-cells = <1>; clock-indices = <3>; @@ -154,7 +154,7 @@ clock-names = "pxlclk"; port { - hdlcd1_output: endpoint@0 { + hdlcd1_output: hdlcd1-endpoint { remote-endpoint = <&tda998x_1_input>; }; }; @@ -168,7 +168,7 @@ clock-names = "pxlclk"; port { - hdlcd0_output: endpoint@0 { + hdlcd0_output: hdlcd0-endpoint { remote-endpoint = <&tda998x_0_input>; }; }; @@ -196,7 +196,7 @@ compatible = "nxp,tda998x"; reg = <0x70>; port { - tda998x_0_input: endpoint@0 { + tda998x_0_input: tda998x-0-endpoint { remote-endpoint = <&hdlcd0_output>; }; }; @@ -206,7 +206,7 @@ compatible = "nxp,tda998x"; reg = <0x71>; port { - tda998x_1_input: endpoint@0 { + tda998x_1_input: tda998x-1-endpoint { remote-endpoint = <&hdlcd1_output>; }; }; @@ -243,7 +243,7 @@ <0x00000008 0x80000000 0x1 0x80000000>; }; - smb { + smb@08000000 { compatible = "simple-bus"; #address-cells = <2>; #size-cells = <1>; |