| Message ID | 20230202104014.2931517-1-wenst@chromium.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Headers | show |
| Series | arm64: dts: mediatek: mt8195: Fix vdosys* compatible strings | expand |
Il 02/02/23 11:40, Chen-Yu Tsai ha scritto: > When vdosys1 was initially added, it was incorrectly assumed to be > compatible with vdosys0, and thus both had the same mt8195-mmsys > compatible attached. > > This has since been corrected in commit b237efd47df7 ("dt-bindings: > arm: mediatek: mmsys: change compatible for MT8195") and commit > 82219cfbef18 ("dt-bindings: arm: mediatek: mmsys: add vdosys1 compatible > for MT8195"). The device tree needs to be fixed as well, otherwise > the vdosys1 block fails to work, and causes its dependent power domain > controller to not work either. > > Change the compatible string of vdosys1 to "mediatek,mt8195-vdosys1". > While at it, also add the new "mediatek,mt8195-vdosys0" compatible to > vdosys0. > > Fixes: 6aa5b46d1755 ("arm64: dts: mt8195: Add vdosys and vppsys clock nodes") > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > > Since we are at -rc6 and Matthias already sent out pull requests, I've > CC-ed soc@ so that this may be picked up directly on top of them. This > should be merged for -next. > > Thanks >
On 02/02/2023 12:42, AngeloGioacchino Del Regno wrote: > Il 02/02/23 11:40, Chen-Yu Tsai ha scritto: >> When vdosys1 was initially added, it was incorrectly assumed to be >> compatible with vdosys0, and thus both had the same mt8195-mmsys >> compatible attached. >> >> This has since been corrected in commit b237efd47df7 ("dt-bindings: >> arm: mediatek: mmsys: change compatible for MT8195") and commit >> 82219cfbef18 ("dt-bindings: arm: mediatek: mmsys: add vdosys1 compatible >> for MT8195"). The device tree needs to be fixed as well, otherwise >> the vdosys1 block fails to work, and causes its dependent power domain >> controller to not work either. >> >> Change the compatible string of vdosys1 to "mediatek,mt8195-vdosys1". >> While at it, also add the new "mediatek,mt8195-vdosys0" compatible to >> vdosys0. >> >> Fixes: 6aa5b46d1755 ("arm64: dts: mt8195: Add vdosys and vppsys clock nodes") >> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> Arnd, Olof, will you take it directly or shall I provide a pull request once -rc1 is out? Regards, Matthias >> --- >> >> Since we are at -rc6 and Matthias already sent out pull requests, I've >> CC-ed soc@ so that this may be picked up directly on top of them. This >> should be merged for -next. >> >> Thanks >> >
diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi index 5ffcfd8da31d..93ba274c3f42 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi @@ -2439,7 +2439,7 @@ vencsys_core1: clock-controller@1b000000 { }; vdosys0: syscon@1c01a000 { - compatible = "mediatek,mt8195-mmsys", "syscon"; + compatible = "mediatek,mt8195-vdosys0", "mediatek,mt8195-mmsys", "syscon"; reg = <0 0x1c01a000 0 0x1000>; mboxes = <&gce0 0 CMDQ_THR_PRIO_4>; #clock-cells = <1>; @@ -2625,7 +2625,7 @@ larb1: larb@1c019000 { }; vdosys1: syscon@1c100000 { - compatible = "mediatek,mt8195-mmsys", "syscon"; + compatible = "mediatek,mt8195-vdosys1", "syscon"; reg = <0 0x1c100000 0 0x1000>; #clock-cells = <1>; };
When vdosys1 was initially added, it was incorrectly assumed to be compatible with vdosys0, and thus both had the same mt8195-mmsys compatible attached. This has since been corrected in commit b237efd47df7 ("dt-bindings: arm: mediatek: mmsys: change compatible for MT8195") and commit 82219cfbef18 ("dt-bindings: arm: mediatek: mmsys: add vdosys1 compatible for MT8195"). The device tree needs to be fixed as well, otherwise the vdosys1 block fails to work, and causes its dependent power domain controller to not work either. Change the compatible string of vdosys1 to "mediatek,mt8195-vdosys1". While at it, also add the new "mediatek,mt8195-vdosys0" compatible to vdosys0. Fixes: 6aa5b46d1755 ("arm64: dts: mt8195: Add vdosys and vppsys clock nodes") Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> --- Since we are at -rc6 and Matthias already sent out pull requests, I've CC-ed soc@ so that this may be picked up directly on top of them. This should be merged for -next. Thanks arch/arm64/boot/dts/mediatek/mt8195.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)