hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Rename scpsys nodes to power-controller. 

- Add PWM node to MT7629 SoC
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAl50pJcXHG1hdHRoaWFz
 LmJnZ0BnbWFpbC5jb20ACgkQL21+TfbCqH6DXhAAnlivhRR5ybMTDrF0LVzEIaD0
 s5JWNSLZXYp/k/KwlE/8wtL7l65we1ezb/W2R9kRskh4wdX4wJ88URukyA17PNFv
 /sapYD8esZ/b/37MJDR0xPuKBIcEgiVAHFA+m/h8gd+5yt0UdJmr7vPvfD2y8L8Z
 nHQC0Xggy2y0Eyq0kXfbdIVeD+KiZej0DIo+dGgg/GW1Xt9c+ACFF8JjOkcIRGcJ
 7ntrggla4uKNIwfb3hEzKUtnccEM9g6FbwxXGwJKfAWwAStGbFgxcyGbRtMG/NmV
 IJ7IM/z9U4mKU2oRyBRhJh4A02aWL9zpUVxkLm4Al8uKZkAXv7yMhO9IeLuzOuuS
 arMhDzEz+v+6M/h7y+8IA3AjZw0PNkEjkE8ptyfJrGG8qo3nvppSQp1YbpL2Vpct
 xma4Hcw57nWm6HE/BAiRxDRmJUUtyYX+5AsP2VQop1NF8uNJgNgBuBqphn+jDRzn
 TcUrdVGZo+aO23rLu8K1uJT/HVZ6B6CtuZmGrd4Ek1qckqFeC7jyzr5quSHXp0Qx
 WDz31gi+l1YH2DbPChzAbKjESds0fR3Syu4LyXNmtkGu9QcEsjDgJ1dZQRdkH1lA
 tzkp9eGfL4YbEa/ZHiQPcHxi5d9Sqwacqi0SmJBYnL9EfXmfWXKnXbYsiZXoWlyn
 XkOVMkMISjGIvwkxJAQ=
 =fYiW
 -----END PGP SIGNATURE-----

Merge tag 'v5.6-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

- Rename scpsys nodes to power-controller.
- Add PWM node to MT7629 SoC

* tag 'v5.6-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  ARM: dts: mediatek: add mt7629 pwm support
  ARM: dts: mediatek: rename scpsys nodes to power-controller

Link: https://lore.kernel.org/r/b454c6b2-656e-2261-7688-f7f2773189cf@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-03-25 22:27:22 +01:00
parent 12ecf0680c 5afc2b83ac
commit 21a3c5dd23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/mt2701.dtsi
View File

@ -148,7 +148,7 @@
reg = <0 0x10005000 0 0x1000>;
};
scpsys: scpsys@10006000 {
scpsys: power-controller@10006000 {
compatible = "mediatek,mt2701-scpsys", "syscon";
#power-domain-cells = <1>;
reg = <0 0x10006000 0 0x1000>;

2
arch/arm/boot/dts/mt7623.dtsi
View File

@ -268,7 +268,7 @@
reg = <0 0x10005000 0 0x1000>;
};
scpsys: scpsys@10006000 {
scpsys: power-controller@10006000 {
compatible = "mediatek,mt7623-scpsys",
"mediatek,mt2701-scpsys",
"syscon";

16
arch/arm/boot/dts/mt7629.dtsi
View File

@ -90,7 +90,7 @@
#clock-cells = <1>;
};
scpsys: scpsys@10006000 {
scpsys: power-controller@10006000 {
compatible = "mediatek,mt7629-scpsys",
"mediatek,mt7622-scpsys";
#power-domain-cells = <1>;
@ -241,6 +241,20 @@
status = "disabled";
};
pwm: pwm@11006000 {
compatible = "mediatek,mt7629-pwm";
reg = <0x11006000 0x1000>;
#pwm-cells = <2>;
clocks = <&topckgen CLK_TOP_PWM_SEL>,
<&pericfg CLK_PERI_PWM_PD>,
<&pericfg CLK_PERI_PWM1_PD>;
clock-names = "top", "main", "pwm1";
assigned-clocks = <&topckgen CLK_TOP_PWM_SEL>;
assigned-clock-parents =
<&topckgen CLK_TOP_UNIVPLL2_D4>;
status = "disabled";
};
i2c: i2c@11007000 {
compatible = "mediatek,mt7629-i2c",
"mediatek,mt2712-i2c";