* [PATCH] arm64: allwinner: h6: restore the usage of CCU slice macros
@ 2018-04-03 13:40 Icenowy Zheng
2018-04-23 6:58 ` Icenowy Zheng
0 siblings, 1 reply; 3+ messages in thread
From: Icenowy Zheng @ 2018-04-03 13:40 UTC (permalink / raw)
To: linux-arm-kernel
As the definition of CCU slice macros are already merged into the source
tree, restore the usage of the macros now.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
---
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 56563150d61a..4debc3962830 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -4,6 +4,8 @@
*/
#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>;
@@ -115,7 +117,7 @@
<GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 54 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";
gpio-controller;
#gpio-cells = <3>;
@@ -134,8 +136,8 @@
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&ccu 70>;
- resets = <&ccu 21>;
+ clocks = <&ccu CLK_BUS_UART0>;
+ resets = <&ccu RST_BUS_UART0>;
status = "disabled";
};
@@ -145,8 +147,8 @@
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&ccu 71>;
- resets = <&ccu 22>;
+ clocks = <&ccu CLK_BUS_UART1>;
+ resets = <&ccu RST_BUS_UART1>;
status = "disabled";
};
@@ -156,8 +158,8 @@
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&ccu 72>;
- resets = <&ccu 23>;
+ clocks = <&ccu CLK_BUS_UART2>;
+ resets = <&ccu RST_BUS_UART2>;
status = "disabled";
};
@@ -167,8 +169,8 @@
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&ccu 73>;
- resets = <&ccu 24>;
+ clocks = <&ccu CLK_BUS_UART3>;
+ resets = <&ccu RST_BUS_UART3>;
status = "disabled";
};
};
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] arm64: allwinner: h6: restore the usage of CCU slice macros
2018-04-03 13:40 [PATCH] arm64: allwinner: h6: restore the usage of CCU slice macros Icenowy Zheng
@ 2018-04-23 6:58 ` Icenowy Zheng
2018-04-23 7:47 ` Maxime Ripard
0 siblings, 1 reply; 3+ messages in thread
From: Icenowy Zheng @ 2018-04-23 6:58 UTC (permalink / raw)
To: linux-arm-kernel
? 2018-04-03?? 21:40 +0800?Icenowy Zheng???
> As the definition of CCU slice macros are already merged into the
> source
> tree, restore the usage of the macros now.
Maxime, could you check this patch and pick it?
Thanks!
>
> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
> ---
> arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +++++++++++-------
> --
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> index 56563150d61a..4debc3962830 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> @@ -4,6 +4,8 @@
> */
>
> #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>;
> @@ -115,7 +117,7 @@
> <GIC_SPI 53
> IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 54
> 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";
> gpio-controller;
> #gpio-cells = <3>;
> @@ -134,8 +136,8 @@
> interrupts = <GIC_SPI 0
> IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&ccu 70>;
> - resets = <&ccu 21>;
> + clocks = <&ccu CLK_BUS_UART0>;
> + resets = <&ccu RST_BUS_UART0>;
> status = "disabled";
> };
>
> @@ -145,8 +147,8 @@
> interrupts = <GIC_SPI 1
> IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&ccu 71>;
> - resets = <&ccu 22>;
> + clocks = <&ccu CLK_BUS_UART1>;
> + resets = <&ccu RST_BUS_UART1>;
> status = "disabled";
> };
>
> @@ -156,8 +158,8 @@
> interrupts = <GIC_SPI 2
> IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&ccu 72>;
> - resets = <&ccu 23>;
> + clocks = <&ccu CLK_BUS_UART2>;
> + resets = <&ccu RST_BUS_UART2>;
> status = "disabled";
> };
>
> @@ -167,8 +169,8 @@
> interrupts = <GIC_SPI 3
> IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&ccu 73>;
> - resets = <&ccu 24>;
> + clocks = <&ccu CLK_BUS_UART3>;
> + resets = <&ccu RST_BUS_UART3>;
> status = "disabled";
> };
> };
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-23 7:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-03 13:40 [PATCH] arm64: allwinner: h6: restore the usage of CCU slice macros Icenowy Zheng
2018-04-23 6:58 ` Icenowy Zheng
2018-04-23 7:47 ` Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).