mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Clock properties for cru nodes to match the yaml-converted bindings 

and renaming of Quartz-A bluetooth pin nodename to not conflict with
 Yaml constraints.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmKRDwMQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgaxyB/9tzsQldon0EfO1UpZsbNaqT7b18E4tNUkY
 4oNkm9GG5wgl9AcOzWnm40zb+2bpSgZUWqBiVgrtDJzvbDuS3fFIwzoyEV5QQysM
 znQNyJzeBQ1rpNkd5qSOUaFwIblk7PGiuSD0JV/J9dkjsy4VSd4t6LkpR+1O1f4O
 hcLhAtII6rzg/iNlLS0JCo2sNmF0kz7U4gLzNcq5AOZCHPkKQGBa0lR7DtAna41K
 c8nKLlKBPY/Z60JAEtlcSEZVJS0Wk187FIwylfrUaeuVZKnCSrg3UyImFjEVT705
 6ulPRjVdCWUWY+O71hyCiBEERQavDJwoCUD18hwLFtGwxtcQEgBz
 =U6N1
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmKRMrUACgkQmmx57+YA
 GNmBWA/9GvtI9XWiaaF+rZgxFurpsvLmQ/AwWKa61n99n4RGs7+9xihpX5nIF2k0
 FXAIEUHL2rMYdgBWGUToSXa+9iia80cdw4Y/LPb2cQjOva3fBTxTzu904aCrZDjB
 mx5ylqj9DRy77oya9yAFgaAO2Ze05/nUWuOI32sXgRoxzgUR/9zuDX16FVGVkvyE
 OHUOEm24BZexd5qILIFQ/FlHF8m2DEgCG83APqtp0aNomfI+ahvkJkRxJqiIxkkq
 rRVmKB3MsiOkBAAXEGetNUx0XeqN32oqsk9sbVrLnYhzJ+DvhBRg0txz2wDdmuZN
 MZUERVbK19mvjjsXkJuKfapQ5mirbj1v0+sKTNWKhXl47avK/hPqoF8Q/OxsuBGf
 B7W9AXjUENd4X4zwYbMvp8fDPOPDW6O4lj0QUJ2gV+lQp+tWiKOw95ltK5h0hWkQ
 1PuOEYbroqB6t8PEWWayaTyWwRcAnN3h9outRwoXz32RIDxBG30xLgSFsuBlTBJ/
 YDGD/oyyIJOmeSvlxgow/RrHRC91GbdxXitxCVq2+p1k/g6VTWRyBbgPlr4RTc12
 BdAWNAp7dRf5AXWNXQt1YBx4jn1tkK4epNqlTOC+w0M29ocfO8Ntd8PPdDJLd6lq
 Pg99jgoYw7kJ5/Iwh1rMWmOi6DQFcQNXcMtJPWk47FsB21RMq88=
 =ZMYI
 -----END PGP SIGNATURE-----

Merge tag 'v5.19-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/late

Clock properties for cru nodes to match the yaml-converted bindings
and renaming of Quartz-A bluetooth pin nodename to not conflict with
Yaml constraints.

* tag 'v5.19-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: rename Quartz64-A bluetooth gpios
  arm64: dts: rockchip: add clocks property to cru node rk3368
  arm64: dts: rockchip: add clocks property to cru node rk3308
  arm64: dts: rockchip: add clocks to rk356x cru

Link: https://lore.kernel.org/r/7695907.Sb9uPGUboI@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-27 22:21:08 +02:00
parent 440517772b cd414d5ac1
commit 8a1e75c53c
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/boot/dts/rockchip/rk3308.dtsi
View File

@ -745,10 +745,11 @@
cru: clock-controller@ff500000 {
compatible = "rockchip,rk3308-cru";
reg = <0x0 0xff500000 0x0 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;
rockchip,grf = <&grf>;
assigned-clocks = <&cru SCLK_RTC32K>;
assigned-clock-rates = <32768>;
};

2
arch/arm64/boot/dts/rockchip/rk3368.dtsi
View File

@ -747,6 +747,8 @@
cru: clock-controller@ff760000 {
compatible = "rockchip,rk3368-cru";
reg = <0x0 0xff760000 0x0 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;

4
arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
View File

@ -652,8 +652,8 @@
compatible = "brcm,bcm43438-bt";
clocks = <&rk817 1>;
clock-names = "lpo";
device-wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
host-wake-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;

2
arch/arm64/boot/dts/rockchip/rk356x.dtsi
View File

@ -397,6 +397,8 @@
cru: clock-controller@fdd20000 {
compatible = "rockchip,rk3568-cru";
reg = <0x0 0xfdd20000 0x0 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
#clock-cells = <1>;
#reset-cells = <1>;
assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>;