Commit 24a1be4e authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Maxime Ripard

ARM/arm64: dts: allwinner: Move H3/H5 syscon label over to soc-specific nodes

The EMAC driver requires a syscon node to access the EMAC clock
configuration register (that is part of the system-control register
range and controlled). For this purpose, a dummy syscon node was
introduced to let the driver access the register freely.

Recently, the EMAC driver was tuned to get access to the register when
the SRAM driver is registered (as used on the A64). As a result, it is
no longer necessary to have a dummy syscon node for that purpose.

Now that we have a proper system-control node for both the H3 and H5,
we can get rid of that dummy syscon node and have the EMAC driver use
the node corresponding to the proper SRAM driver (by switching the
syscon label over to each dtsi). This way, we no longer have two
separate nodes for the same register space.
Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 973efbc6
...@@ -134,7 +134,7 @@ cma_pool: cma@4a000000 { ...@@ -134,7 +134,7 @@ cma_pool: cma@4a000000 {
}; };
soc { soc {
system-control@1c00000 { syscon: system-control@1c00000 {
compatible = "allwinner,sun8i-h3-system-control"; compatible = "allwinner,sun8i-h3-system-control";
reg = <0x01c00000 0x1000>; reg = <0x01c00000 0x1000>;
#address-cells = <1>; #address-cells = <1>;
......
...@@ -152,12 +152,6 @@ mixer0_out_tcon0: endpoint { ...@@ -152,12 +152,6 @@ mixer0_out_tcon0: endpoint {
}; };
}; };
syscon: syscon@1c00000 {
compatible = "allwinner,sun8i-h3-system-controller",
"syscon";
reg = <0x01c00000 0x1000>;
};
dma: dma-controller@1c02000 { dma: dma-controller@1c02000 {
compatible = "allwinner,sun8i-h3-dma"; compatible = "allwinner,sun8i-h3-dma";
reg = <0x01c02000 0x1000>; reg = <0x01c02000 0x1000>;
......
...@@ -94,7 +94,7 @@ timer { ...@@ -94,7 +94,7 @@ timer {
}; };
soc { soc {
system-control@1c00000 { syscon: system-control@1c00000 {
compatible = "allwinner,sun50i-h5-system-control"; compatible = "allwinner,sun50i-h5-system-control";
reg = <0x01c00000 0x1000>; reg = <0x01c00000 0x1000>;
#address-cells = <1>; #address-cells = <1>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment