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

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

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

+11 −9
Original line number Diff line number Diff line
@@ -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";

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE