Commit 21a3c5dd authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'v5.6-next-dts32' of...

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 12ecf068 5afc2b83
......@@ -148,7 +148,7 @@ syscfg_pctl_a: syscfg@10005000 {
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>;
......
......@@ -268,7 +268,7 @@ syscfg_pctl_a: syscfg@10005000 {
reg = <0 0x10005000 0 0x1000>;
};
scpsys: scpsys@10006000 {
scpsys: power-controller@10006000 {
compatible = "mediatek,mt7623-scpsys",
"mediatek,mt2701-scpsys",
"syscon";
......
......@@ -90,7 +90,7 @@ pericfg: syscon@10002000 {
#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 @@ uart2: serial@11004000 {
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";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment