在 2018-06-20三的 13:15 +0800，Chen-Yu Tsai写道：
> Now that the device tree binding headers for the R_CCU have been
> merged,
> we can use the macros, instead of raw numbers.
>
> Switch to R_CCU macros for clock and reset indices.
>
> Signed-off-by: Chen-Yu Tsai <wens@xxxxxxxx>
> ---
> arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> index c72da8cd9ef5..d85070f8c4a2 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> @@ -5,7 +5,9 @@
>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> #include <dt-bindings/clock/sun50i-h6-ccu.h>
> +#include <dt-bindings/clock/sun50i-h6-r-ccu.h>
> #include <dt-bindings/reset/sun50i-h6-ccu.h>
> +#include <dt-bindings/reset/sun50i-h6-r-ccu.h>
>
> / {
> interrupt-parent = <&gic>;
> @@ -198,7 +200,7 @@
> reg = <0x07022000 0x400>;
> interrupts = <GIC_SPI 105
> IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 111
> IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&r_ccu 2>, <&osc24M>, <&osc32k>;
> + clocks = <&r_ccu CLK_R_APB1>, <&osc24M>,
> <&osc32k>;
> clock-names = "apb", "hosc", "losc";
> gpio-controller;
> #gpio-cells = <3>;
> @@ -208,6 +210,7 @@
> r_i2c_pins: r-i2c {
> pins = "PL0", "PL1";
> function = "s_i2c";
> + bias-pull-up;
Should this be included in this patch?
> };
> };
>
> @@ -215,8 +218,8 @@
> compatible = "allwinner,sun6i-a31-i2c";
> reg = <0x07081400 0x400>;
> interrupts = <GIC_SPI 107
> IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&r_ccu 8>;
> - resets = <&r_ccu 4>;
> + clocks = <&r_ccu CLK_R_APB2_I2C>;
> + resets = <&r_ccu RST_R_APB2_I2C>;
> pinctrl-names = "default";
> pinctrl-0 = <&r_i2c_pins>;
> status = "disabled";
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
