diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-10-27 12:21:05 +0900 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-31 01:58:06 +0000 |
| commit | 1b38b0e3349d733679e91b029a7f0dfd9e16a169 (patch) | |
| tree | b23a9649b62996c2d4b2c2c02cad9457e1135df9 /arch/arm/boot/dts/uniphier-proxstream2.dtsi | |
| parent | 980bbff018f64a22af0e75a12ee14cbfbc547e6a (diff) | |
| download | blackbird-obmc-linux-1b38b0e3349d733679e91b029a7f0dfd9e16a169.tar.gz blackbird-obmc-linux-1b38b0e3349d733679e91b029a7f0dfd9e16a169.zip | |
ARM: dts: uniphier: add system-bus-controller nodes
The System Bus Controller block has two register regions,
but having only the second one in a separate node was not nice.
Replace it with a new node with two register regions in it.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/uniphier-proxstream2.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/uniphier-proxstream2.dtsi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/uniphier-proxstream2.dtsi b/arch/arm/boot/dts/uniphier-proxstream2.dtsi index ad5fb390e003..259f1a909e24 100644 --- a/arch/arm/boot/dts/uniphier-proxstream2.dtsi +++ b/arch/arm/boot/dts/uniphier-proxstream2.dtsi @@ -251,10 +251,9 @@ clock-frequency = <400000>; }; - system-bus-controller-misc@59800000 { - compatible = "socionext,uniphier-system-bus-controller-misc", - "syscon"; - reg = <0x59800000 0x2000>; + system-bus-controller@58c00000 { + compatible = "socionext,uniphier-system-bus-controller"; + reg = <0x58c00000 0x400>, <0x59800000 0x2000>; }; pinctrl: pinctrl@5f801000 { |
