Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98d87eb5 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard
Browse files

ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros 



Now that the R_CCU device tree binding headers have been merged, we
can convert the raw number references in the device trees to use the
defined macros.

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 2ea659a9

arch/arm/boot/dts/sunxi-h3-h5.dtsi

+5 −3
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ 
 */



#include <dt-bindings/clock/sun8i-h3-ccu.h>

#include <dt-bindings/clock/sun8i-r-ccu.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/reset/sun8i-h3-ccu.h>

#include <dt-bindings/reset/sun8i-r-ccu.h>



/ {

	interrupt-parent = <&gic>;
@@ -573,9 +575,9 @@ 


		ir: ir@01f02000 {

			compatible = "allwinner,sun5i-a13-ir";

			clocks = <&r_ccu 4>, <&r_ccu 11>;

			clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>;

			clock-names = "apb", "ir";

			resets = <&r_ccu 0>;

			resets = <&r_ccu RST_APB0_IR>;

			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0x01f02000 0x40>;

			status = "disabled";
@@ -585,7 +587,7 @@ 
			compatible = "allwinner,sun8i-h3-r-pinctrl";

			reg = <0x01f02c00 0x400>;

			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&r_ccu 3>, <&osc24M>, <&osc32k>;

			clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>;

			clock-names = "apb", "hosc", "losc";

			gpio-controller;

			#gpio-cells = <3>;