Re: Adapt to Allwinner device tree changes in linux >= 5.0-rc1

[Mark Kettenis]

> Date: Mon, 21 Jan 2019 11:39:42 +1100
> From: Jonathan Gray 
> 
> Adapt to allwinner device tree changes in linux >= 5.0-rc1
> "allwinner,sun6i-a31-rtc" has been removed from h3/h5/r40/a64
> 
> 507c6e89d6c4b2cd68a8e7ff69d1a00cf74b15dd
> ARM: dts: sunxi: h3/h5: Fix up RTC device node and clock references
> 
> 44ff3cafcd7f413e7710a58ac40cfdc3a9380097
> arm64: dts: allwinner: a64: Fix up RTC device node and clock references
> 
> 5f9e882825467105acafd208520b69bf95adb963
> ARM: dts: sun8i: r40: Add RTC device node
> 
> compile tested only

Sure.  Can't do any harm.

> Index: sxirtc.c
> ===
> RCS file: /cvs/src/sys/dev/fdt/sxirtc.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 sxirtc.c
> --- sxirtc.c  27 Mar 2017 14:03:19 -  1.2
> +++ sxirtc.c  21 Jan 2019 00:16:02 -
> @@ -76,7 +76,9 @@ sxirtc_match(struct device *parent, void
>  
>   return (OF_is_compatible(faa->fa_node, "allwinner,sun4i-a10-rtc") ||
>   OF_is_compatible(faa->fa_node, "allwinner,sun7i-a20-rtc") ||
> - OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc"));
> + OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc") ||
> + OF_is_compatible(faa->fa_node, "allwinner,sun8i-h3-rtc") ||
> + OF_is_compatible(faa->fa_node, "allwinner,sun50i-h5-rtc"));
>  }
>  
>  void
> @@ -98,7 +100,9 @@ sxirtc_attach(struct device *parent, str
>   faa->fa_reg[0].size, 0, >sc_ioh))
>   panic("sxirtc_attach: bus_space_map failed!");
>  
> - if (OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc")) {
> + if (OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc") ||
> + OF_is_compatible(faa->fa_node, "allwinner,sun8i-h3-rtc") ||
> + OF_is_compatible(faa->fa_node, "allwinner,sun50i-h5-rtc")) {
>   sc->sc_yymmdd = SXIRTC_YYMMDD_A31;
>   sc->sc_hhmmss = SXIRTC_HHMMSS_A31;
>   } else {
> 
> 

Adapt to Allwinner device tree changes in linux >= 5.0-rc1

[Jonathan Gray]

Adapt to allwinner device tree changes in linux >= 5.0-rc1
"allwinner,sun6i-a31-rtc" has been removed from h3/h5/r40/a64

507c6e89d6c4b2cd68a8e7ff69d1a00cf74b15dd
ARM: dts: sunxi: h3/h5: Fix up RTC device node and clock references

44ff3cafcd7f413e7710a58ac40cfdc3a9380097
arm64: dts: allwinner: a64: Fix up RTC device node and clock references

5f9e882825467105acafd208520b69bf95adb963
ARM: dts: sun8i: r40: Add RTC device node

compile tested only

Index: sxirtc.c
===
RCS file: /cvs/src/sys/dev/fdt/sxirtc.c,v
retrieving revision 1.2
diff -u -p -r1.2 sxirtc.c
--- sxirtc.c27 Mar 2017 14:03:19 -  1.2
+++ sxirtc.c21 Jan 2019 00:16:02 -
@@ -76,7 +76,9 @@ sxirtc_match(struct device *parent, void
 
return (OF_is_compatible(faa->fa_node, "allwinner,sun4i-a10-rtc") ||
OF_is_compatible(faa->fa_node, "allwinner,sun7i-a20-rtc") ||
-   OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc"));
+   OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc") ||
+   OF_is_compatible(faa->fa_node, "allwinner,sun8i-h3-rtc") ||
+   OF_is_compatible(faa->fa_node, "allwinner,sun50i-h5-rtc"));
 }
 
 void
@@ -98,7 +100,9 @@ sxirtc_attach(struct device *parent, str
faa->fa_reg[0].size, 0, >sc_ioh))
panic("sxirtc_attach: bus_space_map failed!");
 
-   if (OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc")) {
+   if (OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc") ||
+   OF_is_compatible(faa->fa_node, "allwinner,sun8i-h3-rtc") ||
+   OF_is_compatible(faa->fa_node, "allwinner,sun50i-h5-rtc")) {
sc->sc_yymmdd = SXIRTC_YYMMDD_A31;
sc->sc_hhmmss = SXIRTC_HHMMSS_A31;
} else {