Commit 95beb93d authored by Icenowy Zheng's avatar Icenowy Zheng Committed by Maxime Ripard

arm64: allwinner: h6: restore the usage of CCU slice macros

As the definition of CCU slice macros are already merged into the source
tree, restore the usage of the macros now.
Signed-off-by: default avatarIcenowy Zheng <icenowy@aosc.io>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 60cc43fc
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
*/ */
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/sun50i-h6-ccu.h>
#include <dt-bindings/reset/sun50i-h6-ccu.h>
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
...@@ -115,7 +117,7 @@ pio: pinctrl@300b000 { ...@@ -115,7 +117,7 @@ pio: pinctrl@300b000 {
<GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu 26>, <&osc24M>, <&osc32k>; clocks = <&ccu CLK_APB1>, <&osc24M>, <&osc32k>;
clock-names = "apb", "hosc", "losc"; clock-names = "apb", "hosc", "losc";
gpio-controller; gpio-controller;
#gpio-cells = <3>; #gpio-cells = <3>;
...@@ -134,8 +136,8 @@ uart0: serial@5000000 { ...@@ -134,8 +136,8 @@ uart0: serial@5000000 {
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&ccu 70>; clocks = <&ccu CLK_BUS_UART0>;
resets = <&ccu 21>; resets = <&ccu RST_BUS_UART0>;
status = "disabled"; status = "disabled";
}; };
...@@ -145,8 +147,8 @@ uart1: serial@5000400 { ...@@ -145,8 +147,8 @@ uart1: serial@5000400 {
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&ccu 71>; clocks = <&ccu CLK_BUS_UART1>;
resets = <&ccu 22>; resets = <&ccu RST_BUS_UART1>;
status = "disabled"; status = "disabled";
}; };
...@@ -156,8 +158,8 @@ uart2: serial@5000800 { ...@@ -156,8 +158,8 @@ uart2: serial@5000800 {
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&ccu 72>; clocks = <&ccu CLK_BUS_UART2>;
resets = <&ccu 23>; resets = <&ccu RST_BUS_UART2>;
status = "disabled"; status = "disabled";
}; };
...@@ -167,8 +169,8 @@ uart3: serial@5000c00 { ...@@ -167,8 +169,8 @@ uart3: serial@5000c00 {
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&ccu 73>; clocks = <&ccu CLK_BUS_UART3>;
resets = <&ccu 24>; resets = <&ccu RST_BUS_UART3>;
status = "disabled"; status = "disabled";
}; };
}; };
......
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