Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188

With grf.txt converted to YAML a lot of compatibles
did not have 'simple-mfd' added in the old binding.
That implies that if you have child nodes they need
to be documented.
Make the new layout fit for rk3066/rk3188,
move and restyle the grf nodes.
Remove rockchip,grf from usbphy node.
Add "#phy-cells", because it is a required property
by phy-provider.yaml
With the conversion of syscon.yaml minItems for compatibles
was set to 2. Current Rockchip rk3xxx.dtsi file only uses "syscon"
for the grf registers. Add "syscon", "simple-mfd"
compatible for rk3066/rk3188 to reduce notifications produced with:

make ARCH=arm dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/mfd/syscon.yaml

Changed compatibles:
"rockchip,rk3066-grf", "syscon", "simple-mfd"
"rockchip,rk3188-grf", "syscon", "simple-mfd"

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20210512122346.9463-4-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

authored by

Johan Jonker and committed by
Heiko Stuebner
6e4e4e2a 87cf20cc

+59 -49
+29 -24
arch/arm/boot/dts/rk3066a.dtsi
··· 266 266 status = "disabled"; 267 267 }; 268 268 269 - usbphy: phy { 270 - compatible = "rockchip,rk3066a-usb-phy", "rockchip,rk3288-usb-phy"; 271 - rockchip,grf = <&grf>; 272 - #address-cells = <1>; 273 - #size-cells = <0>; 274 - status = "disabled"; 275 - 276 - usbphy0: usb-phy@17c { 277 - #phy-cells = <0>; 278 - reg = <0x17c>; 279 - clocks = <&cru SCLK_OTGPHY0>; 280 - clock-names = "phyclk"; 281 - #clock-cells = <0>; 282 - }; 283 - 284 - usbphy1: usb-phy@188 { 285 - #phy-cells = <0>; 286 - reg = <0x188>; 287 - clocks = <&cru SCLK_OTGPHY1>; 288 - clock-names = "phyclk"; 289 - #clock-cells = <0>; 290 - }; 291 - }; 292 - 293 269 pinctrl: pinctrl { 294 270 compatible = "rockchip,rk3066a-pinctrl"; 295 271 rockchip,grf = <&grf>; ··· 676 700 "pp3", 677 701 "ppmmu3"; 678 702 power-domains = <&power RK3066_PD_GPU>; 703 + }; 704 + 705 + &grf { 706 + compatible = "rockchip,rk3066-grf", "syscon", "simple-mfd"; 707 + 708 + usbphy: usbphy { 709 + compatible = "rockchip,rk3066a-usb-phy", 710 + "rockchip,rk3288-usb-phy"; 711 + #phy-cells = <0>; 712 + #address-cells = <1>; 713 + #size-cells = <0>; 714 + status = "disabled"; 715 + 716 + usbphy0: usb-phy@17c { 717 + reg = <0x17c>; 718 + clocks = <&cru SCLK_OTGPHY0>; 719 + clock-names = "phyclk"; 720 + #clock-cells = <0>; 721 + #phy-cells = <0>; 722 + }; 723 + 724 + usbphy1: usb-phy@188 { 725 + reg = <0x188>; 726 + clocks = <&cru SCLK_OTGPHY1>; 727 + clock-names = "phyclk"; 728 + #clock-cells = <0>; 729 + #phy-cells = <0>; 730 + }; 731 + }; 679 732 }; 680 733 681 734 &i2c0 {
+29 -24
arch/arm/boot/dts/rk3188.dtsi
··· 214 214 }; 215 215 }; 216 216 217 - usbphy: phy { 218 - compatible = "rockchip,rk3188-usb-phy", "rockchip,rk3288-usb-phy"; 219 - rockchip,grf = <&grf>; 220 - #address-cells = <1>; 221 - #size-cells = <0>; 222 - status = "disabled"; 223 - 224 - usbphy0: usb-phy@10c { 225 - #phy-cells = <0>; 226 - reg = <0x10c>; 227 - clocks = <&cru SCLK_OTGPHY0>; 228 - clock-names = "phyclk"; 229 - #clock-cells = <0>; 230 - }; 231 - 232 - usbphy1: usb-phy@11c { 233 - #phy-cells = <0>; 234 - reg = <0x11c>; 235 - clocks = <&cru SCLK_OTGPHY1>; 236 - clock-names = "phyclk"; 237 - #clock-cells = <0>; 238 - }; 239 - }; 240 - 241 217 pinctrl: pinctrl { 242 218 compatible = "rockchip,rk3188-pinctrl"; 243 219 rockchip,grf = <&grf>; ··· 636 660 "pp3", 637 661 "ppmmu3"; 638 662 power-domains = <&power RK3188_PD_GPU>; 663 + }; 664 + 665 + &grf{ 666 + compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd"; 667 + 668 + usbphy: usbphy { 669 + compatible = "rockchip,rk3188-usb-phy", 670 + "rockchip,rk3288-usb-phy"; 671 + #phy-cells = <0>; 672 + #address-cells = <1>; 673 + #size-cells = <0>; 674 + status = "disabled"; 675 + 676 + usbphy0: usb-phy@10c { 677 + reg = <0x10c>; 678 + clocks = <&cru SCLK_OTGPHY0>; 679 + clock-names = "phyclk"; 680 + #clock-cells = <0>; 681 + #phy-cells = <0>; 682 + }; 683 + 684 + usbphy1: usb-phy@11c { 685 + reg = <0x11c>; 686 + clocks = <&cru SCLK_OTGPHY1>; 687 + clock-names = "phyclk"; 688 + #clock-cells = <0>; 689 + #phy-cells = <0>; 690 + }; 691 + }; 639 692 }; 640 693 641 694 &i2c0 {
+1 -1
arch/arm/boot/dts/rk3xxx.dtsi
··· 256 256 }; 257 257 258 258 grf: grf@20008000 { 259 - compatible = "syscon"; 259 + compatible = "syscon", "simple-mfd"; 260 260 reg = <0x20008000 0x200>; 261 261 }; 262 262